Remove duplicated fields

Signed-off-by: Israel Blancas <[email protected]>

Author: Israel Blancas

tests/e2e-instrumentation/instrumentation-apache-multicontainer/01-assert.yaml

@@ -40,16 +40,6 @@ spec:
       value: parentbased_traceidratio
     - name: OTEL_TRACES_SAMPLER_ARG
       value: "0.25"
-    - name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME
-      valueFrom:
-        fieldRef:
-          apiVersion: v1
-          fieldPath: metadata.name
-    - name: OTEL_RESOURCE_ATTRIBUTES_NODE_NAME
-      valueFrom:
-        fieldRef:
-          apiVersion: v1
-          fieldPath: spec.nodeName
     - name: OTEL_RESOURCE_ATTRIBUTES
     name: myapp
   - env:

tests/e2e-instrumentation/instrumentation-apache-multicontainer/02-assert.yaml

@@ -51,16 +51,6 @@ spec:
       value: parentbased_traceidratio
     - name: OTEL_TRACES_SAMPLER_ARG
       value: "0.25"
-    - name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME
-      valueFrom:
-        fieldRef:
-          apiVersion: v1
-          fieldPath: metadata.name
-    - name: OTEL_RESOURCE_ATTRIBUTES_NODE_NAME
-      valueFrom:
-        fieldRef:
-          apiVersion: v1
-          fieldPath: spec.nodeName
     - name: OTEL_RESOURCE_ATTRIBUTES
     name: myapp
   - image: rabbitmq

tests/e2e-instrumentation/instrumentation-nginx-multicontainer/01-assert.yaml

@@ -42,16 +42,6 @@ spec:
       value: parentbased_traceidratio
     - name: OTEL_TRACES_SAMPLER_ARG
       value: "0.25"
-    - name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME
-      valueFrom:
-        fieldRef:
-          apiVersion: v1
-          fieldPath: metadata.name
-    - name: OTEL_RESOURCE_ATTRIBUTES_NODE_NAME
-      valueFrom:
-        fieldRef:
-          apiVersion: v1
-          fieldPath: spec.nodeName
     - name: OTEL_RESOURCE_ATTRIBUTES
     name: myapp
     volumeMounts:

tests/e2e-instrumentation/instrumentation-nginx-multicontainer/01-install-app.yaml

@@ -45,7 +45,6 @@ spec:
             mountPath: /etc/nginx/nginx.conf
             subPath: nginx.conf
             readOnly: true
-        imagePullPolicy: Always
         resources:
           limits:
             cpu: 500m

tests/e2e-instrumentation/instrumentation-nginx-multicontainer/02-assert.yaml

@@ -53,16 +53,6 @@ spec:
       value: parentbased_traceidratio
     - name: OTEL_TRACES_SAMPLER_ARG
       value: "0.25"
-    - name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME
-      valueFrom:
-        fieldRef:
-          apiVersion: v1
-          fieldPath: metadata.name
-    - name: OTEL_RESOURCE_ATTRIBUTES_NODE_NAME
-      valueFrom:
-        fieldRef:
-          apiVersion: v1
-          fieldPath: spec.nodeName
     - name: OTEL_RESOURCE_ATTRIBUTES
     name: myapp
     volumeMounts: