From 1ad5b55ca4ad1fa50315cb47228d92513b1324b0 Mon Sep 17 00:00:00 2001 From: Joseph McGinley Date: Wed, 11 Dec 2024 10:36:25 -0500 Subject: [PATCH 1/4] Remove addonmanager label from node-local-dns configmap and make annotations configurable --- stable/node-local-dns/Chart.yaml | 2 +- stable/node-local-dns/README.md | 5 +++-- stable/node-local-dns/templates/configmap.yaml | 8 +++++--- stable/node-local-dns/values.yaml | 2 ++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/stable/node-local-dns/Chart.yaml b/stable/node-local-dns/Chart.yaml index eda3e438..bca9542e 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.1 +version: 2.1.2 appVersion: 1.23.1 maintainers: - name: gabrieladt diff --git a/stable/node-local-dns/README.md b/stable/node-local-dns/README.md index 2c686f61..ba1e59b9 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.1](https://img.shields.io/badge/Version-2.1.1-informational?style=flat-square) ![AppVersion: 1.23.1](https://img.shields.io/badge/AppVersion-1.23.1-informational?style=flat-square) +![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) 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.1 +helm install --generate-name oci://ghcr.io/deliveryhero/helm-charts/node-local-dns --version 2.1.2 ``` To install the chart with the release name `my-release`: @@ -63,6 +63,7 @@ helm install my-release oci://ghcr.io/deliveryhero/helm-charts/node-local-dns -f | config.setupInterface | bool | `true` | | | config.setupIptables | bool | `true` | | | config.skipTeardown | bool | `false` | | +| configMapAnnotations | object | `{}` | | | daemonsetAnnotations | object | `{}` | | | daemonsetLabels | object | `{}` | | | dashboard | object | `{"annotations":{},"enabled":false,"label":"grafana_dashboard","namespace":"kube-system"}` | https://github.com/grafana/helm-charts/blob/main/charts/grafana/README.md | diff --git a/stable/node-local-dns/templates/configmap.yaml b/stable/node-local-dns/templates/configmap.yaml index 11ec215c..f9486439 100644 --- a/stable/node-local-dns/templates/configmap.yaml +++ b/stable/node-local-dns/templates/configmap.yaml @@ -3,9 +3,11 @@ kind: ConfigMap metadata: name: {{ include "node-local-dns.fullname" . }} namespace: kube-system - labels: - addonmanager.kubernetes.io/mode: Reconcile - {{- include "node-local-dns.labels" . | nindent 4 }} + labels: {{- include "node-local-dns.labels" . | nindent 4 }} + annotations: + {{- with $.Values.configMapAnnotations.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} data: Corefile: | {{- if .Values.config.customConfig -}} diff --git a/stable/node-local-dns/values.yaml b/stable/node-local-dns/values.yaml index 30905567..4bd4f737 100644 --- a/stable/node-local-dns/values.yaml +++ b/stable/node-local-dns/values.yaml @@ -67,6 +67,8 @@ podAnnotations: {} podLabels: {} +configMapAnnotations: {} + daemonsetAnnotations: {} daemonsetLabels: {} From 71ba839ee20e86be80035a843c718303e9060437 Mon Sep 17 00:00:00 2001 From: Joseph McGinley Date: Wed, 11 Dec 2024 10:45:15 -0500 Subject: [PATCH 2/4] Make labels configurable too --- stable/node-local-dns/templates/configmap.yaml | 12 ++++++++---- stable/node-local-dns/values.yaml | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/stable/node-local-dns/templates/configmap.yaml b/stable/node-local-dns/templates/configmap.yaml index f9486439..54c137f2 100644 --- a/stable/node-local-dns/templates/configmap.yaml +++ b/stable/node-local-dns/templates/configmap.yaml @@ -3,11 +3,15 @@ kind: ConfigMap metadata: name: {{ include "node-local-dns.fullname" . }} namespace: kube-system - labels: {{- include "node-local-dns.labels" . | nindent 4 }} + {{- with .Values.configMapAnnotations }} annotations: - {{- with $.Values.configMapAnnotations.annotations }} - {{- toYaml . | nindent 4 }} - {{- end }} + {{- toYaml . | nindent 4 }} + {{- end }} + labels: + {{- include "node-local-dns.labels" . | nindent 4 }} + {{- with .Values.configMapLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} data: Corefile: | {{- if .Values.config.customConfig -}} diff --git a/stable/node-local-dns/values.yaml b/stable/node-local-dns/values.yaml index 4bd4f737..0ac2d296 100644 --- a/stable/node-local-dns/values.yaml +++ b/stable/node-local-dns/values.yaml @@ -69,6 +69,8 @@ podLabels: {} configMapAnnotations: {} +configMapLabels: {} + daemonsetAnnotations: {} daemonsetLabels: {} From a3de34de098a424afcbdc5a6cfc750b3a823b4ed Mon Sep 17 00:00:00 2001 From: Joseph McGinley Date: Wed, 11 Dec 2024 11:06:54 -0500 Subject: [PATCH 3/4] Re-update docs after making labels configurable --- stable/node-local-dns/README.md | 42 ++++++--------------------------- 1 file changed, 7 insertions(+), 35 deletions(-) diff --git a/stable/node-local-dns/README.md b/stable/node-local-dns/README.md index ba1e59b9..d4af670f 100644 --- a/stable/node-local-dns/README.md +++ b/stable/node-local-dns/README.md @@ -12,37 +12,11 @@ Further documentation is [here](https://kubernetes.io/docs/tasks/administer-clus This helm chart works for both kube-proxy setups (iptables or ipvs). -## How to install this chart - -A simple install with default values, latest chart version and generated name: - -```console -helm install --generate-name oci://ghcr.io/deliveryhero/helm-charts/node-local-dns -``` - -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 -``` - -To install the chart with the release name `my-release`: - -```console -helm install my-release oci://ghcr.io/deliveryhero/helm-charts/node-local-dns -``` - -To install with some set values: - -```console -helm install my-release oci://ghcr.io/deliveryhero/helm-charts/node-local-dns --set values_key1=value1 --set values_key2=value2 -``` - -To install with custom values file: +## Maintainers -```console -helm install my-release oci://ghcr.io/deliveryhero/helm-charts/node-local-dns -f values.yaml -``` +| Name | Email | Url | +| ---- | ------ | --- | +| gabrieladt | | | ## Values @@ -64,6 +38,7 @@ helm install my-release oci://ghcr.io/deliveryhero/helm-charts/node-local-dns -f | config.setupIptables | bool | `true` | | | config.skipTeardown | bool | `false` | | | configMapAnnotations | object | `{}` | | +| configMapLabels | object | `{}` | | | daemonsetAnnotations | object | `{}` | | | daemonsetLabels | object | `{}` | | | dashboard | object | `{"annotations":{},"enabled":false,"label":"grafana_dashboard","namespace":"kube-system"}` | https://github.com/grafana/helm-charts/blob/main/charts/grafana/README.md | @@ -90,8 +65,5 @@ helm install my-release oci://ghcr.io/deliveryhero/helm-charts/node-local-dns -f | 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) | -## Maintainers - -| Name | Email | Url | -| ---- | ------ | --- | -| gabrieladt | | | +---------------------------------------------- +Autogenerated from chart metadata using [helm-docs v1.11.3](https://github.com/norwoodj/helm-docs/releases/v1.11.3) From 962d69e3b8a58db7686ef981fe6151ff72d68822 Mon Sep 17 00:00:00 2001 From: Joseph McGinley Date: Wed, 11 Dec 2024 12:52:03 -0500 Subject: [PATCH 4/4] Fix readme --- stable/node-local-dns/README.md | 41 ++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/stable/node-local-dns/README.md b/stable/node-local-dns/README.md index d4af670f..50ae6510 100644 --- a/stable/node-local-dns/README.md +++ b/stable/node-local-dns/README.md @@ -12,11 +12,37 @@ Further documentation is [here](https://kubernetes.io/docs/tasks/administer-clus This helm chart works for both kube-proxy setups (iptables or ipvs). -## Maintainers +## How to install this chart -| Name | Email | Url | -| ---- | ------ | --- | -| gabrieladt | | | +A simple install with default values, latest chart version and generated name: + +```console +helm install --generate-name oci://ghcr.io/deliveryhero/helm-charts/node-local-dns +``` + +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 +``` + +To install the chart with the release name `my-release`: + +```console +helm install my-release oci://ghcr.io/deliveryhero/helm-charts/node-local-dns +``` + +To install with some set values: + +```console +helm install my-release oci://ghcr.io/deliveryhero/helm-charts/node-local-dns --set values_key1=value1 --set values_key2=value2 +``` + +To install with custom values file: + +```console +helm install my-release oci://ghcr.io/deliveryhero/helm-charts/node-local-dns -f values.yaml +``` ## Values @@ -65,5 +91,8 @@ This helm chart works for both kube-proxy setups (iptables or ipvs). | 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) | ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.11.3](https://github.com/norwoodj/helm-docs/releases/v1.11.3) +## Maintainers + +| Name | Email | Url | +| ---- | ------ | --- | +| gabrieladt | | |