nodelocaldns: allow binding metrics address to host IP (#7748)

This commit is contained in:
Cristian Calin 2021-06-29 15:28:41 +03:00 committed by GitHub
parent e3850fbbbc
commit bd6d810d0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 5 deletions

View file

@ -166,6 +166,7 @@ dns_mode: coredns
enable_nodelocaldns: true enable_nodelocaldns: true
nodelocaldns_ip: 169.254.25.10 nodelocaldns_ip: 169.254.25.10
nodelocaldns_health_port: 9254 nodelocaldns_health_port: 9254
nodelocaldns_bind_metrics_host_ip: false
# nodelocaldns_external_zones: # nodelocaldns_external_zones:
# - zones: # - zones:
# - example.com # - example.com

View file

@ -17,7 +17,7 @@ data:
loop loop
bind {{ nodelocaldns_ip }} bind {{ nodelocaldns_ip }}
forward . {{ block['nameservers'] | join(' ') }} forward . {{ block['nameservers'] | join(' ') }}
prometheus :9253 prometheus {% if nodelocaldns_bind_metrics_host_ip %}{$MY_HOST_IP}{% endif %}:9253
log log
{% if dns_etchosts | default(None) %} {% if dns_etchosts | default(None) %}
hosts /etc/coredns/hosts { hosts /etc/coredns/hosts {
@ -39,7 +39,7 @@ data:
forward . {{ forwardTarget }} { forward . {{ forwardTarget }} {
force_tcp force_tcp
} }
prometheus :9253 prometheus {% if nodelocaldns_bind_metrics_host_ip %}{$MY_HOST_IP}{% endif %}:9253
health {{ nodelocaldns_ip }}:{{ nodelocaldns_health_port }} health {{ nodelocaldns_ip }}:{{ nodelocaldns_health_port }}
{% if dns_etchosts | default(None) %} {% if dns_etchosts | default(None) %}
hosts /etc/coredns/hosts { hosts /etc/coredns/hosts {
@ -56,7 +56,7 @@ data:
forward . {{ forwardTarget }} { forward . {{ forwardTarget }} {
force_tcp force_tcp
} }
prometheus :9253 prometheus {% if nodelocaldns_bind_metrics_host_ip %}{$MY_HOST_IP}{% endif %}:9253
} }
ip6.arpa:53 { ip6.arpa:53 {
errors errors
@ -67,7 +67,7 @@ data:
forward . {{ forwardTarget }} { forward . {{ forwardTarget }} {
force_tcp force_tcp
} }
prometheus :9253 prometheus {% if nodelocaldns_bind_metrics_host_ip %}{$MY_HOST_IP}{% endif %}:9253
} }
.:53 { .:53 {
errors errors
@ -76,7 +76,7 @@ data:
loop loop
bind {{ nodelocaldns_ip }} bind {{ nodelocaldns_ip }}
forward . {{ upstreamForwardTarget }} forward . {{ upstreamForwardTarget }}
prometheus :9253 prometheus {% if nodelocaldns_bind_metrics_host_ip %}{$MY_HOST_IP}{% endif %}:9253
{% if dns_etchosts | default(None) %} {% if dns_etchosts | default(None) %}
hosts /etc/coredns/hosts { hosts /etc/coredns/hosts {
fallthrough fallthrough

View file

@ -41,6 +41,13 @@ spec:
args: [ "-localip", "{{ nodelocaldns_ip }}", "-conf", "/etc/coredns/Corefile", "-upstreamsvc", "coredns" ] args: [ "-localip", "{{ nodelocaldns_ip }}", "-conf", "/etc/coredns/Corefile", "-upstreamsvc", "coredns" ]
securityContext: securityContext:
privileged: true privileged: true
{% if nodelocaldns_bind_metrics_host_ip %}
env:
- name: MY_HOST_IP
valueFrom:
fieldRef:
fieldPath: status.hostIP
{% endif %}
ports: ports:
- containerPort: 53 - containerPort: 53
name: dns name: dns

View file

@ -89,6 +89,7 @@ dns_mode: coredns
enable_nodelocaldns: true enable_nodelocaldns: true
nodelocaldns_ip: 169.254.25.10 nodelocaldns_ip: 169.254.25.10
nodelocaldns_health_port: 9254 nodelocaldns_health_port: 9254
nodelocaldns_bind_metrics_host_ip: false
# Should be set to a cluster IP if using a custom cluster DNS # Should be set to a cluster IP if using a custom cluster DNS
manual_dns_server: "" manual_dns_server: ""