From b551233d01a7bd8e36046dda3493a2da42fbfed8 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Fri, 23 Feb 2018 16:59:22 +0100 Subject: [PATCH] Enable PV protection test by default - StorageObjectInUseProtection is enabled by default now so the test can run in regular tests. - Enable StorageObjectInUseProtection admission plugins during tests --- cluster/gce/config-test.sh | 2 +- cluster/kubemark/gce/config-default.sh | 2 +- test/e2e/storage/pv_protection.go | 2 +- test/e2e/storage/pvc_protection.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index ab786ff7065..2d2697c5e51 100755 --- a/cluster/gce/config-test.sh +++ b/cluster/gce/config-test.sh @@ -317,7 +317,7 @@ if [[ -n "${GCE_GLBC_IMAGE:-}" ]]; then fi if [[ -z "${KUBE_ADMISSION_CONTROL:-}" ]]; then - ADMISSION_CONTROL="Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,PodPreset,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,Priority" + ADMISSION_CONTROL="Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,PodPreset,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,Priority,StorageObjectInUseProtection" if [[ "${ENABLE_POD_SECURITY_POLICY:-}" == "true" ]]; then ADMISSION_CONTROL="${ADMISSION_CONTROL},PodSecurityPolicy" fi diff --git a/cluster/kubemark/gce/config-default.sh b/cluster/kubemark/gce/config-default.sh index 9c54753fad4..6a4049d020a 100644 --- a/cluster/kubemark/gce/config-default.sh +++ b/cluster/kubemark/gce/config-default.sh @@ -89,7 +89,7 @@ TEST_CLUSTER_API_CONTENT_TYPE="${TEST_CLUSTER_API_CONTENT_TYPE:-}" KUBEMARK_MASTER_COMPONENTS_QPS_LIMITS="${KUBEMARK_MASTER_COMPONENTS_QPS_LIMITS:-}" -CUSTOM_ADMISSION_PLUGINS="${CUSTOM_ADMISSION_PLUGINS:-Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,PodPreset,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,Priority,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota}" +CUSTOM_ADMISSION_PLUGINS="${CUSTOM_ADMISSION_PLUGINS:-Initializers,NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,PodPreset,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,Priority,StorageObjectInUseProtection,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota}" # Master components' test arguments. APISERVER_TEST_ARGS="${KUBEMARK_APISERVER_TEST_ARGS:-} --runtime-config=extensions/v1beta1 ${API_SERVER_TEST_LOG_LEVEL} ${TEST_CLUSTER_MAX_REQUESTS_INFLIGHT} ${TEST_CLUSTER_DELETE_COLLECTION_WORKERS}" diff --git a/test/e2e/storage/pv_protection.go b/test/e2e/storage/pv_protection.go index 8210d1f978f..4c698f3f0bb 100644 --- a/test/e2e/storage/pv_protection.go +++ b/test/e2e/storage/pv_protection.go @@ -31,7 +31,7 @@ import ( "k8s.io/kubernetes/test/e2e/storage/utils" ) -var _ = utils.SIGDescribe("PV Protection [Feature:StorageObjectInUseProtection]", func() { +var _ = utils.SIGDescribe("PV Protection", func() { var ( client clientset.Interface nameSpace string diff --git a/test/e2e/storage/pvc_protection.go b/test/e2e/storage/pvc_protection.go index f3fd5c44e75..2d2346ee134 100644 --- a/test/e2e/storage/pvc_protection.go +++ b/test/e2e/storage/pvc_protection.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/test/e2e/storage/utils" ) -var _ = utils.SIGDescribe("Storage Protection", func() { +var _ = utils.SIGDescribe("PVC Protection", func() { var ( client clientset.Interface nameSpace string