Merge pull request #65057 from sttts/sttts-apiexitensions-coreapi

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. apiextensions: enable CoreAPI options needed for admission Admission webhooks need the client and the shared informers for kube resources. The comment is invalid and we have to enable the CoreAPI options. This PR is important to run apiextensions-apiserver in a standalone integration test setup.

Merge pull request #65057 from sttts/sttts-apiexitensions-coreapi
f01eaef7 · Kubernetes Submit Queue · GitHub · 7a9a30a4 · 1c67e1dc · f01eaef7
Unverified Commit f01eaef7 authored Jun 24, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 24, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

start.go ...rc/k8s.io/apiextensions-apiserver/pkg/cmd/server/start.go +0 -3

start.go ...extensions-apiserver/test/integration/testserver/start.go +1 -0

No files found.
--- a/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/start.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/cmd/server/start.go
@@ -51,9 +51,6 @@ func NewCustomResourceDefinitionsServerOptions(out, errOut io.Writer) *CustomRes
 		StdErr: errOut,
 	}

-	// the shared informer is not needed for apiextentions apiserver. Disable the kubeconfig flag and the client creation.
-	o.RecommendedOptions.CoreAPI = nil
-
 	return o
 }


--- a/staging/src/k8s.io/apiextensions-apiserver/test/integration/testserver/start.go
+++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/testserver/start.go
@@ -47,6 +47,7 @@ func DefaultServerConfig() (*extensionsapiserver.Config, error) {
 	options.RecommendedOptions.Authentication = nil // disable
 	options.RecommendedOptions.Authorization = nil  // disable
 	options.RecommendedOptions.Admission = nil      // disable
+	options.RecommendedOptions.CoreAPI = nil        // disable
 	options.RecommendedOptions.SecureServing.BindAddress = net.ParseIP("127.0.0.1")
 	options.RecommendedOptions.SecureServing.Listener = listener
 	etcdURL, ok := os.LookupEnv("KUBE_INTEGRATION_ETCD_URL")