Skip to content

Commit f82ae5a

Browse files
committed
other fix
1 parent 4c81f5a commit f82ae5a

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

test/e2e/framework/auth/helpers.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,10 @@ func BindClusterRole(ctx context.Context, c bindingsGetter, clusterRole, ns stri
108108
return nil
109109
}
110110

111+
// Since the namespace names are unique, we can leave this lying around so we don't have to race any caches
111112
_, err := c.ClusterRoleBindings().Create(ctx, &rbacv1.ClusterRoleBinding{
112113
ObjectMeta: metav1.ObjectMeta{
113-
Name: clusterRole,
114+
Name: ns + "--" + clusterRole,
114115
},
115116
RoleRef: rbacv1.RoleRef{
116117
APIGroup: "rbac.authorization.k8s.io",

test/e2e/node/kubelet_authz.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,9 @@ func runKubeletAuthzTest(ctx context.Context, f *framework.Framework, endpoint,
103103
err = e2eauth.BindClusterRole(ctx, f.ClientSet.RbacV1(), clusterRole.Name, ns, subject)
104104
framework.ExpectNoError(err)
105105
defer func() {
106-
ginkgo.By(fmt.Sprintf("Destroying ClusterRoleBindings %q for this suite.", clusterRole.Name))
107-
framework.ExpectNoError(f.ClientSet.RbacV1().ClusterRoleBindings().Delete(ctx, clusterRole.Name, metav1.DeleteOptions{}))
106+
clusterRoleBindingName := ns + "--" + clusterRole.Name
107+
ginkgo.By(fmt.Sprintf("Destroying ClusterRoleBindings %q for this suite.", clusterRoleBindingName))
108+
framework.ExpectNoError(f.ClientSet.RbacV1().ClusterRoleBindings().Delete(ctx, clusterRoleBindingName, metav1.DeleteOptions{}))
108109
}()
109110

110111
ginkgo.By("Waiting for Authorization Update.")

0 commit comments

Comments
 (0)