From a4f8ee17ee5d5beb1efb2a28fa8466ed3ca70ad3 Mon Sep 17 00:00:00 2001 From: Tim Allclair Date: Wed, 28 Aug 2019 13:23:55 -0700 Subject: [PATCH] Enable the RuntimeClass admission controller on GCE & CI --- cluster/gce/config-default.sh | 2 +- cluster/gce/config-test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh index 56e1347e376..d8813479169 100755 --- a/cluster/gce/config-default.sh +++ b/cluster/gce/config-default.sh @@ -356,7 +356,7 @@ fi CUSTOM_INGRESS_YAML="${CUSTOM_INGRESS_YAML:-}" # Admission Controllers to invoke prior to persisting objects in cluster -ADMISSION_CONTROL=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,PersistentVolumeClaimResize,DefaultTolerationSeconds,NodeRestriction,Priority,StorageObjectInUseProtection +ADMISSION_CONTROL=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,PersistentVolumeClaimResize,DefaultTolerationSeconds,NodeRestriction,Priority,StorageObjectInUseProtection,RuntimeClass if [[ "${ENABLE_POD_SECURITY_POLICY:-}" == "true" ]]; then ADMISSION_CONTROL="${ADMISSION_CONTROL},PodSecurityPolicy" diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index 9bcb381d0d1..d70eeb18ae6 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -387,7 +387,7 @@ fi CUSTOM_INGRESS_YAML="${CUSTOM_INGRESS_YAML:-}" if [[ -z "${KUBE_ADMISSION_CONTROL:-}" ]]; then - ADMISSION_CONTROL="NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,PodPreset,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,Priority,StorageObjectInUseProtection,PersistentVolumeClaimResize" + ADMISSION_CONTROL="NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,PodPreset,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,Priority,StorageObjectInUseProtection,PersistentVolumeClaimResize,RuntimeClass" if [[ "${ENABLE_POD_SECURITY_POLICY:-}" == "true" ]]; then ADMISSION_CONTROL="${ADMISSION_CONTROL},PodSecurityPolicy" fi