karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix test for corev1.LoadBalancerIngress,add IP model to VIP when ip is setting. 

Signed-off-by: Lan Liang <gcslyp@gmail.com>
This commit is contained in:
Lan Liang 2024-08-09 10:23:06 +00:00
parent 23fc1db9a0
commit 8271dca431
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/resource_test.go
View File

@ -172,12 +172,12 @@ var _ = ginkgo.Describe("[resource-status collection] resource status collection
for index, clusterName := range framework.ClusterNames() { for index, clusterName := range framework.ClusterNames() {
clusterClient := framework.GetClusterClient(clusterName) clusterClient := framework.GetClusterClient(clusterName)
gomega.Expect(clusterClient).ShouldNot(gomega.BeNil()) gomega.Expect(clusterClient).ShouldNot(gomega.BeNil())
ingresses := []corev1.LoadBalancerIngress{{IP: fmt.Sprintf("172.19.1.%d", index+6)}} ingresses := []corev1.LoadBalancerIngress{{IP: fmt.Sprintf("172.19.1.%d", index+6)}}
for _, ingress := range ingresses { for _, ingress := range ingresses {
svcLoadBalancer.Ingress = append(svcLoadBalancer.Ingress, corev1.LoadBalancerIngress{ svcLoadBalancer.Ingress = append(svcLoadBalancer.Ingress, corev1.LoadBalancerIngress{
IP: ingress.IP, IP: ingress.IP,
Hostname: clusterName, Hostname: clusterName,
IPMode: ingress.IPMode,
}) })
} }
@ -198,8 +198,14 @@ var _ = ginkgo.Describe("[resource-status collection] resource status collection
latestSvc, err := kubeClient.CoreV1().Services(serviceNamespace).Get(context.TODO(), serviceName, metav1.GetOptions{}) latestSvc, err := kubeClient.CoreV1().Services(serviceNamespace).Get(context.TODO(), serviceName, metav1.GetOptions{})
g.Expect(err).NotTo(gomega.HaveOccurred()) g.Expect(err).NotTo(gomega.HaveOccurred())
// TODO: Once karmada-apiserver v1.30 deploy by default,delete the following five lines, see https://github.com/karmada-io/karmada/pull/5141
for i := range latestSvc.Status.LoadBalancer.Ingress {
if latestSvc.Status.LoadBalancer.Ingress[i].IPMode != nil {
latestSvc.Status.LoadBalancer.Ingress[i].IPMode = nil
}
}
klog.Infof("the latest serviceStatus loadBalancer: %v", latestSvc.Status.LoadBalancer) klog.Infof("the latest serviceStatus loadBalancer: %v", latestSvc.Status.LoadBalancer)
return reflect.DeepEqual(latestSvc.Status.LoadBalancer, svcLoadBalancer), nil return reflect.DeepEqual(latestSvc.Status.LoadBalancer.Ingress, svcLoadBalancer.Ingress), nil
}, pollTimeout, pollInterval).Should(gomega.Equal(true)) }, pollTimeout, pollInterval).Should(gomega.Equal(true))
}) })
}) })