Skip to content

Commit 8ca07b3

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #20635 from deads2k/server-16-agg503
UPSTREAM: 66932: Include unavailable apiservices in discovery response
2 parents e920f6d + 80590e9 commit 8ca07b3

File tree

4 files changed

+81
-17
lines changed

4 files changed

+81
-17
lines changed

‎vendor/k8s.io/kubernetes/pkg/controller/resourcequota/resource_quota_controller.go

Lines changed: 13 additions & 7 deletions
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/kube-aggregator/pkg/apiserver/handler_apis.go

Lines changed: 0 additions & 4 deletions
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/kube-aggregator/pkg/apiserver/handler_apis_test.go

Lines changed: 41 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/test/integration/examples/apiserver_test.go

Lines changed: 27 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)