Skip to content

Commit ed59731

Browse files
aojeaaojea
committed
modify tests to use the networking v1beta1 API
1 parent dbfdd07 commit ed59731

File tree

8 files changed

+84
-81
lines changed

8 files changed

+84
-81
lines changed

‎test/e2e/network/service_cidrs.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
"github.com/onsi/ginkgo/v2"
2323
v1 "k8s.io/api/core/v1"
24-
networkingv1alpha1 "k8s.io/api/networking/v1alpha1"
24+
networkingv1beta1 "k8s.io/api/networking/v1beta1"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
"k8s.io/apimachinery/pkg/util/intstr"
2727
"k8s.io/apimachinery/pkg/util/wait"
@@ -62,18 +62,18 @@ var _ = common.SIGDescribe(feature.ServiceCIDRs, func() {
6262

6363
ginkgo.It("should create Services and servce on different Service CIDRs", func(ctx context.Context) {
6464
// create a new service CIDR
65-
svcCIDR := &networkingv1alpha1.ServiceCIDR{
65+
svcCIDR := &networkingv1beta1.ServiceCIDR{
6666
ObjectMeta: metav1.ObjectMeta{
6767
Name: "test-svc-cidr",
6868
},
69-
Spec: networkingv1alpha1.ServiceCIDRSpec{
69+
Spec: networkingv1beta1.ServiceCIDRSpec{
7070
CIDRs: []string{"10.196.196.0/24"},
7171
},
7272
}
73-
_, err := cs.NetworkingV1alpha1().ServiceCIDRs().Create(context.TODO(), svcCIDR, metav1.CreateOptions{})
73+
_, err := cs.NetworkingV1beta1().ServiceCIDRs().Create(context.TODO(), svcCIDR, metav1.CreateOptions{})
7474
framework.ExpectNoError(err, "error creating ServiceCIDR")
7575
if pollErr := wait.PollUntilContextTimeout(ctx, framework.Poll, e2eservice.RespondingTimeout, false, func(ctx context.Context) (bool, error) {
76-
svcCIDR, err := cs.NetworkingV1alpha1().ServiceCIDRs().Get(ctx, svcCIDR.Name, metav1.GetOptions{})
76+
svcCIDR, err := cs.NetworkingV1beta1().ServiceCIDRs().Get(ctx, svcCIDR.Name, metav1.GetOptions{})
7777
if err != nil {
7878
return false, nil
7979
}
@@ -103,13 +103,13 @@ var _ = common.SIGDescribe(feature.ServiceCIDRs, func() {
103103

104104
})
105105

106-
func isReady(serviceCIDR *networkingv1alpha1.ServiceCIDR) bool {
106+
func isReady(serviceCIDR *networkingv1beta1.ServiceCIDR) bool {
107107
if serviceCIDR == nil {
108108
return false
109109
}
110110

111111
for _, condition := range serviceCIDR.Status.Conditions {
112-
if condition.Type == string(networkingv1alpha1.ServiceCIDRConditionReady) {
112+
if condition.Type == string(networkingv1beta1.ServiceCIDRConditionReady) {
113113
return condition.Status == metav1.ConditionStatus(metav1.ConditionTrue)
114114
}
115115
}

‎test/integration/apiserver/apply/reset_fields_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ var resetFieldsStatusData = map[schema.GroupVersionResource]string{
6767
gvr("admissionregistration.k8s.io", "v1beta1", "validatingadmissionpolicies"): `{"status": {"conditions":[{"type":"Accepted","status":"True","lastTransitionTime":"2020-01-01T00:00:00Z","reason":"RuleApplied","message":"Rule was applied"}]}}`,
6868
gvr("admissionregistration.k8s.io", "v1", "validatingadmissionpolicies"): `{"status": {"conditions":[{"type":"Accepted","status":"True","lastTransitionTime":"2020-01-01T00:00:00Z","reason":"RuleApplied","message":"Rule was applied"}]}}`,
6969
gvr("networking.k8s.io", "v1alpha1", "servicecidrs"): `{"status": {"conditions":[{"type":"Accepted","status":"True","lastTransitionTime":"2020-01-01T00:00:00Z","reason":"RuleApplied","message":"Rule was applied"}]}}`,
70+
gvr("networking.k8s.io", "v1beta1", "servicecidrs"): `{"status": {"conditions":[{"type":"Accepted","status":"True","lastTransitionTime":"2020-01-01T00:00:00Z","reason":"RuleApplied","message":"Rule was applied"}]}}`,
7071
}
7172

7273
// resetFieldsStatusDefault conflicts with statusDefault
@@ -140,6 +141,7 @@ var resetFieldsSpecData = map[schema.GroupVersionResource]string{
140141
gvr("networking.k8s.io", "v1beta1", "ingresses"): `{"spec": {"backend": {"serviceName": "service2"}}}`,
141142
gvr("networking.k8s.io", "v1", "ingresses"): `{"spec": {"defaultBackend": {"service": {"name": "service2"}}}}`,
142143
gvr("networking.k8s.io", "v1alpha1", "servicecidrs"): `{}`,
144+
gvr("networking.k8s.io", "v1beta1", "servicecidrs"): `{}`,
143145
gvr("policy", "v1", "poddisruptionbudgets"): `{"spec": {"selector": {"matchLabels": {"anokkey2": "anokvalue"}}}}`,
144146
gvr("policy", "v1beta1", "poddisruptionbudgets"): `{"spec": {"selector": {"matchLabels": {"anokkey2": "anokvalue"}}}}`,
145147
gvr("storage.k8s.io", "v1alpha1", "volumeattachments"): `{"metadata": {"name": "va3"}, "spec": {"nodeName": "localhost2"}}`,

‎test/integration/etcd/data.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -202,17 +202,17 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes
202202
},
203203
// --
204204

205-
// k8s.io/kubernetes/pkg/apis/networking/v1alpha1
206-
gvr("networking.k8s.io", "v1alpha1", "ipaddresses"): {
207-
Stub: `{"metadata": {"name": "192.168.1.2"}, "spec": {"parentRef": {"resource": "services","name": "test", "namespace": "ns"}}}`,
208-
ExpectedEtcdPath: "/registry/ipaddresses/192.168.1.2",
205+
// k8s.io/kubernetes/pkg/apis/networking/v1beta1
206+
gvr("networking.k8s.io", "v1beta1", "ipaddresses"): {
207+
Stub: `{"metadata": {"name": "192.168.1.3"}, "spec": {"parentRef": {"resource": "services","name": "test", "namespace": "ns"}}}`,
208+
ExpectedEtcdPath: "/registry/ipaddresses/192.168.1.3",
209209
},
210210
// --
211211

212-
// k8s.io/kubernetes/pkg/apis/networking/v1alpha1
213-
gvr("networking.k8s.io", "v1alpha1", "servicecidrs"): {
214-
Stub: `{"metadata": {"name": "range1"}, "spec": {"cidrs": ["192.168.0.0/16","fd00:1::/120"]}}`,
215-
ExpectedEtcdPath: "/registry/servicecidrs/range1",
212+
// k8s.io/kubernetes/pkg/apis/networking/v1beta1
213+
gvr("networking.k8s.io", "v1beta1", "servicecidrs"): {
214+
Stub: `{"metadata": {"name": "range-b1"}, "spec": {"cidrs": ["192.168.0.0/16","fd00:1::/120"]}}`,
215+
ExpectedEtcdPath: "/registry/servicecidrs/range-b1",
216216
},
217217
// --
218218

‎test/integration/servicecidr/allocator_test.go‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func TestServiceAllocation(t *testing.T) {
7474
s1 := kubeapiservertesting.StartTestServerOrDie(t,
7575
apiServerOptions,
7676
[]string{
77-
"--runtime-config=networking.k8s.io/v1alpha1=true",
77+
"--runtime-config=networking.k8s.io/v1beta1=true",
7878
"--service-cluster-ip-range=" + serviceCIDR,
7979
"--advertise-address=10.0.0.2",
8080
"--disable-admission-plugins=ServiceAccount",
@@ -159,7 +159,7 @@ func TestServiceAllocIPAddressLargeCIDR(t *testing.T) {
159159
s1 := kubeapiservertesting.StartTestServerOrDie(t,
160160
apiServerOptions,
161161
[]string{
162-
"--runtime-config=networking.k8s.io/v1alpha1=true",
162+
"--runtime-config=networking.k8s.io/v1beta1=true",
163163
"--service-cluster-ip-range=" + serviceCIDR,
164164
"--advertise-address=2001:db8::10",
165165
"--disable-admission-plugins=ServiceAccount",
@@ -205,7 +205,7 @@ func TestServiceAllocIPAddressLargeCIDR(t *testing.T) {
205205
if err != nil {
206206
t.Error(err)
207207
}
208-
_, err = client.NetworkingV1alpha1().IPAddresses().Get(tCtx, svc.Spec.ClusterIP, metav1.GetOptions{})
208+
_, err = client.NetworkingV1beta1().IPAddresses().Get(tCtx, svc.Spec.ClusterIP, metav1.GetOptions{})
209209
if err != nil {
210210
t.Error(err)
211211
}
@@ -218,7 +218,8 @@ func TestServiceAllocIPAddressLargeCIDR(t *testing.T) {
218218
if _, err := client.CoreV1().Services(metav1.NamespaceDefault).Create(tCtx, lastSvc, metav1.CreateOptions{}); err != nil {
219219
t.Errorf("unexpected error text: %v", err)
220220
}
221-
_, err = client.NetworkingV1alpha1().IPAddresses().Get(tCtx, lastSvc.Spec.ClusterIP, metav1.GetOptions{})
221+
222+
_, err = client.NetworkingV1beta1().IPAddresses().Get(context.TODO(), lastSvc.Spec.ClusterIP, metav1.GetOptions{})
222223
if err != nil {
223224
t.Error(err)
224225
}
@@ -231,7 +232,7 @@ func TestMigrateService(t *testing.T) {
231232
s := kubeapiservertesting.StartTestServerOrDie(t,
232233
apiServerOptions,
233234
[]string{
234-
"--runtime-config=networking.k8s.io/v1alpha1=true",
235+
"--runtime-config=networking.k8s.io/v1beta1=true",
235236
"--service-cluster-ip-range=10.0.0.0/24",
236237
"--advertise-address=10.1.1.1",
237238
"--disable-admission-plugins=ServiceAccount",
@@ -285,7 +286,7 @@ func TestMigrateService(t *testing.T) {
285286

286287
err = wait.PollImmediate(1*time.Second, 10*time.Second, func() (bool, error) {
287288
// The repair loop must create the IP address associated
288-
_, err = kubeclient.NetworkingV1alpha1().IPAddresses().Get(context.TODO(), svc.Spec.ClusterIP, metav1.GetOptions{})
289+
_, err = kubeclient.NetworkingV1beta1().IPAddresses().Get(context.TODO(), svc.Spec.ClusterIP, metav1.GetOptions{})
289290
if err != nil {
290291
return false, nil
291292
}
@@ -319,7 +320,7 @@ func TestSkewedAllocatorsRollback(t *testing.T) {
319320
// s1 uses IPAddress allocator
320321
s1 := kubeapiservertesting.StartTestServerOrDie(t, apiServerOptions,
321322
[]string{
322-
"--runtime-config=networking.k8s.io/v1alpha1=true",
323+
"--runtime-config=networking.k8s.io/v1beta1=true",
323324
"--service-cluster-ip-range=10.0.0.0/24",
324325
"--disable-admission-plugins=ServiceAccount",
325326
fmt.Sprintf("--feature-gates=%s=true,%s=true", features.MultiCIDRServiceAllocator, features.DisableAllocatorDualWrite)},
@@ -338,7 +339,7 @@ func TestSkewedAllocatorsRollback(t *testing.T) {
338339
t.Error(err)
339340
continue
340341
}
341-
_, err = kubeclient1.NetworkingV1alpha1().IPAddresses().Get(context.TODO(), service.Spec.ClusterIP, metav1.GetOptions{})
342+
_, err = kubeclient1.NetworkingV1beta1().IPAddresses().Get(context.TODO(), service.Spec.ClusterIP, metav1.GetOptions{})
342343
if err != nil {
343344
t.Error(err)
344345
}
@@ -347,7 +348,7 @@ func TestSkewedAllocatorsRollback(t *testing.T) {
347348
// s2 uses bitmap allocator
348349
s2 := kubeapiservertesting.StartTestServerOrDie(t, apiServerOptions,
349350
[]string{
350-
"--runtime-config=networking.k8s.io/v1alpha1=false",
351+
"--runtime-config=networking.k8s.io/v1beta1=false",
351352
"--service-cluster-ip-range=10.0.0.0/24",
352353
"--disable-admission-plugins=ServiceAccount",
353354
fmt.Sprintf("--feature-gates=%s=false", features.MultiCIDRServiceAllocator)},
@@ -368,7 +369,7 @@ func TestSkewedAllocatorsRollback(t *testing.T) {
368369

369370
err = wait.PollImmediate(1*time.Second, 10*time.Second, func() (bool, error) {
370371
// The repair loop must create the IP address associated
371-
_, err = kubeclient1.NetworkingV1alpha1().IPAddresses().Get(context.TODO(), service.Spec.ClusterIP, metav1.GetOptions{})
372+
_, err = kubeclient1.NetworkingV1beta1().IPAddresses().Get(context.TODO(), service.Spec.ClusterIP, metav1.GetOptions{})
372373
if err != nil {
373374
return false, nil
374375
}
@@ -409,7 +410,7 @@ func TestSkewAllocatorsRollout(t *testing.T) {
409410
// oldServer uses bitmap allocator
410411
oldServer := kubeapiservertesting.StartTestServerOrDie(t, apiServerOptions,
411412
[]string{
412-
"--runtime-config=networking.k8s.io/v1alpha1=false",
413+
"--runtime-config=networking.k8s.io/v1beta1=false",
413414
"--service-cluster-ip-range=10.0.0.0/16",
414415
"--disable-admission-plugins=ServiceAccount",
415416
fmt.Sprintf("--feature-gates=%s=false", features.MultiCIDRServiceAllocator)},
@@ -423,7 +424,7 @@ func TestSkewAllocatorsRollout(t *testing.T) {
423424
// s1 uses IPAddress allocator
424425
newServer := kubeapiservertesting.StartTestServerOrDie(t, apiServerOptions,
425426
[]string{
426-
"--runtime-config=networking.k8s.io/v1alpha1=true",
427+
"--runtime-config=networking.k8s.io/v1beta1=true",
427428
"--service-cluster-ip-range=10.0.0.0/16",
428429
"--disable-admission-plugins=ServiceAccount",
429430
fmt.Sprintf("--feature-gates=%s=true,%s=false", features.MultiCIDRServiceAllocator, features.DisableAllocatorDualWrite)},
@@ -497,7 +498,7 @@ func TestSkewAllocatorsRollout(t *testing.T) {
497498
// It takes some time for the repairip loop to create the corresponding IPAddress objects
498499
// ClusterIPs are synchronized through the bitmap.
499500
err = wait.PollUntilContextTimeout(context.Background(), 1*time.Second, 10*time.Second, true, func(context.Context) (bool, error) {
500-
ips, err := kubeclientNew.NetworkingV1alpha1().IPAddresses().List(context.Background(), metav1.ListOptions{})
501+
ips, err := kubeclientNew.NetworkingV1beta1().IPAddresses().List(context.Background(), metav1.ListOptions{})
501502
if err != nil {
502503
return false, nil
503504
}
@@ -526,7 +527,7 @@ func TestSkewAllocatorsRollout(t *testing.T) {
526527
ip := fmt.Sprintf("10.0.0.%d", i)
527528
err = wait.PollUntilContextTimeout(context.Background(), 1*time.Second, 10*time.Second, true, func(context.Context) (bool, error) {
528529
// The repair loop must create the IP address associated
529-
_, err = kubeclientNew.NetworkingV1alpha1().IPAddresses().Get(context.Background(), ip, metav1.GetOptions{})
530+
_, err = kubeclientNew.NetworkingV1beta1().IPAddresses().Get(context.Background(), ip, metav1.GetOptions{})
530531
if err != nil {
531532
return false, nil
532533
}
@@ -558,7 +559,7 @@ func TestFlagsIPAllocator(t *testing.T) {
558559
// s1 uses IPAddress allocator
559560
s1 := kubeapiservertesting.StartTestServerOrDie(t, apiServerOptions,
560561
[]string{
561-
"--runtime-config=networking.k8s.io/v1alpha1=true",
562+
"--runtime-config=networking.k8s.io/v1beta1=true",
562563
"--service-cluster-ip-range=10.0.0.0/24",
563564
fmt.Sprintf("--feature-gates=%s=true", features.MultiCIDRServiceAllocator)},
564565
etcdOptions)
@@ -576,7 +577,7 @@ func TestFlagsIPAllocator(t *testing.T) {
576577
t.Error(err)
577578
continue
578579
}
579-
_, err = kubeclient1.NetworkingV1alpha1().IPAddresses().Get(context.TODO(), service.Spec.ClusterIP, metav1.GetOptions{})
580+
_, err = kubeclient1.NetworkingV1beta1().IPAddresses().Get(context.TODO(), service.Spec.ClusterIP, metav1.GetOptions{})
580581
if err != nil {
581582
t.Error(err)
582583
}

‎test/integration/servicecidr/feature_enable_disable.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func TestEnableDisableServiceCIDR(t *testing.T) {
4949
apiServerOptions := kubeapiservertesting.NewDefaultTestServerOptions()
5050
s1 := kubeapiservertesting.StartTestServerOrDie(t, apiServerOptions,
5151
[]string{
52-
"--runtime-config=networking.k8s.io/v1alpha1=false",
52+
"--runtime-config=networking.k8s.io/v1beta1=false",
5353
"--service-cluster-ip-range=10.0.0.0/24",
5454
"--disable-admission-plugins=ServiceAccount",
5555
fmt.Sprintf("--feature-gates=%s=false", features.MultiCIDRServiceAllocator)},
@@ -82,7 +82,7 @@ func TestEnableDisableServiceCIDR(t *testing.T) {
8282
// apiserver with the feature enabled
8383
s2 := kubeapiservertesting.StartTestServerOrDie(t, apiServerOptions,
8484
[]string{
85-
"--runtime-config=networking.k8s.io/v1alpha1=true",
85+
"--runtime-config=networking.k8s.io/v1beta1=true",
8686
"--service-cluster-ip-range=10.0.0.0/24",
8787
"--disable-admission-plugins=ServiceAccount",
8888
fmt.Sprintf("--feature-gates=%s=true", features.MultiCIDRServiceAllocator)},
@@ -113,7 +113,7 @@ func TestEnableDisableServiceCIDR(t *testing.T) {
113113
// start an apiserver with the feature disabled
114114
s3 := kubeapiservertesting.StartTestServerOrDie(t, apiServerOptions,
115115
[]string{
116-
"--runtime-config=networking.k8s.io/v1alpha1=false",
116+
"--runtime-config=networking.k8s.io/v1beta1=false",
117117
"--service-cluster-ip-range=10.0.0.0/24",
118118
"--disable-admission-plugins=ServiceAccount",
119119
fmt.Sprintf("--feature-gates=%s=false", features.MultiCIDRServiceAllocator)},

0 commit comments

Comments
 (0)