github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove podpreset in local up cluster

Browse Source 
This was enabled in 6a7aca3129, but
shouldn't have been since the podpreset implementation is in the process
of being moved into service-catalog.
This commit is contained in:
Jeff Peeler
2018-02-20 12:27:27 -05:00
parent cb5f1ad9f7
commit d839053878
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -432,7 +432,7 @@ function start_apiserver {
# Admission Controllers to invoke prior to persisting objects in cluster # Admission Controllers to invoke prior to persisting objects in cluster
# #
# The order defined here dose not matter. # The order defined here dose not matter.
ENABLE_ADMISSION_PLUGINS=Initializers,LimitRanger,ServiceAccount${security_admission},DefaultStorageClass,DefaultTolerationSeconds,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota,PodPreset,StorageObjectInUseProtection ENABLE_ADMISSION_PLUGINS=Initializers,LimitRanger,ServiceAccount${security_admission},DefaultStorageClass,DefaultTolerationSeconds,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota,StorageObjectInUseProtection
audit_arg="" audit_arg=""
APISERVER_BASIC_AUDIT_LOG="" APISERVER_BASIC_AUDIT_LOG=""
@@ -473,13 +473,6 @@ function start_apiserver {
RUNTIME_CONFIG+="admissionregistration.k8s.io/v1alpha1" RUNTIME_CONFIG+="admissionregistration.k8s.io/v1alpha1"
fi fi
if [[ ${ENABLE_ADMISSION_PLUGINS} == *"PodPreset"* ]]; then
if [[ -n "${RUNTIME_CONFIG}" ]]; then
RUNTIME_CONFIG+=","
fi
RUNTIME_CONFIG+="settings.k8s.io/v1alpha1"
fi
runtime_config="" runtime_config=""
if [[ -n "${RUNTIME_CONFIG}" ]]; then if [[ -n "${RUNTIME_CONFIG}" ]]; then
runtime_config="--runtime-config=${RUNTIME_CONFIG}" runtime_config="--runtime-config=${RUNTIME_CONFIG}"