Fix tests after the reconciliation fix (#1023)

grafana · Aug 28, 2024 · bdf452d · bdf452d
1 parent fccddfd
commit bdf452d
Show file tree

Hide file tree

Showing 3 changed files with 95 additions and 6 deletions.
diff --git a/tests/e2e-openshift/tls-monolithic-singletenant/01-assert.yaml b/tests/e2e-openshift/tls-monolithic-singletenant/01-assert.yaml
@@ -32,6 +32,19 @@ spec:
     spec:
       containers:
       - name: tempo
+        ports:
+        - containerPort: 3200
+          name: http
+          protocol: TCP
+        - containerPort: 3101
+          name: tempo-internal
+          protocol: TCP
+        - containerPort: 4317
+          name: otlp-grpc
+          protocol: TCP
+        - containerPort: 4318
+          name: otlp-http
+          protocol: TCP
         volumeMounts:
         - mountPath: /conf
           name: tempo-conf
@@ -55,8 +68,6 @@ spec:
         volumeMounts:
         - mountPath: /etc/tls/private
           name: mono-ui-oauth-proxy-tls
-        - mountPath: /etc/proxy/cookie/
-          name: tempo-mono-cookie-proxy
       volumes:
       - configMap:
           defaultMode: 420
@@ -76,12 +87,9 @@ spec:
         secret:
           defaultMode: 420
           secretName: mono-ui-oauth-proxy-tls
-      - name: tempo-mono-cookie-proxy
-        secret:
-          defaultMode: 420
-          secretName: tempo-mono-cookie-proxy
 status:
   availableReplicas: 1
+  currentReplicas: 1
   readyReplicas: 1
   replicas: 1
 

diff --git a/tests/e2e-openshift/tls-singletenant/01-assert.yaml b/tests/e2e-openshift/tls-singletenant/01-assert.yaml
@@ -25,10 +25,90 @@ status:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  labels:
+    app.kubernetes.io/component: query-frontend
+    app.kubernetes.io/instance: simplest
+    app.kubernetes.io/managed-by: tempo-operator
+    app.kubernetes.io/name: tempo
   name: tempo-simplest-query-frontend
   namespace: chainsaw-tls-singletenant
+spec:
+  selector:
+    matchLabels:
+      app.kubernetes.io/component: query-frontend
+      app.kubernetes.io/instance: simplest
+      app.kubernetes.io/managed-by: tempo-operator
+      app.kubernetes.io/name: tempo
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/component: query-frontend
+        app.kubernetes.io/instance: simplest
+        app.kubernetes.io/managed-by: tempo-operator
+        app.kubernetes.io/name: tempo
+        tempo-gossip-member: "true"
+    spec:
+      containers:
+      - name: tempo
+        ports:
+        - containerPort: 3200
+          name: http
+          protocol: TCP
+        - containerPort: 9095
+          name: grpc
+          protocol: TCP
+        volumeMounts:
+        - mountPath: /conf
+          name: tempo-conf
+          readOnly: true
+        - mountPath: /var/tempo
+          name: tempo-tmp-storage
+        - mountPath: /var/run/ca
+          name: tempo-simplest-ca-bundle
+        - mountPath: /var/run/tls/server
+          name: tempo-simplest-query-frontend-mtls
+      - name: tempo-query
+        ports:
+        - containerPort: 16685
+          name: jaeger-grpc
+          protocol: TCP
+        - containerPort: 16686
+          name: jaeger-ui
+          protocol: TCP
+        - containerPort: 16687
+          name: jaeger-metrics
+          protocol: TCP
+        volumeMounts:
+        - mountPath: /conf
+          name: tempo-conf
+          readOnly: true
+        - mountPath: /tmp
+          name: tempo-tmp-storage-query
+        - mountPath: /var/run/ca
+          name: tempo-simplest-ca-bundle
+        - mountPath: /var/run/tls/server
+          name: tempo-simplest-query-frontend-mtls
+      volumes:
+      - configMap:
+          defaultMode: 420
+          name: tempo-simplest
+        name: tempo-conf
+      - emptyDir: {}
+        name: tempo-tmp-storage
+      - emptyDir: {}
+        name: tempo-tmp-storage-query
+      - configMap:
+          defaultMode: 420
+          name: tempo-simplest-ca-bundle
+        name: tempo-simplest-ca-bundle
+      - name: tempo-simplest-query-frontend-mtls
+        secret:
+          defaultMode: 420
+          secretName: tempo-simplest-query-frontend-mtls
 status:
+  availableReplicas: 1
   readyReplicas: 1
+  replicas: 1
 ---
 apiVersion: apps/v1
 kind: StatefulSet

diff --git a/tests/e2e-openshift/tls-singletenant/chainsaw-test.yaml b/tests/e2e-openshift/tls-singletenant/chainsaw-test.yaml
@@ -5,6 +5,7 @@ metadata:
   creationTimestamp: null
   name: tls-singletenant
 spec:
+  namespace: chainsaw-tls-singletenant
   steps:
   - name: step-00
     try: