Skip to content

Commit

Permalink
Merge pull request #1668 from cvvz/fix-e2e-disable-podSecurity
Browse files Browse the repository at this point in the history
fix e2e: disable podSecurity
  • Loading branch information
andyzhangx authored Dec 21, 2022
2 parents 29b146d + ee531c5 commit aaa8bad
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion test/e2e/manifest/migration-windows.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
"--feature-gates": "CSIMigration=true,CSIMigrationAzureDisk=true"
},
"apiServerConfig": {
"--enable-admission-plugins": "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,AlwaysPullImages"
"--enable-admission-plugins": "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,AlwaysPullImages",
"--disable-admission-plugins": "PodSecurity"
}
}
},
Expand Down
3 changes: 2 additions & 1 deletion test/e2e/manifest/migration.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
"--feature-gates": "CSIMigration=true,CSIMigrationAzureDisk=true"
},
"apiServerConfig": {
"--enable-admission-plugins": "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,AlwaysPullImages"
"--enable-admission-plugins": "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,AlwaysPullImages",
"--disable-admission-plugins": "PodSecurity"
}
}
},
Expand Down
3 changes: 2 additions & 1 deletion test/e2e/manifest/multi-az.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"cloudProviderRateLimitQPS": 6,
"cloudProviderRateLimitBucket": 20,
"apiServerConfig": {
"--enable-admission-plugins": "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,AlwaysPullImages"
"--enable-admission-plugins": "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,AlwaysPullImages",
"--disable-admission-plugins": "PodSecurity"
},
"outboundRuleIdleTimeoutInMinutes": 30,
"addons": [
Expand Down
3 changes: 2 additions & 1 deletion test/e2e/manifest/single-az.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"cloudProviderRateLimitQPS": 6,
"cloudProviderRateLimitBucket": 20,
"apiServerConfig": {
"--enable-admission-plugins": "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,AlwaysPullImages"
"--enable-admission-plugins": "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,AlwaysPullImages",
"--disable-admission-plugins": "PodSecurity"
},
"addons": [
{
Expand Down

0 comments on commit aaa8bad

Please sign in to comment.