Skip to content

Commit 077037c

Browse files
committed
deps: bump controller-runtime to v0.7.0 and related deps to the incorporating version
1 parent 931e9a7 commit 077037c

File tree

4 files changed

+31
-37
lines changed

4 files changed

+31
-37
lines changed

conditions/conditions_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ var _ = Describe("Condition", func() {
4848
sch := runtime.NewScheme()
4949
err = apiv1.AddToScheme(sch)
5050
Expect(err).NotTo(HaveOccurred())
51-
cl = fake.NewFakeClientWithScheme(sch)
51+
cl = fake.NewClientBuilder().WithScheme(sch).Build()
5252
})
5353

5454
Describe("NewCondition", func() {
@@ -109,7 +109,7 @@ var _ = Describe("Condition", func() {
109109
sch := runtime.NewScheme()
110110
err = apiv1.AddToScheme(sch)
111111
Expect(err).NotTo(HaveOccurred())
112-
cl = fake.NewFakeClientWithScheme(sch)
112+
cl = fake.NewClientBuilder().WithScheme(sch).Build()
113113

114114
// create an operator Condition resource
115115
err = cl.Create(ctx, operatorCond)

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ go 1.15
55
require (
66
github.com/onsi/ginkgo v1.14.1
77
github.com/onsi/gomega v1.10.2
8-
github.com/operator-framework/api v0.3.25
8+
github.com/operator-framework/api v0.4.0
99
github.com/prometheus/client_golang v1.7.1
1010
github.com/prometheus/client_model v0.2.0
1111
k8s.io/api v0.19.4
1212
k8s.io/apimachinery v0.19.4
1313
k8s.io/client-go v0.19.4
1414
k8s.io/component-base v0.19.4 // indirect
15-
sigs.k8s.io/controller-runtime v0.7.0-alpha.6
15+
sigs.k8s.io/controller-runtime v0.7.0
1616
)

go.sum

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,8 @@ github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg=
120120
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
121121
github.com/go-logr/logr v0.2.0 h1:QvGt2nLcHH0WK9orKa+ppBPAxREcH364nPUedEpK0TY=
122122
github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
123-
github.com/go-logr/logr v0.2.1 h1:fV3MLmabKIZ383XifUjFSwcoGee0v9qgPp8wy5svibE=
124-
github.com/go-logr/logr v0.2.1/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
125-
github.com/go-logr/zapr v0.1.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk=
123+
github.com/go-logr/logr v0.3.0 h1:q4c+kbcR0d5rSurhBR8dIgieOaYpXtsdTYfx22Cu6rs=
124+
github.com/go-logr/logr v0.3.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
126125
github.com/go-logr/zapr v0.2.0 h1:v6Ji8yBW77pva6NkJKQdHLAJKrIJKRHz0RXwPqCHSR4=
127126
github.com/go-logr/zapr v0.2.0/go.mod h1:qhKdvif7YF5GI9NWEpyxTSSBdGmzkNguibrdCNVPunU=
128127
github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=
@@ -219,7 +218,6 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+
219218
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
220219
github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
221220
github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
222-
github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU=
223221
github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg=
224222
github.com/googleapis/gnostic v0.5.1 h1:A8Yhf6EtqTv9RMsU6MQTyrtV1TjWlR6xU9BsZIwuTCM=
225223
github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU=
@@ -240,8 +238,6 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T
240238
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
241239
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
242240
github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
243-
github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
244-
github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
245241
github.com/imdario/mergo v0.3.10 h1:6q5mVkdH/vYmqngx7kZQTjJ5HRsx+ImorDIEQ+beJgc=
246242
github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
247243
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
@@ -304,20 +300,18 @@ github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:v
304300
github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
305301
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
306302
github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
307-
github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
308303
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
309304
github.com/onsi/ginkgo v1.14.1 h1:jMU0WaQrP0a/YAEq8eJmJKjBoMs+pClEr1vDMlM/Do4=
310305
github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
311306
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
312307
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
313308
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
314309
github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
315-
github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
316310
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
317311
github.com/onsi/gomega v1.10.2 h1:aY/nuoWlKJud2J6U0E3NWsjlg+0GtwXxgEqthRdzlcs=
318312
github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
319-
github.com/operator-framework/api v0.3.25 h1:d6WgHCshCffT37okVZeL+IbGlhrsHy57xdfMnopC8rI=
320-
github.com/operator-framework/api v0.3.25/go.mod h1:GVNiB6AQucwdZz3ZFXNv9HtcLOzcFnr6O/QldzKG93g=
313+
github.com/operator-framework/api v0.4.0 h1:OeuGMXScjwosNKXttH3uorywr7APT5luTNPWy3zvqXs=
314+
github.com/operator-framework/api v0.4.0/go.mod h1:xXYReW8+PpSBHMxsf0e7uhtfQTLqIM1iz4X6zUs20+c=
321315
github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
322316
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
323317
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
@@ -573,11 +567,12 @@ golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtn
573567
golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
574568
golang.org/x/tools v0.0.0-20200616133436-c1934b75d054 h1:HHeAlu5H9b71C+Fx0K+1dGgVFN1DM1/wz4aoGOA5qS8=
575569
golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
570+
golang.org/x/tools v0.0.0-20200616195046-dc31b401abb5 h1:UaoXseXAWUJUcuJ2E2oczJdLxAJXL0lOmVaBl7kuk+I=
571+
golang.org/x/tools v0.0.0-20200616195046-dc31b401abb5/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
576572
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
577573
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
578574
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
579575
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
580-
gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU=
581576
gomodules.xyz/jsonpatch/v2 v2.1.0 h1:Phva6wqu+xR//Njw6iorylFFgn/z547tw5Ne3HZPQ+k=
582577
gomodules.xyz/jsonpatch/v2 v2.1.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU=
583578
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
@@ -708,10 +703,9 @@ k8s.io/utils v0.0.0-20200912215256-4140de9c8800/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
708703
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
709704
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0=
710705
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9/go.mod h1:dzAXnQbTRyDlZPJX2SUPEqvnB+j7AJjtlox7PEwigU0=
711-
sigs.k8s.io/controller-runtime v0.6.0/go.mod h1:CpYf5pdNY/B352A1TFLAS2JVSlnGQ5O2cftPHndTroo=
712-
sigs.k8s.io/controller-runtime v0.7.0-alpha.6 h1:ieFqEijQyDEZVIGwI5sYkk7VTa8Itim0kU/TCOnCkto=
713-
sigs.k8s.io/controller-runtime v0.7.0-alpha.6/go.mod h1:03b1n6EtlDvuBPPEOHadJUusruwLWgoT4BDCybMibnA=
714-
sigs.k8s.io/controller-tools v0.3.0/go.mod h1:enhtKGfxZD1GFEoMgP8Fdbu+uKQ/cq1/WGJhdVChfvI=
706+
sigs.k8s.io/controller-runtime v0.7.0 h1:bU20IBBEPccWz5+zXpLnpVsgBYxqclaHu1pVDl/gEt8=
707+
sigs.k8s.io/controller-runtime v0.7.0/go.mod h1:pJ3YBrJiAqMAZKi6UVGuE98ZrroV1p+pIhoHsMm9wdU=
708+
sigs.k8s.io/controller-tools v0.4.1/go.mod h1:G9rHdZMVlBDocIxGkK3jHLWqcTMNvveypYJwrvYKjWU=
715709
sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
716710
sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
717711
sigs.k8s.io/structured-merge-diff/v4 v4.0.1 h1:YXTMot5Qz/X1iBRJhAt+vI+HVttY0WkSqqhKxQ0xVbA=

leader/leader_test.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ var _ = Describe("Leader election", func() {
3434
client crclient.Client
3535
)
3636
BeforeEach(func() {
37-
client = fake.NewFakeClient(
37+
client = fake.NewClientBuilder().WithObjects(
3838
&corev1.Pod{
3939
ObjectMeta: metav1.ObjectMeta{
4040
Name: "leader-test",
@@ -61,7 +61,7 @@ var _ = Describe("Leader election", func() {
6161
},
6262
},
6363
},
64-
)
64+
).Build()
6565
})
6666
It("should return an error when POD_NAME is not set", func() {
6767
os.Unsetenv("POD_NAME")
@@ -118,14 +118,14 @@ var _ = Describe("Leader election", func() {
118118
client crclient.Client
119119
)
120120
BeforeEach(func() {
121-
client = fake.NewFakeClient(
121+
client = fake.NewClientBuilder().WithObjects(
122122
&corev1.Pod{
123123
ObjectMeta: metav1.ObjectMeta{
124124
Name: "mypod",
125125
Namespace: "testns",
126126
},
127127
},
128-
)
128+
).Build()
129129
})
130130
It("should return an error when POD_NAME is not set", func() {
131131
os.Unsetenv("POD_NAME")
@@ -151,14 +151,14 @@ var _ = Describe("Leader election", func() {
151151
client crclient.Client
152152
)
153153
BeforeEach(func() {
154-
client = fake.NewFakeClient(
154+
client = fake.NewClientBuilder().WithObjects(
155155
&corev1.Pod{
156156
ObjectMeta: metav1.ObjectMeta{
157157
Name: "mypod",
158158
Namespace: "testns",
159159
},
160160
},
161-
)
161+
).Build()
162162
})
163163
It("should return an error when POD_NAME is not set", func() {
164164
os.Unsetenv("POD_NAME")
@@ -185,13 +185,13 @@ var _ = Describe("Leader election", func() {
185185
client crclient.Client
186186
)
187187
BeforeEach(func() {
188-
client = fake.NewFakeClient(
188+
client = fake.NewClientBuilder().WithObjects(
189189
&corev1.Node{
190190
ObjectMeta: metav1.ObjectMeta{
191191
Name: "mynode",
192192
},
193193
},
194-
)
194+
).Build()
195195
})
196196
It("should return an error if no node is found", func() {
197197
node := corev1.Node{}
@@ -226,33 +226,33 @@ var _ = Describe("Leader election", func() {
226226
})
227227

228228
It("should return false if node is invalid", func() {
229-
client = fake.NewFakeClient()
229+
client = fake.NewClientBuilder().WithObjects().Build()
230230
ret := isNotReadyNode(context.TODO(), client, "")
231231
Expect(ret).To(Equal(false))
232232
})
233233
It("should return false if no NodeCondition is found", func() {
234-
client = fake.NewFakeClient(node)
234+
client = fake.NewClientBuilder().WithObjects(node).Build()
235235
ret := isNotReadyNode(context.TODO(), client, nodeName)
236236
Expect(ret).To(Equal(false))
237237
})
238238
It("should return false if type is incorrect", func() {
239239
node.Status.Conditions[0].Type = corev1.NodeMemoryPressure
240240
node.Status.Conditions[0].Status = corev1.ConditionFalse
241-
client = fake.NewFakeClient(node)
241+
client = fake.NewClientBuilder().WithObjects(node).Build()
242242
ret := isNotReadyNode(context.TODO(), client, nodeName)
243243
Expect(ret).To(Equal(false))
244244
})
245245
It("should return false if NodeReady's type is true", func() {
246246
node.Status.Conditions[0].Type = corev1.NodeReady
247247
node.Status.Conditions[0].Status = corev1.ConditionTrue
248-
client = fake.NewFakeClient(node)
248+
client = fake.NewClientBuilder().WithObjects(node).Build()
249249
ret := isNotReadyNode(context.TODO(), client, nodeName)
250250
Expect(ret).To(Equal(false))
251251
})
252252
It("should return true when Type is set and Status is set to false", func() {
253253
node.Status.Conditions[0].Type = corev1.NodeReady
254254
node.Status.Conditions[0].Status = corev1.ConditionFalse
255-
client = fake.NewFakeClient(node)
255+
client = fake.NewClientBuilder().WithObjects(node).Build()
256256
ret := isNotReadyNode(context.TODO(), client, nodeName)
257257
Expect(ret).To(Equal(true))
258258
})
@@ -292,27 +292,27 @@ var _ = Describe("Leader election", func() {
292292
}
293293
})
294294
It("should return an error if existing is not found", func() {
295-
client = fake.NewFakeClient(pod)
295+
client = fake.NewClientBuilder().WithObjects(pod).Build()
296296
err := deleteLeader(context.TODO(), client, pod, configmap)
297297
Expect(err).ShouldNot(BeNil())
298298
})
299299
It("should return an error if pod is not found", func() {
300-
client = fake.NewFakeClient(configmap)
300+
client = fake.NewClientBuilder().WithObjects(configmap).Build()
301301
err := deleteLeader(context.TODO(), client, pod, configmap)
302302
Expect(err).ShouldNot(BeNil())
303303
})
304304
It("should return an error if pod is nil", func() {
305-
client = fake.NewFakeClient(pod, configmap)
305+
client = fake.NewClientBuilder().WithObjects(pod, configmap).Build()
306306
err := deleteLeader(context.TODO(), client, nil, configmap)
307307
Expect(err).ShouldNot(BeNil())
308308
})
309309
It("should return an error if configmap is nil", func() {
310-
client = fake.NewFakeClient(pod, configmap)
310+
client = fake.NewClientBuilder().WithObjects(pod, configmap).Build()
311311
err := deleteLeader(context.TODO(), client, pod, nil)
312312
Expect(err).ShouldNot(BeNil())
313313
})
314314
It("should return nil if pod and configmap exists and configmap's owner is the pod", func() {
315-
client = fake.NewFakeClient(pod, configmap)
315+
client = fake.NewClientBuilder().WithObjects(pod, configmap).Build()
316316
err := deleteLeader(context.TODO(), client, pod, configmap)
317317
Expect(err).Should(BeNil())
318318
})

0 commit comments

Comments
 (0)