don't modify the existing chainsaw test

Author: zeitlinger

tests/e2e/env-vars/00-install-instrumentation.yaml

@@ -5,6 +5,3 @@ metadata:
 spec:
   exporter:
     endpoint: http://localhost:4317
-  defaults:
-    useLabelsForResourceAttributes: true
-

tests/e2e/env-vars/01-assert.yaml

@@ -21,7 +21,7 @@ spec:
           apiVersion: v1
           fieldPath: status.podIP
     - name: OTEL_SERVICE_NAME
-      value: my-app
+      value: my-deploy
     - name: OTEL_EXPORTER_OTLP_ENDPOINT
       value: http://localhost:4317
     - name: OTEL_RESOURCE_ATTRIBUTES_POD_NAME
@@ -36,7 +36,6 @@ spec:
           fieldPath: spec.nodeName
     - name: OTEL_RESOURCE_ATTRIBUTES
       value:
-        ( contains(@, 'foo=bar') ): true
         ( contains(@, 'k8s.container.name=myapp') ): true
         ( contains(@, 'k8s.pod.name=$(OTEL_RESOURCE_ATTRIBUTES_POD_NAME)') ): true
         ( contains(@, 'k8s.replicaset.name=my-deploy-') ): true

tests/e2e/env-vars/01-deployment.yaml

@@ -11,11 +11,9 @@ spec:
     metadata:
       labels:
         app: my-deploy
-        app.kubernetes.io/name: my-app
       annotations:
         sidecar.opentelemetry.io/inject: "true"
         instrumentation.opentelemetry.io/inject-sdk: "true"
-        resource.opentelemetry.io/foo: "bar"
     spec:
       containers:
       - name: myapp

tests/e2e/use-labels-for-resource-attributes/00-install-collector.yaml

@@ -0,0 +1,22 @@
+apiVersion: opentelemetry.io/v1alpha1
+kind: OpenTelemetryCollector
+metadata:
+  name: sidecar
+spec:
+  config: |
+    receivers:
+      otlp:
+        protocols:
+          grpc:
+          http:
+    processors:
+
+    exporters:
+      debug:
+
+    service:
+      pipelines:
+        traces:
+          receivers: [otlp]
+          exporters: [debug]
+  mode: sidecar

tests/e2e/use-labels-for-resource-attributes/00-install-instrumentation.yaml

@@ -0,0 +1,10 @@
+apiVersion: opentelemetry.io/v1alpha1
+kind: Instrumentation
+metadata:
+  name: sdk-only
+spec:
+  exporter:
+    endpoint: http://localhost:4317
+  defaults:
+    useLabelsForResourceAttributes: true
+

tests/e2e/use-labels-for-resource-attributes/01-assert.yaml

@@ -0,0 +1,47 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  annotations:
+    instrumentation.opentelemetry.io/inject-sdk: "true"
+    sidecar.opentelemetry.io/inject: "true"
+  labels:
+    app: my-deploy
+spec:
+  (containers[?name == 'myapp']):
+  - name: myapp
+    env:
+    - name: OTEL_NODE_IP
+      valueFrom:
+        fieldRef:
+          apiVersion: v1
+          fieldPath: status.hostIP
+    - name: OTEL_POD_IP
+      valueFrom:
+        fieldRef:
+          apiVersion: v1
+          fieldPath: status.podIP
+    - name: OTEL_SERVICE_NAME
+      value: my-app
+    - name: OTEL_EXPORTER_OTLP_ENDPOINT
+      value: http://localhost:4317
+    - 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
+      value:
+        ( contains(@, 'foo=bar') ): true
+        ( contains(@, 'k8s.container.name=myapp') ): true
+        ( contains(@, 'k8s.pod.name=$(OTEL_RESOURCE_ATTRIBUTES_POD_NAME)') ): true
+        ( contains(@, 'k8s.replicaset.name=my-deploy-') ): true
+        ( contains(@, 'k8s.deployment.name=my-deploy') ): true
+        ( contains(@, concat('k8s.namespace.name=', $namespace)) ): true
+        ( contains(@, 'k8s.node.name=$(OTEL_RESOURCE_ATTRIBUTES_NODE_NAME)') ): true
+        ( contains(@, join('', ['service.instance.id=', $namespace, '.$(OTEL_RESOURCE_ATTRIBUTES_POD_NAME).myapp'])  ) ): true
+        ( contains(@, 'service.version=main') ): true

tests/e2e/use-labels-for-resource-attributes/01-deployment.yaml

@@ -0,0 +1,22 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: my-deploy
+spec:
+  selector:
+    matchLabels:
+      app: my-deploy
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: my-deploy
+        app.kubernetes.io/name: my-app
+      annotations:
+        sidecar.opentelemetry.io/inject: "true"
+        instrumentation.opentelemetry.io/inject-sdk: "true"
+        resource.opentelemetry.io/foo: "bar"
+    spec:
+      containers:
+      - name: myapp
+        image: ghcr.io/open-telemetry/opentelemetry-operator/e2e-test-app-python:main

tests/e2e/use-labels-for-resource-attributes/chainsaw-test.yaml

@@ -0,0 +1,24 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/kyverno/chainsaw/main/.schemas/json/test-chainsaw-v1alpha1.json
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  creationTimestamp: null
+  name: env-vars
+spec:
+  steps:
+    - name: step-00
+      try:
+        - apply:
+            file: 00-install-collector.yaml
+        - apply:
+            file: 00-install-instrumentation.yaml
+    # Deployment
+    - name: step-01
+      try:
+        - apply:
+            file: 01-deployment.yaml
+        - assert:
+            file: 01-assert.yaml
+      catch:
+        - podLogs:
+            selector: app=my-deploy