Skip to content

Commit

Permalink
Bump controller runtime to avoid mistakenly defaulting to wrong mapper
Browse files Browse the repository at this point in the history
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 <akalenyu@redhat.com>
  • Loading branch information
akalenyu committed Nov 10, 2023
1 parent 5ab49da commit 5d496e6
Show file tree
Hide file tree
Showing 8 changed files with 69 additions and 126 deletions.
9 changes: 5 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ require (
google.golang.org/api v0.110.0
gopkg.in/fsnotify.v1 v1.4.7
gopkg.in/square/go-jose.v2 v2.6.0
k8s.io/api v0.26.7
k8s.io/apiextensions-apiserver v0.26.1
k8s.io/apimachinery v0.26.7
k8s.io/api v0.26.10
k8s.io/apiextensions-apiserver v0.26.10
k8s.io/apimachinery v0.26.10
k8s.io/apiserver v0.26.7
k8s.io/client-go v12.0.0+incompatible
k8s.io/cluster-bootstrap v0.26.1
Expand Down Expand Up @@ -147,7 +147,7 @@ require (
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/component-base v0.26.7 // indirect
k8s.io/component-base v0.26.10 // indirect
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/kube-storage-version-migrator v0.0.4 // indirect
Expand Down Expand Up @@ -194,4 +194,5 @@ replace (

kubevirt.io/containerized-data-importer-api => ./staging/src/kubevirt.io/containerized-data-importer-api
kubevirt.io/controller-lifecycle-operator-sdk/api => kubevirt.io/controller-lifecycle-operator-sdk/api v0.0.0-20220329064328-f3cc58c6ed90
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.14.7
)
31 changes: 15 additions & 16 deletions go.sum

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,7 @@ gopkg.in/yaml.v2
# gopkg.in/yaml.v3 v3.0.1
## explicit
gopkg.in/yaml.v3
# k8s.io/api v0.26.7 => k8s.io/api v0.26.7
# k8s.io/api v0.26.10 => k8s.io/api v0.26.7
## explicit; go 1.19
k8s.io/api/admission/v1
k8s.io/api/admission/v1beta1
Expand Down Expand Up @@ -928,7 +928,7 @@ k8s.io/api/scheduling/v1beta1
k8s.io/api/storage/v1
k8s.io/api/storage/v1alpha1
k8s.io/api/storage/v1beta1
# k8s.io/apiextensions-apiserver v0.26.1 => k8s.io/apiextensions-apiserver v0.26.7
# k8s.io/apiextensions-apiserver v0.26.10 => k8s.io/apiextensions-apiserver v0.26.7
## explicit; go 1.19
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
Expand All @@ -937,7 +937,7 @@ k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1
k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1
# k8s.io/apimachinery v0.26.7 => k8s.io/apimachinery v0.26.7
# k8s.io/apimachinery v0.26.10 => k8s.io/apimachinery v0.26.7
## explicit; go 1.19
k8s.io/apimachinery/pkg/api/equality
k8s.io/apimachinery/pkg/api/errors
Expand Down Expand Up @@ -1336,7 +1336,7 @@ k8s.io/code-generator/cmd/set-gen
k8s.io/code-generator/pkg/namer
k8s.io/code-generator/pkg/util
k8s.io/code-generator/third_party/forked/golang/reflect
# k8s.io/component-base v0.26.7 => k8s.io/component-base v0.26.7
# k8s.io/component-base v0.26.10 => k8s.io/component-base v0.26.7
## explicit; go 1.19
k8s.io/component-base/config
k8s.io/component-base/config/v1alpha1
Expand Down Expand Up @@ -1437,7 +1437,7 @@ kubevirt.io/qe-tools/pkg/polarion-xml
# libguestfs.org/libnbd v1.11.5
## explicit; go 1.13
libguestfs.org/libnbd
# sigs.k8s.io/controller-runtime v0.14.6
# sigs.k8s.io/controller-runtime v0.14.6 => sigs.k8s.io/controller-runtime v0.14.7
## explicit; go 1.19
sigs.k8s.io/controller-runtime/pkg/cache
sigs.k8s.io/controller-runtime/pkg/cache/internal
Expand Down Expand Up @@ -1534,3 +1534,4 @@ sigs.k8s.io/yaml
# k8s.io/sample-controller => k8s.io/sample-controller v0.26.7
# kubevirt.io/containerized-data-importer-api => ./staging/src/kubevirt.io/containerized-data-importer-api
# kubevirt.io/controller-lifecycle-operator-sdk/api => kubevirt.io/controller-lifecycle-operator-sdk/api v0.0.0-20220329064328-f3cc58c6ed90
# sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.14.7
44 changes: 34 additions & 10 deletions vendor/sigs.k8s.io/controller-runtime/pkg/cache/cache.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions vendor/sigs.k8s.io/controller-runtime/pkg/client/options.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 5d496e6

Please sign in to comment.