Skip to content

K
k3s
Commit 0bef5e43 authored by Dan Mace's avatar Dan Mace
Browse files
Options

Make CreatePrivilegedPSPBinding reentrant

Make CreatePrivilegedPSPBinding reentrant so tests using it (e.g. DNS) can be executed more than once against a cluster. Without this change, such tests will fail because the PSP already exists, short circuiting test setup.
parent b11211ed
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
test/e2e/framework/psp_util.go
View file @ 0bef5e43
...@@ -113,7 +113,9 @@ func CreatePrivilegedPSPBinding(f *Framework, namespace string) { ...@@ -113,7 +113,9 @@ func CreatePrivilegedPSPBinding(f *Framework, namespace string) {
psp := PrivilegedPSP(podSecurityPolicyPrivileged) psp := PrivilegedPSP(podSecurityPolicyPrivileged)
psp, err = f.ClientSet.ExtensionsV1beta1().PodSecurityPolicies().Create(psp) psp, err = f.ClientSet.ExtensionsV1beta1().PodSecurityPolicies().Create(psp)
ExpectNoError(err, "Failed to create PSP %s", podSecurityPolicyPrivileged) if !apierrs.IsAlreadyExists(err) {
ExpectNoError(err, "Failed to create PSP %s", podSecurityPolicyPrivileged)
}
if IsRBACEnabled(f) { if IsRBACEnabled(f) {
// Create the Role to bind it to the namespace. // Create the Role to bind it to the namespace.
...@@ -126,7 +128,9 @@ func CreatePrivilegedPSPBinding(f *Framework, namespace string) { ...@@ -126,7 +128,9 @@ func CreatePrivilegedPSPBinding(f *Framework, namespace string) {
Verbs: []string{"use"}, Verbs: []string{"use"},
}}, }},
}) })
ExpectNoError(err, "Failed to create PSP role") if !apierrs.IsAlreadyExists(err) {
ExpectNoError(err, "Failed to create PSP role")
}
} }
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment