fix range loop

kubeovn · Mar 14, 2022 · 5a52041 · 5a52041
1 parent 37937fc
commit 5a52041
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/pkg/controller/init.go b/pkg/controller/init.go
@@ -417,14 +417,15 @@ func (c *Controller) initDefaultProviderNetwork() error {
 			pn.Spec.ExcludeNodes = append(pn.Spec.ExcludeNodes, node.Name)
 			newNode = node.DeepCopy()
 		} else if s := node.Annotations[interfaceAnno]; s != "" {
-			var index int
-			for index = range pn.Spec.CustomInterfaces {
-				if pn.Spec.CustomInterfaces[index].Interface == s {
+			var index *int
+			for i := range pn.Spec.CustomInterfaces {
+				if pn.Spec.CustomInterfaces[i].Interface == s {
+					index = &i
 					break
 				}
 			}
-			if index != len(pn.Spec.CustomInterfaces) {
-				pn.Spec.CustomInterfaces[index].Nodes = append(pn.Spec.CustomInterfaces[index].Nodes, node.Name)
+			if index != nil {
+				pn.Spec.CustomInterfaces[*index].Nodes = append(pn.Spec.CustomInterfaces[*index].Nodes, node.Name)
 			} else {
 				ci := kubeovnv1.CustomInterface{Interface: s, Nodes: []string{node.Name}}
 				pn.Spec.CustomInterfaces = append(pn.Spec.CustomInterfaces, ci)

diff --git a/pkg/controller/node.go b/pkg/controller/node.go
@@ -349,14 +349,15 @@ func (c *Controller) handleNodeAnnotationsForProviderNetworks(node *v1.Node) err
 				if newPn == nil {
 					newPn = pn.DeepCopy()
 				}
-				var index int
-				for index = range newPn.Spec.CustomInterfaces {
-					if newPn.Spec.CustomInterfaces[index].Interface == customInterface {
+				var index *int
+				for i := range newPn.Spec.CustomInterfaces {
+					if newPn.Spec.CustomInterfaces[i].Interface == customInterface {
+						index = &i
 						break
 					}
 				}
-				if index != len(newPn.Spec.CustomInterfaces) {
-					newPn.Spec.CustomInterfaces[index].Nodes = append(newPn.Spec.CustomInterfaces[index].Nodes, node.Name)
+				if index != nil {
+					newPn.Spec.CustomInterfaces[*index].Nodes = append(newPn.Spec.CustomInterfaces[*index].Nodes, node.Name)
 				} else {
 					ci := kubeovnv1.CustomInterface{Interface: customInterface, Nodes: []string{node.Name}}
 					newPn.Spec.CustomInterfaces = append(newPn.Spec.CustomInterfaces, ci)