diff --git a/federation/cluster/common.sh b/federation/cluster/common.sh index a13c69a9f41..d0610a6523b 100644 --- a/federation/cluster/common.sh +++ b/federation/cluster/common.sh @@ -258,7 +258,7 @@ function create-federation-api-objects { export FEDERATION_APISERVER_KEY_BASE64="${FEDERATION_APISERVER_KEY_BASE64}" # Enable the NamespaceLifecycle admission control by default. - export FEDERATION_ADMISSION_CONTROL="${FEDERATION_ADMISSION_CONTROL:-Initializers,NamespaceLifecycle}" + export FEDERATION_ADMISSION_CONTROL="${FEDERATION_ADMISSION_CONTROL:-NamespaceLifecycle}" for file in federation-etcd-pvc.yaml federation-apiserver-{deployment,secrets}.yaml federation-controller-manager-deployment.yaml; do echo "Creating manifest: ${file}" diff --git a/federation/pkg/kubefed/init/init.go b/federation/pkg/kubefed/init/init.go index d94a8abd3dc..13388216ef4 100644 --- a/federation/pkg/kubefed/init/init.go +++ b/federation/pkg/kubefed/init/init.go @@ -692,7 +692,7 @@ func createAPIServer(clientset client.Interface, namespace, name, federationName "--client-ca-file": "/etc/federation/apiserver/ca.crt", "--tls-cert-file": "/etc/federation/apiserver/server.crt", "--tls-private-key-file": "/etc/federation/apiserver/server.key", - "--admission-control": "Initializers,NamespaceLifecycle", + "--admission-control": "NamespaceLifecycle", } if advertiseAddress != "" { diff --git a/federation/pkg/kubefed/init/init_test.go b/federation/pkg/kubefed/init/init_test.go index 60a847f3f63..765bbad5ffb 100644 --- a/federation/pkg/kubefed/init/init_test.go +++ b/federation/pkg/kubefed/init/init_test.go @@ -869,7 +869,7 @@ func fakeInitHostFactory(apiserverServiceType v1.ServiceType, federationName, na fmt.Sprintf("--secure-port=%d", apiServerSecurePort), "--tls-cert-file=/etc/federation/apiserver/server.crt", "--tls-private-key-file=/etc/federation/apiserver/server.key", - "--admission-control=Initializers,NamespaceLifecycle", + "--admission-control=NamespaceLifecycle", fmt.Sprintf("--advertise-address=%s", address), } diff --git a/hack/make-rules/test-federation-cmd.sh b/hack/make-rules/test-federation-cmd.sh index 65e6f6594c6..45e49a5d306 100755 --- a/hack/make-rules/test-federation-cmd.sh +++ b/hack/make-rules/test-federation-cmd.sh @@ -34,7 +34,7 @@ function run_federation_apiserver() { kube::log::status "Starting federation-apiserver" # Admission Controllers to invoke prior to persisting objects in cluster - ADMISSION_CONTROL="Initializers,NamespaceLifecycle" + ADMISSION_CONTROL="NamespaceLifecycle" "${KUBE_OUTPUT_HOSTBIN}/federation-apiserver" \ --insecure-port="${API_PORT}" \