Skip to content

Commit 3c18cd3

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #18380 from DirectXMan12/bug/hpa-dc-oapi-sadness-electric-boogaloo
Automatic merge from submit-queue. UPSTREAM: <carry>: Short-circuit HPA oapi/v1.DC The legacy oapi v1 group-version very much confuses anything not designed to explicitly work with it. Since we now don't do any custom HPA setup, we need to teach the scale client and the HPA what to do with the oapi version of DC, since it won't even show up in its discovery process. Related to #18377
2 parents 35cbe8e + eea8aa3 commit 3c18cd3

File tree

4 files changed

+49
-0
lines changed

4 files changed

+49
-0
lines changed

‎vendor/k8s.io/kubernetes/pkg/controller/podautoscaler/horizontal.go

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

‎vendor/k8s.io/kubernetes/pkg/controller/podautoscaler/patch_dc.go

+22
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/scale/client.go

+2
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/scale/patch_dc.go

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

0 commit comments

Comments
 (0)