teleport-kube-agent Helm chart: Optional overwrite of .Release.Name

examples/chart/teleport-kube-agent/templates/_helpers.tpl

@@ -1,7 +1,7 @@
 {{- define "teleport.kube.agent.isUpgrade" -}}
 {{- /* Checks if action is an upgrade from an old release that didn't support Secret storage */}}
 {{- if .Release.IsUpgrade }}
-  {{- $deployment := (lookup "apps/v1" "Deployment"  .Release.Namespace .Release.Name ) -}}
+  {{- $deployment := (lookup "apps/v1" "Deployment"  .Release.Namespace ( include "teleport-kube-agent.releaseName" . ) ) -}}
   {{- if ($deployment) }}
 true
   {{- else if .Values.unitTestUpgrade }}
@@ -11,15 +11,15 @@ true
 {{- end -}}
 {{/*
 Create the name of the service account to use
-if serviceAccount is not defined or serviceAccount.name is empty, use .Release.Name
+if serviceAccount is not defined or serviceAccount.name is empty, use teleport-kube-agent.releaseName
 */}}
 {{- define "teleport-kube-agent.serviceAccountName" -}}
-{{- coalesce .Values.serviceAccount.name .Values.serviceAccountName .Release.Name -}}
+{{- coalesce .Values.serviceAccount.name .Values.serviceAccountName ( include "teleport-kube-agent.releaseName" . ) -}}
 {{- end -}}
 
 {{/*
 Create the name of the service account to use for the post-delete hook
-if serviceAccount is not defined or serviceAccount.name is empty, use .Release.Name-delete-hook
+if serviceAccount is not defined or serviceAccount.name is empty, use teleport-kube-agent.releaseName-delete-hook
 */}}
 {{- define "teleport-kube-agent.deleteHookServiceAccountName" -}}
 {{- if .Values.serviceAccount.create -}}
@@ -48,3 +48,11 @@ if serviceAccount is not defined or serviceAccount.name is empty, use .Release.N
 {{- define "teleport-kube-agent.image" -}}
 {{ include "teleport-kube-agent.baseImage" . }}:{{ include "teleport-kube-agent.version" . }}
 {{- end -}}
+
+{{- define "teleport-kube-agent.releaseName" -}}
+{{- if .Values.releaseNameOverwrite -}}
+  {{- .Values.releaseNameOverwrite -}}
+{{- else -}}
+  {{- .Release.Name -}}
+{{- end -}}
+{{- end -}}

examples/chart/teleport-kube-agent/templates/clusterrole.yaml

@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ .Values.clusterRoleName | default .Release.Name }}
+  name: {{ .Values.clusterRoleName | default ( include "teleport-kube-agent.releaseName" . ) }}
 {{- if .Values.extraLabels.clusterRole }}
   labels:
   {{- toYaml .Values.extraLabels.clusterRole | nindent 4 }}

examples/chart/teleport-kube-agent/templates/clusterrolebinding.yaml

@@ -2,15 +2,15 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ .Values.clusterRoleBindingName | default .Release.Name }}
+  name: {{ .Values.clusterRoleBindingName | default ( include "teleport-kube-agent.releaseName" . ) }}
 {{- if .Values.extraLabels.clusterRoleBinding }}
   labels:
   {{- toYaml .Values.extraLabels.clusterRoleBinding | nindent 4 }}
 {{- end }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ .Values.clusterRoleName | default .Release.Name }}
+  name: {{ .Values.clusterRoleName | default ( include "teleport-kube-agent.releaseName" . ) }}
 subjects:
 - kind: ServiceAccount
   name: {{ template "teleport-kube-agent.serviceAccountName" . }}

examples/chart/teleport-kube-agent/templates/config.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ include "teleport-kube-agent.releaseName" . }}
   namespace: {{ .Release.Namespace }}
 {{- if .Values.extraLabels.config }}
   labels:

examples/chart/teleport-kube-agent/templates/delete_hook.yaml

@@ -18,7 +18,7 @@ metadata:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{ .Release.Name }}-delete-hook
+  name: {{ include "teleport-kube-agent.releaseName" . }}-delete-hook
   namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/hook": post-delete
@@ -36,7 +36,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ .Release.Name }}-delete-hook
+  name: {{ include "teleport-kube-agent.releaseName" . }}-delete-hook
   namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/hook": post-delete
@@ -49,7 +49,7 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ .Release.Name }}-delete-hook
+  name: {{ include "teleport-kube-agent.releaseName" . }}-delete-hook
 subjects:
 - kind: ServiceAccount
   name: {{ template "teleport-kube-agent.deleteHookServiceAccountName" . }}
@@ -59,7 +59,7 @@ subjects:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ .Release.Name }}-delete-hook
+  name: {{ include "teleport-kube-agent.releaseName" . }}-delete-hook
   namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/hook": post-delete
