Skip to content

Commit 779b9cf

Browse files
aojeaaojea
committed
update integration test
1 parent b6c3dfd commit 779b9cf

File tree

5 files changed

+61
-51
lines changed

5 files changed

+61
-51
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ var resetFieldsStatusData = map[schema.GroupVersionResource]string{
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"}]}}`,
7070
gvr("networking.k8s.io", "v1beta1", "servicecidrs"): `{"status": {"conditions":[{"type":"Accepted","status":"True","lastTransitionTime":"2020-01-01T00:00:00Z","reason":"RuleApplied","message":"Rule was applied"}]}}`,
71+
gvr("networking.k8s.io", "v1", "servicecidrs"): `{"status": {"conditions":[{"type":"Accepted","status":"True","lastTransitionTime":"2020-01-01T00:00:00Z","reason":"RuleApplied","message":"Rule was applied"}]}}`,
7172
}
7273

7374
// resetFieldsStatusDefault conflicts with statusDefault
@@ -138,6 +139,7 @@ var resetFieldsSpecData = map[schema.GroupVersionResource]string{
138139
gvr("networking.k8s.io", "v1", "ingresses"): `{"spec": {"defaultBackend": {"service": {"name": "service2"}}}}`,
139140
gvr("networking.k8s.io", "v1alpha1", "servicecidrs"): `{}`,
140141
gvr("networking.k8s.io", "v1beta1", "servicecidrs"): `{}`,
142+
gvr("networking.k8s.io", "v1", "servicecidrs"): `{}`,
141143
gvr("policy", "v1", "poddisruptionbudgets"): `{"spec": {"selector": {"matchLabels": {"anokkey2": "anokvalue"}}}}`,
142144
gvr("policy", "v1beta1", "poddisruptionbudgets"): `{"spec": {"selector": {"matchLabels": {"anokkey2": "anokvalue"}}}}`,
143145
gvr("storage.k8s.io", "v1alpha1", "volumeattachments"): `{"metadata": {"name": "va3"}, "spec": {"nodeName": "localhost2"}}`,

‎test/integration/etcd/data.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,14 @@ func GetEtcdStorageDataForNamespaceServedAt(namespace string, v string, removeAl
272272
ExpectedEtcdPath: "/registry/networkpolicies/" + namespace + "/np2",
273273
IntroducedVersion: "1.7",
274274
},
275+
gvr("networking.k8s.io", "v1", "ipaddresses"): {
276+
Stub: `{"metadata": {"name": "192.168.2.3"}, "spec": {"parentRef": {"resource": "services","name": "test", "namespace": "ns"}}}`,
277+
ExpectedEtcdPath: "/registry/ipaddresses/192.168.2.3",
278+
},
279+
gvr("networking.k8s.io", "v1", "servicecidrs"): {
280+
Stub: `{"metadata": {"name": "range-b2"}, "spec": {"cidrs": ["192.168.0.0/16","fd00:1::/120"]}}`,
281+
ExpectedEtcdPath: "/registry/servicecidrs/range-b2",
282+
},
275283
// --
276284

277285
// k8s.io/kubernetes/pkg/apis/networking/v1beta1

‎test/integration/servicecidr/allocator_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ func TestServiceAllocIPAddressLargeCIDR(t *testing.T) {
205205
if err != nil {
206206
t.Error(err)
207207
}
208-
_, err = client.NetworkingV1beta1().IPAddresses().Get(tCtx, svc.Spec.ClusterIP, metav1.GetOptions{})
208+
_, err = client.NetworkingV1().IPAddresses().Get(tCtx, svc.Spec.ClusterIP, metav1.GetOptions{})
209209
if err != nil {
210210
t.Error(err)
211211
}
@@ -219,7 +219,7 @@ func TestServiceAllocIPAddressLargeCIDR(t *testing.T) {
219219
t.Errorf("unexpected error text: %v", err)
220220
}
221221

222-
_, err = client.NetworkingV1beta1().IPAddresses().Get(context.TODO(), lastSvc.Spec.ClusterIP, metav1.GetOptions{})
222+
_, err = client.NetworkingV1().IPAddresses().Get(context.TODO(), lastSvc.Spec.ClusterIP, metav1.GetOptions{})
223223
if err != nil {
224224
t.Error(err)
225225
}
@@ -286,7 +286,7 @@ func TestMigrateService(t *testing.T) {
286286

287287
err = wait.PollImmediate(1*time.Second, 10*time.Second, func() (bool, error) {
288288
// The repair loop must create the IP address associated
289-
_, err = kubeclient.NetworkingV1beta1().IPAddresses().Get(context.TODO(), svc.Spec.ClusterIP, metav1.GetOptions{})
289+
_, err = kubeclient.NetworkingV1().IPAddresses().Get(context.TODO(), svc.Spec.ClusterIP, metav1.GetOptions{})
290290
if err != nil {
291291
return false, nil
292292
}
@@ -339,7 +339,7 @@ func TestSkewedAllocatorsRollback(t *testing.T) {
339339
t.Error(err)
340340
continue
341341
}
342-
_, err = kubeclient1.NetworkingV1beta1().IPAddresses().Get(context.TODO(), service.Spec.ClusterIP, metav1.GetOptions{})
342+
_, err = kubeclient1.NetworkingV1().IPAddresses().Get(context.TODO(), service.Spec.ClusterIP, metav1.GetOptions{})
343343
if err != nil {
344344
t.Error(err)
345345
}
@@ -369,7 +369,7 @@ func TestSkewedAllocatorsRollback(t *testing.T) {
369369

370370
err = wait.PollImmediate(1*time.Second, 10*time.Second, func() (bool, error) {
371371
// The repair loop must create the IP address associated
372-
_, err = kubeclient1.NetworkingV1beta1().IPAddresses().Get(context.TODO(), service.Spec.ClusterIP, metav1.GetOptions{})
372+
_, err = kubeclient1.NetworkingV1().IPAddresses().Get(context.TODO(), service.Spec.ClusterIP, metav1.GetOptions{})
373373
if err != nil {
374374
return false, nil
375375
}
@@ -498,7 +498,7 @@ func TestSkewAllocatorsRollout(t *testing.T) {
498498
// It takes some time for the repairip loop to create the corresponding IPAddress objects
499499
// ClusterIPs are synchronized through the bitmap.
500500
err = wait.PollUntilContextTimeout(context.Background(), 1*time.Second, 10*time.Second, true, func(context.Context) (bool, error) {
501-
ips, err := kubeclientNew.NetworkingV1beta1().IPAddresses().List(context.Background(), metav1.ListOptions{})
501+
ips, err := kubeclientNew.NetworkingV1().IPAddresses().List(context.Background(), metav1.ListOptions{})
502502
if err != nil {
503503
return false, nil
504504
}
@@ -527,7 +527,7 @@ func TestSkewAllocatorsRollout(t *testing.T) {
527527
ip := fmt.Sprintf("10.0.0.%d", i)
528528
err = wait.PollUntilContextTimeout(context.Background(), 1*time.Second, 10*time.Second, true, func(context.Context) (bool, error) {
529529
// The repair loop must create the IP address associated
530-
_, err = kubeclientNew.NetworkingV1beta1().IPAddresses().Get(context.Background(), ip, metav1.GetOptions{})
530+
_, err = kubeclientNew.NetworkingV1().IPAddresses().Get(context.Background(), ip, metav1.GetOptions{})
531531
if err != nil {
532532
return false, nil
533533
}
@@ -577,7 +577,7 @@ func TestFlagsIPAllocator(t *testing.T) {
577577
t.Error(err)
578578
continue
579579
}
580-
_, err = kubeclient1.NetworkingV1beta1().IPAddresses().Get(context.TODO(), service.Spec.ClusterIP, metav1.GetOptions{})
580+
_, err = kubeclient1.NetworkingV1().IPAddresses().Get(context.TODO(), service.Spec.ClusterIP, metav1.GetOptions{})
581581
if err != nil {
582582
t.Error(err)
583583
}

‎test/integration/servicecidr/migration_test.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"time"
2424

2525
v1 "k8s.io/api/core/v1"
26-
networkingv1beta1 "k8s.io/api/networking/v1beta1"
26+
networkingv1 "k8s.io/api/networking/v1"
2727
apierrors "k8s.io/apimachinery/pkg/api/errors"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
"k8s.io/apimachinery/pkg/util/wait"
@@ -77,16 +77,16 @@ func TestMigrateServiceCIDR(t *testing.T) {
7777
// ServiceCIDR controller
7878
go servicecidrs.NewController(
7979
tCtx,
80-
informers1.Networking().V1beta1().ServiceCIDRs(),
81-
informers1.Networking().V1beta1().IPAddresses(),
80+
informers1.Networking().V1().ServiceCIDRs(),
81+
informers1.Networking().V1().IPAddresses(),
8282
client1,
8383
).Run(tCtx, 5)
8484
informers1.Start(tCtx.Done())
8585
informers1.WaitForCacheSync(tCtx.Done())
8686

8787
// the default serviceCIDR should have a finalizer and ready condition set to true
8888
if err := wait.PollUntilContextTimeout(context.Background(), 1*time.Second, time.Minute, false, func(ctx context.Context) (bool, error) {
89-
cidr, err := client1.NetworkingV1beta1().ServiceCIDRs().Get(context.TODO(), defaultservicecidr.DefaultServiceCIDRName, metav1.GetOptions{})
89+
cidr, err := client1.NetworkingV1().ServiceCIDRs().Get(context.TODO(), defaultservicecidr.DefaultServiceCIDRName, metav1.GetOptions{})
9090
if err != nil && !apierrors.IsNotFound(err) {
9191
return false, err
9292
}
@@ -120,13 +120,13 @@ func TestMigrateServiceCIDR(t *testing.T) {
120120
}
121121
}
122122
// Add a new service CIDR to be able to migrate the apiserver
123-
if _, err := client1.NetworkingV1beta1().ServiceCIDRs().Create(context.Background(), makeServiceCIDR("migration-cidr", cidr2, ""), metav1.CreateOptions{}); err != nil {
123+
if _, err := client1.NetworkingV1().ServiceCIDRs().Create(context.Background(), makeServiceCIDR("migration-cidr", cidr2, ""), metav1.CreateOptions{}); err != nil {
124124
t.Fatalf("got unexpected error: %v", err)
125125
}
126126

127127
// wait ServiceCIDR is ready
128128
if err := wait.PollUntilContextTimeout(context.Background(), 1*time.Second, time.Minute, false, func(ctx context.Context) (bool, error) {
129-
cidr, err := client1.NetworkingV1beta1().ServiceCIDRs().Get(context.TODO(), "migration-cidr", metav1.GetOptions{})
129+
cidr, err := client1.NetworkingV1().ServiceCIDRs().Get(context.TODO(), "migration-cidr", metav1.GetOptions{})
130130
if err != nil && !apierrors.IsNotFound(err) {
131131
return false, err
132132
}
@@ -136,18 +136,18 @@ func TestMigrateServiceCIDR(t *testing.T) {
136136
}
137137

138138
// delete the default ServiceCIDR so is no longer used for allocating IPs
139-
if err := client1.NetworkingV1beta1().ServiceCIDRs().Delete(context.Background(), defaultservicecidr.DefaultServiceCIDRName, metav1.DeleteOptions{}); err != nil {
139+
if err := client1.NetworkingV1().ServiceCIDRs().Delete(context.Background(), defaultservicecidr.DefaultServiceCIDRName, metav1.DeleteOptions{}); err != nil {
140140
t.Fatalf("got unexpected error: %v", err)
141141
}
142142

143143
// the default serviceCIDR should be pending deletion with Ready condition set to false
144144
if err := wait.PollUntilContextTimeout(context.Background(), 1*time.Second, time.Minute, false, func(ctx context.Context) (bool, error) {
145-
cidr, err := client1.NetworkingV1beta1().ServiceCIDRs().Get(context.TODO(), defaultservicecidr.DefaultServiceCIDRName, metav1.GetOptions{})
145+
cidr, err := client1.NetworkingV1().ServiceCIDRs().Get(context.TODO(), defaultservicecidr.DefaultServiceCIDRName, metav1.GetOptions{})
146146
if err != nil && !apierrors.IsNotFound(err) {
147147
return false, err
148148
}
149149
for _, condition := range cidr.Status.Conditions {
150-
if condition.Type == networkingv1beta1.ServiceCIDRConditionReady {
150+
if condition.Type == networkingv1.ServiceCIDRConditionReady {
151151
return condition.Status == metav1.ConditionFalse, nil
152152
}
153153
}
@@ -216,8 +216,8 @@ func TestMigrateServiceCIDR(t *testing.T) {
216216
informers2 := informers.NewSharedInformerFactory(client2, resyncPeriod)
217217
go servicecidrs.NewController(
218218
tCtx2,
219-
informers2.Networking().V1beta1().ServiceCIDRs(),
220-
informers2.Networking().V1beta1().IPAddresses(),
219+
informers2.Networking().V1().ServiceCIDRs(),
220+
informers2.Networking().V1().IPAddresses(),
221221
client2,
222222
).Run(tCtx2, 5)
223223
informers2.Start(tCtx2.Done())
@@ -231,7 +231,7 @@ func TestMigrateServiceCIDR(t *testing.T) {
231231

232232
// the default serviceCIDR should be the new one
233233
if err := wait.PollUntilContextTimeout(context.Background(), 1*time.Second, time.Minute, false, func(ctx context.Context) (bool, error) {
234-
cidr, err := client2.NetworkingV1beta1().ServiceCIDRs().Get(context.TODO(), defaultservicecidr.DefaultServiceCIDRName, metav1.GetOptions{})
234+
cidr, err := client2.NetworkingV1().ServiceCIDRs().Get(context.TODO(), defaultservicecidr.DefaultServiceCIDRName, metav1.GetOptions{})
235235
if err != nil && !apierrors.IsNotFound(err) {
236236
return false, err
237237
}
@@ -252,7 +252,7 @@ func TestMigrateServiceCIDR(t *testing.T) {
252252
}
253253

254254
for _, condition := range cidr.Status.Conditions {
255-
if condition.Type == networkingv1beta1.ServiceCIDRConditionReady {
255+
if condition.Type == networkingv1.ServiceCIDRConditionReady {
256256
t.Logf("Expected Condition %s to be %s", condition.Status, metav1.ConditionTrue)
257257
return condition.Status == metav1.ConditionTrue, nil
258258
}
@@ -277,13 +277,13 @@ func TestMigrateServiceCIDR(t *testing.T) {
277277
}
278278

279279
// The temporary ServiceCIDR can be deleted now since the Default ServiceCIDR will cover it
280-
if err := client2.NetworkingV1beta1().ServiceCIDRs().Delete(context.Background(), "migration-cidr", metav1.DeleteOptions{}); err != nil {
280+
if err := client2.NetworkingV1().ServiceCIDRs().Delete(context.Background(), "migration-cidr", metav1.DeleteOptions{}); err != nil {
281281
t.Fatalf("got unexpected error: %v", err)
282282
}
283283

284284
// wait ServiceCIDR no longer exist
285285
if err := wait.PollUntilContextTimeout(context.Background(), 1*time.Second, time.Minute, false, func(ctx context.Context) (bool, error) {
286-
_, err := client2.NetworkingV1beta1().ServiceCIDRs().Get(context.TODO(), "migration-cidr", metav1.GetOptions{})
286+
_, err := client2.NetworkingV1().ServiceCIDRs().Get(context.TODO(), "migration-cidr", metav1.GetOptions{})
287287
if err != nil && !apierrors.IsNotFound(err) {
288288
return false, nil
289289
}

0 commit comments

Comments
 (0)