[stable/parse] fix ingress template (#12909)

* fixed usage of non existing template function and only generating dashboard ingress if enabled

Signed-off-by: Max Enelund <max@ig4.se>

* bump chart version

Signed-off-by: Max Enelund <max@ig4.se>

* added template function for chart

Signed-off-by: Max Enelund <max@ig4.se>

* do not generate tls structure for dashboard if not enabled

Signed-off-by: Max Enelund <max@ig4.se>

stable/parse/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: parse
-version: 6.2.2
+version: 6.2.3
 appVersion: 3.2.3
 description: Parse is a platform that enables users to add a scalable and powerful backend to launch a full-featured app for iOS, Android, JavaScript, Windows, Unity, and more.
 keywords:

stable/parse/templates/_helpers.tpl

@@ -6,6 +6,13 @@ Expand the name of the chart.
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "parse.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).

stable/parse/templates/dashboard-deployment.yaml

@@ -5,7 +5,7 @@ metadata:
   name: {{ template "parse.fullname" . }}-dashboard
   labels:
     app: {{ template "parse.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: {{ template "parse.chart" . }}
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
     component: "dashboard"

stable/parse/templates/ingress.yaml

@@ -4,8 +4,8 @@ kind: Ingress
 metadata:
   name: {{ template "parse.fullname" . }}
   labels:
-    app: "{{ template "parse.fullname" . }}"
-    chart: "{{ template "parse.chart" . }}"
+    app: {{ template "parse.fullname" . }}
+    chart: {{ template "parse.chart" . }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
   annotations:
@@ -17,7 +17,8 @@ metadata:
     {{- end }}
 spec:
   rules:
-  {{- range .Values.ingress.dashbard.hosts }}
+  {{- if .Values.dashboard.enabled }}
+  {{- range .Values.ingress.dashboard.hosts }}
   - host: {{ .name }}
     http:
       paths:
@@ -26,6 +27,7 @@ spec:
           serviceName: {{ template "parse.fullname" $ }}
           servicePort: dashboard-http
   {{- end }}
+  {{- end }}
   {{- range .Values.ingress.server.hosts }}
   - host: {{ .name }}
     http:
@@ -36,6 +38,7 @@ spec:
           servicePort: server-http
   {{- end }}
   tls:
+  {{- if .Values.dashboard.enabled }}
   {{- range .Values.ingress.dashboard.hosts }}
   {{- if .tls }}
   - hosts:
@@ -49,6 +52,7 @@ spec:
     secretName: {{ .tlsSecret }}
   {{- end }}
   {{- end }}
+  {{- end }}
   {{- range .Values.ingress.server.hosts }}
   {{- if .tls }}
   - hosts:

stable/parse/templates/pvc.yaml

@@ -5,7 +5,7 @@ metadata:
   name: {{ template "parse.fullname" . }}
   labels:
     app: {{ template "parse.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: {{ template "parse.chart" . }}
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 spec:

stable/parse/templates/secrets.yaml

@@ -4,7 +4,7 @@ metadata:
   name: {{ template "parse.fullname" . }}
   labels:
     app: {{ template "parse.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: {{ template "parse.chart" . }}
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 type: Opaque

stable/parse/templates/server-deployment.yaml

@@ -4,7 +4,7 @@ metadata:
   name: {{ template "parse.fullname" . }}-server
   labels:
     app: {{ template "parse.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: {{ template "parse.chart" . }}
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
     component: "server"

stable/parse/templates/svc.yaml

@@ -4,7 +4,7 @@ metadata:
   name: {{ template "parse.fullname" . }}
   labels:
     app: {{ template "parse.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: {{ template "parse.chart" . }}
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 spec: