Skip to content

Commit cd91bcc

Browse files
AKamyshnikovaamuraru
AKamyshnikova
authored and
amuraru
committed
Bump kub libs
- k8s libs to v0.27.5 - controller-runtime to v0.15.0 Updated usage for fake client - now required WithStatusSubresource(..) MultiNamespacedCacheBuilder is deprecated switched to usage Cache.Options.Namespaces. Updated usage for depricated wait.Poll and use fake.NewClientBuilder() Fixes: pravega#567 Signed-off-by: Ann Taraday <[email protected]> Change-Id: Ia673486d8ebb3c76e86d1cc3af846cd890b4ffaa
1 parent 11ff8ef commit cd91bcc

File tree

11 files changed

+839
-1101
lines changed

11 files changed

+839
-1101
lines changed

‎charts/zookeeper-operator/templates/zookeeper.pravega.io_zookeeperclusters_crd.yaml‎

Lines changed: 342 additions & 95 deletions
Large diffs are not rendered by default.

‎config/crd/bases/zookeeper.pravega.io_zookeeperclusters.yaml‎

Lines changed: 342 additions & 95 deletions
Large diffs are not rendered by default.

‎controllers/zookeepercluster_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ func YAMLExporterReconciler(zookeepercluster *zookeeperv1beta1.ZookeeperCluster)
594594
var scheme = scheme.Scheme
595595
scheme.AddKnownTypes(zookeeperv1beta1.GroupVersion, zookeepercluster)
596596
return &ZookeeperClusterReconciler{
597-
Client: fake.NewFakeClient(zookeepercluster),
597+
Client: fake.NewClientBuilder().WithRuntimeObjects(zookeepercluster).Build(),
598598
Scheme: scheme,
599599
ZkClient: new(zk.DefaultZookeeperClient),
600600
}

