From b0d205fb5fea57511e33a7ea113ed50b3090ee90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=9D=AC=EC=84=B1?= Date: Wed, 16 Oct 2024 11:57:45 +0900 Subject: [PATCH] Feature/topologySpreadConstraints ADD --- charts/redash/templates/hook-migrations-job.yaml | 3 +++ charts/redash/templates/scheduler-deployment.yaml | 3 +++ charts/redash/templates/server-deployment.yaml | 3 +++ charts/redash/templates/worker-deployment.yaml | 3 +++ charts/redash/values.yaml | 12 ++++++++++++ 5 files changed, 24 insertions(+) diff --git a/charts/redash/templates/hook-migrations-job.yaml b/charts/redash/templates/hook-migrations-job.yaml index 3bd245d..971321a 100644 --- a/charts/redash/templates/hook-migrations-job.yaml +++ b/charts/redash/templates/hook-migrations-job.yaml @@ -62,6 +62,9 @@ spec: {{- with .Values.migrations.nodeSelector }} nodeSelector: {{ toYaml . | nindent 8 }} {{- end }} + {{- if .Values.migrations.topologySpreadConstraints }} + topologySpreadConstraints: {{ toYaml .Values.migrations.topologySpreadConstraints | indent 8 }} + {{- end }} {{- with .Values.migrations.affinity }} affinity: {{ toYaml . | nindent 8 }} {{- end }} diff --git a/charts/redash/templates/scheduler-deployment.yaml b/charts/redash/templates/scheduler-deployment.yaml index ea40682..d4a0bef 100644 --- a/charts/redash/templates/scheduler-deployment.yaml +++ b/charts/redash/templates/scheduler-deployment.yaml @@ -67,6 +67,9 @@ spec: {{- with .Values.scheduler.nodeSelector }} nodeSelector: {{ toYaml . | nindent 8 }} {{- end }} + {{- if .Values.scheduler.topologySpreadConstraints }} + topologySpreadConstraints: {{ toYaml .Values.scheduler.topologySpreadConstraints | indent 8 }} + {{- end }} {{- with .Values.scheduler.affinity }} affinity: {{ toYaml . | nindent 8 }} {{- end }} diff --git a/charts/redash/templates/server-deployment.yaml b/charts/redash/templates/server-deployment.yaml index ab078ba..9d3f41d 100644 --- a/charts/redash/templates/server-deployment.yaml +++ b/charts/redash/templates/server-deployment.yaml @@ -71,6 +71,9 @@ spec: {{- with .Values.server.nodeSelector }} nodeSelector: {{ toYaml . | nindent 8 }} {{- end }} + {{- if .Values.server.topologySpreadConstraints }} + topologySpreadConstraints: {{ toYaml .Values.server.topologySpreadConstraints | indent 8 }} + {{- end }} {{- with .Values.server.affinity }} affinity: {{ toYaml . | nindent 8 }} {{- end }} diff --git a/charts/redash/templates/worker-deployment.yaml b/charts/redash/templates/worker-deployment.yaml index 2722ae4..8d89d3d 100644 --- a/charts/redash/templates/worker-deployment.yaml +++ b/charts/redash/templates/worker-deployment.yaml @@ -63,6 +63,9 @@ spec: {{- with $workerConfig.nodeSelector }} nodeSelector: {{ toYaml . | nindent 8 }} {{- end }} + {{- if .Values.$workerConfig.topologySpreadConstraints }} + topologySpreadConstraints: {{ toYaml .Values.$workerConfig.topologySpreadConstraints | indent 8 }} + {{- end }} {{- with $workerConfig.affinity }} affinity: {{ toYaml . | nindent 8 }} {{- end }} diff --git a/charts/redash/values.yaml b/charts/redash/values.yaml index 03a9f10..36ae145 100644 --- a/charts/redash/values.yaml +++ b/charts/redash/values.yaml @@ -337,6 +337,9 @@ server: # server.nodeSelector -- Node labels for server pod assignment [ref](https://kubernetes.io/docs/user-guide/node-selection/) nodeSelector: {} + # server.topologySpreadConstraints -- Default topologySpreadConstraints for server pod assignment [ref](https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/) + topologySpreadConstraints: {} + # server.tolerations -- Tolerations for server pod assignment [ref](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) tolerations: [] @@ -435,6 +438,9 @@ worker: # worker.nodeSelector -- Default node labels for worker pod assignment [ref](https://kubernetes.io/docs/user-guide/node-selection/) nodeSelector: {} + # worker.topologySpreadConstraints -- Default topologySpreadConstraints for worker pod assignment [ref](https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/) + topologySpreadConstraints: {} + # worker.tolerations -- Default tolerations for worker pod assignment [ref](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) tolerations: [] @@ -505,6 +511,9 @@ scheduler: # scheduler.nodeSelector -- Node labels for scheduler pod assignment [ref](https://kubernetes.io/docs/user-guide/node-selection/) nodeSelector: {} + # scheduler.topologySpreadConstraints -- Default topologySpreadConstraints for scheduler pod assignment [ref](https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/) + topologySpreadConstraints: {} + # scheduler.tolerations -- Tolerations for scheduler pod assignment [ref](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) tolerations: [] @@ -555,6 +564,9 @@ migrations: # migrations.nodeSelector -- Node labels for scheduled worker pod assignment [ref](https://kubernetes.io/docs/user-guide/node-selection/) nodeSelector: {} + # migrations.topologySpreadConstraints -- Default topologySpreadConstraints for migrations pod assignment [ref](https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/) + topologySpreadConstraints: {} + # migrations.tolerations -- Tolerations for server pod assignment [ref](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) tolerations: []