From bd02c081e2a7f21100e0dedea04d34037601acd9 Mon Sep 17 00:00:00 2001 From: kostas Date: Mon, 14 Aug 2023 20:29:01 +0200 Subject: [PATCH] feat: stable/node-local-dns support podlabels and ds labels, annotations --- stable/node-local-dns/Chart.yaml | 2 +- stable/node-local-dns/README.md | 5 ++++- stable/node-local-dns/templates/daemonset.yaml | 10 ++++++++++ stable/node-local-dns/values.yaml | 6 ++++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/stable/node-local-dns/Chart.yaml b/stable/node-local-dns/Chart.yaml index a03a6934..7ad23442 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: 1.1.4 +version: 1.1.5 appVersion: 1.22.20 maintainers: - name: gabrieladt diff --git a/stable/node-local-dns/README.md b/stable/node-local-dns/README.md index 0ae220f6..a8b14e13 100644 --- a/stable/node-local-dns/README.md +++ b/stable/node-local-dns/README.md @@ -1,6 +1,6 @@ # node-local-dns -![Version: 1.1.4](https://img.shields.io/badge/Version-1.1.4-informational?style=flat-square) ![AppVersion: 1.22.20](https://img.shields.io/badge/AppVersion-1.22.20-informational?style=flat-square) +![Version: 1.1.5](https://img.shields.io/badge/Version-1.1.5-informational?style=flat-square) ![AppVersion: 1.22.20](https://img.shields.io/badge/AppVersion-1.22.20-informational?style=flat-square) A chart to install node-local-dns. @@ -57,6 +57,8 @@ helm install my-release deliveryhero/node-local-dns -f values.yaml | config.setupInterface | bool | `false` | | | config.setupIptables | bool | `false` | | | config.skipTeardown | bool | `true` | | +| daemonsetAnnotations | object | `{}` | | +| daemonsetLabels | object | `{}` | | | dashboard.annotations | object | `{}` | | | dashboard.enabled | bool | `false` | | | dashboard.label | string | `"grafana_dashboard"` | | @@ -67,6 +69,7 @@ helm install my-release deliveryhero/node-local-dns -f values.yaml | imagePullSecrets | list | `[]` | | | nameOverride | string | `""` | | | podAnnotations | object | `{}` | | +| podLabels | object | `{}` | | | resources.limits.memory | string | `"128Mi"` | | | resources.requests.cpu | string | `"25m"` | | | resources.requests.memory | string | `"128Mi"` | | diff --git a/stable/node-local-dns/templates/daemonset.yaml b/stable/node-local-dns/templates/daemonset.yaml index e293d0a8..07d39b13 100644 --- a/stable/node-local-dns/templates/daemonset.yaml +++ b/stable/node-local-dns/templates/daemonset.yaml @@ -3,8 +3,15 @@ kind: DaemonSet metadata: name: {{ include "node-local-dns.fullname" . }} namespace: kube-system + {{- with .Values.daemonsetAnnotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} labels: {{- include "node-local-dns.labels" . | nindent 4 }} + {{- with .Values.daemonsetLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: updateStrategy: rollingUpdate: @@ -15,6 +22,9 @@ spec: template: metadata: labels: + {{- if .Values.podLabels }} + {{- toYaml .Values.podLabels | nindent 8 }} + {{- end }} k8s-app: {{ include "node-local-dns.name" . }} {{- if or .Values.podAnnotations (not .Values.serviceMonitor.enabled) }} annotations: diff --git a/stable/node-local-dns/values.yaml b/stable/node-local-dns/values.yaml index 493f1c39..5cc51abc 100644 --- a/stable/node-local-dns/values.yaml +++ b/stable/node-local-dns/values.yaml @@ -39,6 +39,12 @@ serviceAccount: podAnnotations: {} +podLabels: {} + +daemonsetAnnotations: {} + +daemonsetLabels: {} + securityContext: capabilities: add: