Merge pull request #270 from epinio/1696-numeric-only-app-names

Quote values coming from user when they should be strings
epinio · Sep 8, 2022 · 0c7230e · 0c7230e
2 parents 253cd4c + 7a279ff
commit 0c7230e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/chart/application/templates/_helpers.tpl b/chart/application/templates/_helpers.tpl
@@ -10,7 +10,7 @@ Common labels
 */}}
 {{- define "epinio-application.labels" -}}
 app.kubernetes.io/managed-by: epinio
-app.kubernetes.io/part-of: {{ .Release.Namespace }}
+app.kubernetes.io/part-of: {{ .Release.Namespace | quote }}
 helm.sh/chart: {{ include "epinio-application.chart" . }}
 {{ include "epinio-application.selectorLabels" . }}
 {{- end }}
@@ -19,14 +19,14 @@ helm.sh/chart: {{ include "epinio-application.chart" . }}
 Common annotations
 */}}
 {{- define "epinio-application.annotations" -}}
-epinio.io/created-by: {{ .Values.epinio.username }}
+epinio.io/created-by: {{ .Values.epinio.username | quote }}
 {{- end }}
 
 {{/*
 Selector labels
 */}}
 {{- define "epinio-application.selectorLabels" -}}
-app.kubernetes.io/name: {{ .Values.epinio.appName }}
+app.kubernetes.io/name: {{ .Values.epinio.appName | quote }}
 app.kubernetes.io/component: application
 {{- end }}
 

diff --git a/chart/application/templates/deployment.yaml b/chart/application/templates/deployment.yaml
@@ -11,11 +11,11 @@ spec:
   replicas: {{ .Values.epinio.replicaCount }}
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ .Values.epinio.appName }}
+      app.kubernetes.io/name: {{ .Values.epinio.appName | quote }}
   template:
     metadata:
       annotations:
-        app.kubernetes.io/name: {{ .Values.epinio.appName }}
+        app.kubernetes.io/name: {{ .Values.epinio.appName | quote }}
         {{- include "epinio-application.annotations" . | nindent 8 }}
         {{- with .Values.epinio.start }}
         epinio.io/start: {{ . | quote }}

diff --git a/chart/application/templates/ingress.yaml b/chart/application/templates/ingress.yaml
@@ -12,7 +12,7 @@ metadata:
 spec:
   secretName: {{ include "epinio-truncate" (print $.Values.epinio.appName "-" .id "-tls") }}
   dnsNames:
-  - {{ .domain }}
+  - {{ .domain | quote }}
   issuerRef:
     name : {{ $.Values.epinio.tlsIssuer | quote }}
     kind: ClusterIssuer
@@ -22,7 +22,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ include "epinio-truncate" (print $.Values.epinio.appName "-" .id) }}
-  namespace: {{ $.Release.Namespace }}
+  namespace: {{ $.Release.Namespace | quote }}
   annotations:
     traefik.ingress.kubernetes.io/router.entrypoints: websecure
     traefik.ingress.kubernetes.io/router.tls: "true"
@@ -48,7 +48,7 @@ spec:
     - hosts:
       - {{ .domain | quote }}
 {{- if .secret }}
-      secretName: {{ .secret }}
+      secretName: {{ .secret | quote }}
 {{- else }}
       secretName: {{ include "epinio-truncate" (print $.Values.epinio.appName "-" .id "-tls") }}
 {{- end }}

diff --git a/chart/application/templates/service.yaml b/chart/application/templates/service.yaml
@@ -8,7 +8,7 @@ metadata:
   labels:
     {{- include "epinio-application.labels" . | nindent 4 }}
   name: {{ include "epinio-truncate" .Values.epinio.appName }}
-  namespace:  {{ .Release.Namespace }}
+  namespace:  {{ .Release.Namespace | quote }}
 spec:
   ports:
     - port: 8080