Skip to content

Commit 5a9f20a

Browse files
committed
test new generator
1 parent abd2214 commit 5a9f20a

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

test/e2e/node/kubelet_authz.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
v1 "k8s.io/api/core/v1"
2727
rbacv1 "k8s.io/api/rbac/v1"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
29-
"k8s.io/apimachinery/pkg/util/uuid"
3029
"k8s.io/apiserver/pkg/authentication/serviceaccount"
3130
"k8s.io/kubernetes/pkg/cluster/ports"
3231
"k8s.io/kubernetes/pkg/features"
@@ -60,7 +59,7 @@ var _ = SIGDescribe(framework.WithFeatureGate(features.KubeletFineGrainedAuthz),
6059
func runKubeletAuthzTest(ctx context.Context, f *framework.Framework, endpoint, authzSubresource string) string {
6160
ns := f.Namespace.Name
6261
saName := authzSubresource
63-
crName := authzSubresource + string(uuid.NewUUID())
62+
crName := authzSubresource
6463
verb := "get"
6564
resource := "nodes"
6665

@@ -74,11 +73,11 @@ func runKubeletAuthzTest(ctx context.Context, f *framework.Framework, endpoint,
7473
}, metav1.CreateOptions{})
7574
framework.ExpectNoError(err)
7675

77-
ginkgo.By(fmt.Sprintf("Creating ClusterRole %s with for %s/%s", crName, resource, authzSubresource))
76+
ginkgo.By(fmt.Sprintf("Creating ClusterRole with suffix %s with for %s/%s", crName, resource, authzSubresource))
7877

79-
_, err = f.ClientSet.RbacV1().ClusterRoles().Create(ctx, &rbacv1.ClusterRole{
78+
clusterRole, err := f.ClientSet.RbacV1().ClusterRoles().Create(ctx, &rbacv1.ClusterRole{
8079
ObjectMeta: metav1.ObjectMeta{
81-
Name: crName,
80+
GenerateName: crName + "-",
8281
},
8382
Rules: []rbacv1.PolicyRule{
8483
{
@@ -96,9 +95,9 @@ func runKubeletAuthzTest(ctx context.Context, f *framework.Framework, endpoint,
9695
Name: saName,
9796
}
9897

99-
ginkgo.By(fmt.Sprintf("Creating ClusterRoleBinding with ClusterRole %s with subject %s/%s", crName, ns, saName))
98+
ginkgo.By(fmt.Sprintf("Creating ClusterRoleBinding with ClusterRole %s with subject %s/%s", clusterRole.Name, ns, saName))
10099

101-
err = e2eauth.BindClusterRole(ctx, f.ClientSet.RbacV1(), crName, ns, subject)
100+
err = e2eauth.BindClusterRole(ctx, f.ClientSet.RbacV1(), clusterRole.Name, ns, subject)
102101
framework.ExpectNoError(err)
103102

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

0 commit comments

Comments
 (0)