Skip to content

refactor(app): use StatefulSet for persistence instead of standalone PVCs #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robinbraemer merged 1 commit into from
Mar 11, 2026
Merged

refactor(app): use StatefulSet for persistence instead of standalone PVCs #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: app
description: Generic Helm chart for deploying Docker containers
type: application
version: 1.1.0
version: 1.2.0
appVersion: 'latest'
annotations:
artifacthub.io/images: |
Expand Down
124 changes: 124 additions & 0 deletions app/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,127 @@ Create the name of the service account to use
{{- default "default" .Values.serviceAccount.name }}
{{- end }}
{{- end }}

{{/*
Pod template spec — shared between Deployment and StatefulSet.
Includes everything inside spec.template.
*/}}
{{- define "app.podTemplate" -}}
metadata:
{{- with .Values.podAnnotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
{{- include "app.labels" . | nindent 4 }}
{{- with .Values.podLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 4 }}
{{- end }}
serviceAccountName: {{ include "app.serviceAccountName" . }}
{{- with .Values.podSecurityContext }}
securityContext:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.initContainers }}
initContainers:
{{- toYaml . | nindent 4 }}
{{- end }}
containers:
- name: {{ .Chart.Name }}
{{- with .Values.securityContext }}
securityContext:
{{- toYaml . | nindent 8 }}
{{- end }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- with .Values.container.command }}
command:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.container.args }}
args:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.container.ports }}
ports:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.container.env }}
env:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.healthChecks.liveness.enabled }}
livenessProbe:
{{- if eq .Values.healthChecks.liveness.type "httpGet" }}
httpGet:
{{- toYaml .Values.healthChecks.liveness.httpGet | nindent 10 }}
{{- else if eq .Values.healthChecks.liveness.type "tcpSocket" }}
tcpSocket:
{{- toYaml .Values.healthChecks.liveness.tcpSocket | nindent 10 }}
{{- else if eq .Values.healthChecks.liveness.type "exec" }}
exec:
{{- toYaml .Values.healthChecks.liveness.exec | nindent 10 }}
{{- end }}
initialDelaySeconds: {{ .Values.healthChecks.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.healthChecks.liveness.periodSeconds }}
timeoutSeconds: {{ .Values.healthChecks.liveness.timeoutSeconds }}
failureThreshold: {{ .Values.healthChecks.liveness.failureThreshold }}
{{- end }}
{{- if .Values.healthChecks.readiness.enabled }}
readinessProbe:
{{- if eq .Values.healthChecks.readiness.type "httpGet" }}
httpGet:
{{- toYaml .Values.healthChecks.readiness.httpGet | nindent 10 }}
{{- else if eq .Values.healthChecks.readiness.type "tcpSocket" }}
tcpSocket:
{{- toYaml .Values.healthChecks.readiness.tcpSocket | nindent 10 }}
{{- else if eq .Values.healthChecks.readiness.type "exec" }}
exec:
{{- toYaml .Values.healthChecks.readiness.exec | nindent 10 }}
{{- end }}
initialDelaySeconds: {{ .Values.healthChecks.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.healthChecks.readiness.periodSeconds }}
timeoutSeconds: {{ .Values.healthChecks.readiness.timeoutSeconds }}
failureThreshold: {{ .Values.healthChecks.readiness.failureThreshold }}
{{- end }}
{{- with .Values.resources }}
resources:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if or .Values.volumeMounts (and .Values.persistence.enabled .Values.persistence.volumes) }}
volumeMounts:
{{- with .Values.volumeMounts }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.persistence.enabled }}
{{- range .Values.persistence.volumes }}
- name: {{ .name }}
mountPath: {{ .mountPath }}
{{- end }}
{{- end }}
{{- end }}
{{- with .Values.sidecars }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.volumes }}
volumes:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- end }}
129 changes: 3 additions & 126 deletions app/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{{- if not .Values.persistence.enabled }}
apiVersion: apps/v1
kind: Deployment
metadata:
Expand All @@ -12,129 +13,5 @@ spec:
matchLabels:
{{- include "app.selectorLabels" . | nindent 6 }}
template:
metadata:
{{- with .Values.podAnnotations }}
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "app.labels" . | nindent 8 }}
{{- with .Values.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "app.serviceAccountName" . }}
{{- with .Values.podSecurityContext }}
securityContext:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.initContainers }}
initContainers:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ .Chart.Name }}
{{- with .Values.securityContext }}
securityContext:
{{- toYaml . | nindent 12 }}
{{- end }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- with .Values.container.command }}
command:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.container.args }}
args:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.container.ports }}
ports:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.container.env }}
env:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- if .Values.healthChecks.liveness.enabled }}
livenessProbe:
{{- if eq .Values.healthChecks.liveness.type "httpGet" }}
httpGet:
{{- toYaml .Values.healthChecks.liveness.httpGet | nindent 14 }}
{{- else if eq .Values.healthChecks.liveness.type "tcpSocket" }}
tcpSocket:
{{- toYaml .Values.healthChecks.liveness.tcpSocket | nindent 14 }}
{{- else if eq .Values.healthChecks.liveness.type "exec" }}
exec:
{{- toYaml .Values.healthChecks.liveness.exec | nindent 14 }}
{{- end }}
initialDelaySeconds: {{ .Values.healthChecks.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.healthChecks.liveness.periodSeconds }}
timeoutSeconds: {{ .Values.healthChecks.liveness.timeoutSeconds }}
failureThreshold: {{ .Values.healthChecks.liveness.failureThreshold }}
{{- end }}
{{- if .Values.healthChecks.readiness.enabled }}
readinessProbe:
{{- if eq .Values.healthChecks.readiness.type "httpGet" }}
httpGet:
{{- toYaml .Values.healthChecks.readiness.httpGet | nindent 14 }}
{{- else if eq .Values.healthChecks.readiness.type "tcpSocket" }}
tcpSocket:
{{- toYaml .Values.healthChecks.readiness.tcpSocket | nindent 14 }}
{{- else if eq .Values.healthChecks.readiness.type "exec" }}
exec:
{{- toYaml .Values.healthChecks.readiness.exec | nindent 14 }}
{{- end }}
initialDelaySeconds: {{ .Values.healthChecks.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.healthChecks.readiness.periodSeconds }}
timeoutSeconds: {{ .Values.healthChecks.readiness.timeoutSeconds }}
failureThreshold: {{ .Values.healthChecks.readiness.failureThreshold }}
{{- end }}
{{- with .Values.resources }}
resources:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- if or .Values.volumeMounts (and .Values.persistence.enabled .Values.persistence.volumes) }}
volumeMounts:
{{- with .Values.volumeMounts }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- if .Values.persistence.enabled }}
{{- range .Values.persistence.volumes }}
- name: {{ .name }}
mountPath: {{ .mountPath }}
{{- end }}
{{- end }}
{{- end }}
{{- with .Values.sidecars }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if or .Values.volumes (and .Values.persistence.enabled .Values.persistence.volumes) }}
volumes:
{{- with .Values.volumes }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.persistence.enabled }}
{{- range .Values.persistence.volumes }}
- name: {{ .name }}
persistentVolumeClaim:
claimName: {{ include "app.fullname" $ }}-{{ .name }}
{{- end }}
{{- end }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- include "app.podTemplate" . | nindent 4 }}
{{- end }}
20 changes: 0 additions & 20 deletions app/templates/pvc.yaml
View file
Open in desktop

This file was deleted.

32 changes: 32 additions & 0 deletions app/templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{{- if .Values.persistence.enabled }}
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: {{ include "app.fullname" . }}
labels:
{{- include "app.labels" . | nindent 4 }}
spec:
serviceName: {{ include "app.fullname" . }}
{{- if not .Values.autoscaling.enabled }}
replicas: {{ .Values.replicaCount }}
{{- end }}
selector:
matchLabels:
{{- include "app.selectorLabels" . | nindent 6 }}
template:
{{- include "app.podTemplate" . | nindent 4 }}
volumeClaimTemplates:
{{- range .Values.persistence.volumes }}
- metadata:
name: {{ .name }}
spec:
accessModes:
- {{ .accessMode | default "ReadWriteOnce" }}
{{- if .storageClassName }}
storageClassName: {{ .storageClassName }}
{{- end }}
resources:
requests:
storage: {{ .size | default "1Gi" }}
{{- end }}
{{- end }}
Loading