Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add HOST_IP environment variable to consul_dataplane_sidecar.go #4277

Merged
merged 10 commits into from
Aug 30, 2024
Merged

Add HOST_IP environment variable to consul_dataplane_sidecar.go #4277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6982b65
Add HOST_IP environment variable to consul_dataplane_sidecar.go
woz5999 Apr 16, 2024
63df118
Update consul_dataplane_sidecar.go
woz5999 Apr 16, 2024
fadb91e
Add tests
woz5999 Apr 16, 2024
6e07105
Add changelog entry
woz5999 Apr 16, 2024
7f7aa40
fix changelog
woz5999 Apr 16, 2024
2bae8a5
webhook v2
woz5999 Apr 16, 2024
f20395b
Update consul_dataplane_sidecar_test.go
woz5999 Apr 16, 2024
cc1a640
Merge remote-tracking branch 'upstream/main'
woz5999 Aug 29, 2024
fbee95e
Update .changelog/3916.txt
woz5999 Aug 29, 2024
9dc8708
Rename 3916.txt to 4277.txt
nathancoleman Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/4277.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
control-plane: add missing `$HOST_IP` environment variable to consul-dataplane sidecar containers
```
6 changes: 6 additions & 0 deletions control-plane/connect-inject/webhook/consul_dataplane_sidecar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
{
Expand Down
3 changes: 2 additions & 1 deletion control-plane/connect-inject/webhook/consul_dataplane_sidecar_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
})
}
}
Expand Down
Loading