Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Chore] Fix tests after the reconciliation fix #1023

Merged
merged 1 commit into from
Aug 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions tests/e2e-openshift/tls-monolithic-singletenant/01-assert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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

Expand Down
80 changes: 80 additions & 0 deletions tests/e2e-openshift/tls-singletenant/01-assert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions tests/e2e-openshift/tls-singletenant/chainsaw-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
creationTimestamp: null
name: tls-singletenant
spec:
namespace: chainsaw-tls-singletenant
steps:
- name: step-00
try:
Expand Down