github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #69243 from jfchevrette/local_cluster_default_admission_plugins

Browse Source 
Fix setting admission plugins on local-up-cluster.sh
This commit is contained in:
k8s-ci-robot 2018-10-02 21:46:31 -07:00 committed by GitHub
commit a94755cf2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hack/local-up-cluster.sh
View File

@ -103,7 +103,9 @@ export KUBE_CACHE_MUTATION_DETECTOR
KUBE_PANIC_WATCH_DECODE_ERROR="${KUBE_PANIC_WATCH_DECODE_ERROR:-true}" KUBE_PANIC_WATCH_DECODE_ERROR="${KUBE_PANIC_WATCH_DECODE_ERROR:-true}"
export KUBE_PANIC_WATCH_DECODE_ERROR export KUBE_PANIC_WATCH_DECODE_ERROR
ENABLE_ADMISSION_PLUGINS=${ENABLE_ADMISSION_PLUGINS:-""} # Default list of admission Controllers to invoke prior to persisting objects in cluster
# The order defined here does not matter.
ENABLE_ADMISSION_PLUGINS=${ENABLE_ADMISSION_PLUGINS:-"NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota"}
DISABLE_ADMISSION_PLUGINS=${DISABLE_ADMISSION_PLUGINS:-""} DISABLE_ADMISSION_PLUGINS=${DISABLE_ADMISSION_PLUGINS:-""}
ADMISSION_CONTROL_CONFIG_FILE=${ADMISSION_CONTROL_CONFIG_FILE:-""} ADMISSION_CONTROL_CONFIG_FILE=${ADMISSION_CONTROL_CONFIG_FILE:-""}
@ -507,11 +509,8 @@ function start_apiserver {
RUNTIME_CONFIG+="scheduling.k8s.io/v1alpha1=true" RUNTIME_CONFIG+="scheduling.k8s.io/v1alpha1=true"
fi fi
# Append security_admission plugin
# Admission Controllers to invoke prior to persisting objects in cluster ENABLE_ADMISSION_PLUGINS="${ENABLE_ADMISSION_PLUGINS}${security_admission}"
#
# The order defined here dose not matter.
ENABLE_ADMISSION_PLUGINS=LimitRanger,ServiceAccount${security_admission},DefaultStorageClass,DefaultTolerationSeconds,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota,StorageObjectInUseProtection
swagger_arg="" swagger_arg=""
if [[ "${ENABLE_SWAGGER_UI}" = true ]]; then if [[ "${ENABLE_SWAGGER_UI}" = true ]]; then