[vikunja] removeOpenIdInitContainer and replace with general initContainers

README.md

@@ -1,6 +1,8 @@
 # charts
 
-Here you can find a collection of oecis charts :)
+Here you can find a collection of oecis helm charts :)
+
+You can see most of them in action at https://gitlab.com/oecis/fountain
 
 # Publish charts
 

charts/vikunja/Chart.yaml

@@ -6,8 +6,8 @@ sources:
   - https://kolaente.dev/vikunja/
   - https://gitlab.com/oecis/charts/-/tree/main/charts/vikunja
 type: application
-version: 0.1.3
+version: 0.1.4
-appVersion: "0.22.0"
+appVersion: "0.22.1"
 dependencies:
   - condition: postgresql.enabled
     name: postgresql

charts/vikunja/README.md

@@ -1,6 +1,6 @@
 # vikunja
 
-![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.22.0](https://img.shields.io/badge/AppVersion-0.22.0-informational?style=flat-square)
+![Version: 0.1.4](https://img.shields.io/badge/Version-0.1.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.22.1](https://img.shields.io/badge/AppVersion-0.22.1-informational?style=flat-square)
 
 The to-do app to organize your life
 
@@ -28,9 +28,12 @@ The to-do app to organize your life
 | autoscaling.minReplicas | int | `1` |  |
 | autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
 | backend.extraEnv | list | `[]` |  |
+| backend.extraVolumeMounts | list | `[]` |  |
+| backend.extraVolumes | list | `[]` |  |
 | backend.image.pullPolicy | string | `"IfNotPresent"` |  |
 | backend.image.repository | string | `"vikunja/api"` |  |
 | backend.image.tag | string | `"latest"` |  |
+| backend.initContainers | list | `[]` |  |
 | backend.service.port | int | `3456` |  |
 | backend.service.type | string | `"ClusterIP"` |  |
 | config.cache.enabled | bool | `false` |  |
@@ -53,9 +56,12 @@ The to-do app to organize your life
 | config.registration | bool | `true` |  |
 | config.taskAttachments | bool | `true` |  |
 | frontend.extraEnv | list | `[]` |  |
+| frontend.extraVolumeMounts | list | `[]` |  |
+| frontend.extraVolumes | list | `[]` |  |
 | frontend.image.pullPolicy | string | `"IfNotPresent"` |  |
 | frontend.image.repository | string | `"vikunja/frontend"` |  |
 | frontend.image.tag | string | `"latest"` |  |
+| frontend.initContainers | list | `[]` |  |
 | frontend.service.port | int | `80` |  |
 | frontend.service.type | string | `"ClusterIP"` |  |
 | fullnameOverride | string | `""` |  |
@@ -67,9 +73,6 @@ The to-do app to organize your life
 | ingress.tls | list | `[]` |  |
 | nameOverride | string | `""` |  |
 | nodeSelector | object | `{}` |  |
-| openIdInitContainer.config | object | `{}` |  |
-| openIdInitContainer.enabled | bool | `false` |  |
-| openIdInitContainer.env | list | `[]` |  |
 | podAnnotations | object | `{}` |  |
 | podSecurityContext | object | `{}` |  |
 | postgresql.enabled | bool | `true` |  |

charts/vikunja/templates/backend/deployment.yaml

@@ -27,21 +27,13 @@ spec:
       serviceAccountName: {{ include "vikunja.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      {{- if .Values.openIdInitContainer.enabled }}
+      {{- if not (empty .Values.backend.extraVolumes ) }}
       volumes:
-        - name: openid-config
+        {{- toYaml .Values.backend.extraVolumes | nindent 8 }}
-          emptyDir:
+      {{- end }}
-            medium: Memory
+      {{- if not (empty .Values.backend.initContainers)}}
       initContainers:
-        - name: {{ .Chart.Name }}-openid-config-injector
+        {{- toYaml .Values.backend.initContainers | nindent 10}}
-          image: busybox
-          volumeMounts:
-            - mountPath: /config
-              name: openid-config
-          command: ["/bin/sh"]
-          args: ["-c", {{ quote (printf "echo -e %q > /config/config.yaml" ( .Values.openIdInitContainer.config | toYaml ))}}]
-          env:
-            {{- toYaml .Values.openIdInitContainer.env | nindent 12}}
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}-backend
@@ -100,10 +92,9 @@ spec:
             {{- if not (empty .Values.backend.extraEnv) }}
               {{- toYaml .Values.backend.extraEnv | nindent 12 }}
             {{- end }}
-          {{- if .Values.openIdInitContainer.enabled }}
+          {{- if not (empty .Values.backend.extraVolumeMounts) }}
           volumeMounts:
-            - mountPath: /etc/vikunja
+            {{- toYaml .Values.backend.extraVolumeMounts | nindent 12 }}
-              name: openid-config
           {{- end}}
       {{- with .Values.nodeSelector }}
       nodeSelector:

charts/vikunja/templates/frontend/deployment.yaml

@@ -27,6 +27,14 @@ spec:
       serviceAccountName: {{ include "vikunja.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      {{- if not (empty .Values.frontend.extraVolumes ) }}
+      volumes:
+        {{- toYaml .Values.frontend.extraVolumes | nindent 8 }}
+      {{- end }}
+      {{- if not (empty .Values.frontend.initContainers)}}
+      initContainers:
+        {{- toYaml .Values.frontend.initContainers | nindent 10}}
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}-frontend
           securityContext:
@@ -51,6 +59,10 @@ spec:
           env:
             {{- toYaml .Values.backend.extraEnv | nindent 12 }}
           {{- end }}
+          {{- if not (empty .Values.frontend.extraVolumeMounts) }}
+          volumeMounts:
+            {{- toYaml .Values.frontend.extraVolumeMounts | nindent 12 }}
+          {{- end}}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/vikunja/values.yaml

@@ -14,6 +14,9 @@ frontend:
     type: ClusterIP
     port: 80
   extraEnv: []
+  extraVolumes: []
+  extraVolumeMounts: []
+  initContainers: []
 backend:
   image:
     repository: vikunja/api
@@ -24,10 +27,9 @@ backend:
     type: ClusterIP
     port: 3456
   extraEnv: []
-openIdInitContainer:
+  extraVolumes: []
-  enabled: false
+  extraVolumeMounts: []
-  config: {}
+  initContainers: []
-  env: []
 
 ingress:
   enabled: false