From 922b46f9f4be82c21b3b50094828bfd80850f61b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miko=C5=82aj=20=C5=9Awi=C4=85tek?=
 <mail+sumo@mikolajswiatek.com>
Date: Tue, 12 Nov 2024 09:46:10 +0000
Subject: [PATCH] Fix invalid manifests in e2e tests (#3449)

---
 .../instrumentation-nginx-contnr-secctx/01-install-app.yaml   | 2 --
 .../instrumentation-nginx-multicontainer/01-install-app.yaml  | 2 --
 .../instrumentation-nginx-multicontainer/02-install-app.yaml  | 3 ---
 .../instrumentation-nodejs-volume/01-assert.yaml              | 4 ----
 .../instrumentation-nodejs-volume/01-install-app.yaml         | 2 +-
 .../targetallocator-features/00-install.yaml                  | 1 -
 6 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/tests/e2e-instrumentation/instrumentation-nginx-contnr-secctx/01-install-app.yaml b/tests/e2e-instrumentation/instrumentation-nginx-contnr-secctx/01-install-app.yaml
index eea887ae21..d1ae0e239f 100644
--- a/tests/e2e-instrumentation/instrumentation-nginx-contnr-secctx/01-install-app.yaml
+++ b/tests/e2e-instrumentation/instrumentation-nginx-contnr-secctx/01-install-app.yaml
@@ -22,7 +22,6 @@ spec:
         securityContext:
           runAsUser: 1000
           runAsGroup: 3000
-          fsGroup: 3000
         ports:
         - containerPort: 8765
         env:
@@ -33,7 +32,6 @@ spec:
             mountPath: /etc/nginx/nginx.conf
             subPath: nginx.conf
             readOnly: true
-        imagePullPolicy: Always
         resources:
           limits:
             cpu: "1"
diff --git a/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/01-install-app.yaml b/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/01-install-app.yaml
index 523a44efcf..3a50ecd54d 100644
--- a/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/01-install-app.yaml
+++ b/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/01-install-app.yaml
@@ -28,7 +28,6 @@ spec:
         securityContext:
           runAsUser: 1000
           runAsGroup: 3000
-          fsGroup: 3000
           runAsNonRoot: true
           allowPrivilegeEscalation: false
           seccompProfile:
@@ -57,7 +56,6 @@ spec:
         securityContext:
           runAsUser: 1000
           runAsGroup: 3000
-          fsGroup: 3000
           runAsNonRoot: true
           seccompProfile:
             type: RuntimeDefault
diff --git a/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/02-install-app.yaml b/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/02-install-app.yaml
index ab80a2db5a..0f2b3a828b 100644
--- a/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/02-install-app.yaml
+++ b/tests/e2e-instrumentation/instrumentation-nginx-multicontainer/02-install-app.yaml
@@ -28,7 +28,6 @@ spec:
         securityContext:
           runAsUser: 1000
           runAsGroup: 3000
-          fsGroup: 3000
           runAsNonRoot: true
           allowPrivilegeEscalation: false
           seccompProfile:
@@ -45,7 +44,6 @@ spec:
             mountPath: /etc/nginx/nginx.conf
             subPath: nginx.conf
             readOnly: true
-        imagePullPolicy: Always
         resources:
           limits:
             cpu: 500m
@@ -58,7 +56,6 @@ spec:
         securityContext:
           runAsUser: 1000
           runAsGroup: 3000
-          fsGroup: 3000
           runAsNonRoot: true
           seccompProfile:
             type: RuntimeDefault
diff --git a/tests/e2e-instrumentation/instrumentation-nodejs-volume/01-assert.yaml b/tests/e2e-instrumentation/instrumentation-nodejs-volume/01-assert.yaml
index 227a175150..83e32efc3a 100644
--- a/tests/e2e-instrumentation/instrumentation-nodejs-volume/01-assert.yaml
+++ b/tests/e2e-instrumentation/instrumentation-nodejs-volume/01-assert.yaml
@@ -54,8 +54,6 @@ spec:
         - name: OTEL_RESOURCE_ATTRIBUTES
       name: myapp
       volumeMounts:
-        - mountPath: /var/run/secrets/kubernetes.io/serviceaccount
-          readOnly: true
         - mountPath: /otel-auto-instrumentation-nodejs
           name: opentelemetry-auto-instrumentation-nodejs
     - args:
@@ -64,8 +62,6 @@ spec:
   initContainers:
     - name: opentelemetry-auto-instrumentation-nodejs
   volumes:
-    - projected:
-        defaultMode: 420
     - name: opentelemetry-auto-instrumentation-nodejs
       ephemeral:
         volumeClaimTemplate:
diff --git a/tests/e2e-instrumentation/instrumentation-nodejs-volume/01-install-app.yaml b/tests/e2e-instrumentation/instrumentation-nodejs-volume/01-install-app.yaml
index f92dc1491b..b219006dfc 100644
--- a/tests/e2e-instrumentation/instrumentation-nodejs-volume/01-install-app.yaml
+++ b/tests/e2e-instrumentation/instrumentation-nodejs-volume/01-install-app.yaml
@@ -29,4 +29,4 @@ spec:
         env:
         - name: NODE_PATH
           value: /usr/local/lib/node_modules
-    automountServiceAccountToken: false
+      automountServiceAccountToken: false
diff --git a/tests/e2e-targetallocator/targetallocator-features/00-install.yaml b/tests/e2e-targetallocator/targetallocator-features/00-install.yaml
index 26eed14f12..9213d607a4 100644
--- a/tests/e2e-targetallocator/targetallocator-features/00-install.yaml
+++ b/tests/e2e-targetallocator/targetallocator-features/00-install.yaml
@@ -93,7 +93,6 @@ spec:
       runAsUser: 1000
     prometheusCR:
       enabled: true
-      filterStrategy: ""
     securityContext:
       capabilities:
         add: