Merge pull request #1669 from kubernetes-sigs/revert-1668-fix-e2e-dis…

…able-podSecurity Revert "fix e2e: disable podSecurity"
kubernetes-sigs · Dec 21, 2022 · 2f0aad5 · 2f0aad5
2 parents aaa8bad + cc0fa3d
commit 2f0aad5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/test/e2e/manifest/migration-windows.json b/test/e2e/manifest/migration-windows.json
@@ -19,8 +19,7 @@
                     "--feature-gates": "CSIMigration=true,CSIMigrationAzureDisk=true"
                 },
                 "apiServerConfig": {
-                    "--enable-admission-plugins": "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,AlwaysPullImages",
-                    "--disable-admission-plugins": "PodSecurity"
+                    "--enable-admission-plugins": "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,AlwaysPullImages"
                 }
             }
         },

diff --git a/test/e2e/manifest/migration.json b/test/e2e/manifest/migration.json
@@ -20,8 +20,7 @@
                     "--feature-gates": "CSIMigration=true,CSIMigrationAzureDisk=true"
                 },
                 "apiServerConfig": {
-                    "--enable-admission-plugins": "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,AlwaysPullImages",
-                    "--disable-admission-plugins": "PodSecurity"
+                    "--enable-admission-plugins": "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,AlwaysPullImages"
                 }
             }
         },

diff --git a/test/e2e/manifest/multi-az.json b/test/e2e/manifest/multi-az.json
@@ -12,8 +12,7 @@
                 "cloudProviderRateLimitQPS": 6,
                 "cloudProviderRateLimitBucket": 20,
                 "apiServerConfig": {
-                    "--enable-admission-plugins": "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,AlwaysPullImages",
-                    "--disable-admission-plugins": "PodSecurity"
+                    "--enable-admission-plugins": "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,AlwaysPullImages"
                 },
                 "outboundRuleIdleTimeoutInMinutes": 30,
                 "addons": [

diff --git a/test/e2e/manifest/single-az.json b/test/e2e/manifest/single-az.json
@@ -13,8 +13,7 @@
                 "cloudProviderRateLimitQPS": 6,
                 "cloudProviderRateLimitBucket": 20,
                 "apiServerConfig": {
-                    "--enable-admission-plugins": "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,AlwaysPullImages",
-                    "--disable-admission-plugins": "PodSecurity"
+                    "--enable-admission-plugins": "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,AlwaysPullImages"
                 },
                 "addons": [
                     {