Merge pull request #1642 from weaveworks/1602_tnancy_role_binding

fix tenancy deployment role binding name

Author: alichaddad

pkg/tenancy/tenancy.go

@@ -435,7 +435,7 @@ func newServiceAccount(name, namespace string, labels map[string]string) *corev1
 }
 
 func newDeploymentRBACRoleBinding(tenantName, namespace, serviceAccountName string, labels map[string]string) *rbacv1.RoleBinding {
-	name := fmt.Sprintf("%s-service-account-deployment", tenantName)
+	name := fmt.Sprintf("%s-service-account", tenantName)
 	return newRoleBinding(
 		name,
 		namespace,

pkg/tenancy/tenancy_test.go

@@ -815,9 +815,9 @@ func Test_newDeploymentRBACRoleBinding(t *testing.T) {
 	}
 
 	rb := newDeploymentRBACRoleBinding("test-tenant", "test-namespace", "test-tenant", labels)
-	assert.Equal(t, rb.Name, "test-tenant-service-account-deployment")
+	assert.Equal(t, rb.Name, "test-tenant-service-account")
 	assert.Equal(t, rb.Namespace, "test-namespace")
-	assert.Equal(t, rb.RoleRef.Name, "test-tenant-service-account-deployment")
+	assert.Equal(t, rb.RoleRef.Name, "test-tenant-service-account")
 	assert.Equal(t, rb.Labels["toolkit.fluxcd.io/tenant"], "test-tenant")
 	assert.Equal(t, rb.Subjects, sub)
 }

pkg/tenancy/testdata/example.yaml.golden

@@ -41,12 +41,12 @@ metadata:
   creationTimestamp: null
   labels:
     toolkit.fluxcd.io/tenant: foo-tenant
-  name: foo-tenant-service-account-deployment
+  name: foo-tenant-service-account
   namespace: foo-ns
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: foo-tenant-service-account-deployment
+  name: foo-tenant-service-account
 subjects:
 - kind: ServiceAccount
   name: foo-tenant
@@ -154,12 +154,12 @@ metadata:
   creationTimestamp: null
   labels:
     toolkit.fluxcd.io/tenant: bar-tenant
-  name: bar-tenant-service-account-deployment
+  name: bar-tenant-service-account
   namespace: bar-ns
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: bar-tenant-service-account-deployment
+  name: bar-tenant-service-account
 subjects:
 - kind: ServiceAccount
   name: bar-tenant
@@ -246,12 +246,12 @@ metadata:
   creationTimestamp: null
   labels:
     toolkit.fluxcd.io/tenant: bar-tenant
-  name: bar-tenant-service-account-deployment
+  name: bar-tenant-service-account
   namespace: foobar-ns
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: bar-tenant-service-account-deployment
+  name: bar-tenant-service-account
 subjects:
 - kind: ServiceAccount
   name: bar-tenant

pkg/tenancy/testdata/with_bind_roles.yaml.golden

@@ -39,12 +39,12 @@ metadata:
   creationTimestamp: null
   labels:
     toolkit.fluxcd.io/tenant: foo-tenant
-  name: foo-tenant-service-account-deployment
+  name: foo-tenant-service-account
   namespace: foo-ns
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: foo-tenant-service-account-deployment
+  name: foo-tenant-service-account
 subjects:
 - kind: ServiceAccount
   name: foo-tenant