Skip to content

Commit c1a851a

Browse files
committed
Add integration test
Signed-off-by: Lubron Zhan <[email protected]>
1 parent fb500ec commit c1a851a

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

controllers/cluster/cluster_intg_test.go

+14-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
)
2424

2525
func intgTestEnsureClusterHAProvider() {
26-
2726
Context("EnsureHAService", func() {
2827
var (
2928
ctx *builder.IntegrationTestContext
@@ -104,7 +103,6 @@ func intgTestEnsureClusterHAProvider() {
104103
Name: serviceName,
105104
Namespace: ctx.Namespace,
106105
}, &corev1.Endpoints{}, testutil.EXIST)
107-
108106
})
109107
})
110108

@@ -143,9 +141,22 @@ func intgTestEnsureClusterHAProvider() {
143141
err := ctx.Client.Get(ctx, client.ObjectKey{Name: serviceName, Namespace: ctx.Namespace}, service)
144142
Expect(err).ShouldNot(HaveOccurred())
145143
Expect(service.Annotations[akoov1alpha1.AkoPreferredIPAnnotation]).Should(Equal("10.1.2.1"))
144+
// make sure the service has ip as ingress, not fqdn
145+
Consistently(func() bool {
146+
err := ctx.Client.Get(ctx, client.ObjectKey{Name: serviceName, Namespace: ctx.Namespace}, service)
147+
if err != nil {
148+
return false
149+
}
150+
if len(service.Status.LoadBalancer.Ingress) < 0 {
151+
return false
152+
}
153+
if service.Status.LoadBalancer.Ingress[0].IP != "10.1.2.1" {
154+
return false
155+
}
156+
return true
157+
}, "30s").Should(BeTrue())
146158
})
147159
})
148160
})
149-
150161
})
151162
}

pkg/test/util/utils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func EnsureClusterAviLabelMatchExpectation(ctx *builder.IntegrationTestContext,
128128

129129
func UpdateObjectLabels(ctx *builder.IntegrationTestContext, key client.ObjectKey, labels map[string]string) {
130130
Eventually(func() error {
131-
var cluster = new(clusterv1.Cluster)
131+
cluster := new(clusterv1.Cluster)
132132

133133
if err := ctx.Client.Get(ctx, client.ObjectKey{
134134
Name: key.Name,

0 commit comments

Comments
 (0)