From 374da15461a014e81699da543b15e66e8728d492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20W=C3=B6hrl?= Date: Tue, 17 Dec 2024 11:34:33 +0100 Subject: [PATCH] [stable/node-local-dns]: support modifying tolerations (#642) feat(node-local-dns): support modifying tolerations --- stable/node-local-dns/Chart.yaml | 2 +- stable/node-local-dns/README.md | 10 ++++++++-- stable/node-local-dns/templates/daemonset.yaml | 7 +------ stable/node-local-dns/values.yaml | 10 +++++++++- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/stable/node-local-dns/Chart.yaml b/stable/node-local-dns/Chart.yaml index bca9542e..1d33339a 100644 --- a/stable/node-local-dns/Chart.yaml +++ b/stable/node-local-dns/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: node-local-dns -version: 2.1.2 +version: 2.1.3 appVersion: 1.23.1 maintainers: - name: gabrieladt diff --git a/stable/node-local-dns/README.md b/stable/node-local-dns/README.md index 50ae6510..bbd555cd 100644 --- a/stable/node-local-dns/README.md +++ b/stable/node-local-dns/README.md @@ -1,6 +1,6 @@ # node-local-dns -![Version: 2.1.2](https://img.shields.io/badge/Version-2.1.2-informational?style=flat-square) ![AppVersion: 1.23.1](https://img.shields.io/badge/AppVersion-1.23.1-informational?style=flat-square) +![Version: 2.1.3](https://img.shields.io/badge/Version-2.1.3-informational?style=flat-square) ![AppVersion: 1.23.1](https://img.shields.io/badge/AppVersion-1.23.1-informational?style=flat-square) A chart to install node-local-dns. @@ -23,7 +23,7 @@ helm install --generate-name oci://ghcr.io/deliveryhero/helm-charts/node-local-d To install a specific version of this chart: ```console -helm install --generate-name oci://ghcr.io/deliveryhero/helm-charts/node-local-dns --version 2.1.2 +helm install --generate-name oci://ghcr.io/deliveryhero/helm-charts/node-local-dns --version 2.1.3 ``` To install the chart with the release name `my-release`: @@ -90,6 +90,12 @@ helm install my-release oci://ghcr.io/deliveryhero/helm-charts/node-local-dns -f | serviceMonitor.enabled | bool | `false` | Ensure that servicemonitor is created, this will disable prometheus annotations | | serviceMonitor.metricRelabelings | list | `[]` | Metric relabel configs to apply to samples before ingestion. [Metric Relabeling](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs) | | serviceMonitor.relabelings | list | `[]` | Relabel configs to apply to samples before ingestion. [Relabeling](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config) | +| tolerations[0].key | string | `"CriticalAddonsOnly"` | | +| tolerations[0].operator | string | `"Exists"` | | +| tolerations[1].effect | string | `"NoExecute"` | | +| tolerations[1].operator | string | `"Exists"` | | +| tolerations[2].effect | string | `"NoSchedule"` | | +| tolerations[2].operator | string | `"Exists"` | | ## Maintainers diff --git a/stable/node-local-dns/templates/daemonset.yaml b/stable/node-local-dns/templates/daemonset.yaml index 53551538..6450456c 100644 --- a/stable/node-local-dns/templates/daemonset.yaml +++ b/stable/node-local-dns/templates/daemonset.yaml @@ -48,12 +48,7 @@ spec: hostNetwork: {{ .Values.config.setupIptables }} dnsPolicy: Default # Don't use cluster DNS. tolerations: - - key: "CriticalAddonsOnly" - operator: "Exists" - - effect: "NoExecute" - operator: "Exists" - - effect: "NoSchedule" - operator: "Exists" + {{- toYaml .Values.tolerations | nindent 8 }} containers: - name: node-cache image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" diff --git a/stable/node-local-dns/values.yaml b/stable/node-local-dns/values.yaml index 0ac2d296..9526fea5 100644 --- a/stable/node-local-dns/values.yaml +++ b/stable/node-local-dns/values.yaml @@ -78,7 +78,7 @@ daemonsetLabels: {} securityContext: capabilities: add: - - NET_ADMIN + - NET_ADMIN # -- https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/user-guides/getting-started.md serviceMonitor: @@ -133,3 +133,11 @@ imagePullSecrets: [] prometheusScraping: enabled: true + +tolerations: + - key: "CriticalAddonsOnly" + operator: "Exists" + - effect: "NoExecute" + operator: "Exists" + - effect: "NoSchedule" + operator: "Exists"