Merge pull request #20635 from deads2k/server-16-agg503

UPSTREAM: 66932: Include unavailable apiservices in discovery response
openshift · Aug 16, 2018 · 8ca07b3 · 8ca07b3
2 parents e920f6d + 80590e9
commit 8ca07b3
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 17 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/resourcequota/resource_quota_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/resourcequota/resource_quota_controller.go
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_apis.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_apis.go
diff --git a/...r/k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_apis_test.go b/...r/k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_apis_test.go
diff --git a/vendor/k8s.io/kubernetes/test/integration/examples/apiserver_test.go b/vendor/k8s.io/kubernetes/test/integration/examples/apiserver_test.go