Skip to content

Commit 008f2d5

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #16976 from juanvallejo/jvallejo/pick-upstream-45743
Automatic merge from submit-queue. UPSTREAM: 45743: pick 45743 to fix config groupversion defaults Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1503910 Picks upstream changes introduced in https://github.com/kubernetes/kubernetes/pull/45743/files which fix a bug where setting kubernetes defaults on a rest config would sometimes overwrite its ContentConfig.GroupVersion field with the wrong group version - causing resources such as `cronjob.v2alpha1.batch` to return an error [1] when attempted to be described through `oc`. 1. ``` $ oc describe cronjob existing-cronjob Error from server (NotFound): the server could not find the requested resource ``` cc @deads2k @fabianofranz
2 parents 5fa553e + 4df1f41 commit 008f2d5

File tree

5 files changed

+34
-124
lines changed

5 files changed

+34
-124
lines changed

‎vendor/k8s.io/kubernetes/pkg/client/unversioned/helper.go

+4-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/client/unversioned/helper_test.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubectl/cmd/util/clientcache.go

+13-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/discovery/helper.go

+10-50
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/discovery/helper_blackbox_test.go

+6-50
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)