@@ -72,13 +72,13 @@ metadata:
 spec:
   template:
     metadata:
-      name: {{ .Release.Name }}-delete-hook
+      name: {{ include "teleport-kube-agent.releaseName" . }}-delete-hook
 {{- if .Values.annotations.pod }}
       annotations:
   {{- toYaml .Values.annotations.pod | nindent 8 }}
 {{- end }}
       labels:
-        app: {{ .Release.Name }}
+        app: {{ include "teleport-kube-agent.releaseName" . }}
 {{- if .Values.extraLabels.pod }}
   {{- toYaml .Values.extraLabels.pod | nindent 8 }}
 {{- end }}
@@ -108,7 +108,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: RELEASE_NAME
-            value: {{ .Release.Name }}
+            value: {{ include "teleport-kube-agent.releaseName" . }}
         image: {{ include "teleport-kube-agent.image" . | quote }}
         {{- if .Values.imagePullPolicy }}
         imagePullPolicy: {{ toYaml .Values.imagePullPolicy }}

examples/chart/teleport-kube-agent/templates/pdb.yaml

@@ -6,16 +6,16 @@ apiVersion: policy/v1beta1
 {{- end }}
 kind: PodDisruptionBudget
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ include "teleport-kube-agent.releaseName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ .Release.Name }}
+    app: {{ include "teleport-kube-agent.releaseName" . }}
 {{- if .Values.extraLabels.podDisruptionBudget }}
   {{- toYaml .Values.extraLabels.podDisruptionBudget | nindent 4 }}
 {{- end }}
 spec:
   minAvailable: {{ .Values.highAvailability.podDisruptionBudget.minAvailable }}
   selector:
     matchLabels:
-      app: {{ .Release.Name }}
+      app: {{ include "teleport-kube-agent.releaseName" . }}
 {{- end }}

examples/chart/teleport-kube-agent/templates/podmonitor.yaml

@@ -2,20 +2,20 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ include "teleport-kube-agent.releaseName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
   {{- with .Values.podMonitor.additionalLabels }}
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  jobLabel: {{ .Release.Name }}
+  jobLabel: {{ include "teleport-kube-agent.releaseName" . }}
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}
   selector:
     matchLabels:
-      app: {{ .Release.Name }}
+      app: {{ include "teleport-kube-agent.releaseName" . }}
   podMetricsEndpoints:
     - port: diag
       path: /metrics

examples/chart/teleport-kube-agent/templates/psp.yaml

@@ -6,7 +6,7 @@
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ include "teleport-kube-agent.releaseName" . }}
 {{- if .Values.extraLabels.podSecurityPolicy }}
   labels:
   {{- toYaml .Values.extraLabels.podSecurityPolicy | nindent 4 }}
@@ -45,7 +45,7 @@ spec:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{ .Release.Name }}-psp
+  name: {{ include "teleport-kube-agent.releaseName" . }}-psp
 rules:
 - apiGroups:
   - policy
@@ -54,16 +54,16 @@ rules:
   verbs:
   - use
   resourceNames:
-  - {{ .Release.Name }}
+  - {{ include "teleport-kube-agent.releaseName" . }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ .Release.Name }}-psp
+  name: {{ include "teleport-kube-agent.releaseName" . }}-psp
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ .Release.Name }}-psp
+  name: {{ include "teleport-kube-agent.releaseName" . }}-psp
 subjects:
 - kind: ServiceAccount
   name: {{ template "teleport-kube-agent.serviceAccountName" . }}

examples/chart/teleport-kube-agent/templates/role.yaml

@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{ .Values.roleName | default .Release.Name }}
+  name: {{ .Values.roleName | default ( include "teleport-kube-agent.releaseName" . ) }}
   namespace: {{ .Release.Namespace }}
 {{- if .Values.extraLabels.role }}
   labels:

examples/chart/teleport-kube-agent/templates/rolebinding.yaml

@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ .Values.roleBindingName | default .Release.Name }}
+  name: {{ .Values.roleBindingName | default ( include "teleport-kube-agent.releaseName" . ) }}
   namespace: {{ .Release.Namespace }}
 {{- if .Values.extraLabels.roleBinding }}
   labels:
@@ -10,7 +10,7 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ .Values.roleName | default .Release.Name }}
+  name: {{ .Values.roleName | default ( include "teleport-kube-agent.releaseName" . ) }}
 subjects:
 - kind: ServiceAccount
   name: {{ template "teleport-kube-agent.serviceAccountName" . }}

examples/chart/teleport-kube-agent/templates/statefulset.yaml

