diff --git a/packages/twenty-docker/helm/twenty/templates/deployment-server.yaml b/packages/twenty-docker/helm/twenty/templates/deployment-server.yaml index e262422099..5f9cde4344 100644 --- a/packages/twenty-docker/helm/twenty/templates/deployment-server.yaml +++ b/packages/twenty-docker/helm/twenty/templates/deployment-server.yaml @@ -32,6 +32,25 @@ spec: spec: securityContext: {{- toYaml .Values.securityContext | nindent 8 }} + {{- with .Values.server.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.server.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.server.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.server.dnsPolicy }} + dnsPolicy: {{ . }} + {{- end }} + {{- with .Values.server.dnsConfig }} + dnsConfig: + {{- toYaml . | nindent 8 }} + {{- end }} volumes: {{- if .Values.server.dockerDataPersistence.enabled }} - name: docker-data diff --git a/packages/twenty-docker/helm/twenty/templates/deployment-worker.yaml b/packages/twenty-docker/helm/twenty/templates/deployment-worker.yaml index 50fe02e7c9..287ff085bb 100644 --- a/packages/twenty-docker/helm/twenty/templates/deployment-worker.yaml +++ b/packages/twenty-docker/helm/twenty/templates/deployment-worker.yaml @@ -28,6 +28,25 @@ spec: spec: securityContext: {{- toYaml .Values.securityContext | nindent 8 }} + {{- with .Values.worker.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.worker.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.worker.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.worker.dnsPolicy }} + dnsPolicy: {{ . }} + {{- end }} + {{- with .Values.worker.dnsConfig }} + dnsConfig: + {{- toYaml . | nindent 8 }} + {{- end }} initContainers: - name: wait-for-db image: postgres:16-alpine diff --git a/packages/twenty-docker/helm/twenty/values.schema.json b/packages/twenty-docker/helm/twenty/values.schema.json index 48db9817d1..9bfe0eebdd 100644 --- a/packages/twenty-docker/helm/twenty/values.schema.json +++ b/packages/twenty-docker/helm/twenty/values.schema.json @@ -138,7 +138,15 @@ "accessModes": { "type": "array", "items": { "type": "string" } }, "size": { "type": "string" } } - } + }, + "nodeSelector": { "type": "object" }, + "tolerations": { + "type": "array", + "items": { "type": "object" } + }, + "affinity": { "type": "object" }, + "dnsPolicy": { "type": ["string", "null"], "enum": ["ClusterFirst", "ClusterFirstWithHostNet", "Default", "None", null] }, + "dnsConfig": { "type": "object" } } }, @@ -173,7 +181,15 @@ { "required": ["valueFrom"] } ] } - } + }, + "nodeSelector": { "type": "object" }, + "tolerations": { + "type": "array", + "items": { "type": "object" } + }, + "affinity": { "type": "object" }, + "dnsPolicy": { "type": ["string", "null"], "enum": ["ClusterFirst", "ClusterFirstWithHostNet", "Default", "None", null] }, + "dnsConfig": { "type": "object" } } }, diff --git a/packages/twenty-docker/helm/twenty/values.yaml b/packages/twenty-docker/helm/twenty/values.yaml index 088c9e5a9c..633426ac46 100644 --- a/packages/twenty-docker/helm/twenty/values.yaml +++ b/packages/twenty-docker/helm/twenty/values.yaml @@ -98,6 +98,13 @@ server: extraVolumeMounts: [] + # Pod scheduling and DNS + nodeSelector: {} + tolerations: [] + affinity: {} + dnsPolicy: ~ + dnsConfig: {} + # Worker deployment worker: enabled: true @@ -115,6 +122,13 @@ worker: extraEnv: [] + # Pod scheduling and DNS + nodeSelector: {} + tolerations: [] + affinity: {} + dnsPolicy: ~ + dnsConfig: {} + # PostgreSQL db: enabled: true