go fumpt

Signed-off-by: Karol Szwaj <[email protected]>
kubeovn · Dec 30, 2024 · 464c30a · 464c30a
1 parent c31bf6b
commit 464c30a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -1657,7 +1657,7 @@ func (c *Controller) acquireAddress(pod *v1.Pod, podNet *kubeovnNet) (string, st
 
 					switch podNet.Subnet.Spec.Protocol {
 					case kubeovnv1.ProtocolDual:
-						if ippool.Status.V4AvailableIPs.Int64() == 0 && ippool.Status.V6AvailableIPs.Int64() == 0 {
+						if ippool.Status.V4AvailableIPs.Int64() == 0 || ippool.Status.V6AvailableIPs.Int64() == 0 {
 							continue
 						}
 					case kubeovnv1.ProtocolIPv4:
@@ -1673,6 +1673,7 @@ func (c *Controller) acquireAddress(pod *v1.Pod, podNet *kubeovnNet) (string, st
 
 					if ippool.Spec.Subnet == podNet.Subnet.Name {
 						ippoolStr = ippool.Name
+						break
 					}
 				}
 			}

diff --git a/test/e2e/kube-ovn/ipam/ipam.go b/test/e2e/kube-ovn/ipam/ipam.go
@@ -586,6 +586,9 @@ var _ = framework.Describe("[group:ipam]", func() {
 			framework.ExpectIPInCIDR(pod.Annotations[util.IPAddressAnnotation], subnet.Spec.CIDRBlock)
 			framework.ExpectMAC(pod.Annotations[util.MacAddressAnnotation])
 			framework.ExpectHaveKeyWithValue(pod.Annotations, util.RoutedAnnotation, "true")
+			for _, ip := range util.PodIPs(pod) {
+				framework.ExpectContainElement(append(ipsRange1, ipsRange2...), ip)
+			}
 		}
 
 		ginkgo.By("Creating second statefulset " + stsName2 + " with logical switch annotation and no ippool annotation")
@@ -605,6 +608,9 @@ var _ = framework.Describe("[group:ipam]", func() {
 			framework.ExpectIPInCIDR(pod.Annotations[util.IPAddressAnnotation], subnet.Spec.CIDRBlock)
 			framework.ExpectMAC(pod.Annotations[util.MacAddressAnnotation])
 			framework.ExpectHaveKeyWithValue(pod.Annotations, util.RoutedAnnotation, "true")
+			for _, ip := range util.PodIPs(pod) {
+				framework.ExpectContainElement(append(ipsRange1, ipsRange2...), ip)
+			}
 		}
 	})
 })
diff --git a/test/e2e/multus/e2e_test.go b/test/e2e/multus/e2e_test.go
@@ -501,7 +501,6 @@ var _ = framework.SerialDescribe("[group:multus]", func() {
 	})
 
 	framework.ConformanceIt("should be able to use mac and ip provided by k8s.v1.cni.cncf.io/networks annotation", func() {
-
 		if f.VersionPriorTo(1, 13) {
 			ginkgo.Skip("this feature is supported from version 1.13")
 		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -501,7 +501,6 @@ var _ = framework.SerialDescribe("[group:multus]", func() { @@
     	})
     	framework.ConformanceIt("should be able to use mac and ip provided by k8s.v1.cni.cncf.io/networks annotation", func() {
     		if f.VersionPriorTo(1, 13) {
     			ginkgo.Skip("this feature is supported from version 1.13")
     		}
@@ Expand Down @@