diff --git a/test/integration/servicecidr/migration_test.go b/test/integration/servicecidr/migration_test.go index 0c679b4821a..8f0964078e7 100644 --- a/test/integration/servicecidr/migration_test.go +++ b/test/integration/servicecidr/migration_test.go @@ -230,7 +230,11 @@ func TestMigrateServiceCIDR(t *testing.T) { return false, err } - if cidr.Spec.IPv4 != cidr2 { + if len(cidr.Spec.CIDRs) == 0 { + return false, nil + } + + if cidr.Spec.CIDRs[0] != cidr2 { return false, nil } diff --git a/test/integration/servicecidr/servicecidr_test.go b/test/integration/servicecidr/servicecidr_test.go index b61981baf0f..4b10f2edbbd 100644 --- a/test/integration/servicecidr/servicecidr_test.go +++ b/test/integration/servicecidr/servicecidr_test.go @@ -304,15 +304,16 @@ func TestServiceCIDRDeletion(t *testing.T) { } } -func makeServiceCIDR(name, ipv4, ipv6 string) *networkingv1alpha1.ServiceCIDR { +func makeServiceCIDR(name, primary, secondary string) *networkingv1alpha1.ServiceCIDR { serviceCIDR := &networkingv1alpha1.ServiceCIDR{ ObjectMeta: metav1.ObjectMeta{ Name: name, }, - Spec: networkingv1alpha1.ServiceCIDRSpec{ - IPv4: ipv4, - IPv6: ipv6, - }, + Spec: networkingv1alpha1.ServiceCIDRSpec{}, + } + serviceCIDR.Spec.CIDRs = append(serviceCIDR.Spec.CIDRs, primary) + if secondary != "" { + serviceCIDR.Spec.CIDRs = append(serviceCIDR.Spec.CIDRs, secondary) } return serviceCIDR }