Add HOST_IP environment variable to consul_dataplane_sidecar.go (#4277)

* Add HOST_IP environment variable to consul_dataplane_sidecar.go This environment variable must be set in order to utilize HOST_IP as part of statsd or dogstatsd sinks. If this variable is unset and the sink is configured to use HOST_IP, the sidecar won't start and pods won't coe up healthy. * Update consul_dataplane_sidecar.go * Add tests * Add changelog entry * fix changelog * webhook v2 * Update consul_dataplane_sidecar_test.go * Update .changelog/3916.txt Co-authored-by: Nathan Coleman <nathandanielcoleman@gmail.com> * Rename 3916.txt to 4277.txt --------- Co-authored-by: Jeff <woz5999@gmail.com> Co-authored-by: woz5999 <jeff.wozniak@umbra.space>
hashicorp · Aug 30, 2024 · 2ed5fd8 · 2ed5fd8
1 parent 1164953
commit 2ed5fd8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/.changelog/4277.txt b/.changelog/4277.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+control-plane: add missing `$HOST_IP` environment variable to consul-dataplane sidecar containers
+```
diff --git a/control-plane/connect-inject/webhook/consul_dataplane_sidecar.go b/control-plane/connect-inject/webhook/consul_dataplane_sidecar.go
@@ -153,6 +153,12 @@ func (w *MeshWebhook) consulDataplaneSidecar(namespace corev1.Namespace, pod cor
 				Name:  "DP_CREDENTIAL_LOGIN_META2",
 				Value: "pod-uid=$(POD_UID)",
 			},
+			{
+				Name: "HOST_IP",
+				ValueFrom: &corev1.EnvVarSource{
+					FieldRef: &corev1.ObjectFieldSelector{FieldPath: "status.hostIP"},
+				},
+			},
 		},
 		VolumeMounts: []corev1.VolumeMount{
 			{

diff --git a/control-plane/connect-inject/webhook/consul_dataplane_sidecar_test.go b/control-plane/connect-inject/webhook/consul_dataplane_sidecar_test.go
@@ -221,7 +221,7 @@ func TestHandlerConsulDataplaneSidecar(t *testing.T) {
 			}
 			require.Equal(t, expectedProbe, container.ReadinessProbe)
 			require.Nil(t, container.StartupProbe)
-			require.Len(t, container.Env, 9)
+			require.Len(t, container.Env, 10)
 			require.Equal(t, container.Env[0].Name, "TMPDIR")
 			require.Equal(t, container.Env[0].Value, "/consul/connect-inject")
 			require.Equal(t, container.Env[2].Name, "DP_SERVICE_NODE_NAME")
@@ -235,6 +235,7 @@ func TestHandlerConsulDataplaneSidecar(t *testing.T) {
 			require.Equal(t, container.Env[7].Value, "pod=$(POD_NAMESPACE)/$(POD_NAME)")
 			require.Equal(t, container.Env[8].Name, "DP_CREDENTIAL_LOGIN_META2")
 			require.Equal(t, container.Env[8].Value, "pod-uid=$(POD_UID)")
+			require.Equal(t, container.Env[9].Name, "HOST_IP")
 		})
 	}
 }