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 #1955 from BaiMeow/master 

fix: slice overflow panic sometimes during node info parsing
This commit is contained in:
KubeSphere CI Bot 2023-08-23 10:58:58 +08:00 committed by GitHub
parent 6db33bc06f c3948bb2df
commit 8b11847712
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmd/kk/pkg/k8e/k8e_status.go
View File

@ -92,19 +92,21 @@ func (k *K8eStatus) SearchNodesInfo(_ connector.Runtime) error {
return err
}
tmp := strings.Split(k.ClusterInfo, "\r\n")
if len(tmp) >= 1 {
for i := 0; i < len(tmp); i++ {
if ipv4 := ipv4Regexp.FindStringSubmatch(tmp[i]); len(ipv4) != 0 {
k.NodesInfo[ipv4[0]] = ipv4[0]
}
if ipv6 := ipv6Regexp.FindStringSubmatch(tmp[i]); len(ipv6) != 0 {
k.NodesInfo[ipv6[0]] = ipv6[0]
}
if len(strings.Fields(tmp[i])) > 3 {
k.NodesInfo[strings.Fields(tmp[i])[0]] = strings.Fields(tmp[i])[1]
} else {
k.NodesInfo[strings.Fields(tmp[i])[0]] = ""
}
if len(tmp) < 1 || len(tmp) == 1 && tmp[0] == "" {
return errors.New("search K8e node info failed")
}
for i := 0; i < len(tmp); i++ {
if ipv4 := ipv4Regexp.FindStringSubmatch(tmp[i]); len(ipv4) != 0 {
k.NodesInfo[ipv4[0]] = ipv4[0]
}
if ipv6 := ipv6Regexp.FindStringSubmatch(tmp[i]); len(ipv6) != 0 {
k.NodesInfo[ipv6[0]] = ipv6[0]
}
if len(strings.Fields(tmp[i])) > 3 {
k.NodesInfo[strings.Fields(tmp[i])[0]] = strings.Fields(tmp[i])[1]
} else {
k.NodesInfo[strings.Fields(tmp[i])[0]] = ""
}
}
return nil