From 9f8f750f93342d6eeae39efb7bf3f287a33609b1 Mon Sep 17 00:00:00 2001 From: pmariglia Date: Tue, 19 Mar 2024 10:15:16 -0400 Subject: [PATCH] Allow Configurable Daemonset Tolerations This is necessary for the Daemonset can run on nodes with taints. --- charts/nx-agents/Chart.yaml | 2 +- charts/nx-agents/ci/basic-values.yaml | 9 ++++++++- charts/nx-agents/templates/daemonset.yaml | 4 ++++ charts/nx-agents/values.yaml | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/charts/nx-agents/Chart.yaml b/charts/nx-agents/Chart.yaml index 3be1c89..2181429 100644 --- a/charts/nx-agents/Chart.yaml +++ b/charts/nx-agents/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: nx-agents description: Nx Cloud Agents Helm Chart type: application -version: 1.1.0 +version: 1.2.0 maintainers: - name: nx url: "https://nx.app/" diff --git a/charts/nx-agents/ci/basic-values.yaml b/charts/nx-agents/ci/basic-values.yaml index ba1766c..ee9fa24 100644 --- a/charts/nx-agents/ci/basic-values.yaml +++ b/charts/nx-agents/ci/basic-values.yaml @@ -15,7 +15,7 @@ controller: deployment: port: 9000 annotations: {} - env: {} + env: [] service: port: 9000 type: ClusterIP @@ -41,6 +41,13 @@ executor: daemonset: enabled: true + tolerations: + - effect: NoSchedule + key: kubernetes.io/arch + value: arm64 + - effect: NoSchedule + key: kubernetes.io/arch + value: amd64 image: registry: '' imageName: ubuntu diff --git a/charts/nx-agents/templates/daemonset.yaml b/charts/nx-agents/templates/daemonset.yaml index d9ef299..0fe24db 100644 --- a/charts/nx-agents/templates/daemonset.yaml +++ b/charts/nx-agents/templates/daemonset.yaml @@ -15,6 +15,10 @@ spec: labels: name: nx-cloud-workflows-daemon spec: + {{- with .Values.daemonset.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} containers: - name: nx-cloud-workflows-daemon image: {{ include "nxCloud.images.daemonset.image" . }} diff --git a/charts/nx-agents/values.yaml b/charts/nx-agents/values.yaml index 4819cde..213d882 100644 --- a/charts/nx-agents/values.yaml +++ b/charts/nx-agents/values.yaml @@ -105,6 +105,7 @@ executor: # Additionally this feature can be retained, and you can update the provided script to run other things you would like on # each node in your cluster. daemonset: + tolerations: [] image: registry: '' imageName: ubuntu