From f9df64a5f9436811fa0c052fd6012982ad22851e Mon Sep 17 00:00:00 2001
From: Benedikt Bongartz <bongartz@klimlive.de>
Date: Mon, 14 Oct 2024 21:54:56 +0200
Subject: [PATCH] apply recommendations

Signed-off-by: Benedikt Bongartz <bongartz@klimlive.de>
---
 pkg/sidecar/pod.go                       | 12 ++++++------
 pkg/sidecar/pod_test.go                  |  6 +++---
 tests/e2e-native-sidecar/00-assert.yaml  |  1 +
 tests/e2e-native-sidecar/00-install.yaml |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkg/sidecar/pod.go b/pkg/sidecar/pod.go
index f019d760c9..d7a99918df 100644
--- a/pkg/sidecar/pod.go
+++ b/pkg/sidecar/pod.go
@@ -70,34 +70,34 @@ func add(cfg config.Config, logger logr.Logger, otelcol v1beta1.OpenTelemetryCol
 	return pod, nil
 }
 
+func isOtelColContainer(c corev1.Container) bool { return c.Name == naming.Container() }
+
 // remove the sidecar container from the given pod.
 func remove(pod corev1.Pod) corev1.Pod {
 	if !existsIn(pod) {
 		return pod
 	}
 
-	fn := func(c corev1.Container) bool { return c.Name == naming.Container() }
-	pod.Spec.Containers = slices.DeleteFunc(pod.Spec.Containers, fn)
+	pod.Spec.Containers = slices.DeleteFunc(pod.Spec.Containers, isOtelColContainer)
 
 	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, fn)
+		pod.Spec.InitContainers = slices.DeleteFunc(pod.Spec.InitContainers, isOtelColContainer)
 	}
 	return pod
 }
 
 // existsIn checks whether a sidecar container exists in the given pod.
 func existsIn(pod corev1.Pod) bool {
-	fn := func(c corev1.Container) bool { return c.Name == naming.Container() }
-	if slices.ContainsFunc(pod.Spec.Containers, fn) {
+	if slices.ContainsFunc(pod.Spec.Containers, isOtelColContainer) {
 		return true
 	}
 
 	if featuregate.EnableNativeSidecarContainers.IsEnabled() {
 		// NOTE: we also check init containers (native sidecars) since k8s 1.28.
 		// This should have no side effects.
-		if slices.ContainsFunc(pod.Spec.InitContainers, fn) {
+		if slices.ContainsFunc(pod.Spec.InitContainers, isOtelColContainer) {
 			return true
 		}
 	}
diff --git a/pkg/sidecar/pod_test.go b/pkg/sidecar/pod_test.go
index 4141137b94..58c0de9841 100644
--- a/pkg/sidecar/pod_test.go
+++ b/pkg/sidecar/pod_test.go
@@ -32,7 +32,7 @@ import (
 
 var logger = logf.Log.WithName("unit-tests")
 
-func sidecarFeatureGate(t *testing.T) {
+func enableSidecarFeatureGate(t *testing.T) {
 	originalVal := featuregate.EnableNativeSidecarContainers.IsEnabled()
 	t.Logf("original is: %+v", originalVal)
 	require.NoError(t, colfeaturegate.GlobalRegistry().Set(featuregate.EnableNativeSidecarContainers.ID(), true))
@@ -42,7 +42,7 @@ func sidecarFeatureGate(t *testing.T) {
 }
 
 func TestAddNativeSidecar(t *testing.T) {
-	sidecarFeatureGate(t)
+	enableSidecarFeatureGate(t)
 	// prepare
 	pod := corev1.Pod{
 		Spec: corev1.PodSpec{
@@ -269,7 +269,7 @@ func TestRemoveNonExistingSidecar(t *testing.T) {
 }
 
 func TestExistsIn(t *testing.T) {
-	sidecarFeatureGate(t)
+	enableSidecarFeatureGate(t)
 
 	for _, tt := range []struct {
 		desc     string
diff --git a/tests/e2e-native-sidecar/00-assert.yaml b/tests/e2e-native-sidecar/00-assert.yaml
index 8e67bb081e..823eaf2ad1 100644
--- a/tests/e2e-native-sidecar/00-assert.yaml
+++ b/tests/e2e-native-sidecar/00-assert.yaml
@@ -10,6 +10,7 @@ spec:
   - name: myapp
   initContainers:
   - name: otc-container
+    restartPolicy: Always
 status:
   containerStatuses:
   - name: myapp
diff --git a/tests/e2e-native-sidecar/00-install.yaml b/tests/e2e-native-sidecar/00-install.yaml
index e07768b415..82c54ffdf8 100644
--- a/tests/e2e-native-sidecar/00-install.yaml
+++ b/tests/e2e-native-sidecar/00-install.yaml
@@ -35,7 +35,7 @@ metadata:
 spec:
   containers:
   - name: myapp
-    image: jaegertracing/vertx-create-span:operator-e2e-tests
+    image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-python:main
     ports:
       - containerPort: 8080
         protocol: TCP