Skip to content

Commit 67c6e1f

Browse files
authored
[release-v1.57] Bump controller runtime to avoid mistakenly defaulting to wrong mapper (#2978)
* Bump controller runtime to avoid mistakenly defaulting to wrong mapper Today, controller runtime mistakenly ignores the inherited Manager default dynamic mapper and uses a discovery mapper instead: kubernetes-sigs/controller-runtime#2491 This means that if some CRD was not available on the cdi-controller startup, Even if it got installed after, we would still get IsNoMatch when trying to access it. Signed-off-by: Alex Kalenyuk <[email protected]> * Bump k8s deps to 1.26.10 Aligned with kubernetes-sigs/controller-runtime#2559 Signed-off-by: Alex Kalenyuk <[email protected]> --------- Signed-off-by: Alex Kalenyuk <[email protected]>
1 parent 5ab49da commit 67c6e1f

File tree

16 files changed

+187
-233
lines changed

16 files changed

+187
-233
lines changed

go.mod

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@ require (
4242
google.golang.org/api v0.110.0
4343
gopkg.in/fsnotify.v1 v1.4.7
4444
gopkg.in/square/go-jose.v2 v2.6.0
45-
k8s.io/api v0.26.7
46-
k8s.io/apiextensions-apiserver v0.26.1
47-
k8s.io/apimachinery v0.26.7
48-
k8s.io/apiserver v0.26.7
45+
k8s.io/api v0.26.10
46+
k8s.io/apiextensions-apiserver v0.26.10
47+
k8s.io/apimachinery v0.26.10
48+
k8s.io/apiserver v0.26.10
4949
k8s.io/client-go v12.0.0+incompatible
50-
k8s.io/cluster-bootstrap v0.26.1
51-
k8s.io/code-generator v0.26.7
52-
k8s.io/component-helpers v0.26.1
50+
k8s.io/cluster-bootstrap v0.26.10
51+
k8s.io/code-generator v0.26.10
52+
k8s.io/component-helpers v0.26.10
5353
k8s.io/klog/v2 v2.90.1
54-
k8s.io/kube-aggregator v0.26.1
54+
k8s.io/kube-aggregator v0.26.10
5555
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280
5656
k8s.io/utils v0.0.0-20230313181309-38a27ef9d749
5757
kubevirt.io/containerized-data-importer-api v0.0.0
@@ -147,7 +147,7 @@ require (
147147
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
148148
gopkg.in/yaml.v2 v2.4.0 // indirect
149149
gopkg.in/yaml.v3 v3.0.1 // indirect
150-
k8s.io/component-base v0.26.7 // indirect
150+
k8s.io/component-base v0.26.10 // indirect
151151
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
152152
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
153153
sigs.k8s.io/kube-storage-version-migrator v0.0.4 // indirect
@@ -163,35 +163,36 @@ replace (
163163
github.com/openshift/library-go => github.com/mhenriks/library-go v0.0.0-20230310153733-63d38b55bd5a
164164
github.com/operator-framework/operator-lifecycle-manager => github.com/operator-framework/operator-lifecycle-manager v0.0.0-20190128024246-5eb7ae5bdb7a
165165

166-
k8s.io/api => k8s.io/api v0.26.7
167-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.7
168-
k8s.io/apimachinery => k8s.io/apimachinery v0.26.7
169-
k8s.io/apiserver => k8s.io/apiserver v0.26.7
170-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.7
171-
k8s.io/client-go => k8s.io/client-go v0.26.7
172-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.7
173-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.7
174-
k8s.io/code-generator => k8s.io/code-generator v0.26.7
175-
k8s.io/component-base => k8s.io/component-base v0.26.7
176-
k8s.io/component-helpers => k8s.io/component-helpers v0.26.7
177-
k8s.io/controller-manager => k8s.io/controller-manager v0.26.7
178-
k8s.io/cri-api => k8s.io/cri-api v0.26.7
179-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.7
180-
k8s.io/dynamic-resource-allocation => dynamic-resource-allocation v0.26.7
181-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.7
182-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.7
183-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.7
184-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.7
185-
k8s.io/kubectl => k8s.io/kubectl v0.26.7
186-
k8s.io/kubelet => k8s.io/kubelet v0.26.7
187-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.7
188-
k8s.io/metrics => k8s.io/metrics v0.26.7
189-
k8s.io/mount-utils => k8s.io/mount-utils v0.26.7
190-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.7
191-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.7
192-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.7
193-
k8s.io/sample-controller => k8s.io/sample-controller v0.26.7
166+
k8s.io/api => k8s.io/api v0.26.10
167+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.10
168+
k8s.io/apimachinery => k8s.io/apimachinery v0.26.10
169+
k8s.io/apiserver => k8s.io/apiserver v0.26.10
170+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.10
171+
k8s.io/client-go => k8s.io/client-go v0.26.10
172+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.10
173+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.10
174+
k8s.io/code-generator => k8s.io/code-generator v0.26.10
175+
k8s.io/component-base => k8s.io/component-base v0.26.10
176+
k8s.io/component-helpers => k8s.io/component-helpers v0.26.10
177+
k8s.io/controller-manager => k8s.io/controller-manager v0.26.10
178+
k8s.io/cri-api => k8s.io/cri-api v0.26.10
179+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.10
180+
k8s.io/dynamic-resource-allocation => dynamic-resource-allocation v0.26.10
181+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.10
182+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.10
183+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.10
184+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.10
185+
k8s.io/kubectl => k8s.io/kubectl v0.26.10
186+
k8s.io/kubelet => k8s.io/kubelet v0.26.10
187+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.10
188+
k8s.io/metrics => k8s.io/metrics v0.26.10
189+
k8s.io/mount-utils => k8s.io/mount-utils v0.26.10
190+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.10
191+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.10
192+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.10
193+
k8s.io/sample-controller => k8s.io/sample-controller v0.26.10
194194

195195
kubevirt.io/containerized-data-importer-api => ./staging/src/kubevirt.io/containerized-data-importer-api
196196
kubevirt.io/controller-lifecycle-operator-sdk/api => kubevirt.io/controller-lifecycle-operator-sdk/api v0.0.0-20220329064328-f3cc58c6ed90
197+
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.14.7
197198
)

0 commit comments

Comments
 (0)