Merge pull request kubeedge#5895 from cuishuang/master

fix: fix slice init issue
1Shubham7 · Sep 29, 2024 · 8554c10 · 8554c10
2 parents 841368a + 1e0c2ea
commit 8554c10
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cloud/pkg/cloudstream/iptables/iptables.go b/cloud/pkg/cloudstream/iptables/iptables.go
@@ -140,7 +140,7 @@ func (im *Manager) reconcile() {
 	for _, ipports := range addedIPPort {
 		ipport := strings.Split(ipports, ":")
 		ip, port := ipport[0], ipport[1]
-		args := append([]string{"-p", "tcp", "-j", "DNAT", "--dport", port, "--to", ip + ":" + strconv.Itoa(im.streamPort)})
+		args := []string{"-p", "tcp", "-j", "DNAT", "--dport", port, "--to", ip + ":" + strconv.Itoa(im.streamPort)}
 		if _, err := im.iptables.EnsureRule(utiliptables.Append, utiliptables.TableNAT, tunnelPortChain, args...); err != nil {
 			klog.ErrorS(err, "Failed to ensure rules", "table", utiliptables.TableNAT, "chain", tunnelPortChain)
 			return
@@ -150,7 +150,7 @@ func (im *Manager) reconcile() {
 	for _, ipports := range deletedIPPort {
 		ipport := strings.Split(ipports, ":")
 		ip, port := ipport[0], ipport[1]
-		args := append([]string{"-p", "tcp", "-j", "DNAT", "--dport", port, "--to", ip + ":" + strconv.Itoa(im.streamPort)})
+		args := []string{"-p", "tcp", "-j", "DNAT", "--dport", port, "--to", ip + ":" + strconv.Itoa(im.streamPort)}
 		if err := im.iptables.DeleteRule(utiliptables.TableNAT, tunnelPortChain, args...); err != nil {
 			klog.ErrorS(err, "Failed to delete rules", "table", utiliptables.TableNAT, "chain", tunnelPortChain)
 			return

diff --git a/keadm/cmd/keadm/app/cmd/helm/installer.go b/keadm/cmd/keadm/app/cmd/helm/installer.go
@@ -341,7 +341,7 @@ func (cu *KubeCloudHelmInstTool) checkProfile(baseHelmRoot string) error {
 	validProfiles[IptablesMgrProfileKey] = true
 	validProfiles[ControllerManagerProfileKey] = true
 	if ok := validProfiles[cu.ProfileKey]; !ok {
-		validKeys := make([]string, len(validProfiles))
+		validKeys := make([]string, 0, len(validProfiles))
 		for k := range validProfiles {
 			validKeys = append(validKeys, k)
 		}