Fix e2e tests (#1056)

grafana · Oct 11, 2024 · 5238c4c · 5238c4c
1 parent 3084bc9
commit 5238c4c
Show file tree

Hide file tree

Showing 10 changed files with 117 additions and 57 deletions.
diff --git a/tests/e2e-openshift/component-replicas/scale-tempo-assert.yaml b/tests/e2e-openshift/component-replicas/scale-tempo-assert.yaml
@@ -135,6 +135,7 @@ metadata:
     kind: TempoStack
     name: cmpreps
 spec:
+  replicas: 2
   selector:
     matchLabels:
       app.kubernetes.io/component: gateway
@@ -156,8 +157,8 @@ spec:
         - --web.internal.listen=0.0.0.0:8081
         - --traces.write.otlpgrpc.endpoint=tempo-cmpreps-distributor.chainsaw-replicas.svc.cluster.local:4317
         - --traces.write.otlphttp.endpoint=https://tempo-cmpreps-distributor.chainsaw-replicas.svc.cluster.local:4318
-        - --traces.tempo.endpoint=https://tempo-cmpreps-query-frontend.chainsaw-replicas.svc.cluster.local:3200
         - --traces.write-timeout=30s
+        - --traces.tempo.endpoint=https://tempo-cmpreps-query-frontend.chainsaw-replicas.svc.cluster.local:3200
         - --grpc.listen=0.0.0.0:8090
         - --rbac.config=/etc/tempo-gateway/cm/rbac.yaml
         - --tenants.config=/etc/tempo-gateway/secret/tenants.yaml

diff --git a/tests/e2e-openshift/monolithic-multitenancy-static/03-assert.yaml b/tests/e2e-openshift/monolithic-multitenancy-static/03-assert.yaml
@@ -2,5 +2,27 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: opentelemetry-collector
+  namespace: chainsaw-monolithic-multitenancy-static
 status:
+  availableReplicas: 1
   readyReplicas: 1
+  replicas: 1
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: opentelemetry-collector
+  namespace: chainsaw-monolithic-multitenancy-static
+spec:
+  ports:
+  - appProtocol: grpc
+    name: otlp-grpc
+    port: 4317
+    protocol: TCP
+    targetPort: 4317
+  selector:
+    app.kubernetes.io/component: opentelemetry-collector
+    app.kubernetes.io/instance: chainsaw-monolithic-multitenancy-static.opentelemetry
+    app.kubernetes.io/managed-by: opentelemetry-operator
+    app.kubernetes.io/part-of: opentelemetry
diff --git a/tests/e2e-openshift/monolithic-multitenancy-static/03-install-otel.yaml b/tests/e2e-openshift/monolithic-multitenancy-static/03-install-otel.yaml
@@ -1,9 +1,10 @@
-apiVersion: v1
-kind: ConfigMap
+apiVersion: opentelemetry.io/v1alpha1
+kind: OpenTelemetryCollector
 metadata:
-  name: opentelemetry-collector-configmap
-data:
-  config.yaml: |
+  name: opentelemetry
+spec:
+  mode: deployment
+  config: |
     extensions:
       oauth2client:
         client_id: tenant1-oidc-client
@@ -35,42 +36,4 @@ data:
       pipelines:
         traces:
           exporters: [otlp]
-          receivers: [otlp]
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: opentelemetry-collector
-spec:
-  selector:
-    matchLabels:
-      app: opentelemetry-collector
-  template:
-    metadata:
-      labels:
-        app: opentelemetry-collector
-    spec:
-      containers:
-      - name: opentelemetry-collector
-        image: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:0.106.1
-        command: ["/otelcol-contrib", "--config=/conf/config.yaml"]
-        volumeMounts:
-        - mountPath: /conf
-          name: opentelemetry-collector-configmap
-      volumes:
-      - name: opentelemetry-collector-configmap
-        configMap:
-          name: opentelemetry-collector-configmap
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: opentelemetry-collector
-spec:
-  type: ClusterIP
-  ports:
-    - name: otlp-grpc
-      port: 4317
-      targetPort: 4317
-  selector:
-    app: opentelemetry-collector
+          receivers: [otlp]
diff --git a/tests/e2e-openshift/monolithic-route/check-must-gahter.sh b/tests/e2e-openshift/monolithic-route/check-must-gahter.sh
@@ -12,12 +12,10 @@ REQUIRED_ITEMS=(
   "event-filter.html"
   "timestamp"
   "*sha*/deployment-tempo-operator-controller.yaml"
-  "*sha*/olm/operator-servicemeshoperator-openshift-operators.yaml"
   "*sha*/olm/installplan-install-*.yaml"
   "*sha*/olm/clusterserviceversion-tempo-operator-*.yaml"
   "*sha*/olm/operator-opentelemetry-product-openshift-opentelemetry-operator.yaml"
-  "*sha*/olm/operator-tempo-operator-tempo-operator.yaml"
-  "*sha*/olm/operator-tempo-product-openshift-tempo-operator.yaml"
+  "*sha*/olm/operator-tempo-*-tempo-operator.yaml"
   "*sha*/olm/subscription-tempo-operator-*-sub.yaml"
   "*sha*/namespaces/chainsaw-mono-route/tempomonolithic/mono-route/tempomonolithic-mono-route.yaml"
   "*sha*/namespaces/chainsaw-mono-route/tempomonolithic/mono-route/service-tempo-mono-route-jaegerui.yaml"

diff --git a/tests/e2e-openshift/monolithic-route/install-tempo-assert.yaml b/tests/e2e-openshift/monolithic-route/install-tempo-assert.yaml
@@ -258,6 +258,7 @@ data:
     backend: 127.0.0.1:3200
     tenant_header_key: x-scope-orgid
     services_query_duration: 72h0m0s
+    find_traces_concurrent_requests: 2
   tempo.yaml: |
     server:
       http_listen_port: 3200

diff --git a/tests/e2e-openshift/route/check-must-gahter.sh b/tests/e2e-openshift/route/check-must-gahter.sh
@@ -15,8 +15,7 @@ REQUIRED_ITEMS=(
   "*sha*/olm/installplan-install-*"
   "*sha*/olm/clusterserviceversion-tempo-operator-*.yaml"
   "*sha*/olm/operator-opentelemetry-product-openshift-opentelemetry-operator.yaml"
-  "*sha*/olm/operator-tempo-operator-tempo-operator.yaml"
-  "*sha*/olm/operator-tempo-product-openshift-tempo-operator.yaml"
+  "*sha*/olm/operator-*-tempo-operator.yaml"
   "*sha*/olm/subscription-tempo-operator-*-sub.yaml"
   "*sha*/namespaces/chainsaw-route/tempostack/simplest/service-tempo-simplest-distributor.yaml"
   "*sha*/namespaces/chainsaw-route/tempostack/simplest/service-tempo-simplest-ingester.yaml"

diff --git a/tests/e2e-openshift/route/install-tempo-assert.yaml b/tests/e2e-openshift/route/install-tempo-assert.yaml
@@ -129,6 +129,7 @@ data:
     backend: 127.0.0.1:3200
     tenant_header_key: x-scope-orgid
     services_query_duration: 72h0m0s
+    find_traces_concurrent_requests: 2
   tempo.yaml: |
     compactor:
       compaction:

diff --git a/tests/e2e-openshift/tempo-single-tenant-auth/install-tempo-assert.yaml b/tests/e2e-openshift/tempo-single-tenant-auth/install-tempo-assert.yaml
@@ -47,7 +47,25 @@ spec:
         tempo-gossip-member: "true"
     spec:
       containers:
-      - name: tempo
+      - args:
+        - -target=query-frontend
+        - -config.file=/conf/tempo-query-frontend.yaml
+        - -mem-ballast-size-mbs=1024
+        - -log.level=info
+        - --storage.trace.s3.secret_key=$(S3_SECRET_KEY)
+        - --storage.trace.s3.access_key=$(S3_ACCESS_KEY)
+        env:
+        - name: S3_SECRET_KEY
+          valueFrom:
+            secretKeyRef:
+              key: access_key_secret
+              name: minio
+        - name: S3_ACCESS_KEY
+          valueFrom:
+            secretKeyRef:
+              key: access_key_id
+              name: minio
+        name: tempo
         ports:
         - containerPort: 3200
           name: http
@@ -65,7 +83,12 @@ spec:
           name: tempo-tempo-st-ca-bundle
         - mountPath: /var/run/tls/server
           name: tempo-tempo-st-query-frontend-mtls
-      - name: jaeger-query
+      - args:
+        - --query.base-path=/
+        - --span-storage.type=grpc
+        - --grpc-storage.server=localhost:7777
+        - --query.bearer-token-propagation=true
+        name: jaeger-query
         ports:
         - containerPort: 16685
           name: jaeger-grpc
@@ -79,7 +102,13 @@ spec:
         volumeMounts:
         - mountPath: /tmp
           name: tempo-tmp-storage-query
-      - name: tempo-query
+        - mountPath: /var/run/ca
+          name: tempo-tempo-st-ca-bundle
+        - mountPath: /var/run/tls/server
+          name: tempo-tempo-st-query-frontend-mtls
+      - args:
+        - -config=/conf/tempo-query.yaml
+        name: tempo-query
         ports:
         - containerPort: 7777
           name: proxy-grpc
@@ -92,7 +121,18 @@ spec:
           name: tempo-tempo-st-ca-bundle
         - mountPath: /var/run/tls/server
           name: tempo-tempo-st-query-frontend-mtls
-      - name: oauth-proxy
+      - args:
+        - --cookie-secret-file=/var/run/secrets/kubernetes.io/serviceaccount/token
+        - --https-address=:8443
+        - --openshift-service-account=tempo-tempo-st-query-frontend
+        - --provider=openshift
+        - --tls-cert=/etc/tls/private/tls.crt
+        - --tls-key=/etc/tls/private/tls.key
+        - --upstream=http://localhost:16686
+        - --upstream-timeout=30s
+        - '--openshift-sar={"namespace": "chainsaw-mst", "resource": "pods", "verb":
+          "get"}'
+        name: oauth-proxy
         ports:
         - containerPort: 8443
           name: oauth-proxy

diff --git a/tests/e2e-openshift/tls-monolithic-singletenant/01-assert.yaml b/tests/e2e-openshift/tls-monolithic-singletenant/01-assert.yaml
@@ -302,6 +302,7 @@ data:
     backend: 127.0.0.1:3200
     tenant_header_key: x-scope-orgid
     services_query_duration: 72h0m0s
+    find_traces_concurrent_requests: 2
   tempo.yaml: |
     server:
       http_listen_port: 3200

diff --git a/tests/e2e-openshift/tls-singletenant/01-assert.yaml b/tests/e2e-openshift/tls-singletenant/01-assert.yaml
@@ -42,7 +42,25 @@ spec:
         tempo-gossip-member: "true"
     spec:
       containers:
-      - name: tempo
+      - args:
+        - -target=query-frontend
+        - -config.file=/conf/tempo-query-frontend.yaml
+        - -mem-ballast-size-mbs=1024
+        - -log.level=info
+        - --storage.trace.s3.secret_key=$(S3_SECRET_KEY)
+        - --storage.trace.s3.access_key=$(S3_ACCESS_KEY)
+        env:
+        - name: S3_SECRET_KEY
+          valueFrom:
+            secretKeyRef:
+              key: access_key_secret
+              name: minio
+        - name: S3_ACCESS_KEY
+          valueFrom:
+            secretKeyRef:
+              key: access_key_id
+              name: minio
+        name: tempo
         ports:
         - containerPort: 3200
           name: http
@@ -60,7 +78,12 @@ spec:
           name: tempo-simplest-ca-bundle
         - mountPath: /var/run/tls/server
           name: tempo-simplest-query-frontend-mtls
-      - name: jaeger-query
+      - args:
+        - --query.base-path=/
+        - --span-storage.type=grpc
+        - --grpc-storage.server=localhost:7777
+        - --query.bearer-token-propagation=true
+        name: jaeger-query
         ports:
         - containerPort: 16685
           name: jaeger-grpc
@@ -74,7 +97,13 @@ spec:
         volumeMounts:
         - mountPath: /tmp
           name: tempo-tmp-storage-query
-      - name: tempo-query
+        - mountPath: /var/run/ca
+          name: tempo-simplest-ca-bundle
+        - mountPath: /var/run/tls/server
+          name: tempo-simplest-query-frontend-mtls
+      - args:
+        - -config=/conf/tempo-query.yaml
+        name: tempo-query
         ports:
         - containerPort: 7777
           name: proxy-grpc
@@ -99,6 +128,10 @@ spec:
         - '--openshift-sar={"namespace": "chainsaw-tls-singletenant", "resource":
           "pods", "verb": "get"}'
         name: oauth-proxy
+        ports:
+        - containerPort: 8443
+          name: oauth-proxy
+          protocol: TCP
       volumes:
       - configMap:
           defaultMode: 420
@@ -195,6 +228,7 @@ data:
     backend: 127.0.0.1:3200
     tenant_header_key: x-scope-orgid
     services_query_duration: 72h0m0s
+    find_traces_concurrent_requests: 2
   tempo.yaml: "compactor:\n  compaction:\n    block_retention: 48h0m0s\n  ring:\n
     \   kvstore:\n      store: memberlist\ndistributor:\n  receivers:\n    jaeger:\n
     \     protocols:\n        thrift_http:\n          endpoint: 0.0.0.0:14268\n          tls:\n