Merge pull request #809 from thomasferrandiz/fix-cilium-nodelocaldns

rke2-coredns: fix an issue where node-local-dns did not work with cilium and lrp

Author: thomasferrandiz

packages/rke2-coredns/generated-changes/overlay/templates/daemonset-nodelocal.yaml

@@ -33,11 +33,11 @@ spec:
       dnsPolicy: Default  # Don't use cluster DNS.
       tolerations:
       - operator: Exists
-{{- if eq .Values.nodelocal.ipvs false }}
+{{- if and (eq .Values.nodelocal.ipvs false) (eq .Values.nodelocal.use_cilium_lrp false) }}
       initContainers:
       - name: wait-coredns
         image: {{ template "system_default_registry" . }}{{ .Values.nodelocal.initimage.repository }}:{{ .Values.nodelocal.initimage.tag }}
-        command: ['sh', '-c', "until nc -zv -u {{ template "clusterDNSServerIP" . }} 53; do echo waiting for dns service; sleep 2; done"]
+        command: ['sh', '-c', 'until nc -zv -u {{ template "clusterDNSServerIP" . }} 53; do echo waiting for dns service; sleep 2; done']
 {{- end }}
       containers:
       - name: node-cache
@@ -62,10 +62,10 @@ spec:
           privileged: true
         ports:
         - containerPort: 53
-          name: udp-53
+          name: dns
           protocol: UDP
         - containerPort: 53
-          name: tcp-53
+          name: dns-tcp
           protocol: TCP
         - containerPort: 9253
           name: metrics

packages/rke2-coredns/generated-changes/overlay/templates/lrp-nodelocal.yaml

@@ -4,19 +4,26 @@ kind: CiliumLocalRedirectPolicy
 metadata:
   name: "lrp-nodelocal"
 spec:
+  skipRedirectFromBackend: true
   redirectFrontend:
-    serviceMatcher:
-      serviceName: {{ default (include "coredns.fullname" .) .Values.service.name }}
-      namespace: {{ .Release.Namespace }}
+    addressMatcher:
+      ip: "{{ template "clusterDNSServerIP" . }}"
+      toPorts:
+        - name: tcp-53
+          port: "53"
+          protocol: TCP
+        - name: udp-53
+          port: "53"
+          protocol: UDP
   redirectBackend:
     localEndpointSelector:
       matchLabels:
         k8s-app: node-local-dns
     toPorts:
       - port: "53"
-        name: udp-53
+        name: dns
         protocol: UDP
       - port: "53"
-        name: tcp-53
+        name: dns-tcp
         protocol: TCP
 {{- end }}

packages/rke2-coredns/package.yaml

@@ -1,2 +1,2 @@
 url: https://github.com/coredns/helm/releases/download/coredns-1.45.0/coredns-1.45.0.tgz
-packageVersion: 01
+packageVersion: 02