From 0a64d5892649b94e42bb0b5166f4fb332b85a370 Mon Sep 17 00:00:00 2001 From: Konstantin Konnov Date: Tue, 8 Aug 2023 18:31:38 +0300 Subject: [PATCH 1/3] extend daemonset arg list --- stable/node-local-dns/Chart.yaml | 2 +- stable/node-local-dns/README.md | 9 ++++++++- stable/node-local-dns/templates/daemonset.yaml | 16 +++++++++++++++- stable/node-local-dns/values.yaml | 12 ++++++++++++ 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/stable/node-local-dns/Chart.yaml b/stable/node-local-dns/Chart.yaml index edfb2553..a03a6934 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.3 +version: 1.1.4 appVersion: 1.22.20 maintainers: - name: gabrieladt diff --git a/stable/node-local-dns/README.md b/stable/node-local-dns/README.md index 2cc8fa49..e802d503 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.3](https://img.shields.io/badge/Version-1.1.3-informational?style=flat-square) ![AppVersion: 1.22.20](https://img.shields.io/badge/AppVersion-1.22.20-informational?style=flat-square) +![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) A chart to install node-local-dns. @@ -50,10 +50,17 @@ helm install my-release deliveryhero/node-local-dns -f values.yaml |-----|------|---------|-------------| | affinity | object | `{}` | | | config.commProtocol | string | `"force_tcp"` | | +| config.configArgs[0] | string | `"-localip"` | | +| config.configArgs[1] | string | `"-conf"` | | +| config.configArgs[2] | string | `"/etc/Corefile"` | | +| config.configArgs[3] | string | `"-upstreamsvc"` | | | config.dnsDomain | string | `"cluster.local"` | | | config.dnsServer | string | `"172.20.0.10"` | | | config.healthPort | int | `8080` | | | config.localDns | string | `"169.254.20.25"` | | +| config.setupInterface | object | `{}` | | +| config.setupIptables | object | `{}` | | +| config.skipTeardown | object | `{}` | | | dashboard.annotations | object | `{}` | | | dashboard.enabled | bool | `false` | | | dashboard.label | string | `"grafana_dashboard"` | | diff --git a/stable/node-local-dns/templates/daemonset.yaml b/stable/node-local-dns/templates/daemonset.yaml index 5e8dd544..bff18cf4 100644 --- a/stable/node-local-dns/templates/daemonset.yaml +++ b/stable/node-local-dns/templates/daemonset.yaml @@ -50,7 +50,21 @@ spec: {{- with .Values.resources }} resources: {{- toYaml . | nindent 10 }} {{- end }} - args: [ "-localip", "{{ .Values.config.localDns }},{{ .Values.config.dnsServer }}", "-conf", "/etc/Corefile", "-upstreamsvc", "{{ include "node-local-dns.fullname" . }}-upstream" ] + args: + {{- range .Values.configArgs }} + - {{ . }} + {{- end }} + - "{{ .Values.config.localDns }},{{ .Values.config.dnsServer }}" + - "{{ include "node-local-dns.fullname" . }}-upstream" + {{- if .Values.config.skipTeardown }} + - -skipteardown={{ .Values.config.skipTeardown }} + {{- end }} + {{- if .Values.config.setupInterface }} + - -setupinterface={{ .Values.config.setupInterface }} + {{- end }} + {{- if .Values.config.setupIptables }} + - -setupiptables={{ .Values.config.setupIptables }} + {{- end }} securityContext: {{- toYaml .Values.securityContext | nindent 10 }} ports: diff --git a/stable/node-local-dns/values.yaml b/stable/node-local-dns/values.yaml index 085e3fc7..5bcf7711 100644 --- a/stable/node-local-dns/values.yaml +++ b/stable/node-local-dns/values.yaml @@ -19,6 +19,18 @@ config: # Port used for the health endpoint healthPort: 8080 + setupInterface: {} + + setupIptables: {} + + skipTeardown: {} + + configArgs: + - "-localip" + - "-conf" + - "/etc/Corefile" + - "-upstreamsvc" + nameOverride: "" fullnameOverride: "" From 3b97be911095083e8e94e50d7a63e211639ca172 Mon Sep 17 00:00:00 2001 From: kkonnov Date: Thu, 10 Aug 2023 18:17:59 +0300 Subject: [PATCH 2/3] set boolean default values --- stable/node-local-dns/templates/daemonset.yaml | 6 ------ stable/node-local-dns/values.yaml | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/stable/node-local-dns/templates/daemonset.yaml b/stable/node-local-dns/templates/daemonset.yaml index bff18cf4..afeda910 100644 --- a/stable/node-local-dns/templates/daemonset.yaml +++ b/stable/node-local-dns/templates/daemonset.yaml @@ -56,15 +56,9 @@ spec: {{- end }} - "{{ .Values.config.localDns }},{{ .Values.config.dnsServer }}" - "{{ include "node-local-dns.fullname" . }}-upstream" - {{- if .Values.config.skipTeardown }} - -skipteardown={{ .Values.config.skipTeardown }} - {{- end }} - {{- if .Values.config.setupInterface }} - -setupinterface={{ .Values.config.setupInterface }} - {{- end }} - {{- if .Values.config.setupIptables }} - -setupiptables={{ .Values.config.setupIptables }} - {{- end }} securityContext: {{- toYaml .Values.securityContext | nindent 10 }} ports: diff --git a/stable/node-local-dns/values.yaml b/stable/node-local-dns/values.yaml index 5bcf7711..50d2630b 100644 --- a/stable/node-local-dns/values.yaml +++ b/stable/node-local-dns/values.yaml @@ -19,11 +19,11 @@ config: # Port used for the health endpoint healthPort: 8080 - setupInterface: {} + setupInterface: false - setupIptables: {} + setupIptables: false - skipTeardown: {} + skipTeardown: true configArgs: - "-localip" From a39b00d17a5efcc5f517102d8409b179250c3220 Mon Sep 17 00:00:00 2001 From: kkonnov Date: Fri, 11 Aug 2023 16:20:20 +0300 Subject: [PATCH 3/3] change structure --- stable/node-local-dns/README.md | 10 +++------- stable/node-local-dns/templates/daemonset.yaml | 17 +++++++++-------- stable/node-local-dns/values.yaml | 6 ------ 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/stable/node-local-dns/README.md b/stable/node-local-dns/README.md index e802d503..0ae220f6 100644 --- a/stable/node-local-dns/README.md +++ b/stable/node-local-dns/README.md @@ -50,17 +50,13 @@ helm install my-release deliveryhero/node-local-dns -f values.yaml |-----|------|---------|-------------| | affinity | object | `{}` | | | config.commProtocol | string | `"force_tcp"` | | -| config.configArgs[0] | string | `"-localip"` | | -| config.configArgs[1] | string | `"-conf"` | | -| config.configArgs[2] | string | `"/etc/Corefile"` | | -| config.configArgs[3] | string | `"-upstreamsvc"` | | | config.dnsDomain | string | `"cluster.local"` | | | config.dnsServer | string | `"172.20.0.10"` | | | config.healthPort | int | `8080` | | | config.localDns | string | `"169.254.20.25"` | | -| config.setupInterface | object | `{}` | | -| config.setupIptables | object | `{}` | | -| config.skipTeardown | object | `{}` | | +| config.setupInterface | bool | `false` | | +| config.setupIptables | bool | `false` | | +| config.skipTeardown | bool | `true` | | | dashboard.annotations | object | `{}` | | | dashboard.enabled | bool | `false` | | | dashboard.label | string | `"grafana_dashboard"` | | diff --git a/stable/node-local-dns/templates/daemonset.yaml b/stable/node-local-dns/templates/daemonset.yaml index afeda910..e293d0a8 100644 --- a/stable/node-local-dns/templates/daemonset.yaml +++ b/stable/node-local-dns/templates/daemonset.yaml @@ -51,14 +51,15 @@ spec: resources: {{- toYaml . | nindent 10 }} {{- end }} args: - {{- range .Values.configArgs }} - - {{ . }} - {{- end }} - - "{{ .Values.config.localDns }},{{ .Values.config.dnsServer }}" - - "{{ include "node-local-dns.fullname" . }}-upstream" - - -skipteardown={{ .Values.config.skipTeardown }} - - -setupinterface={{ .Values.config.setupInterface }} - - -setupiptables={{ .Values.config.setupIptables }} + - "-localip" + - "{{ .Values.config.localDns }},{{ .Values.config.dnsServer }}" + - "-conf" + - "/etc/Corefile" + - "-upstreamsvc" + - "{{ include "node-local-dns.fullname" . }}-upstream" + - "-skipteardown={{ .Values.config.skipTeardown }}" + - "-setupinterface={{ .Values.config.setupInterface }}" + - "-setupiptables={{ .Values.config.setupIptables }}" securityContext: {{- toYaml .Values.securityContext | nindent 10 }} ports: diff --git a/stable/node-local-dns/values.yaml b/stable/node-local-dns/values.yaml index 50d2630b..493f1c39 100644 --- a/stable/node-local-dns/values.yaml +++ b/stable/node-local-dns/values.yaml @@ -25,12 +25,6 @@ config: skipTeardown: true - configArgs: - - "-localip" - - "-conf" - - "/etc/Corefile" - - "-upstreamsvc" - nameOverride: "" fullnameOverride: ""