Fix unproper clusterrolebinding settings

Signed-off-by: Wangwang LIU <[email protected]>
kubevela · Dec 16, 2021 · 1aedbd4 · 1aedbd4
1 parent 1e009b6
commit 1aedbd4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/controllers/configuration_controller.go b/controllers/configuration_controller.go
@@ -486,7 +486,7 @@ func (meta *TFConfigurationMeta) assembleAndTriggerJob(ctx context.Context, k8sC
 	if err := createTerraformExecutorServiceAccount(ctx, k8sClient, meta.Namespace, ServiceAccountName); err != nil {
 		return err
 	}
-	if err := createTerraformExecutorClusterRoleBinding(ctx, k8sClient, meta.Namespace, ClusterRoleName, ServiceAccountName); err != nil {
+	if err := createTerraformExecutorClusterRoleBinding(ctx, k8sClient, meta.Namespace, fmt.Sprintf("%s-%s", meta.Namespace, ClusterRoleName), ServiceAccountName); err != nil {
 		return err
 	}
 

diff --git a/controllers/rbac.go b/controllers/rbac.go
@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/pkg/errors"
 	v1 "k8s.io/api/core/v1"
@@ -44,7 +45,7 @@ func createTerraformExecutorClusterRole(ctx context.Context, k8sClient client.Cl
 }
 
 func createTerraformExecutorClusterRoleBinding(ctx context.Context, k8sClient client.Client, namespace, clusterRoleName, serviceAccountName string) error {
-	var crbName = "tf-executor-clusterrole-binding"
+	var crbName = fmt.Sprintf("%s-tf-executor-clusterrole-binding", namespace)
 	var clusterRoleBinding = rbacv1.ClusterRoleBinding{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "rbac.authorization.k8s.io/v1",