From 13558335bd0ffc110ca463c416191eba4adcd765 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Fri, 28 Jul 2017 14:08:08 -0400 Subject: [PATCH] Add admission controller API to config and externalize ADMISSION_CONTROL Enable the dynamic admission controller registration API by adding "admissionregistration.k8s.io/v1alpha1" to --runtime-config to fix problems when starting up local-up-cluster. Also make sure ADMISSION_CONTROL can be specified externally. Fixes 47385 --- hack/local-up-cluster.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh index f3bb73ade4a..c03e8de6224 100755 --- a/hack/local-up-cluster.sh +++ b/hack/local-up-cluster.sh @@ -92,6 +92,7 @@ export KUBE_CACHE_MUTATION_DETECTOR KUBE_PANIC_WATCH_DECODE_ERROR="${KUBE_PANIC_WATCH_DECODE_ERROR:-true}" export KUBE_PANIC_WATCH_DECODE_ERROR +ADMISSION_CONTROL=${ADMISSION_CONTROL:-""} ADMISSION_CONTROL_CONFIG_FILE=${ADMISSION_CONTROL_CONFIG_FILE:-""} # START_MODE can be 'all', 'kubeletonly', or 'nokubelet' @@ -447,6 +448,14 @@ function start_apiserver { if [[ -n "${ALLOW_PRIVILEGED}" ]]; then priv_arg="--allow-privileged " fi + + if [[ ${ADMISSION_CONTROL} == *"Initializers"* ]]; then + if [[ -n "${RUNTIME_CONFIG}" ]]; then + RUNTIME_CONFIG+="," + fi + RUNTIME_CONFIG+="admissionregistration.k8s.io/v1alpha1" + fi + runtime_config="" if [[ -n "${RUNTIME_CONFIG}" ]]; then runtime_config="--runtime-config=${RUNTIME_CONFIG}"