Skip to content

Commit 1e1307d

Browse files
committed
testing latest commit
1 parent abd2214 commit 1e1307d

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

test/e2e/node/kubelet_authz.go

+5-7
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,6 @@ 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())
6462
verb := "get"
6563
resource := "nodes"
6664

@@ -74,11 +72,11 @@ func runKubeletAuthzTest(ctx context.Context, f *framework.Framework, endpoint,
7472
}, metav1.CreateOptions{})
7573
framework.ExpectNoError(err)
7674

77-
ginkgo.By(fmt.Sprintf("Creating ClusterRole %s with for %s/%s", crName, resource, authzSubresource))
75+
ginkgo.By(fmt.Sprintf("Creating ClusterRole with prefix %s with for %s/%s", authzSubresource, resource, authzSubresource))
7876

79-
_, err = f.ClientSet.RbacV1().ClusterRoles().Create(ctx, &rbacv1.ClusterRole{
77+
clusterRole, err := f.ClientSet.RbacV1().ClusterRoles().Create(ctx, &rbacv1.ClusterRole{
8078
ObjectMeta: metav1.ObjectMeta{
81-
Name: crName,
79+
GenerateName: authzSubresource + "-",
8280
},
8381
Rules: []rbacv1.PolicyRule{
8482
{
@@ -96,9 +94,9 @@ func runKubeletAuthzTest(ctx context.Context, f *framework.Framework, endpoint,
9694
Name: saName,
9795
}
9896

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

101-
err = e2eauth.BindClusterRole(ctx, f.ClientSet.RbacV1(), crName, ns, subject)
99+
err = e2eauth.BindClusterRole(ctx, f.ClientSet.RbacV1(), clusterRole.Name, ns, subject)
102100
framework.ExpectNoError(err)
103101

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

0 commit comments

Comments
 (0)