Fix injection check for existing sidecars

the-wondersmith · Apr 23, 2024 · a8ebe76 · a8ebe76
1 parent 44e9625
commit a8ebe76
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/pkg/healthcheck/sidecar.go b/pkg/healthcheck/sidecar.go
@@ -10,7 +10,8 @@ import (
 // HasExistingSidecars returns true if the pod spec already has the proxy init
 // and sidecar containers injected. Otherwise, it returns false.
 func HasExistingSidecars(podSpec *corev1.PodSpec) bool {
-	for _, container := range podSpec.Containers {
+	containers := append(podSpec.InitContainers, podSpec.Containers...)
+	for _, container := range containers {
 		if strings.HasPrefix(container.Image, "cr.l5d.io/linkerd/proxy:") ||
 			strings.HasPrefix(container.Image, "gcr.io/istio-release/proxyv2:") ||
 			container.Name == k8s.ProxyContainerName ||

diff --git a/pkg/healthcheck/sidecar_test.go b/pkg/healthcheck/sidecar_test.go
@@ -44,6 +44,16 @@ func TestHasExistingSidecars(t *testing.T) {
 			},
 			expected: true,
 		},
+		{
+			podSpec: &corev1.PodSpec{
+				InitContainers: []corev1.Container{
+					{
+						Name: k8s.ProxyContainerName,
+					},
+				},
+			},
+			expected: true,
+		},
 		{
 			podSpec: &corev1.PodSpec{
 				Containers: []corev1.Container{