epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2025-12-13 21:34:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ensure metrics port exists for nodelocaldns/nodelocaldns-second daemonsets (#11998)

Browse Source 
- update metrics port to use port variable
- unconditionally define ports
This commit is contained in:
Ricky Kwan
2025-03-27 07:14:34 -04:00
committed by GitHub
parent aa0c0851f8
commit 4a5b524b98
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2
View File

@@ -47,7 +47,7 @@ spec:
- coredns - coredns
{% if enable_nodelocaldns_secondary %} {% if enable_nodelocaldns_secondary %}
- -skipteardown - -skipteardown
{% else %} {% endif %}
ports: ports:
- containerPort: 53 - containerPort: 53
name: dns name: dns
@@ -55,10 +55,9 @@ spec:
- containerPort: 53 - containerPort: 53
name: dns-tcp name: dns-tcp
protocol: TCP protocol: TCP
- containerPort: 9253 - containerPort: {{ nodelocaldns_prometheus_port }}
name: metrics name: metrics
protocol: TCP protocol: TCP
{% endif %}
securityContext: securityContext:
privileged: true privileged: true
{% if nodelocaldns_bind_metrics_host_ip %} {% if nodelocaldns_bind_metrics_host_ip %}

4
roles/kubernetes-apps/ansible/templates/nodelocaldns-second-daemonset.yml.j2
View File

@@ -39,6 +39,10 @@ spec:
cpu: {{ nodelocaldns_cpu_requests }} cpu: {{ nodelocaldns_cpu_requests }}
memory: {{ nodelocaldns_memory_requests }} memory: {{ nodelocaldns_memory_requests }}
args: [ "-localip", "{{ nodelocaldns_ip }}", "-conf", "/etc/coredns/Corefile", "-upstreamsvc", "coredns", "-skipteardown" ] args: [ "-localip", "{{ nodelocaldns_ip }}", "-conf", "/etc/coredns/Corefile", "-upstreamsvc", "coredns", "-skipteardown" ]
ports:
- containerPort: {{ nodelocaldns_secondary_prometheus_port }}
name: metrics
protocol: TCP
securityContext: securityContext:
privileged: true privileged: true
{% if nodelocaldns_bind_metrics_host_ip %} {% if nodelocaldns_bind_metrics_host_ip %}