use slices.DeleteFunc to remove init container

Signed-off-by: Benedikt Bongartz <[email protected]>

Author: frzifus

pkg/sidecar/pod.go

@@ -17,6 +17,7 @@ package sidecar
 
 import (
 	"fmt"
+	"slices"
 
 	"github.com/go-logr/logr"
 	corev1 "k8s.io/api/core/v1"
@@ -83,15 +84,13 @@ func remove(pod corev1.Pod) corev1.Pod {
 	}
 	pod.Spec.Containers = containers
 
-	// NOTE: we also remove init containers (native sidecars) since k8s 1.28.
-	// This should have no side effects.
-	var initContainers []corev1.Container
-	for _, initContainer := range pod.Spec.InitContainers {
-		if initContainer.Name != naming.Container() {
-			initContainers = append(initContainers, initContainer)
-		}
+	if featuregate.EnableNativeSidecarContainers.IsEnabled() {
+		// NOTE: we also remove init containers (native sidecars) since k8s 1.28.
+		// This should have no side effects.
+		pod.Spec.InitContainers = slices.DeleteFunc(pod.Spec.InitContainers, func(c corev1.Container) bool {
+			return c.Name == naming.Container()
+		})
 	}
-	pod.Spec.InitContainers = initContainers
 	return pod
 }