Helm: add a volume for /var/lib/salt

/var/lib/salt contains the Salt SSH configution. This needs to be persisted across restarts.
uyuni-project · Jan 9, 2024 · feb5e27 · feb5e27
1 parent 9216b9a
commit feb5e27
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 0 deletions.
diff --git a/containers/server-helm/templates/deployment.yaml b/containers/server-helm/templates/deployment.yaml
@@ -54,6 +54,22 @@ spec:
         volumeMounts:
           - mountPath: /mnt
             name: var-cobbler
+      - name: init-var-salt
+        image: {{- include "deployment.container.image" (dict "name" "server" "global" .) | indent 1}}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        command:
+          - sh
+          - -x
+          - -c
+          - >
+            chown --reference=/var/lib/salt /mnt;
+            chmod --reference=/var/lib/salt /mnt;
+            if [ -z "$(ls -A /mnt)" ]; then
+              cp -a /var/lib/salt/. /mnt;
+            fi
+        volumeMounts:
+          - mountPath: /mnt
+            name: var-salt
       - name: init-var-pgsql
         image: {{- include "deployment.container.image" (dict "name" "server" "global" .) | indent 1}}
         imagePullPolicy: {{ .Values.pullPolicy }}
@@ -442,6 +458,8 @@ spec:
             name: cgroup
           - mountPath: /var/lib/cobbler
             name: var-cobbler
+          - mountPath: /var/lib/salt
+            name: var-salt
           - mountPath: /var/lib/pgsql
             name: var-pgsql
           - mountPath: /var/cache
@@ -534,6 +552,9 @@ spec:
       - name: var-cobbler
         persistentVolumeClaim:
           claimName: var-cobbler
+      - name: var-salt
+        persistentVolumeClaim:
+          claimName: var-salt
       - name: var-pgsql
         persistentVolumeClaim:
           claimName: var-pgsql

diff --git a/containers/server-helm/templates/volumes.yaml b/containers/server-helm/templates/volumes.yaml
@@ -24,6 +24,30 @@ spec:
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
+metadata:
+  name: var-salt
+  namespace: "{{ .Release.Namespace }}"
+spec:
+{{- if .Values.storageClass }}
+{{- if (eq "-" .Values.storageClass) }}
+  storageClassName: ""
+{{- else }}
+  storageClassName: "{{ .Values.storageClass }}"
+{{- end }}
+{{- end }}
+  accessModes:
+{{ toYaml .Values.accessModes | indent 4 }}
+  resources:
+    requests:
+      storage: 10Mi
+{{- if .Values.matchPvByLabel }}
+  selector:
+    matchLabels:
+      data: var-salt
+{{- end }}
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
 metadata:
   name: var-pgsql
   namespace: "{{ .Release.Namespace }}"