Merge pull request #7569 from sapcc/d073579/unbound-maintenance

[unbound] make unbound listen on multiple ports
sapcc · Dec 18, 2024 · f1b00ae · f1b00ae
2 parents 9f17ef9 + 7ea69d9
commit f1b00ae
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/system/unbound/templates/config.yaml b/system/unbound/templates/config.yaml
@@ -18,8 +18,12 @@ data:
 
         module-config: {{ $unbound_modules | quote }}
 
-        interface: {{.Values.unbound.interface}}
-        port: 53
+        # let unbound listen on all the ports we've defined as external
+        # so that we can map them one-to-one
+{{- range $.Values.unbound.externalPorts | required ".Values.unbound.externalPorts missing" }}
+        interface: {{$.Values.unbound.interface}}@{{.}}
+{{- end }}
+
         do-ip4: yes
         do-ip6: no
         do-udp: yes

diff --git a/system/unbound/templates/deployment.yaml b/system/unbound/templates/deployment.yaml
@@ -47,12 +47,14 @@ spec:
         securityContext:
          privileged: true
         ports:
-          - name: dns-tcp
-            containerPort: 53
+{{- range $.Values.unbound.externalPorts | required "externalPorts missing" }}
+          - name: dns-tcp-{{.}}
+            containerPort: {{.}}
             protocol: TCP
-          - name: dns-udp
-            containerPort: 53
+          - name: dns-udp-{{.}}
+            containerPort: {{.}}
             protocol: UDP
+{{- end }}
         volumeMounts:
           - name: unbound-conf
             mountPath: /etc/unbound

diff --git a/system/unbound/templates/service.yaml b/system/unbound/templates/service.yaml
@@ -19,11 +19,11 @@ spec:
     - name: dns-tcp-{{.}}
       protocol: TCP
       port: {{.}}
-      targetPort: dns-tcp
+      targetPort: dns-tcp-{{.}}
     - name: dns-udp-{{.}}
       protocol: UDP
       port: {{.}}
-      targetPort: dns-udp
+      targetPort: dns-udp-{{.}}
 {{- end }}
   externalIPs:
     {{- required "A valid .Values.unbound.externalIPs required!" .Values.unbound.externalIPs | toYaml | nindent 2 }}