@@ -7,10 +7,10 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: {{ .Release.Name }}
+  name: {{ include "teleport-kube-agent.releaseName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ .Release.Name }}
+    app: {{ include "teleport-kube-agent.releaseName" . }}
   {{- if .Values.extraLabels.deployment }}
     {{- toYaml .Values.extraLabels.deployment | nindent 4 }}
   {{- end }}
@@ -19,11 +19,11 @@ metadata:
     {{- toYaml .Values.annotations.deployment | nindent 4 }}
   {{- end }}
 spec:
-  serviceName: {{ .Release.Name }}
+  serviceName: {{ include "teleport-kube-agent.releaseName" . }}
   replicas: {{ $replicaCount }}
   selector:
     matchLabels:
-      app: {{ .Release.Name }}
+      app: {{ include "teleport-kube-agent.releaseName" . }}
   template:
     metadata:
       annotations:
@@ -33,7 +33,7 @@ spec:
   {{- toYaml .Values.annotations.pod | nindent 8 }}
 {{- end }}
       labels:
-        app: {{ .Release.Name }}
+        app: {{ include "teleport-kube-agent.releaseName" . }}
 {{- if .Values.extraLabels.pod }}
   {{- toYaml .Values.extraLabels.pod | nindent 8 }}
 {{- end }}
@@ -69,7 +69,7 @@ spec:
               - key: app
                 operator: In
                 values:
-                - {{ .Release.Name }}
+                - {{ include "teleport-kube-agent.releaseName" . }}
             topologyKey: "kubernetes.io/hostname"
         {{- else if gt (int $replicaCount) 1 }}
           preferredDuringSchedulingIgnoredDuringExecution:
@@ -80,7 +80,7 @@ spec:
                 - key: app
                   operator: In
                   values:
-                  - {{ .Release.Name }}
+                  - {{ include "teleport-kube-agent.releaseName" . }}
               topologyKey: "kubernetes.io/hostname"
         {{- end }}
         {{- end }}
@@ -95,13 +95,13 @@ spec:
           whenUnsatisfiable: ScheduleAnyway
           labelSelector:
             matchLabels:
-              app: {{ .Release.Name }}
+              app: {{ include "teleport-kube-agent.releaseName" . }}
         - maxSkew: 1
           topologyKey: topology.kubernetes.io/zone
           whenUnsatisfiable: ScheduleAnyway
           labelSelector:
             matchLabels:
-              app: {{ .Release.Name }}
+              app: {{ include "teleport-kube-agent.releaseName" . }}
   {{- end }}
 {{- end }}
       {{- if .Values.tolerations }}
@@ -128,7 +128,7 @@ spec:
           name: "auth-token"
           readOnly: true
         - mountPath: /var/lib/teleport
-          name: "{{ .Release.Name }}-teleport-data"
+          name: "{{ include "teleport-kube-agent.releaseName" . }}-teleport-data"
           {{- if .Values.tls.existingCASecretName }}
         - mountPath: /etc/teleport-tls-ca
           name: "teleport-tls-ca"
@@ -171,7 +171,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: RELEASE_NAME
-            value: {{ .Release.Name }}
+            value: {{ include "teleport-kube-agent.releaseName" . }}
           {{- if .Values.updater.enabled }}
           - name: TELEPORT_EXT_UPGRADER
             value: kube
@@ -242,7 +242,7 @@ spec:
 {{- end }}
 {{- if .Values.storage.enabled }}
         - mountPath: /var/lib/teleport
-          name: "{{ .Release.Name }}-teleport-data"
+          name: "{{ include "teleport-kube-agent.releaseName" . }}-teleport-data"
 {{- else }}
         - mountPath: /var/lib/teleport
           name: "data"
@@ -266,7 +266,7 @@ spec:
       volumes:
       - name: "config"
         configMap:
-          name: {{ .Release.Name }}
+          name: {{ include "teleport-kube-agent.releaseName" . }}
       - name: "auth-token"
         secret:
           secretName: {{ coalesce .Values.secretName .Values.joinTokenSecret.name }}
@@ -303,7 +303,7 @@ spec:
 {{- if and .Values.storage.enabled }}
   volumeClaimTemplates:
   - metadata:
-      name: "{{ .Release.Name }}-teleport-data"
+      name: {{ include "teleport-kube-agent.releaseName" . }}-teleport-data
     spec:
       accessModes: [ "ReadWriteOnce" ]
       storageClassName: {{ .Values.storage.storageClassName }}

examples/chart/teleport-kube-agent/templates/updater/_helpers.tpl

@@ -1,6 +1,6 @@
 {{/*
 Create the name of the service account to use
-if serviceAccount is not defined or serviceAccount.name is empty, use .Release.Name
+if serviceAccount is not defined or serviceAccount.name is empty, use teleport-kube-agent.releaseName
 */}}
 {{- define "teleport-kube-agent-updater.serviceAccountName" -}}
 {{- coalesce .Values.updater.serviceAccount.name (include "teleport-kube-agent.serviceAccountName" . | printf "%s-updater") -}}