github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #69828 from ironcladlou/e2e-psp-reentrancy-fix

Browse Source 
Make CreatePrivilegedPSPBinding reentrant
This commit is contained in:
k8s-ci-robot 2018-10-15 15:04:53 -07:00 committed by GitHub
commit c7886f8ba4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/framework/psp_util.go
View File

@ -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)
if !apierrs.IsAlreadyExists(err) {
ExpectNoError(err, "Failed to create PSP %s", podSecurityPolicyPrivileged) 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,8 +128,10 @@ func CreatePrivilegedPSPBinding(f *Framework, namespace string) {
Verbs: []string{"use"}, Verbs: []string{"use"},
}}, }},
}) })
if !apierrs.IsAlreadyExists(err) {
ExpectNoError(err, "Failed to create PSP role") ExpectNoError(err, "Failed to create PSP role")
} }
}
}) })
if IsRBACEnabled(f) { if IsRBACEnabled(f) {