github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 23:47:50 +00:00
Code Issues Projects Releases Wiki Activity

use e2eskipper package in test/e2e/auth

Browse Source
This commit is contained in:
YuikoTakada
2020-01-10 06:22:28 +00:00
parent 387e6931e5
commit 16fbb5be33
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e/auth/pod_security_policy.go
View File

@@ -34,6 +34,7 @@ import (
"k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/framework/auth"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
imageutils "k8s.io/kubernetes/test/utils/image"
utilpointer "k8s.io/utils/pointer"
@@ -52,10 +53,10 @@ var _ = SIGDescribe("PodSecurityPolicy", func() {
var ns string // Test namespace, for convenience
ginkgo.BeforeEach(func() {
if !framework.IsPodSecurityPolicyEnabled(f.ClientSet) {
framework.Skipf("PodSecurityPolicy not enabled")
e2eskipper.Skipf("PodSecurityPolicy not enabled")
}
if !auth.IsRBACEnabled(f.ClientSet.RbacV1()) {
framework.Skipf("RBAC not enabled")
e2eskipper.Skipf("RBAC not enabled")
}
ns = f.Namespace.Name
@@ -373,5 +374,5 @@ func boolPtr(b bool) *bool {
// isAppArmorSupported checks whether the AppArmor is supported by the node OS distro.
func isAppArmorSupported() bool {
return framework.NodeOSDistroIs(framework.AppArmorDistros...)
return framework.NodeOSDistroIs(e2eskipper.AppArmorDistros...)
}