Add stack persistent volume claim

Signed-off-by: Pascal Morillon <[email protected]>
jacobweinstock · Oct 5, 2024 · 48ecf13 · 48ecf13
1 parent fe80800
commit 48ecf13
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 1 deletion.
diff --git a/tinkerbell/stack/templates/NOTES.txt b/tinkerbell/stack/templates/NOTES.txt
@@ -0,0 +1,7 @@
+{{- if eq (include "stack.hookDownloadJobEnabled" .) "false" }}
+Warning:
+
+You are using no persistence or ReadWriteOnce access modes on PersistentVolumeClaim, Job `download-hook` is disabled.
+You will need to manage hooks artifacts manually.
+Also stack Deployment is not scalable.
+{{- end }}
diff --git a/tinkerbell/stack/templates/_helpers.tpl b/tinkerbell/stack/templates/_helpers.tpl
@@ -0,0 +1,11 @@
+{{- define "stack.hookDownloadJobEnabled" -}}
+{{- $result := .Values.stack.persistence.enabled }}
+{{- if and .Values.stack.persistence.enabled (eq .Values.stack.persistence.type "pvc") }}
+  {{- range .Values.stack.persistence.accessModes }}
+    {{- if eq . "ReadWriteOnce" }}
+      {{- $result = false}}
+    {{- end }}
+  {{- end }}
+{{- end }}
+{{- $result }}
+{{- end -}}
diff --git a/tinkerbell/stack/templates/hook.yaml b/tinkerbell/stack/templates/hook.yaml
@@ -1,4 +1,5 @@
-{{- if .Values.stack.hook.enabled }}
+{{- $hookDownloadJobEnabled := eq (include "stack.hookDownloadJobEnabled" .) "true" -}}
+{{- if and .Values.stack.hook.enabled $hookDownloadJobEnabled }}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -50,9 +51,20 @@ spec:
       restartPolicy: OnFailure
       volumes:
         - name: hook-artifacts
+          {{- if .Values.stack.persistence.enabled }}
+          {{- if eq .Values.stack.persistence.type "hostpath" }}
           hostPath:
             path: {{ .Values.stack.hook.downloadsDest }}
             type: DirectoryOrCreate
+          {{- else if eq .Values.stack.persistence.type "pvc" }}
+          persistentVolumeClaim:
+            claimName: {{ .Values.stack.persistence.existingClaim | default "hook-artifacts" }}
+          {{- else }}
+          {{- fail "value for .Values.stack.persistence.type is not as expected" }}
+          {{- end }}
+          {{- else }}
+          emptyDir: {}
+          {{- end }}
         - name: configmap-volume
           configMap:
             defaultMode: 0700

diff --git a/tinkerbell/stack/templates/nginx.yaml b/tinkerbell/stack/templates/nginx.yaml
@@ -123,9 +123,20 @@ spec:
       {{- end }}
       {{- if .Values.stack.hook.enabled }}
       - name: hook-artifacts
+        {{- if .Values.stack.persistence.enabled }}
+        {{- if eq .Values.stack.persistence.type "hostpath" }}
         hostPath:
           path: {{ .Values.stack.hook.downloadsDest }}
           type: DirectoryOrCreate
+        {{- else if eq .Values.stack.persistence.type "pvc" }}
+        persistentVolumeClaim:
+          claimName: {{ .Values.stack.persistence.existingClaim | default "hook-artifacts" }}
+        {{- else }}
+        {{- fail "value for .Values.stack.persistence.type is not as expected" }}
+        {{- end }}
+        {{- else }}
+        emptyDir: {}
+        {{- end }}
       {{- end }}
       {{- if and .Values.stack.relay.enabled $listenBroadcast }}
       initContainers:

diff --git a/tinkerbell/stack/templates/nginx_persistentvolumeclaim.yaml b/tinkerbell/stack/templates/nginx_persistentvolumeclaim.yaml
@@ -0,0 +1,30 @@
+{{- if and .Values.stack.persistence.enabled (not .Values.stack.persistence.existingClaim) (eq .Values.stack.persistence.type "pvc") }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: hook-artifacts
+  labels:
+    {{- with .Values.stack.persistence.extraPvcLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with .Values.stack.persistence.annotations  }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  accessModes:
+    {{- range .Values.stack.persistence.accessModes }}
+    - {{ . | quote }}
+    {{- end }}
+  resources:
+    requests:
+      storage: {{ .Values.stack.persistence.size | quote }}
+  {{- with .Values.stack.persistence.storageClassName }}
+  storageClassName: {{ . }}
+  {{- end }}
+  {{- with .Values.stack.persistence.selectorLabels }}
+  selector:
+    matchLabels:
+    {{- toYaml . | nindent 6 }}
+  {{- end }}
+{{- end }}
diff --git a/tinkerbell/stack/values.yaml b/tinkerbell/stack/values.yaml
@@ -18,6 +18,20 @@ stack:
   lbClass: kube-vip.io/kube-vip-class
   # Once the Kubernetes Gateway API is more stable, we will use that for all services instead of nginx.
   image: nginx:1.25.1
+  persistence:
+    enabled: true
+    # type hostpath or pvc
+    type: hostpath
+    # When type is pvc
+    # storageClassName: default
+    accessModes:
+      - ReadWriteMany
+    size: 1Gi
+    # annotations: {}
+    # selectorLabels: {}
+    # existingClaim:
+    extraPvcLabels: {}
+
   hook:
     enabled: true
     name: hook-files