Merge pull request #2113 from xrwang8/master

ks-ci-bot · web-flow · commit eb45f76f73f0 · 2024-02-13T19:20:23.000+08:00
fix : redeployment failure when internal ip is modified
diff --git a/cmd/kk/pkg/bootstrap/os/tasks.go b/cmd/kk/pkg/bootstrap/os/tasks.go
@@ -258,6 +258,9 @@ func (r *RemoveFiles) Execute(runtime connector.Runtime) error {
 	for _, file := range clusterFiles {
 		_, _ = runtime.GetRunner().SudoCmd(fmt.Sprintf("rm -rf %s", file), true)
 	}
+	// remove pki/etcd Path if it exists, otherwise it will cause the etcd reinstallation to fail if ip change
+	pkiPath := fmt.Sprintf("%s/pki/etcd", runtime.GetWorkDir())
+	_, _ = runtime.GetRunner().SudoCmd(fmt.Sprintf("rm -rf %s", pkiPath), true)
 	return nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -258,6 +258,9 @@ func (r *RemoveFiles) Execute(runtime connector.Runtime) error {`
`258`	`258`	`for _, file := range clusterFiles {`
`259`	`259`	`_, _ = runtime.GetRunner().SudoCmd(fmt.Sprintf("rm -rf %s", file), true)`
`260`	`260`	`}`
	`261`	`+ // remove pki/etcd Path if it exists, otherwise it will cause the etcd reinstallation to fail if ip change`
	`262`	`+ pkiPath := fmt.Sprintf("%s/pki/etcd", runtime.GetWorkDir())`
	`263`	`+ _, _ = runtime.GetRunner().SudoCmd(fmt.Sprintf("rm -rf %s", pkiPath), true)`
`261`	`264`	`return nil`
`262`	`265`	`}`
`263`	`266`