diff --git a/internal/generator/deployment.go b/internal/generator/deployment.go index a64d90e..1e0a7ec 100644 --- a/internal/generator/deployment.go +++ b/internal/generator/deployment.go @@ -651,7 +651,7 @@ func (d *Deployment) Yaml() ([]byte, error) { func (d *Deployment) SetServiceAccountName() { if d.needsServiceAccount { - d.Spec.Template.Spec.ServiceAccountName = utils.TplName(d.service.Name, d.chart.Name) + d.Spec.Template.Spec.ServiceAccountName = utils.TplName(d.service.Name, d.chart.Name, "dependency") } else { } } diff --git a/internal/generator/rbac.go b/internal/generator/rbac.go index 6c15abd..36b088c 100644 --- a/internal/generator/rbac.go +++ b/internal/generator/rbac.go @@ -32,7 +32,7 @@ func NewRBAC(service types.ServiceConfig, appName string) *RBAC { APIVersion: "rbac.authorization.k8s.io/v1", }, ObjectMeta: metav1.ObjectMeta{ - Name: utils.TplName(service.Name, appName), + Name: utils.TplName(service.Name, appName, "dependency"), Labels: GetLabels(service.Name, appName), Annotations: Annotations, }, @@ -155,7 +155,7 @@ func NewRestrictedRole(service types.ServiceConfig, appName string) *Role { APIVersion: "rbac.authorization.k8s.io/v1", }, ObjectMeta: metav1.ObjectMeta{ - Name: utils.TplName(service.Name, appName), + Name: utils.TplName(service.Name, appName, "dependency"), Labels: GetLabels(service.Name, appName), Annotations: Annotations, }, @@ -180,20 +180,20 @@ func NewRestrictedRoleBinding(service types.ServiceConfig, appName string) *Role APIVersion: "rbac.authorization.k8s.io/v1", }, ObjectMeta: metav1.ObjectMeta{ - Name: utils.TplName(service.Name, appName), + Name: utils.TplName(service.Name, appName, "dependency"), Labels: GetLabels(service.Name, appName), Annotations: Annotations, }, Subjects: []rbacv1.Subject{ { Kind: "ServiceAccount", - Name: utils.TplName(service.Name, appName), + Name: utils.TplName(service.Name, appName, "dependency"), Namespace: "{{ .Release.Namespace }}", }, }, RoleRef: rbacv1.RoleRef{ Kind: "Role", - Name: utils.TplName(service.Name, appName), + Name: utils.TplName(service.Name, appName, "dependency"), APIGroup: "rbac.authorization.k8s.io", }, },