‎controllers/zookeepercluster_controller_test.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ var _ = Describe("ZookeeperCluster Controller", func() {
106106
)
107107

108108
BeforeEach(func() {
109-
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(z).Build()
109+
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(z).WithStatusSubresource(z).Build()
110110
r = &ZookeeperClusterReconciler{Client: cl, Scheme: s, ZkClient: mockZkClient}
111111
res, err = r.Reconcile(context.TODO(), req)
112112
})
@@ -135,7 +135,7 @@ var _ = Describe("ZookeeperCluster Controller", func() {
135135

136136
BeforeEach(func() {
137137
z.WithDefaults()
138-
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(z).Build()
138+
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(z).WithStatusSubresource(z).Build()
139139
r = &ZookeeperClusterReconciler{Client: cl, Scheme: s, ZkClient: mockZkClient}
140140
res, err = r.Reconcile(context.TODO(), req)
141141
})
@@ -206,7 +206,7 @@ var _ = Describe("ZookeeperCluster Controller", func() {
206206
next := z.DeepCopy()
207207
st := zk.MakeStatefulSet(z)
208208
next.Spec.Replicas = 6
209-
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, st).Build()
209+
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, st).WithStatusSubresource(next).Build()
210210
r = &ZookeeperClusterReconciler{Client: cl, Scheme: s, ZkClient: mockZkClient}
211211
res, err = r.Reconcile(context.TODO(), req)
212212
})
@@ -234,7 +234,7 @@ var _ = Describe("ZookeeperCluster Controller", func() {
234234
z.Status.Init()
235235
next := z.DeepCopy()
236236
st := zk.MakeStatefulSet(z)
237-
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, st).Build()
237+
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, st).WithStatusSubresource(next).Build()
238238
r = &ZookeeperClusterReconciler{Client: cl, Scheme: s, ZkClient: mockZkClient}
239239
res, err = r.Reconcile(context.TODO(), req)
240240
})
@@ -265,7 +265,7 @@ var _ = Describe("ZookeeperCluster Controller", func() {
265265
z.Status.Init()
266266
next = z.DeepCopy()
267267
sa = zk.MakeServiceAccount(z)
268-
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, sa).Build()
268+
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, sa).WithStatusSubresource(next).Build()
269269
r = &ZookeeperClusterReconciler{Client: cl, Scheme: s, ZkClient: mockZkClient}
270270
res, err = r.Reconcile(context.TODO(), req)
271271
})
@@ -282,7 +282,7 @@ var _ = Describe("ZookeeperCluster Controller", func() {
282282
})
283283
It("should update the service account", func() {
284284
next.Spec.Pod.ImagePullSecrets = []corev1.LocalObjectReference{{Name: "test-pull-secret"}}
285-
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, sa).Build()
285+
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, sa).WithStatusSubresource(next).Build()
286286
r = &ZookeeperClusterReconciler{Client: cl, Scheme: s, ZkClient: mockZkClient}
287287
_, err := r.Reconcile(context.TODO(), req)
288288
Ω(err).To(BeNil())
@@ -307,7 +307,7 @@ var _ = Describe("ZookeeperCluster Controller", func() {
307307
next.Status.CurrentVersion = "0.2.6"
308308
next.Status.SetPodsReadyConditionTrue()
309309
st := zk.MakeStatefulSet(z)
310-
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, st).Build()
310+
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, st).WithStatusSubresource(next).Build()
311311
st = &appsv1.StatefulSet{}
312312
err = cl.Get(context.TODO(), req.NamespacedName, st)
313313
// changing the Revision value to simulate the upgrade scenario
@@ -367,7 +367,7 @@ var _ = Describe("ZookeeperCluster Controller", func() {
367367
next.Status.TargetVersion = "0.2.7"
368368
next.Status.SetUpgradingConditionTrue(" ", " ")
369369
st := zk.MakeStatefulSet(z)
370-
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, st).Build()
370+
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, st).WithStatusSubresource(next).Build()
371371
st = &appsv1.StatefulSet{}
372372
err = cl.Get(context.TODO(), req.NamespacedName, st)
373373
// changing the Revision value to simulate the upgrade scenario completion
@@ -414,7 +414,7 @@ var _ = Describe("ZookeeperCluster Controller", func() {
414414
next.Status.SetUpgradingConditionTrue(" ", "1")
415415
next.Status.TargetVersion = "0.2.7"
416416
st := zk.MakeStatefulSet(z)
417-
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, st).Build()
417+
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, st).WithStatusSubresource(next).Build()
418418
st = &appsv1.StatefulSet{}
419419
err = cl.Get(context.TODO(), req.NamespacedName, st)
420420
// changing the Revision value to simulate the upgrade scenario
@@ -458,7 +458,7 @@ var _ = Describe("ZookeeperCluster Controller", func() {
458458
next.Status.TargetVersion = ""
459459
next.Status.IsClusterInUpgradingState()
460460
st := zk.MakeStatefulSet(z)
461-
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, st).Build()
461+
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, st).WithStatusSubresource(next).Build()
462462
r = &ZookeeperClusterReconciler{Client: cl, Scheme: s, ZkClient: mockZkClient}
463463
res, err = r.Reconcile(context.TODO(), req)
464464
})
@@ -482,7 +482,7 @@ var _ = Describe("ZookeeperCluster Controller", func() {
482482
BeforeEach(func() {
483483
z.WithDefaults()
484484
z.Status.Init()
485-
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(z).Build()
485+
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(z).WithStatusSubresource(z).Build()
486486
r = &ZookeeperClusterReconciler{Client: cl, Scheme: s, ZkClient: mockZkClient}
487487
req.NamespacedName.Namespace = "temp"
488488
res, err = r.Reconcile(context.TODO(), req)
@@ -503,7 +503,7 @@ var _ = Describe("ZookeeperCluster Controller", func() {
503503
BeforeEach(func() {
504504
z.WithDefaults()
505505
z.Status.Init()
506-
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(z).Build()
506+
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(z).WithStatusSubresource(z).Build()
507507
r = &ZookeeperClusterReconciler{Client: cl, Scheme: s, ZkClient: mockZkClient}
508508
res, err = r.Reconcile(context.TODO(), req)
509509
})
@@ -576,7 +576,7 @@ var _ = Describe("ZookeeperCluster Controller", func() {
576576
next := z.DeepCopy()
577577
next.Spec.Ports[0].ContainerPort = 2182
578578
svc := zk.MakeClientService(z)
579-
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, svc).Build()
579+
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, svc).WithStatusSubresource(next).Build()
580580
r = &ZookeeperClusterReconciler{Client: cl, Scheme: s, ZkClient: mockZkClient}
581581
res, err = r.Reconcile(context.TODO(), req)
582582
})
@@ -594,7 +594,7 @@ var _ = Describe("ZookeeperCluster Controller", func() {
594594
BeforeEach(func() {
595595
z.WithDefaults()
596596
z.Spec.Persistence = nil
597-
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(z).Build()
597+
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(z).WithStatusSubresource(z).Build()
598598
r = &ZookeeperClusterReconciler{Client: cl, Scheme: s, ZkClient: mockZkClient}
599599
res, err = r.Reconcile(context.TODO(), req)
600600
err = r.reconcileFinalizers(z)
@@ -618,7 +618,7 @@ var _ = Describe("ZookeeperCluster Controller", func() {
618618
BeforeEach(func() {
619619
z.WithDefaults()
620620
z.Spec.Persistence = nil
621-
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(z).Build()
621+
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(z).WithStatusSubresource(z).Build()
622622
})
623623
It("should have 1 finalizer, should not raise an error", func() {
624624
config.DisableFinalizer = false
@@ -693,7 +693,7 @@ var _ = Describe("ZookeeperCluster Controller", func() {
693693
next = z.DeepCopy()
694694
next.Spec.TriggerRollingRestart = true
695695
svc = zk.MakeClientService(z)
696-
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, svc).Build()
696+
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, svc).WithStatusSubresource(next).Build()
697697
r = &ZookeeperClusterReconciler{Client: cl, Scheme: s, ZkClient: mockZkClient}
698698
res, err = r.Reconcile(context.TODO(), req)
699699
err = cl.Get(context.TODO(), req.NamespacedName, foundZk)
@@ -713,7 +713,7 @@ var _ = Describe("ZookeeperCluster Controller", func() {
713713

714714
next.Spec.TriggerRollingRestart = false
715715
svc = zk.MakeClientService(z)
716-
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, svc).Build()
716+
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, svc).WithStatusSubresource(next).Build()
717717
r = &ZookeeperClusterReconciler{Client: cl, Scheme: s, ZkClient: mockZkClient}
718718
res, err = r.Reconcile(context.TODO(), req)
719719

@@ -751,7 +751,7 @@ var _ = Describe("ZookeeperCluster Controller", func() {
751751
// update the crd instance to trigger rolling restart
752752
next.Spec.TriggerRollingRestart = true
753753
svc = zk.MakeClientService(z)
754-
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, svc).Build()
754+
cl = fake.NewClientBuilder().WithScheme(scheme.Scheme).WithRuntimeObjects(next, svc).WithStatusSubresource(next).Build()
755755
r = &ZookeeperClusterReconciler{Client: cl, Scheme: s, ZkClient: mockZkClient}
756756
res, err = r.Reconcile(context.TODO(), req)
757757
err = cl.Get(context.TODO(), req.NamespacedName, foundZk)

‎go.mod‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4,74 +4,74 @@ go 1.20
44

55
require (
66
github.com/ghodss/yaml v1.0.0
7-
github.com/go-logr/logr v1.2.3
7+
github.com/go-logr/logr v1.2.4
88
github.com/onsi/ginkgo v1.16.5
9-
github.com/onsi/gomega v1.19.0
9+
github.com/onsi/gomega v1.27.7
1010
github.com/operator-framework/operator-lib v0.11.0
1111
github.com/pkg/errors v0.9.1
1212
github.com/samuel/go-zookeeper v0.0.0-20201211165307-7117e9ea2414
13-
github.com/sirupsen/logrus v1.8.1
14-
k8s.io/api v0.24.1
15-
k8s.io/apimachinery v0.24.1
16-
k8s.io/client-go v0.24.1
17-
sigs.k8s.io/controller-runtime v0.12.1
13+
github.com/sirupsen/logrus v1.9.0
14+
golang.org/x/net v0.17.0
15+
k8s.io/api v0.27.5
16+
k8s.io/apimachinery v0.27.5
17+
k8s.io/client-go v0.27.5
18+
sigs.k8s.io/controller-runtime v0.15.2
1819
)
1920

2021
require (
21-
cloud.google.com/go/compute v1.6.1 // indirect
2222
github.com/beorn7/perks v1.0.1 // indirect
23-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
23+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2424
github.com/davecgh/go-spew v1.1.1 // indirect
25-
github.com/emicklei/go-restful v2.16.0+incompatible // indirect
25+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
2626
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
27-
github.com/fsnotify/fsnotify v1.5.4 // indirect
28-
github.com/go-logr/zapr v1.2.3 // indirect
29-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
30-
github.com/go-openapi/jsonreference v0.20.0 // indirect
31-
github.com/go-openapi/swag v0.21.1 // indirect
27+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
28+
github.com/fsnotify/fsnotify v1.6.0 // indirect
29+
github.com/go-logr/zapr v1.2.4 // indirect
30+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
31+
github.com/go-openapi/jsonreference v0.20.1 // indirect
32+
github.com/go-openapi/swag v0.22.3 // indirect
3233
github.com/gogo/protobuf v1.3.2 // indirect
3334
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
34-
github.com/golang/protobuf v1.5.2 // indirect
35+
github.com/golang/protobuf v1.5.3 // indirect
3536
github.com/google/gnostic v0.6.9 // indirect
36-
github.com/google/go-cmp v0.5.8 // indirect
37+
github.com/google/go-cmp v0.5.9 // indirect
3738
github.com/google/gofuzz v1.2.0 // indirect
3839
github.com/google/uuid v1.3.0 // indirect
3940
github.com/imdario/mergo v0.3.13 // indirect
4041
github.com/josharian/intern v1.0.0 // indirect
4142
github.com/json-iterator/go v1.1.12 // indirect
4243
github.com/mailru/easyjson v0.7.7 // indirect
43-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
44+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
4445
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4546
github.com/modern-go/reflect2 v1.0.2 // indirect
4647
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4748
github.com/nxadm/tail v1.4.8 // indirect
48-
github.com/prometheus/client_golang v1.12.2 // indirect
49-
github.com/prometheus/client_model v0.2.0 // indirect
50-
github.com/prometheus/common v0.34.0 // indirect
51-
github.com/prometheus/procfs v0.7.3 // indirect
49+
github.com/prometheus/client_golang v1.15.1 // indirect
50+
github.com/prometheus/client_model v0.4.0 // indirect
51+
github.com/prometheus/common v0.42.0 // indirect
52+
github.com/prometheus/procfs v0.9.0 // indirect
5253
github.com/spf13/pflag v1.0.5 // indirect
5354
go.uber.org/atomic v1.9.0 // indirect
5455
go.uber.org/multierr v1.8.0 // indirect
55-
go.uber.org/zap v1.21.0 // indirect
56-
golang.org/x/net v0.17.0 // indirect
57-
golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401 // indirect
56+
go.uber.org/zap v1.24.0 // indirect
57+
golang.org/x/oauth2 v0.5.0 // indirect
5858
golang.org/x/sys v0.13.0 // indirect
5959
golang.org/x/term v0.13.0 // indirect
6060
golang.org/x/text v0.13.0 // indirect
61-
golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
62-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
61+
golang.org/x/time v0.3.0 // indirect
62+
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
6363
google.golang.org/appengine v1.6.7 // indirect
64-
google.golang.org/protobuf v1.28.0 // indirect
64+
google.golang.org/protobuf v1.30.0 // indirect
6565
gopkg.in/inf.v0 v0.9.1 // indirect
6666
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
6767
gopkg.in/yaml.v2 v2.4.0 // indirect
6868
gopkg.in/yaml.v3 v3.0.1 // indirect
69-
k8s.io/apiextensions-apiserver v0.24.1 // indirect
70-
k8s.io/component-base v0.24.1 // indirect
71-
k8s.io/klog/v2 v2.60.1 // indirect
72-
k8s.io/kube-openapi v0.0.0-20220413171646-5e7f5fdc6da6 // indirect
73-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
74-
sigs.k8s.io/json v0.0.0-20220525155127-227cbc7cc124 // indirect
75-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
69+
k8s.io/apiextensions-apiserver v0.27.5 // indirect
70+
k8s.io/component-base v0.27.5 // indirect
71+
k8s.io/klog/v2 v2.90.1 // indirect
72+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
73+
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
74+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
75+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
7676
sigs.k8s.io/yaml v1.3.0 // indirect
7777
)

0 commit comments

Comments
 (0)