From 043b145f7b15723a72bd464ab7007b1dd6c9c981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Ka=C5=BAmierczak?=
 <mateuszkazmierczak99@gmail.com>
Date: Mon, 15 Jul 2024 14:03:36 +0200
Subject: [PATCH 1/3] feat: Add missing configuration and secrets for webdav.
 closes: #24

---
 templates/mosaic/deployment.yaml |  4 ++--
 templates/ui/deployment.yaml     |  2 +-
 templates/webdav/configmap.yaml  | 12 ++++++++++++
 templates/webdav/deployment.yaml |  3 ++-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/templates/mosaic/deployment.yaml b/templates/mosaic/deployment.yaml
index 4db9b82..f8ece8f 100644
--- a/templates/mosaic/deployment.yaml
+++ b/templates/mosaic/deployment.yaml
@@ -12,8 +12,8 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/idp/configmap.yaml") . | sha256sum }}
-        checksum/secrets: {{ include (print $.Template.BasePath "/idp/secret.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/mosaic/configmap.yaml") . | sha256sum }}
+        checksum/secrets: {{ include (print $.Template.BasePath "/mosaic/secret.yaml") . | sha256sum }}
         {{- with .Values.mosaic.deployment.podAnnotations }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
diff --git a/templates/ui/deployment.yaml b/templates/ui/deployment.yaml
index 966a14d..ebd4268 100644
--- a/templates/ui/deployment.yaml
+++ b/templates/ui/deployment.yaml
@@ -12,7 +12,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/idp/configmap.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/ui/configmap.yaml") . | sha256sum }}
         {{- with .Values.ui.deployment.podAnnotations }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
diff --git a/templates/webdav/configmap.yaml b/templates/webdav/configmap.yaml
index 0cc9ff4..18380d8 100644
--- a/templates/webdav/configmap.yaml
+++ b/templates/webdav/configmap.yaml
@@ -8,6 +8,18 @@ data:
       {{$k }}: {{ default "" $v | quote }}
     {{- end }}
   {{- end }}
+  {{- if .Values.minio.enabled }}
+  S3_URL: {{ include "voltaserve.fullname" . }}-minio.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain | default "cluster.local" }}:9000
+  {{- else }}
+  S3_URL: {{ .Values.general.envs.S3_URL }}
+  {{- end  }}
+  S3_SECURE: {{ .Values.general.envs.S3_SECURE | quote }}
+  {{- if .Values.redis.enabled }}
+  REDIS_ADDRESS: {{ include "voltaserve.fullname" . }}-redis-master.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain | default "cluster.local" }}:{{ .Values.redis.master.service.ports.redis | default 6379 }}
+  {{- else }}
+  REDIS_ADDRESS: {{ .Values.general.envs.REDIS_ADDRESS }}
+  {{- end  }}
+
   IDP_URL: http://{{ include "voltaserve-idp.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain | default "cluster.local" }}:{{ .Values.idp.service.port }}
   API_URL: http://{{ include "voltaserve-api.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain | default "cluster.local" }}:{{ .Values.api.service.port }}
 
diff --git a/templates/webdav/deployment.yaml b/templates/webdav/deployment.yaml
index 99e379a..f4c6202 100644
--- a/templates/webdav/deployment.yaml
+++ b/templates/webdav/deployment.yaml
@@ -12,7 +12,8 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/idp/configmap.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/webdav/configmap.yaml") . | sha256sum }}
+        checksum/secrets: {{ include (print $.Template.BasePath "/webdav/secret.yaml") . | sha256sum }}
         {{- with .Values.webdav.deployment.podAnnotations }}
           {{- toYaml . | nindent 8 }}
         {{- end }}

From 95cd08e3b1962f0f4c7e2bd4d23121670c017834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Ka=C5=BAmierczak?=
 <mateuszkazmierczak99@gmail.com>
Date: Mon, 15 Jul 2024 14:03:49 +0200
Subject: [PATCH 2/3] fix: add missing secrets file

---
 templates/webdav/secret.yaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 templates/webdav/secret.yaml

diff --git a/templates/webdav/secret.yaml b/templates/webdav/secret.yaml
new file mode 100644
index 0000000..539a382
--- /dev/null
+++ b/templates/webdav/secret.yaml
@@ -0,0 +1,12 @@
+{{- if .Values.general.secrets }}
+{{- $root := .Values.general.secrets }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "voltaserve-webdav.fullname" . }}
+type: Opaque
+data:
+{{- range $k,$v := $root }}
+  {{$k }}: {{ default "" $v | b64enc | quote }}
+{{- end }}
+{{- end }}
\ No newline at end of file

From 16acbd007dd8c3a3a29d11cce1ca858af43893de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Ka=C5=BAmierczak?=
 <mateuszkazmierczak99@gmail.com>
Date: Mon, 15 Jul 2024 17:32:43 +0200
Subject: [PATCH 3/3] fix: Upgrade chart version

---
 Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Chart.yaml b/Chart.yaml
index 533ced0..8ec0520 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -19,5 +19,5 @@ dependencies:
     version: 0.8.0
     repository: https://meilisearch.github.io/meilisearch-kubernetes
     condition: meilisearch.enabled
-version: 0.2.4
+version: 0.2.5
 appVersion: "2.0.2"