Merge pull request #78 from invakid404/main

feat: allow deploying worker groups as statefulsets
windmill-labs · Jan 24, 2025 · d66f503 · d66f503
2 parents 71bbef0 + deadbd1
commit d66f503
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 6 deletions.
diff --git a/charts/windmill/templates/_helpers.tpl b/charts/windmill/templates/_helpers.tpl
@@ -60,3 +60,16 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{/*
+Validate controller kind, defaulting to "Deployment"
+*/}}
+{{- define "validateControllerKind" -}}
+{{- $validTypes := list "Deployment" "StatefulSet" -}}
+{{- $inputType := default "Deployment" . -}}
+{{- if has $inputType $validTypes -}}
+{{ $inputType }}
+{{- else -}}
+{{- fail (printf "Invalid controller type: %s. Must be either Deployment or StatefulSet" $inputType) -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/windmill/templates/worker-groups.yaml b/charts/windmill/templates/worker-groups.yaml
@@ -1,8 +1,9 @@
 {{- range $v := .Values.windmill.workerGroups }}
 {{ if and $v.replicas (gt (int $v.replicas) 0)}}
 ---
+{{- $controllerType := include "validateControllerKind" $v.controller }}
 apiVersion: apps/v1
-kind: Deployment
+kind: {{ $controllerType }}
 metadata:
   name: windmill-workers-{{ $v.name }}
   labels:
@@ -14,11 +15,19 @@ metadata:
     workerGroup: {{ $v.name }}
 spec:
   replicas: {{ $v.replicas }}
+  {{- if eq $controllerType "Deployment" }}
   strategy:
     type: RollingUpdate
     rollingUpdate:
       maxSurge: 3
       maxUnavailable: 0
+  {{- else if eq $controllerType "StatefulSet" }}
+  serviceName: windmill-workers-{{ $v.name }}
+  updateStrategy:
+    type: RollingUpdate
+    rollingUpdate:
+      partition: 0
+  {{- end }}
   selector:
     matchLabels:
       app: windmill-workers
@@ -184,5 +193,11 @@ spec:
       tolerations:
 {{ toYaml . | indent 8 }}
 {{- end }}
+{{- if eq $controllerType "StatefulSet" }}
+  {{- if $v.volumeClaimTemplates }}
+  volumeClaimTemplates:
+    {{- toYaml $v.volumeClaimTemplates | nindent 2 }}
+  {{- end }}
+{{- end }}
 {{- end }}
 {{- end }}
diff --git a/charts/windmill/values.yaml b/charts/windmill/values.yaml
@@ -73,6 +73,9 @@ windmill:
     # workers configuration
     # The default worker group
     - name: "default"
+      # -- Controller to use. Valid options are "Deployment" and "StatefulSet"
+      controller: "Deployment"
+
       replicas: 3
       # -- Annotations to apply to the pods
       annotations: {}
@@ -98,7 +101,6 @@ windmill:
       # -- Security context to apply to the pod
       containerSecurityContext: {}
 
-
       # -- Affinity rules to apply to the pods
       affinity: {}
 
@@ -118,13 +120,19 @@ windmill:
       volumes: []
       volumeMounts: []
 
+      # -- Volume claim templates. Only applies when controller is "StatefulSet"
+      volumeClaimTemplates: []
+
       # -- command override
       command: []
 
       # -- mount the docker socket inside the container to be able to run docker command as docker client to the host docker daemon
       exposeHostDocker: false
 
     - name: "native"
+      # -- Controller to use. Valid options are "Deployment" and "StatefulSet"
+      controller: "Deployment"
+
       replicas: 1
       # -- Annotations to apply to the pods
       annotations: {}
@@ -147,7 +155,6 @@ windmill:
       # -- Security context to apply to the pod
       containerSecurityContext: {}
 
-
       # -- Affinity rules to apply to the pods
       affinity: {}
 
@@ -173,7 +180,13 @@ windmill:
       # -- mount the docker socket inside the container to be able to run docker command as docker client to the host docker daemon
       exposeHostDocker: false
 
+      # -- Volume claim templates. Only applies when controller is "StatefulSet"
+      volumeClaimTemplates: []
+
     - name: "gpu"
+      # -- Controller to use. Valid options are "Deployment" and "StatefulSet"
+      controller: "Deployment"
+
       replicas: 0
       # -- Annotations to apply to the pods
       annotations: {}
@@ -196,7 +209,6 @@ windmill:
       # -- Security context to apply to the pod
       containerSecurityContext: {}
 
-
       # -- Affinity rules to apply to the pods
       affinity: {}
 
@@ -218,6 +230,9 @@ windmill:
 
       # -- mount the docker socket inside the container to be able to run docker command as docker client to the host docker daemon
       exposeHostDocker: false
+
+      # -- Volume claim templates. Only applies when controller is "StatefulSet"
+      volumeClaimTemplates: []
   # app configuration
   app:
     # -- Annotations to apply to the pods
@@ -263,7 +278,7 @@ windmill:
     volumes: []
 
     volumeMounts: []
-    
+
     # app autoscaling configuration
     autoscaling:
       # -- enable or disable autoscaling
@@ -285,7 +300,6 @@ windmill:
       # -- annotations to apply to the service
       annotations: {}
 
-
   # lsp configuration
   lsp:
     tag: "latest"