Update RoleBinding name (#1437)

Signed-off-by: hmsayem <[email protected]>

Co-authored-by: Emruz Hossain <[email protected]>

pkg/rbac/cross_namespace.go

@@ -26,6 +26,7 @@ import (
 	core "k8s.io/api/core/v1"
 	rbac "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"kmodules.xyz/client-go/meta"
 	meta_util "kmodules.xyz/client-go/meta"
 	rbac_util "kmodules.xyz/client-go/rbac/v1"
 )
@@ -95,7 +96,7 @@ func (opt *RBACOptions) ensureCrossNamespaceRoleBinding() error {
 }
 
 func (opt *RBACOptions) getRoleBindingName() string {
-	return strings.ReplaceAll(opt.ServiceAccount.Name, ".", "-")
+	return meta.NameWithSuffix(strings.ToLower(opt.Invoker.Kind), opt.Invoker.Name)
 }
 
 func (opt *RBACOptions) getCrossNamespaceRoleName() string {

pkg/rbac/restore_job.go

@@ -18,7 +18,6 @@ package rbac
 
 import (
 	"context"
-	"strings"
 
 	"stash.appscode.dev/apimachinery/apis"
 	api_v1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1"
@@ -129,7 +128,7 @@ func (opt *RBACOptions) ensureRestoreJobClusterRole() error {
 func (opt *RBACOptions) ensureRestoreJobRoleBinding() error {
 	meta := metav1.ObjectMeta{
 		Namespace: opt.Invoker.Namespace,
-		Name:      getRestoreJobRoleBindingName(opt.ServiceAccount.Name),
+		Name:      opt.getRoleBindingName(),
 		Labels:    opt.OffshootLabels,
 	}
 	_, _, err := rbac_util.CreateOrPatchRoleBinding(context.TODO(), opt.KubeClient, meta, func(in *rbac.RoleBinding) *rbac.RoleBinding {
@@ -151,9 +150,3 @@ func (opt *RBACOptions) ensureRestoreJobRoleBinding() error {
 	}, metav1.PatchOptions{})
 	return err
 }
-
-func getRestoreJobRoleBindingName(name string) string {
-	// Create RoleBinding with name same as the ServiceAccount name.
-	// The ServiceAccount already has Stash specific prefix in it's name.
-	return strings.ReplaceAll(name, ".", "-")
-}