Merge pull request #18380 from DirectXMan12/bug/hpa-dc-oapi-sadness-e…

…lectric-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
openshift · Feb 9, 2018 · 3c18cd3 · 3c18cd3
2 parents 35cbe8e + eea8aa3
commit 3c18cd3
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 0 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/podautoscaler/horizontal.go b/vendor/k8s.io/kubernetes/pkg/controller/podautoscaler/horizontal.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/podautoscaler/patch_dc.go b/vendor/k8s.io/kubernetes/pkg/controller/podautoscaler/patch_dc.go
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/scale/client.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/scale/client.go
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/scale/patch_dc.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/scale/patch_dc.go