From e7c0aaaaf82d8203c272b27b736dcc223e62d86f Mon Sep 17 00:00:00 2001
From: Laurent Caouissin <caouissin.laurent@gmail.com>
Date: Mon, 29 Jan 2024 09:06:36 +0100
Subject: [PATCH] pogues: fix ui deployment and bumb to 0.3.4

---
 charts/pogues/Chart.yaml                       | 2 +-
 charts/pogues/templates/ui/deployment.yaml     | 2 +-
 charts/pogues/templates/ui/ingress.yaml        | 4 ++--
 charts/pogues/templates/ui/service.yaml        | 2 ++
 charts/pogues/templates/ui/serviceaccount.yaml | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/charts/pogues/Chart.yaml b/charts/pogues/Chart.yaml
index 11b79c1..dbd48c9 100644
--- 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
index 29ef440..be4c793 100644
--- 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
index 533a9b3..90fa065 100644
--- 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
index 2b60ffd..a4f6a6b 100644
--- 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 }}
\ No newline at end of file
diff --git a/charts/pogues/templates/ui/serviceaccount.yaml b/charts/pogues/templates/ui/serviceaccount.yaml
index 73f18b3..4f6ee36 100644
--- 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: