Skip to content

Commit 6925ff4

Browse files
josvazgjosvazg
authored
CLOUDP-306040: Manually upgrade to controller-runtime 0.20 (#2199)
Signed-off-by: jose.vazquez <[email protected]>
1 parent 71c355c commit 6925ff4

File tree

5 files changed

+20
-40
lines changed

5 files changed

+20
-40
lines changed

‎.licenses-gomod.sha256

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
100644 e406714f819b45ed848e8cd4765227c73f706e35 go.mod
1+
100644 b84b34d5cda247208570013c668573994497b97d go.mod

‎go.mod

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ require (
3838
k8s.io/apimachinery v0.32.2
3939
k8s.io/apiserver v0.32.2
4040
k8s.io/client-go v0.32.2
41-
sigs.k8s.io/controller-runtime v0.19.4
41+
sigs.k8s.io/controller-runtime v0.20.3
4242
)
4343

4444
require (
@@ -59,6 +59,7 @@ require (
5959
github.com/go-logr/stdr v1.2.2 // indirect
6060
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
6161
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
62+
github.com/google/btree v1.1.3 // indirect
6263
github.com/google/cel-go v0.22.0 // indirect
6364
github.com/google/gnostic-models v0.6.8 // indirect
6465
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
@@ -100,7 +101,7 @@ require (
100101
github.com/dimchansky/utfbom v1.1.1 // indirect
101102
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
102103
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
103-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
104+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
104105
github.com/go-logr/logr v1.4.2
105106
github.com/go-openapi/jsonpointer v0.21.0 // indirect
106107
github.com/go-openapi/jsonreference v0.20.2 // indirect

‎go.sum

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxER
9393
github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
9494
github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
9595
github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
96-
github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg=
97-
github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
96+
github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU=
97+
github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM=
9898
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
9999
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
100100
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
@@ -133,6 +133,8 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek
133133
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
134134
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
135135
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
136+
github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
137+
github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
136138
github.com/google/cel-go v0.22.0 h1:b3FJZxpiv1vTMo2/5RDUqAHPxkT8mmMfJIrq1llbf7g=
137139
github.com/google/cel-go v0.22.0/go.mod h1:BuznPXXfQDpXKWQ9sPW3TzlAJN5zzFe+i9tIs0yC4s8=
138140
github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
@@ -410,8 +412,8 @@ k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJ
410412
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
411413
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
412414
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
413-
sigs.k8s.io/controller-runtime v0.19.4 h1:SUmheabttt0nx8uJtoII4oIP27BVVvAKFvdvGFwV/Qo=
414-
sigs.k8s.io/controller-runtime v0.19.4/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
415+
sigs.k8s.io/controller-runtime v0.20.3 h1:I6Ln8JfQjHH7JbtCD2HCYHoIzajoRxPNuvhvcDbZgkI=
416+
sigs.k8s.io/controller-runtime v0.20.3/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
415417
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
416418
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
417419
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=

‎internal/controller/atlasdatafederation/datafederation_controller_test.go

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ func TestDeleteConnectionSecrets(t *testing.T) {
4848
wantDataFederation: &akov2.AtlasDataFederation{
4949
ObjectMeta: metav1.ObjectMeta{Name: "foo", Namespace: "bar"},
5050
},
51-
wantResult: workflow.OK(),
51+
wantSecrets: []corev1.Secret{},
52+
wantResult: workflow.OK(),
5253
},
5354
{
5455
name: "finalizer set and deletion protection is enabled",
@@ -66,7 +67,8 @@ func TestDeleteConnectionSecrets(t *testing.T) {
6667
Annotations: map[string]string{customresource.ResourcePolicyAnnotation: customresource.ResourcePolicyKeep},
6768
},
6869
},
69-
wantResult: workflow.OK(),
70+
wantSecrets: []corev1.Secret{},
71+
wantResult: workflow.OK(),
7072
},
7173
{
7274
name: "federation object without secrets",
@@ -91,34 +93,8 @@ func TestDeleteConnectionSecrets(t *testing.T) {
9193
},
9294
Spec: akov2.DataFederationSpec{Project: common.ResourceRefNamespaced{Name: "fooProject"}},
9395
},
94-
wantResult: workflow.OK(),
95-
},
96-
{
97-
name: "federation object without secrets",
98-
service: func(serviceMock *translation.DataFederationServiceMock) datafederation.DataFederationService {
99-
serviceMock.EXPECT().Delete(context.Background(), mock.Anything, mock.Anything).Return(nil)
100-
return serviceMock
101-
},
102-
atlasProject: &akov2.AtlasProject{
103-
ObjectMeta: metav1.ObjectMeta{Name: "fooProject", Namespace: "bar"},
104-
},
105-
dataFederation: &akov2.AtlasDataFederation{
106-
ObjectMeta: metav1.ObjectMeta{
107-
Name: "foo", Namespace: "bar",
108-
Finalizers: []string{customresource.FinalizerLabel},
109-
},
110-
Spec: akov2.DataFederationSpec{
111-
Project: common.ResourceRefNamespaced{Name: "fooProject"},
112-
},
113-
},
114-
wantDataFederation: &akov2.AtlasDataFederation{
115-
ObjectMeta: metav1.ObjectMeta{
116-
Name: "foo", Namespace: "bar",
117-
// Finalizers removed
118-
},
119-
Spec: akov2.DataFederationSpec{Project: common.ResourceRefNamespaced{Name: "fooProject"}},
120-
},
121-
wantResult: workflow.OK(),
96+
wantSecrets: []corev1.Secret{},
97+
wantResult: workflow.OK(),
12298
},
12399
{
124100
name: "federation object with secrets",

‎licenses.csv

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ github.com/cespare/xxhash/v2,https://github.com/cespare/xxhash/blob/v2.3.0/LICEN
3434
github.com/davecgh/go-spew/spew,https://github.com/davecgh/go-spew/blob/d8f796af33cc/LICENSE,ISC
3535
github.com/dimchansky/utfbom,https://github.com/dimchansky/utfbom/blob/v1.1.1/LICENSE,Apache-2.0
3636
github.com/emicklei/go-restful/v3,https://github.com/emicklei/go-restful/blob/v3.11.0/LICENSE,MIT
37-
github.com/evanphx/json-patch/v5,https://github.com/evanphx/json-patch/blob/v5.9.0/v5/LICENSE,BSD-3-Clause
37+
github.com/evanphx/json-patch/v5,https://github.com/evanphx/json-patch/blob/v5.9.11/v5/LICENSE,BSD-3-Clause
3838
github.com/felixge/httpsnoop,https://github.com/felixge/httpsnoop/blob/v1.0.4/LICENSE.txt,MIT
3939
github.com/fsnotify/fsnotify,https://github.com/fsnotify/fsnotify/blob/v1.7.0/LICENSE,BSD-3-Clause
4040
github.com/fxamacker/cbor/v2,https://github.com/fxamacker/cbor/blob/v2.7.0/LICENSE,MIT
@@ -50,6 +50,7 @@ github.com/golang-jwt/jwt/v4,https://github.com/golang-jwt/jwt/blob/v4.5.1/LICEN
5050
github.com/golang-jwt/jwt/v5,https://github.com/golang-jwt/jwt/blob/v5.2.1/LICENSE,MIT
5151
github.com/golang/protobuf,https://github.com/golang/protobuf/blob/v1.5.4/LICENSE,BSD-3-Clause
5252
github.com/golang/snappy,https://github.com/golang/snappy/blob/v0.0.4/LICENSE,BSD-3-Clause
53+
github.com/google/btree,https://github.com/google/btree/blob/v1.1.3/LICENSE,Apache-2.0
5354
github.com/google/cel-go,https://github.com/google/cel-go/blob/v0.22.0/LICENSE,Apache-2.0
5455
github.com/google/gnostic-models,https://github.com/google/gnostic-models/blob/v0.6.8/LICENSE,Apache-2.0
5556
github.com/google/go-cmp/cmp,https://github.com/google/go-cmp/blob/v0.7.0/LICENSE,BSD-3-Clause
@@ -113,7 +114,7 @@ golang.org/x/exp,https://cs.opensource.google/go/x/exp/+/8a7402ab:LICENSE,BSD-3-
113114
golang.org/x/net,https://cs.opensource.google/go/x/net/+/v0.36.0:LICENSE,BSD-3-Clause
114115
golang.org/x/oauth2,https://cs.opensource.google/go/x/oauth2/+/v0.27.0:LICENSE,BSD-3-Clause
115116
golang.org/x/sync,https://cs.opensource.google/go/x/sync/+/v0.12.0:LICENSE,BSD-3-Clause
116-
golang.org/x/sys,https://cs.opensource.google/go/x/sys/+/v0.30.0:LICENSE,BSD-3-Clause
117+
golang.org/x/sys/unix,https://cs.opensource.google/go/x/sys/+/v0.30.0:LICENSE,BSD-3-Clause
117118
golang.org/x/term,https://cs.opensource.google/go/x/term/+/v0.29.0:LICENSE,BSD-3-Clause
118119
golang.org/x/text,https://cs.opensource.google/go/x/text/+/v0.22.0:LICENSE,BSD-3-Clause
119120
golang.org/x/time/rate,https://cs.opensource.google/go/x/time/+/v0.10.0:LICENSE,BSD-3-Clause
@@ -144,7 +145,7 @@ k8s.io/kube-openapi/pkg/validation/spec,https://github.com/kubernetes/kube-opena
144145
k8s.io/kube-openapi/pkg/validation/strfmt,https://github.com/kubernetes/kube-openapi/blob/32ad38e42d3f/pkg/validation/strfmt/LICENSE,Apache-2.0
145146
k8s.io/utils,https://github.com/kubernetes/utils/blob/3ea5e8cea738/LICENSE,Apache-2.0
146147
k8s.io/utils/internal/third_party/forked/golang,https://github.com/kubernetes/utils/blob/3ea5e8cea738/internal/third_party/forked/golang/LICENSE,BSD-3-Clause
147-
sigs.k8s.io/controller-runtime,https://github.com/kubernetes-sigs/controller-runtime/blob/v0.19.4/LICENSE,Apache-2.0
148+
sigs.k8s.io/controller-runtime,https://github.com/kubernetes-sigs/controller-runtime/blob/v0.20.3/LICENSE,Apache-2.0
148149
sigs.k8s.io/json,https://github.com/kubernetes-sigs/json/blob/9aa6b5e7a4b3/LICENSE,Apache-2.0
149150
sigs.k8s.io/structured-merge-diff/v4,https://github.com/kubernetes-sigs/structured-merge-diff/blob/v4.4.2/LICENSE,Apache-2.0
150151
sigs.k8s.io/yaml,https://github.com/kubernetes-sigs/yaml/blob/v1.4.0/LICENSE,Apache-2.0

0 commit comments

Comments
 (0)