pogues: fix ui deployment and bumb to 0.3.4

InseeFr · Jan 29, 2024 · e7c0aaa · e7c0aaa
1 parent 4dde186
commit e7c0aaa
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/charts/pogues/Chart.yaml b/charts/pogues/Chart.yaml
@@ -9,5 +9,5 @@ dependencies:
     repository: https://charts.bitnami.com/bitnami
 
 type: application
-version: 0.3.3
+version: 0.3.4
 appVersion: "4.0.8"
diff --git a/charts/pogues/templates/ui/deployment.yaml b/charts/pogues/templates/ui/deployment.yaml
@@ -15,7 +15,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/ui/configmap.yaml") 
+        checksum/config: {{ include (print $.Template.BasePath "/ui/configmap.yaml") . | sha256sum }}
       labels:
         {{- include "pogues.ui.selectorLabels" . | nindent 8 }}
     spec:

diff --git a/charts/pogues/templates/ui/ingress.yaml b/charts/pogues/templates/ui/ingress.yaml
@@ -1,9 +1,9 @@
-{{- if .Values.ui.ingress.enabled -}}
+{{- if and .Values.ui.enabled .Values.ui.ingress.enabled -}}
 {{- $fullName := include "pogues.ui.fullname" . -}}
 {{- $svcPort := .Values.ui.service.port -}}
 {{- if and .Values.ui.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
   {{- if not (hasKey .Values.ui.ingress.annotations "kubernetes.io/ingress.class") }}
-  {{- $_ := set .Values.ui.ingress.annotations "kubernetes.io/ingress.class" .Values.uiingress.className}}
+  {{- $_ := set .Values.ui.ingress.annotations "kubernetes.io/ingress.class" .Values.ui.ingress.className}}
   {{- end }}
 {{- end }}
 {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}

diff --git a/charts/pogues/templates/ui/service.yaml b/charts/pogues/templates/ui/service.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.ui.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -13,3 +14,4 @@ spec:
       name: http
   selector: 
     {{- include "pogues.ui.selectorLabels" . | nindent 4 }}
+{{- end }}
diff --git a/charts/pogues/templates/ui/serviceaccount.yaml b/charts/pogues/templates/ui/serviceaccount.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.ui.serviceAccount.create -}}
+{{- if and .Values.ui.enabled .Values.ui.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata: