15308555518/ kubekey
1
0
Fork 0
mirror of https://github.com/kubesphere/kubekey.git synced 2025-12-26 01:22:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1920 from wenwenxiong/master 

filter etcd node for k8s cluster delete node
This commit is contained in:
KubeSphere CI Bot 2023-07-18 17:59:05 +08:00 committed by GitHub
parent c879a27f44 3d0c1b62ca
commit 76c531bb3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmd/kk/pkg/kubernetes/tasks.go
View File

@ -452,6 +452,18 @@ type FilterFirstMaster struct {
common.KubeAction
}
func filterString(filter string, nodes []string) []string {
j := 0
for _, v := range nodes {
if v != filter {
nodes[j] = v
j++
}
}
resArr := nodes[:j]
return resArr
}
func (f *FilterFirstMaster) Execute(runtime connector.Runtime) error {
firstMaster := runtime.GetHostsByRole(common.Master)[0].GetName()
//kubectl get node
@ -469,19 +481,17 @@ func (f *FilterFirstMaster) Execute(runtime connector.Runtime) error {
nodes = strings.Split(res, "\r\n")
}
//nodes filter first master
j := 0
for _, v := range nodes {
if v != firstMaster {
nodes[j] = v
j++
}
resArr := filterString(firstMaster, nodes)
//nodes filter etcd nodes
for i := 0; i < len(runtime.GetHostsByRole(common.ETCD)); i++ {
etcdName := runtime.GetHostsByRole(common.ETCD)[i].GetName()
resArr = filterString(etcdName, resArr)
}
resArr := nodes[:j]
workerName := make(map[string]struct{})
for j := 0; j < len(runtime.GetHostsByRole(common.Worker)); j++ {
workerName[runtime.GetHostsByRole(common.Worker)[j].GetName()] = struct{}{}
}
//make sure node is not the first master node name
//make sure node is not the first master and etcd node name
var node string
for i := 0; i < len(resArr); i++ {
if _, ok := workerName[resArr[i]]; ok && resArr[i] == f.KubeConf.Arg.NodeName {
@ -494,7 +504,7 @@ func (f *FilterFirstMaster) Execute(runtime connector.Runtime) error {
return errors.New("" +
"1. check the node name in the config-sample.yaml\n" +
"2. check the node name in the Kubernetes cluster\n" +
"3. check the node name is the first master node name\n")
"3. check the node name is the first master and etcd node name\n")
}
f.PipelineCache.Set("dstNode", node)