github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 18:00:08 +00:00
Code Issues Projects Releases Wiki Activity

test integration: use new ServiceCIDR API

Browse Source 
Change-Id: I7aaa978842fbe8d75383f8a3159ca4fce01ffdcb
This commit is contained in:
Antonio Ojea 2023-10-29 19:00:48 +00:00
parent 271900a0f0
commit 5d90d07f2d
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/integration/servicecidr/migration_test.go
View File

@ -230,7 +230,11 @@ func TestMigrateServiceCIDR(t *testing.T) {
return false, err 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 return false, nil
} }

11
test/integration/servicecidr/servicecidr_test.go
View File

@ -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{ serviceCIDR := &networkingv1alpha1.ServiceCIDR{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: name, Name: name,
}, },
Spec: networkingv1alpha1.ServiceCIDRSpec{ Spec: networkingv1alpha1.ServiceCIDRSpec{},
IPv4: ipv4, }
IPv6: ipv6, serviceCIDR.Spec.CIDRs = append(serviceCIDR.Spec.CIDRs, primary)
}, if secondary != "" {
serviceCIDR.Spec.CIDRs = append(serviceCIDR.Spec.CIDRs, secondary)
} }
return serviceCIDR return serviceCIDR
} }