activate tproxy mode even when a cluster IP is not assigned to pod (#…

…3974) * activate tproxy mode even when a cluster IP is not assigned to pod. * add changelog * fix failing tests
hashicorp · May 8, 2024 · c11c201 · c11c201
1 parent 58f715a
commit c11c201
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.changelog/3974.txt b/.changelog/3974.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+Create Consul service with mode transparent-proxy even when a cluster IP is not assigned to the service..
+```
diff --git a/control-plane/connect-inject/controllers/endpoints/endpoints_controller.go b/control-plane/connect-inject/controllers/endpoints/endpoints_controller.go
@@ -582,7 +582,7 @@ func (r *Controller) createServiceRegistrations(pod corev1.Pod, serviceEndpoints
 
 	if tproxyEnabled {
 		var k8sService corev1.Service
-
+		proxyService.Proxy.Mode = api.ProxyModeTransparent
 		err = r.Client.Get(r.Context, types.NamespacedName{Name: serviceEndpoints.Name, Namespace: serviceEndpoints.Namespace}, &k8sService)
 		if err != nil {
 			return nil, nil, err
@@ -625,7 +625,6 @@ func (r *Controller) createServiceRegistrations(pod corev1.Pod, serviceEndpoints
 			service.TaggedAddresses = taggedAddresses
 			proxyService.TaggedAddresses = taggedAddresses
 
-			proxyService.Proxy.Mode = api.ProxyModeTransparent
 		} else {
 			r.Log.Info("skipping syncing service cluster IP to Consul", "name", k8sService.Name, "ns", k8sService.Namespace, "ip", k8sService.Spec.ClusterIP)
 		}

diff --git a/control-plane/connect-inject/controllers/endpoints/endpoints_controller_test.go b/control-plane/connect-inject/controllers/endpoints/endpoints_controller_test.go
@@ -5547,7 +5547,7 @@ func TestCreateServiceRegistrations_withTransparentProxy(t *testing.T) {
 					},
 				},
 			},
-			expProxyMode:       api.ProxyModeDefault,
+			expProxyMode:       api.ProxyModeTransparent,
 			expTaggedAddresses: nil,
 			expErr:             "",
 		},
@@ -5567,7 +5567,7 @@ func TestCreateServiceRegistrations_withTransparentProxy(t *testing.T) {
 					},
 				},
 			},
-			expProxyMode:       api.ProxyModeDefault,
+			expProxyMode:       api.ProxyModeTransparent,
 			expTaggedAddresses: nil,
 			expErr:             "",
 		},
@@ -5588,7 +5588,7 @@ func TestCreateServiceRegistrations_withTransparentProxy(t *testing.T) {
 				},
 			},
 			expTaggedAddresses: nil,
-			expProxyMode:       api.ProxyModeDefault,
+			expProxyMode:       api.ProxyModeTransparent,
 			expErr:             "",
 		},
 		"service with an IPv6 clusterIP": {