From 4a5b524b98c2dc23009913ade3c1ecdffa9a7000 Mon Sep 17 00:00:00 2001
From: Ricky Kwan <rickyk.162@gmail.com>
Date: Thu, 27 Mar 2025 07:14:34 -0400
Subject: [PATCH] Ensure metrics port exists for
 nodelocaldns/nodelocaldns-second daemonsets (#11998)

- update metrics port to use port variable
- unconditionally define ports
---
 .../ansible/templates/nodelocaldns-daemonset.yml.j2          | 5 ++---
 .../ansible/templates/nodelocaldns-second-daemonset.yml.j2   | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2 b/roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2
index 6e1dda36a..723243b57 100644
--- a/roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/nodelocaldns-daemonset.yml.j2
@@ -47,7 +47,7 @@ spec:
         - coredns
 {% if enable_nodelocaldns_secondary %}
         - -skipteardown
-{% else %}
+{% endif %}
         ports:
         - containerPort: 53
           name: dns
@@ -55,10 +55,9 @@ spec:
         - containerPort: 53
           name: dns-tcp
           protocol: TCP
-        - containerPort: 9253
+        - containerPort: {{ nodelocaldns_prometheus_port }}
           name: metrics
           protocol: TCP
-{% endif %}
         securityContext:
           privileged: true
 {% if nodelocaldns_bind_metrics_host_ip %}
diff --git a/roles/kubernetes-apps/ansible/templates/nodelocaldns-second-daemonset.yml.j2 b/roles/kubernetes-apps/ansible/templates/nodelocaldns-second-daemonset.yml.j2
index df9405e4d..76eecef33 100644
--- a/roles/kubernetes-apps/ansible/templates/nodelocaldns-second-daemonset.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/nodelocaldns-second-daemonset.yml.j2
@@ -39,6 +39,10 @@ spec:
             cpu: {{ nodelocaldns_cpu_requests }}
             memory: {{ nodelocaldns_memory_requests }}
         args: [ "-localip", "{{ nodelocaldns_ip }}", "-conf", "/etc/coredns/Corefile", "-upstreamsvc", "coredns", "-skipteardown" ]
+        ports:
+        - containerPort: {{ nodelocaldns_secondary_prometheus_port }}
+          name: metrics
+          protocol: TCP
         securityContext:
           privileged: true
 {% if nodelocaldns_bind_metrics_host_ip %}