new parameter argocd: true for helm/argo annotations,

jobs from init containers are located separately

Author: shcherbak

charts/synapse/Chart.yaml

@@ -1,3 +1,3 @@
 ---
 name: synapse
-version: 0.28.5
+version: 0.29.0

charts/synapse/templates/matrix-authentication-deployment.yaml

@@ -27,44 +27,6 @@ spec:
       {{- end }}
     spec:
       terminationGracePeriodSeconds: 60
-      initContainers:
-        - name: database-migrate
-          image: {{ .Values.matrixAuthentication.image.repository }}:{{ .Values.matrixAuthentication.image.tag }}
-          imagePullPolicy: {{ .Values.matrixAuthentication.image.pullPolicy }}
-          env:
-            - name: "MAS_CONFIG"
-              value: "/etc/mas-config.yaml"
-          command:
-            - /usr/local/bin/mas-cli
-            - database
-            - migrate
-          resources:
-            {{- toYaml .Values.matrixAuthentication.resources | nindent 12 }}
-          volumeMounts:
-            - name: config
-              mountPath: "/etc/mas-config.yaml"
-              subPath: "mas-config.yaml"
-              readOnly: true
-        - name: config-sync
-          image: {{ .Values.matrixAuthentication.image.repository }}:{{ .Values.matrixAuthentication.image.tag }}
-          imagePullPolicy: {{ .Values.matrixAuthentication.image.pullPolicy }}
-          env:
-            - name: "MAS_CONFIG"
-              value: "/etc/mas-config.yaml"
-          command:
-            - /usr/local/bin/mas-cli
-            - config
-            - sync
-            {{- if .Values.matrixAuthentication.configSyncPrune }}
-            - --prune
-            {{- end }}
-          resources:
-            {{- toYaml .Values.matrixAuthentication.resources | nindent 12 }}
-          volumeMounts:
-            - name: config
-              mountPath: "/etc/mas-config.yaml"
-              subPath: "mas-config.yaml"
-              readOnly: true
       containers:
         - name: main
           image: {{ .Values.matrixAuthentication.image.repository }}:{{ .Values.matrixAuthentication.image.tag }}

charts/synapse/templates/matrix-authentication-job-config-sync.yaml

@@ -0,0 +1,46 @@
+{{- if .Values.matrixAuthentication.enabled }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: matrix-authentication-config-sync
+  annotations:
+    {{- if .Values.argocd }}
+    argocd.argoproj.io/sync-wave: "-10"
+    argocd.argoproj.io/hook: "Sync"
+    {{- else }}
+    helm.sh/hook: "pre-install,pre-upgrade"
+    helm.sh/hook-weight: "-10"
+    {{- end }}
+spec:
+  parallelism: 1
+  completions: 1
+  template:
+    spec:
+      restartPolicy: Never
+      containers:
+        - name: config-sync
+          image: {{ .Values.matrixAuthentication.image.repository }}:{{ .Values.matrixAuthentication.image.tag }}
+          imagePullPolicy: {{ .Values.matrixAuthentication.image.pullPolicy }}
+          env:
+            - name: "MAS_CONFIG"
+              value: "/etc/mas-config.yaml"
+          command:
+            - /usr/local/bin/mas-cli
+            - config
+            - sync
+            {{- if .Values.matrixAuthentication.configSyncPrune }}
+            - --prune
+            {{- end }}
+          volumeMounts:
+            - name: config
+              mountPath: "/etc/mas-config.yaml"
+              subPath: "mas-config.yaml"
+              readOnly: true
+      volumes:
+        - name: config
+          secret:
+            secretName: matrix-authentication
+            items:
+             - key: mas-config.yaml
+               path: mas-config.yaml
+{{- end }}

charts/synapse/templates/matrix-authentication-job-db-migration.yaml

@@ -0,0 +1,43 @@
+{{- if .Values.matrixAuthentication.enabled }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: matrix-authentication-db-migration
+  annotations:
+    {{- if .Values.argocd }}
+    argocd.argoproj.io/sync-wave: "-20"
+    argocd.argoproj.io/hook: "Sync"
+    {{- else }}
+    helm.sh/hook: "pre-install,pre-upgrade"
+    helm.sh/hook-weight: "-20"
+    {{- end }}
+spec:
+  parallelism: 1
+  completions: 1
+  template:
+    spec:
+      restartPolicy: Never
+      containers:
+        - name: db-migration
+          image: {{ .Values.matrixAuthentication.image.repository }}:{{ .Values.matrixAuthentication.image.tag }}
+          imagePullPolicy: {{ .Values.matrixAuthentication.image.pullPolicy }}
+          env:
+            - name: "MAS_CONFIG"
+              value: "/etc/mas-config.yaml"
+          command:
+            - /usr/local/bin/mas-cli
+            - database
+            - migrate
+          volumeMounts:
+            - name: config
+              mountPath: "/etc/mas-config.yaml"
+              subPath: "mas-config.yaml"
+              readOnly: true
+      volumes:
+        - name: config
+          secret:
+            secretName: matrix-authentication
+            items:
+             - key: mas-config.yaml
+               path: mas-config.yaml
+{{- end }}

charts/synapse/values.yaml

@@ -606,3 +606,6 @@ resourceQuota:
 livekitServer:
   ingress:
     host: ''
+
+# switch between helm (helm.sh/hook) and argo (argocd.argoproj.io/sync-wave) anotations
+argocd: true