Add TCP port to Lighthouse CoreDNS ClusterIP service

Define TCP port in ClusterIP service to allow k8s DNS server to forward TCP connection requests. Lighthouse CoreDNS pods already support TCP on port 53. This is needed to support TCP retries after truncation per RFC1035 and RFC2181. Signed-off-by: Tony Le <[email protected]>
submariner-io · Sep 11, 2024 · 9a37cd1 · 9a37cd1
1 parent ab6aed4
commit 9a37cd1
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/controllers/servicediscovery/servicediscovery_controller.go b/controllers/servicediscovery/servicediscovery_controller.go
@@ -387,15 +387,26 @@ func newLighthouseCoreDNSService(cr *submarinerv1alpha1.ServiceDiscovery) *corev
 			Labels:    labels,
 		},
 		Spec: corev1.ServiceSpec{
-			Ports: []corev1.ServicePort{{
-				Name:     "udp",
-				Protocol: "UDP",
-				Port:     53,
-				TargetPort: intstr.IntOrString{
-					Type:   intstr.Int,
-					IntVal: 53,
+			Ports: []corev1.ServicePort{
+				{
+					Name:     "udp",
+					Protocol: "UDP",
+					Port:     53,
+					TargetPort: intstr.IntOrString{
+						Type:   intstr.Int,
+						IntVal: 53,
+					},
+				},
+				{
+					Name:     "tcp",
+					Protocol: "TCP",
+					Port:     53,
+					TargetPort: intstr.IntOrString{
+						Type:   intstr.Int,
+						IntVal: 53,
+					},
 				},
-			}},
+			},
 			Type: corev1.ServiceTypeClusterIP,
 			Selector: map[string]string{
 				"app": names.LighthouseCoreDNSComponent,

diff --git a/controllers/servicediscovery/servicediscovery_suite_test.go b/controllers/servicediscovery/servicediscovery_suite_test.go
@@ -234,10 +234,13 @@ func (t *testDriver) assertLighthouseCoreDNSService(ctx context.Context) *corev1
 		service)).To(Succeed())
 
 	Expect(service.Labels).To(HaveKeyWithValue("app", lighthouseDNSServiceName))
-	Expect(service.Spec.Ports).To(HaveLen(1))
+	Expect(service.Spec.Ports).To(HaveLen(2))
 	Expect(service.Spec.Ports[0].Protocol).To(Equal(corev1.Protocol("UDP")))
 	Expect(service.Spec.Ports[0].Port).To(Equal(int32(53)))
 	Expect(service.Spec.Ports[0].TargetPort.IntVal).To(Equal(int32(53)))
+	Expect(service.Spec.Ports[1].Protocol).To(Equal(corev1.Protocol("TCP")))
+	Expect(service.Spec.Ports[1].Port).To(Equal(int32(53)))
+	Expect(service.Spec.Ports[1].TargetPort.IntVal).To(Equal(int32(53)))
 
 	return service
 }