Merge pull request #86 from bytedance/use-template-to-generate-fullname

fix: Use template to generate fullname instead of using fixed resourc…

manifests/varmor/templates/_helpers.tpl

@@ -67,16 +67,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 If release name contains chart name it will be used as a full name.
 */}}
 {{- define "varmor.manager.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- printf "%s-%s" .Release.Name .Values.manager.name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s-%s" .Release.Name $name .Values.manager.name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
+{{- printf "varmor-%s" .Values.manager.name | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{- define "varmor.manager.labels" -}}
@@ -110,16 +101,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 If release name contains chart name it will be used as a full name.
 */}}
 {{- define "varmor.agent.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- printf "%s-%s" .Release.Name .Values.agent.name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s-%s" .Release.Name $name .Values.agent.name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
+{{- printf "varmor-%s" .Values.agent.name | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{- define "varmor.agent.labels" -}}

manifests/varmor/templates/daemonsets/agent.yaml

@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name: varmor-agent
+  name: {{ include "varmor.agent.fullname" . }}
   namespace: {{ include "varmor.namespace" . }}
   labels:
     {{- include "varmor.agent.labels" . | nindent 4 }}
@@ -20,7 +20,7 @@ spec:
       {{- toYaml . | nindent 6 }}
       {{- end }}
       {{- end }}
-      serviceAccountName: varmor-agent
+      serviceAccountName: {{ include "varmor.agent.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.agent.podSecurityContext | nindent 8 }}
       containers:

manifests/varmor/templates/deployments/classifier.yaml

@@ -2,7 +2,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: varmor-classifier
+  name: {{ include "varmor.classifier.fullname" . }}
   namespace: {{ include "varmor.namespace" . }}
   labels:
     {{- include "varmor.classifier.labels" . | nindent 4 }}

manifests/varmor/templates/deployments/manager.yaml

@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: varmor-manager
+  name: {{ include "varmor.manager.fullname" . }}
   namespace: {{ include "varmor.namespace" . }}
   labels:
     {{- include "varmor.manager.labels" . | nindent 4 }}
@@ -27,7 +27,7 @@ spec:
       {{- toYaml . | nindent 6 }}
       {{- end }}
       {{- end }}
-      serviceAccountName: varmor-manager
+      serviceAccountName: {{ include "varmor.manager.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.manager.podSecurityContext | nindent 8 }}
       containers:

manifests/varmor/templates/rbac/agent-clusterrole.yaml

@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: varmor-agent
+  name: {{ include "varmor.agent.fullname" . }}
   labels:
     {{- include "varmor.agent.labels" . | nindent 4 }}
 rules:

manifests/varmor/templates/rbac/agent-clusterrolebinding.yaml

@@ -1,14 +1,14 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: varmor-agent
+  name: {{ include "varmor.agent.fullname" . }}
   labels:
     {{- include "varmor.agent.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: varmor-agent
+  name: {{ include "varmor.agent.fullname" . }}
 subjects:
 - kind: ServiceAccount
-  name: varmor-agent
+  name: {{ include "varmor.agent.serviceAccountName" . }}
   namespace: {{ include "varmor.namespace" . }}

manifests/varmor/templates/rbac/agent-role.yaml

@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: varmor-agent
+  name: {{ include "varmor.agent.fullname" . }}
   namespace: {{ include "varmor.namespace" . }}
   labels:
     {{- include "varmor.agent.labels" . | nindent 4 }}

manifests/varmor/templates/rbac/agent-rolebinding.yaml

@@ -1,15 +1,15 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: varmor-agent
+  name: {{ include "varmor.agent.fullname" . }}
   namespace: {{ include "varmor.namespace" . }}
   labels:
     {{- include "varmor.agent.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: varmor-agent
+  name: {{ include "varmor.agent.fullname" . }}
 subjects:
 - kind: ServiceAccount
-  name: varmor-agent
+  name: {{ include "varmor.agent.serviceAccountName" . }}
   namespace: {{ include "varmor.namespace" . }}

manifests/varmor/templates/rbac/agent-serviceaccount.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: varmor-agent
+  name: {{ include "varmor.agent.serviceAccountName" . }}
   namespace: {{ include "varmor.namespace" . }}
   labels:
     {{- include "varmor.agent.labels" . | nindent 4 }}

manifests/varmor/templates/rbac/manager-clusterrole.yaml

@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: varmor-manager
+  name: {{ include "varmor.manager.fullname" . }}
   labels:
     {{- include "varmor.manager.labels" . | nindent 4 }}
 rules:

manifests/varmor/templates/rbac/manager-clusterrolebinding.yaml

@@ -1,14 +1,14 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: varmor-manager
+  name: {{ include "varmor.manager.fullname" . }}
   labels:
     {{- include "varmor.manager.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: varmor-manager
+  name: {{ include "varmor.manager.fullname" . }}
 subjects:
 - kind: ServiceAccount
-  name: varmor-manager
+  name: {{ include "varmor.manager.serviceAccountName" . }}
   namespace: {{ include "varmor.namespace" . }}

manifests/varmor/templates/rbac/manager-role.yaml

@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: varmor-manager
+  name: {{ include "varmor.manager.fullname" . }}
   namespace: {{ include "varmor.namespace" . }}
   labels:
     {{- include "varmor.manager.labels" . | nindent 4 }}

manifests/varmor/templates/rbac/manager-rolebinding.yaml

@@ -1,15 +1,15 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: varmor-manager
+  name: {{ include "varmor.manager.fullname" . }}
   namespace: {{ include "varmor.namespace" . }}
   labels:
     {{- include "varmor.manager.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: varmor-manager
+  name: {{ include "varmor.manager.fullname" . }}
 subjects:
 - kind: ServiceAccount
-  name: varmor-manager
+  name: {{ include "varmor.manager.serviceAccountName" . }}
   namespace: {{ include "varmor.namespace" . }}

manifests/varmor/templates/rbac/manager-serviceaccount.yaml

@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: varmor-manager
+  name: {{ include "varmor.manager.serviceAccountName" . }}
   namespace: {{ include "varmor.namespace" . }}
   labels:
     {{- include "varmor.manager.labels" . | nindent 4 }}