fix: use release name for resources name

traefik · Jan 10, 2024 · 2bad46f · 2bad46f
1 parent f3477e1
commit 2bad46f
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 18 deletions.
diff --git a/traefik-hub/templates/_helpers.yaml b/traefik-hub/templates/_helpers.yaml
@@ -2,7 +2,7 @@
 Expand the name of the chart.
 */}}
 {{- define "traefik-hub.name" -}}
-{{- .Chart.Name | trunc 63 | trimSuffix "-" -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
@@ -26,11 +26,17 @@ Create chart name and version as used by the chart label.
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{/*
+Expand the serviceAccountName to use for RBAC and the deployment.
+*/}}
+{{- define "traefik-hub.serviceaccount-name" -}}
+{{- .Values.serviceAccountName | default (include "traefik-hub.name" .) -}}
+{{- end -}}
 
 {{/* Shared labels used for selector */}}
 {{/* This is an immutable field: this should not change between upgrade */}}
 {{- define "traefik-hub.labelselector" -}}
-app.kubernetes.io/name: {{ template "traefik-hub.name" . }}
+app.kubernetes.io/name: {{ .Chart.Name }}
 app.kubernetes.io/instance: {{ template "traefik-hub.instance-name" . }}
 {{- end }}
 

diff --git a/traefik-hub/templates/cluster-role-binding.yaml b/traefik-hub/templates/cluster-role-binding.yaml
@@ -2,14 +2,14 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: traefik-hub-controller
+  name: {{ include "traefik-hub.instance-name" . }}
   labels:
   {{- include "traefik-hub.labels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: traefik-hub-controller
+  name: {{ include "traefik-hub.instance-name" . }}
 subjects:
   - kind: ServiceAccount
-    name: {{ .Values.serviceAccountName }}
+    name: {{ include "traefik-hub.serviceaccount-name" . }}
     namespace: {{ .Release.Namespace }}
diff --git a/traefik-hub/templates/deployment.yaml b/traefik-hub/templates/deployment.yaml
@@ -8,7 +8,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: traefik
+  name: {{ include "traefik-hub.name" . }}
   namespace: {{ .Release.Namespace }}
   labels:
   {{- include "traefik-hub.labels" . | nindent 4 }}
@@ -38,7 +38,7 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ .Values.serviceAccountName }}
+      serviceAccountName: {{ include "traefik-hub.serviceaccount-name" . }}
       affinity:
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:

diff --git a/traefik-hub/templates/rbac.yaml b/traefik-hub/templates/rbac.yaml
@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: traefik-hub-controller
+  name: {{ include "traefik-hub.instance-name" . }}
 rules:
   - apiGroups:
       - networking.k8s.io

diff --git a/traefik-hub/templates/service-account.yaml b/traefik-hub/templates/service-account.yaml
@@ -2,8 +2,7 @@
 kind: ServiceAccount
 apiVersion: v1
 metadata:
-  name: {{ .Values.serviceAccountName }}
+  name: {{ include "traefik-hub.serviceaccount-name" . }}
   namespace: {{ .Release.Namespace }}
-  labels:
-  {{- include "traefik-hub.labels" . | nindent 4 }}
+  labels: {{- include "traefik-hub.labels" . | nindent 4 }}
 automountServiceAccountToken: false
diff --git a/traefik-hub/templates/service.yaml b/traefik-hub/templates/service.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: traefik
+  name: {{ include "traefik-hub.name" . }}
   namespace: {{ .Release.Namespace }}
   labels:
   {{- include "traefik-hub.labels" . | nindent 4 }}

diff --git a/traefik-hub/tests/cluster-role-binding_test.yaml b/traefik-hub/tests/cluster-role-binding_test.yaml
@@ -11,12 +11,12 @@ tests:
           of: ClusterRoleBinding
       - equal:
           path: metadata.name
-          value: traefik-hub-controller
+          value: traefik-hub-traefik
       - equal:
           path: subjects[0]
           value:
             kind: ServiceAccount
-            name: traefik-hub-controller
+            name: traefik-hub
             namespace: traefik
   - it: should namespace and serviceAccountName
     set:

diff --git a/traefik-hub/tests/deployment_test.yaml b/traefik-hub/tests/deployment_test.yaml
@@ -9,6 +9,9 @@ tests:
     asserts:
       - isKind:
           of: Deployment
+      - equal:
+          path: metadata.name
+          value: traefik-hub
   - it: should set the image
     set:
       image: test

diff --git a/traefik-hub/tests/service_test.yaml b/traefik-hub/tests/service_test.yaml
@@ -12,6 +12,9 @@ tests:
       - equal:
           path: spec.type
           value: ClusterIP
+      - equal:
+          path: metadata.name
+          value: "traefik-hub"
       - equal:
           path: metadata.annotations
           value: null

diff --git a/traefik-hub/values.yaml b/traefik-hub/values.yaml
@@ -8,11 +8,8 @@ maxSurge: 1
 priorityClassName: ""
 
 imagePullSecrets: []
-#   - name: regcred
-
 image: ghcr.io/traefik/traefik-hub:{{ .Chart.AppVersion }}
-serviceAccountName: traefik-hub-controller
-
+serviceAccountName:
 
 resources: {}
 #  requests: