missing configuration webdav (#25)

* feat: Add missing configuration and secrets for webdav. closes: #24 * fix: add missing secrets file * fix: Upgrade chart version
kouprlabs · Jul 17, 2024 · 35cc467 · 35cc467
1 parent 14d6016
commit 35cc467
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 5 deletions.
diff --git 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"
diff --git 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
@@ -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
@@ -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
@@ -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 }}

diff --git a/templates/webdav/secret.yaml 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 }}