Merge pull request #4133 from nicknovitski/parallel-psp-e2e-test
Run PodSecurityPolicy E2E test in parallel
This commit is contained in:
commit
85842edebb
1 changed files with 1 additions and 25 deletions
|
@ -39,7 +39,7 @@ const (
|
||||||
ingressControllerPSP = "ingress-controller-psp"
|
ingressControllerPSP = "ingress-controller-psp"
|
||||||
)
|
)
|
||||||
|
|
||||||
var _ = framework.IngressNginxDescribe("[Serial] Pod Security Policies", func() {
|
var _ = framework.IngressNginxDescribe("Pod Security Policies", func() {
|
||||||
f := framework.NewDefaultFramework("pod-security-policies")
|
f := framework.NewDefaultFramework("pod-security-policies")
|
||||||
|
|
||||||
BeforeEach(func() {
|
BeforeEach(func() {
|
||||||
|
@ -78,30 +78,6 @@ var _ = framework.IngressNginxDescribe("[Serial] Pod Security Policies", func()
|
||||||
f.NewEchoDeployment()
|
f.NewEchoDeployment()
|
||||||
})
|
})
|
||||||
|
|
||||||
AfterEach(func() {
|
|
||||||
role, err := f.KubeClientSet.RbacV1().ClusterRoles().Get(fmt.Sprintf("nginx-ingress-clusterrole-%v", f.Namespace), metav1.GetOptions{})
|
|
||||||
Expect(err).NotTo(HaveOccurred(), "getting ingress controller cluster role")
|
|
||||||
Expect(role).NotTo(BeNil())
|
|
||||||
|
|
||||||
index := -1
|
|
||||||
for idx, rule := range role.Rules {
|
|
||||||
found := false
|
|
||||||
for _, rn := range rule.ResourceNames {
|
|
||||||
if rn == ingressControllerPSP {
|
|
||||||
found = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if found {
|
|
||||||
index = idx
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
role.Rules = append(role.Rules[:index], role.Rules[index+1:]...)
|
|
||||||
_, err = f.KubeClientSet.RbacV1().ClusterRoles().Update(role)
|
|
||||||
Expect(err).NotTo(HaveOccurred(), "updating ingress controller cluster role to not use a pod security policy")
|
|
||||||
})
|
|
||||||
|
|
||||||
It("should be running with a Pod Security Policy", func() {
|
It("should be running with a Pod Security Policy", func() {
|
||||||
f.WaitForNginxConfiguration(
|
f.WaitForNginxConfiguration(
|
||||||
func(cfg string) bool {
|
func(cfg string) bool {
|
||||||
|
|
Loading…
Reference in a new issue