Skip to content

Commit 30e2592

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #335 from jbpratt/bump-controller-runtime
misc: bump controller-runtime -> v0.15.1
2 parents b495581 + 1992db6 commit 30e2592

File tree

19 files changed

+62
-97
lines changed

19 files changed

+62
-97
lines changed

‎go.mod

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ require (
1414
github.com/openshift/operator-custom-metrics v0.5.1
1515
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.55.1
1616
github.com/prometheus/client_golang v1.16.0
17-
gomodules.xyz/jsonpatch/v2 v2.2.0
18-
k8s.io/api v0.26.2
19-
k8s.io/apiextensions-apiserver v0.26.1
20-
k8s.io/apimachinery v0.26.2
21-
k8s.io/client-go v0.26.2
17+
gomodules.xyz/jsonpatch/v2 v2.3.0
18+
k8s.io/api v0.27.2
19+
k8s.io/apiextensions-apiserver v0.27.2
20+
k8s.io/apimachinery v0.27.2
21+
k8s.io/client-go v0.27.2
2222
k8s.io/klog/v2 v2.110.1
2323
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
24-
sigs.k8s.io/controller-runtime v0.14.6
24+
sigs.k8s.io/controller-runtime v0.15.1
2525
)
2626

2727
require (
@@ -36,6 +36,7 @@ require (
3636
github.com/go-openapi/swag v0.22.3 // indirect
3737
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
3838
github.com/gogo/protobuf v1.3.2 // indirect
39+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3940
github.com/golang/protobuf v1.5.3 // indirect
4041
github.com/google/gnostic v0.5.7-v3refs // indirect
4142
github.com/google/go-cmp v0.6.0 // indirect
@@ -72,7 +73,8 @@ require (
7273
gopkg.in/inf.v0 v0.9.1 // indirect
7374
gopkg.in/yaml.v2 v2.4.0 // indirect
7475
gopkg.in/yaml.v3 v3.0.1 // indirect
75-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
76+
k8s.io/component-base v0.27.2 // indirect
77+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
7678
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7779
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
7880
sigs.k8s.io/yaml v1.3.0 // indirect

‎go.sum

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
334334
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
335335
gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY=
336336
gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY=
337+
gomodules.xyz/jsonpatch/v2 v2.3.0 h1:8NFhfS6gzxNqjLIYnZxg319wZ5Qjnx4m/CcX+Klzazc=
338+
gomodules.xyz/jsonpatch/v2 v2.3.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
337339
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
338340
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
339341
google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
@@ -387,16 +389,26 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
387389
k8s.io/api v0.23.3/go.mod h1:w258XdGyvCmnBj/vGzQMj6kzdufJZVUwEM1U2fRJwSQ=
388390
k8s.io/api v0.26.2 h1:dM3cinp3PGB6asOySalOZxEG4CZ0IAdJsrYZXE/ovGQ=
389391
k8s.io/api v0.26.2/go.mod h1:1kjMQsFE+QHPfskEcVNgL3+Hp88B80uj0QtSOlj8itU=
392+
k8s.io/api v0.27.2 h1:+H17AJpUMvl+clT+BPnKf0E3ksMAzoBBg7CntpSuADo=
393+
k8s.io/api v0.27.2/go.mod h1:ENmbocXfBT2ADujUXcBhHV55RIT31IIEvkntP6vZKS4=
390394
k8s.io/apiextensions-apiserver v0.26.1 h1:cB8h1SRk6e/+i3NOrQgSFij1B2S0Y0wDoNl66bn8RMI=
391395
k8s.io/apiextensions-apiserver v0.26.1/go.mod h1:AptjOSXDGuE0JICx/Em15PaoO7buLwTs0dGleIHixSM=
396+
k8s.io/apiextensions-apiserver v0.27.2 h1:iwhyoeS4xj9Y7v8YExhUwbVuBhMr3Q4bd/laClBV6Bo=
397+
k8s.io/apiextensions-apiserver v0.27.2/go.mod h1:Oz9UdvGguL3ULgRdY9QMUzL2RZImotgxvGjdWRq6ZXQ=
392398
k8s.io/apimachinery v0.23.3/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
393399
k8s.io/apimachinery v0.26.2 h1:da1u3D5wfR5u2RpLhE/ZtZS2P7QvDgLZTi9wrNZl/tQ=
394400
k8s.io/apimachinery v0.26.2/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I=
401+
k8s.io/apimachinery v0.27.2 h1:vBjGaKKieaIreI+oQwELalVG4d8f3YAMNpWLzDXkxeg=
402+
k8s.io/apimachinery v0.27.2/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
395403
k8s.io/client-go v0.26.2 h1:s1WkVujHX3kTp4Zn4yGNFK+dlDXy1bAAkIl+cFAiuYI=
396404
k8s.io/client-go v0.26.2/go.mod h1:u5EjOuSyBa09yqqyY7m3abZeovO/7D/WehVVlZ2qcqU=
405+
k8s.io/client-go v0.27.2 h1:vDLSeuYvCHKeoQRhCXjxXO45nHVv2Ip4Fe0MfioMrhE=
406+
k8s.io/client-go v0.27.2/go.mod h1:tY0gVmUsHrAmjzHX9zs7eCjxcBsf8IiNe7KQ52biTcQ=
397407
k8s.io/code-generator v0.23.3/go.mod h1:S0Q1JVA+kSzTI1oUvbKAxZY/DYbA/ZUb4Uknog12ETk=
398408
k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4=
399409
k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU=
410+
k8s.io/component-base v0.27.2 h1:neju+7s/r5O4x4/txeUONNTS9r1HsPbyoPBAtHsDCpo=
411+
k8s.io/component-base v0.27.2/go.mod h1:5UPk7EjfgrfgRIuDBFtsEFAe4DAvP3U+M8RTzoSJkpo=
400412
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
401413
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
402414
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
@@ -409,12 +421,16 @@ k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lV
409421
k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk=
410422
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
411423
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4=
424+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg=
425+
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg=
412426
k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
413427
k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
414428
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
415429
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
416430
sigs.k8s.io/controller-runtime v0.14.6 h1:oxstGVvXGNnMvY7TAESYk+lzr6S3V5VFxQ6d92KcwQA=
417431
sigs.k8s.io/controller-runtime v0.14.6/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
432+
sigs.k8s.io/controller-runtime v0.15.1 h1:9UvgKD4ZJGcj24vefUFgZFP3xej/3igL9BsOUTb/+4c=
433+
sigs.k8s.io/controller-runtime v0.15.1/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk=
418434
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs=
419435
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
420436
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=

‎pkg/webhooks/clusterlogging/clusterlogging.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,9 @@ func (s *ClusterloggingWebhook) authorized(request admissionctl.Request) admissi
187187
// If the request includes an OldObject (from an update or deletion), it will be
188188
// preferred, otherwise, the Object will be preferred.
189189
func (s *ClusterloggingWebhook) renderClusterLogging(request admissionctl.Request) (*cl.ClusterLogging, error) {
190-
decoder, err := admissionctl.NewDecoder(&s.s)
191-
if err != nil {
192-
return nil, err
193-
}
190+
decoder := admissionctl.NewDecoder(&s.s)
194191
clusterLogging := &cl.ClusterLogging{}
192+
var err error
195193
if len(request.OldObject.Raw) > 0 {
196194
err = decoder.DecodeRaw(request.OldObject, clusterLogging)
197195
} else {

‎pkg/webhooks/clusterrolebinding/clusterrolebinding.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,10 @@ func (s *ClusterRoleBindingWebHook) authorized(request admissionctl.Request) adm
140140

141141
// renderSCC render the SCC object from the requests
142142
func (s *ClusterRoleBindingWebHook) renderClusterRoleBinding(request admissionctl.Request) (*rbacv1.ClusterRoleBinding, error) {
143-
decoder, err := admissionctl.NewDecoder(&s.s)
144-
if err != nil {
145-
return nil, err
146-
}
143+
decoder := admissionctl.NewDecoder(&s.s)
147144
clusterRoleBinding := &rbacv1.ClusterRoleBinding{}
148145

146+
var err error
149147
if len(request.OldObject.Raw) > 0 {
150148
err = decoder.DecodeRaw(request.OldObject, clusterRoleBinding)
151149
}

‎pkg/webhooks/customresourcedefinitions/customresourcedefinitions.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,10 @@ func isAllowedUser(request admissionctl.Request) bool {
116116
}
117117

118118
func (s *customresourcedefinitionsruleWebhook) renderCustomResourceDefinition(req admissionctl.Request) (*apiextensionsv1.CustomResourceDefinition, error) {
119-
decoder, err := admissionctl.NewDecoder(&s.s)
120-
if err != nil {
121-
return nil, err
122-
}
119+
decoder := admissionctl.NewDecoder(&s.s)
123120
customResourceDefinition := &apiextensionsv1.CustomResourceDefinition{}
124121

122+
var err error
125123
if len(req.OldObject.Raw) > 0 {
126124
err = decoder.DecodeRaw(req.OldObject, customResourceDefinition)
127125
} else {

‎pkg/webhooks/imagecontentpolicies/imagecontentpolicies.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ func NewWebhook() *ImageContentPoliciesWebhook {
3737
}
3838

3939
func (w *ImageContentPoliciesWebhook) Authorized(request admission.Request) admission.Response {
40-
decoder, err := admission.NewDecoder(w.scheme)
41-
if err != nil {
42-
return admission.Errored(http.StatusBadRequest, err)
43-
}
40+
decoder := admission.NewDecoder(w.scheme)
4441

4542
switch request.RequestKind.Kind {
4643
case "ImageDigestMirrorSet":

‎pkg/webhooks/ingresscontroller/ingresscontroller.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,9 @@ func (wh *IngressControllerWebhook) Validate(req admissionctl.Request) bool {
9191
}
9292

9393
func (wh *IngressControllerWebhook) renderIngressController(req admissionctl.Request) (*operatorv1.IngressController, error) {
94-
decoder, err := admissionctl.NewDecoder(&wh.s)
95-
if err != nil {
96-
return nil, err
97-
}
94+
decoder := admissionctl.NewDecoder(&wh.s)
9895
ic := &operatorv1.IngressController{}
99-
err = decoder.DecodeRaw(req.Object, ic)
100-
96+
err := decoder.DecodeRaw(req.Object, ic)
10197
if err != nil {
10298
return nil, err
10399
}

‎pkg/webhooks/namespace/namespace.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,9 @@ func (s *NamespaceWebhook) Validate(req admissionctl.Request) bool {
126126
// (request.OldObject) objects returned. See the renderOldAndNewNamespaces
127127
// documentation for more.
128128
func (s *NamespaceWebhook) renderNamespace(req admissionctl.Request) (*corev1.Namespace, error) {
129-
decoder, err := admissionctl.NewDecoder(&s.s)
130-
if err != nil {
131-
return nil, err
132-
}
129+
decoder := admissionctl.NewDecoder(&s.s)
133130
namespace := &corev1.Namespace{}
131+
var err error
134132
if len(req.OldObject.Raw) > 0 {
135133
err = decoder.DecodeRaw(req.OldObject, namespace)
136134
} else {
@@ -151,12 +149,10 @@ func (s *NamespaceWebhook) renderNamespace(req admissionctl.Request) (*corev1.Na
151149
// If there is no corresponding namespace, this method will return nil in the
152150
// appropriate position.
153151
func (s *NamespaceWebhook) renderOldAndNewNamespaces(req admissionctl.Request) (*corev1.Namespace, *corev1.Namespace, error) {
154-
decoder, err := admissionctl.NewDecoder(&s.s)
155-
if err != nil {
156-
return nil, nil, err
157-
}
152+
decoder := admissionctl.NewDecoder(&s.s)
158153
oldNamespace := &corev1.Namespace{}
159154

155+
var err error
160156
if len(req.OldObject.Raw) == 0 {
161157
oldNamespace = nil
162158
} else {

‎pkg/webhooks/networkpolicies/networkpolicies.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,17 +131,14 @@ func isAllowedUser(request admissionctl.Request) bool {
131131
}
132132

133133
func (s *networkpoliciesruleWebhook) renderNetworkPolicy(req admissionctl.Request) (*networkingv1.NetworkPolicy, error) {
134-
decoder, err := admissionctl.NewDecoder(&s.s)
135-
if err != nil {
136-
return nil, err
137-
}
134+
decoder := admissionctl.NewDecoder(&s.s)
138135
networkPolicy := &networkingv1.NetworkPolicy{}
139136

140137
if len(req.Object.Raw) > 0 {
141-
err = decoder.DecodeRaw(req.Object, networkPolicy)
138+
err := decoder.DecodeRaw(req.Object, networkPolicy)
142139
return networkPolicy, err
143140
}
144-
err = decoder.DecodeRaw(req.OldObject, networkPolicy)
141+
err := decoder.DecodeRaw(req.OldObject, networkPolicy)
145142
return networkPolicy, err
146143
}
147144

‎pkg/webhooks/node/node.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,7 @@ func (s *NodeWebhook) authorized(request admissionctl.Request) admissionctl.Resp
136136
//Checks for non-adminGroups non-ceeGroup non-adminGroups users
137137
if request.Kind.Kind == "Node" {
138138
node := corev1.Node{}
139-
decoder, err := admission.NewDecoder(s.scheme)
140-
if err != nil {
141-
return admission.Errored(http.StatusBadRequest, err)
142-
}
143-
139+
decoder := admission.NewDecoder(s.scheme)
144140
switch request.Operation {
145141
case admissionv1.Delete:
146142
// request.Object is empty for the DELETE operation

0 commit comments

Comments
 (0)