Merge pull request #89188 from tallclair/psp-tests

Move PSP tests behind a feature tag
This commit is contained in:
Kubernetes Prow Robot 2020-03-31 12:37:14 -07:00 committed by GitHub
commit b7faac459f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -44,7 +44,7 @@ import (
const nobodyUser = int64(65534)
var _ = SIGDescribe("PodSecurityPolicy", func() {
var _ = SIGDescribe("PodSecurityPolicy [Feature:PodSecurityPolicy]", func() {
f := framework.NewDefaultFramework("podsecuritypolicy")
f.SkipPrivilegedPSPBinding = true
@ -54,7 +54,8 @@ var _ = SIGDescribe("PodSecurityPolicy", func() {
var ns string // Test namespace, for convenience
ginkgo.BeforeEach(func() {
if !framework.IsPodSecurityPolicyEnabled(f.ClientSet) {
e2eskipper.Skipf("PodSecurityPolicy not enabled")
framework.Failf("PodSecurityPolicy not enabled")
return
}
if !e2eauth.IsRBACEnabled(f.ClientSet.RbacV1()) {
e2eskipper.Skipf("RBAC not enabled")