Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable/node-local-dns] Changes for cilium local redirect support #510

Merged
merged 11 commits into from
Aug 30, 2023
Merged

[stable/node-local-dns] Changes for cilium local redirect support #510

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4288d21
add .config.dnsServer to -localip only if config.setupIptables is true
STASiAN Aug 29, 2023
9ce892b
Merge branch 'master' into hotfix/use-dnsServer-only-if-iptables-true
STASiAN Aug 29, 2023
a01c4e0
bind on config.dnsServer ip only if config.setupIptables is true
STASiAN Aug 29, 2023
3bcbecb
change defaults args to return iptables compatibility
STASiAN Aug 29, 2023
cc2ded4
bump Chart Version
STASiAN Aug 29, 2023
dc276f9
simplify daemonset and configmap by using bind 0.0.0.0 and default he…
STASiAN Aug 29, 2023
3cd1942
add NET_ADMIN capability only if setupIptables is true
STASiAN Aug 29, 2023
8f47aff
Update stable/node-local-dns/Chart.yaml
max-rocket-internet Aug 29, 2023
0840b8a
use hostNetwok only if config.setupIptables is true
STASiAN Aug 29, 2023
dc4f623
fix chart version in readme
STASiAN Aug 29, 2023
94a33d4
Merge branch 'master' into hotfix/use-dnsServer-only-if-iptables-true
max-rocket-internet Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions stable/node-local-dns/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: node-local-dns
version: 1.1.5
appVersion: 1.22.20
version: 1.2.0
max-rocket-internet marked this conversation as resolved.
Show resolved Hide resolved
appVersion: 1.22.23
maintainers:
- name: gabrieladt
email: no-reply@deliveryhero.com
Expand Down
9 changes: 4 additions & 5 deletions stable/node-local-dns/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# node-local-dns

![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)
![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![AppVersion: 1.22.23](https://img.shields.io/badge/AppVersion-1.22.23-informational?style=flat-square)

A chart to install node-local-dns.

Expand Down Expand Up @@ -52,11 +52,10 @@ helm install my-release deliveryhero/node-local-dns -f values.yaml
| config.commProtocol | string | `"force_tcp"` | |
| 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 | bool | `false` | |
| config.setupIptables | bool | `false` | |
| config.skipTeardown | bool | `true` | |
STASiAN marked this conversation as resolved.
Show resolved Hide resolved
| config.setupInterface | bool | `true` | |
| config.setupIptables | bool | `true` | |
| config.skipTeardown | bool | `false` | |
| daemonsetAnnotations | object | `{}` | |
| daemonsetLabels | object | `{}` | |
| dashboard.annotations | object | `{}` | |
Expand Down
10 changes: 5 additions & 5 deletions stable/node-local-dns/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ data:
}
reload
loop
bind {{ .Values.config.localDns }} {{ .Values.config.dnsServer }}
bind 0.0.0.0
forward . __PILLAR__CLUSTER__DNS__ {
{{ .Values.config.commProtocol }}
}
prometheus :9253
health {{ .Values.config.localDns }}:{{ .Values.config.healthPort }}
health
}
in-addr.arpa:53 {
errors
cache 30
reload
loop
bind {{ .Values.config.localDns }} {{ .Values.config.dnsServer }}
bind 0.0.0.0
forward . __PILLAR__CLUSTER__DNS__ {
{{ .Values.config.commProtocol }}
}
Expand All @@ -39,7 +39,7 @@ data:
cache 30
reload
loop
bind {{ .Values.config.localDns }} {{ .Values.config.dnsServer }}
bind 0.0.0.0
forward . __PILLAR__CLUSTER__DNS__ {
{{ .Values.config.commProtocol }}
}
Expand All @@ -50,7 +50,7 @@ data:
cache 30
reload
loop
bind {{ .Values.config.localDns }} {{ .Values.config.dnsServer }}
bind 0.0.0.0
forward . __PILLAR__UPSTREAM__SERVERS__
prometheus :9253
}
10 changes: 8 additions & 2 deletions stable/node-local-dns/templates/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,24 @@ spec:
resources: {{- toYaml . | nindent 10 }}
{{- end }}
args:
{{- if .Values.config.setupIptables }}
STASiAN marked this conversation as resolved.
Show resolved Hide resolved
- "-localip"
- "{{ .Values.config.localDns }},{{ .Values.config.dnsServer }}"
{{- else }}
- "-localip"
- "{{ .Values.config.localDns }}"
{{- end }}
- "-conf"
- "/etc/Corefile"
- "-upstreamsvc"
- "{{ include "node-local-dns.fullname" . }}-upstream"
- "-skipteardown={{ .Values.config.skipTeardown }}"
- "-setupinterface={{ .Values.config.setupInterface }}"
- "-setupiptables={{ .Values.config.setupIptables }}"
{{- if .Values.config.setupIptables }}
securityContext:
{{- toYaml .Values.securityContext | nindent 10 }}
{{- end }}
ports:
- containerPort: 53
name: dns
Expand All @@ -84,9 +91,8 @@ spec:
protocol: TCP
livenessProbe:
httpGet:
host: {{ .Values.config.localDns }}
path: /health
port: {{ .Values.config.healthPort }}
port: 8080
initialDelaySeconds: 60
timeoutSeconds: 5
volumeMounts:
Expand Down
9 changes: 3 additions & 6 deletions stable/node-local-dns/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,11 @@ config:
# Set communication protocol. Options are `prefer_udp` or `force_tcp`
commProtocol: "force_tcp"

# Port used for the health endpoint
healthPort: 8080
setupInterface: true

setupInterface: false
setupIptables: true

setupIptables: false

skipTeardown: true
skipTeardown: false

nameOverride: ""
fullnameOverride: ""
Expand Down
Loading