[Chore] Use latest OTEL operator version in tests and fix asserts

Makefile

@@ -51,7 +51,7 @@ OPERATOR_NAMESPACE ?= tempo-operator-system
 
 # OpenTelemetry operator installation vars
 OTEL_OPERATOR_NAMESPACE ?= otel-operator-system
-OTEL_BUNDLE_IMG ?= "ghcr.io/open-telemetry/opentelemetry-operator/operator-bundle:v0.115.0"
+OTEL_BUNDLE_IMG ?= "ghcr.io/open-telemetry/opentelemetry-operator/operator-bundle:v0.136.0"
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")

tests/e2e-openshift-object-stores/monolithic-azure/03-generate-traces.yaml

@@ -7,7 +7,7 @@ spec:
     spec:
       containers:
       - name: telemetrygen
-        image: ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:v0.75.0
+        image: ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:v0.135.0
         args:
         - traces
         - --otlp-endpoint=tempo-simplest:4317

tests/e2e-openshift-upgrade/upgrade/assert-install-tempostack.yaml

@@ -77,23 +77,7 @@ metadata:
       controller: true
       kind: TempoStack
       name: simplst
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  labels:
-    app.kubernetes.io/component: gateway
-    app.kubernetes.io/instance: simplst
-    app.kubernetes.io/managed-by: tempo-operator
-    app.kubernetes.io/name: tempo
-  name: tempo-simplst-gateway-chainsaw-rbac
-rules:
-  - apiGroups:
-      - authentication.k8s.io
-    resources:
-      - tokenreviews
-    verbs:
-      - create
+
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

tests/e2e-openshift-upgrade/upgrade/chainsaw-test.yaml

@@ -77,24 +77,32 @@ spec:
         file: tempostack-rbac-sa-1-traces-gen.yaml
     - assert:
         file: assert-tempostack-rbac-sa-1-traces-gen.yaml
+    - delete:
+        file: tempostack-rbac-sa-1-traces-gen.yaml
   - name: Generate traces from namespace chainsaw-mono-rbac-1 for TempoMonolithic
     try:
     - apply:
         file: tempo-mono-rbac-sa-1-traces-gen.yaml
     - assert:
         file: assert-tempo-mono-rbac-sa-1-traces-gen.yaml
+    - delete:
+        file: tempo-mono-rbac-sa-1-traces-gen.yaml
   - name: Generate traces from namespace chainsaw-test-rbac-2 for TempoStack
     try:
     - apply:
         file: tempostack-rbac-sa-2-traces-gen.yaml
     - assert:
         file: assert-tempostack-rbac-sa-2-traces-gen.yaml
+    - delete:
+        file: tempostack-rbac-sa-2-traces-gen.yaml
   - name: Generate traces from namespace chainsaw-mono-rbac-2 for TempoMonolithic
     try:
     - apply:
         file: tempo-mono-rbac-sa-2-traces-gen.yaml
     - assert:
         file: assert-tempo-mono-rbac-sa-2-traces-gen.yaml
+    - delete:
+        file: tempo-mono-rbac-sa-2-traces-gen.yaml
   - name: Verify tracess using RBAC for TempoStack
     try:
     - apply:
@@ -197,6 +205,18 @@ spec:
         kind: StatefulSet
         namespace: chainsaw-mmo-rbac
         format: yaml
+  - name: Generate traces from namespace chainsaw-mono-rbac-1 for TempoMonolithic after upgrade
+    try:
+    - apply:
+        file: tempo-mono-rbac-sa-1-traces-gen.yaml
+    - assert:
+        file: assert-tempo-mono-rbac-sa-1-traces-gen.yaml
+  - name: Generate traces from namespace chainsaw-mono-rbac-2 for TempoMonolithic after upgrade
+    try:
+    - apply:
+        file: tempo-mono-rbac-sa-2-traces-gen.yaml
+    - assert:
+        file: assert-tempo-mono-rbac-sa-2-traces-gen.yaml
   - name: Verify tracess using RBAC for TempoStack after upgrade
     try:
     - create:
@@ -220,4 +240,4 @@ spec:
     - create:
         file: kubeadmin-tempo-mono-traces-verify.yaml
     - assert:
-        file: assert-kubeadmin-tempo-mono-traces-verify.yaml
+        file: assert-kubeadmin-tempo-mono-traces-verify.yaml

tests/e2e-openshift/red-metrics/02-install-otel-collector.yaml

@@ -42,11 +42,6 @@ spec:
           insecure: true
 
     service:
-      # Expose internal telemetry of the collector
-      # It exposes Prometheus /metrics endpoint for internal telemetry
-      telemetry:
-        metrics:
-          address: 0.0.0.0:8888
       pipelines:
         traces:
           receivers: [otlp]