From c38d7fd6daa555db7197d5da02d0a2350f9b6f16 Mon Sep 17 00:00:00 2001 From: Ishwar Kanse Date: Mon, 2 Dec 2024 16:27:02 +0530 Subject: [PATCH] Update asserts for tests to work on OCP 4.18 (#1093) --- .../tempostack-retention-global/03-assert.yaml | 4 +--- .../tempostack-retention-global/04-assert.yaml | 4 +--- .../tempostack-retention-global/05-assert.yaml | 4 +--- .../verify-traces-grafana-ret-assert.yaml | 4 +--- .../verify-traces-jaeger-ret-assert.yaml | 4 +--- .../install-otel-collector.yaml | 2 +- .../install-otel-collector.yaml | 2 +- .../create-otel-collector.yaml | 2 +- .../verify-traces-assert.yaml | 4 +--- .../tempo-serverless/verify-traces-assert.yaml | 4 +--- .../generate-traces-assert.yaml | 8 ++------ .../component-replicas/verify-traces-assert.yaml | 16 ++++------------ .../monitoring-monolithic/chainsaw-test.yaml | 4 ++-- .../verify-traces-assert.yaml | 6 ++++++ tests/e2e-openshift/monitoring/04-assert.yaml | 4 +--- .../03-assert.yaml | 8 ++------ .../04-assert.yaml | 16 ++++------------ .../01-assert.yaml | 4 +--- .../04-assert.yaml | 4 +--- .../05-assert.yaml | 4 +--- .../monolithic-route/check-must-gather.sh | 4 ++-- .../generate-traces-assert.yaml | 4 +--- .../verify-traces-jaeger-assert.yaml | 4 +--- .../verify-traces-traceql-assert.yaml | 4 +--- tests/e2e-openshift/multitenancy/03-assert.yaml | 8 ++------ tests/e2e-openshift/multitenancy/04-assert.yaml | 16 ++++------------ .../red-metrics/02-install-otel-collector.yaml | 4 ++-- tests/e2e-openshift/red-metrics/06-assert.yaml | 4 +--- tests/e2e-openshift/route/check-must-gather.sh | 4 ++-- .../generate-traces-assert.yaml | 4 +--- .../verify-traces-jaeger-assert.yaml | 4 +--- .../verify-traces-traceql-assert.yaml | 4 +--- .../tls-monolithic-singletenant/03-assert.yaml | 8 ++------ .../tls-monolithic-singletenant/04-assert.yaml | 8 ++------ .../tls-singletenant/03-assert.yaml | 8 ++------ .../tls-singletenant/04-assert.yaml | 8 ++------ tests/e2e-upgrade/upgrade/40-assert.yaml | 4 +--- tests/e2e-upgrade/upgrade/50-assert.yaml | 4 +--- tests/e2e-upgrade/upgrade/70-assert.yaml | 4 +--- tests/e2e/compatibility/03-assert.yaml | 4 +--- tests/e2e/compatibility/04-assert.yaml | 4 +--- tests/e2e/compatibility/05-assert.yaml | 4 +--- tests/e2e/custom-ca/02-assert.yaml | 4 +--- tests/e2e/custom-ca/03-assert.yaml | 4 +--- .../e2e/monolithic-ingestion-mtls/03-assert.yaml | 4 +--- .../e2e/monolithic-ingestion-mtls/04-assert.yaml | 4 +--- tests/e2e/monolithic-memory/03-assert.yaml | 4 +--- tests/e2e/monolithic-memory/04-assert.yaml | 4 +--- tests/e2e/monolithic-memory/05-assert.yaml | 4 +--- tests/e2e/monolithic-pv/03-assert.yaml | 4 +--- tests/e2e/monolithic-pv/04-assert.yaml | 4 +--- .../e2e/monolithic-receivers-tls/03-assert.yaml | 8 ++------ .../e2e/monolithic-receivers-tls/04-assert.yaml | 8 ++------ tests/e2e/monolithic-s3-tls/03-assert.yaml | 4 +--- tests/e2e/monolithic-s3-tls/04-assert.yaml | 4 +--- tests/e2e/receivers-mtls/03-assert.yaml | 4 +--- tests/e2e/receivers-mtls/04-assert.yaml | 4 +--- tests/e2e/receivers-tls/03-assert.yaml | 4 +--- tests/e2e/receivers-tls/04-assert.yaml | 4 +--- .../max-loops/01-assert-job.yaml | 4 +--- 60 files changed, 87 insertions(+), 221 deletions(-) create mode 100644 tests/e2e-openshift/monitoring-monolithic/verify-traces-assert.yaml diff --git a/tests/e2e-long-running/tempostack-retention-global/03-assert.yaml b/tests/e2e-long-running/tempostack-retention-global/03-assert.yaml index 3f7323066..a88d2a37b 100644 --- a/tests/e2e-long-running/tempostack-retention-global/03-assert.yaml +++ b/tests/e2e-long-running/tempostack-retention-global/03-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: generate-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-long-running/tempostack-retention-global/04-assert.yaml b/tests/e2e-long-running/tempostack-retention-global/04-assert.yaml index ab9e98db3..2000de515 100644 --- a/tests/e2e-long-running/tempostack-retention-global/04-assert.yaml +++ b/tests/e2e-long-running/tempostack-retention-global/04-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces-jaeger status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-long-running/tempostack-retention-global/05-assert.yaml b/tests/e2e-long-running/tempostack-retention-global/05-assert.yaml index 7eec01bfb..d4baf6efe 100644 --- a/tests/e2e-long-running/tempostack-retention-global/05-assert.yaml +++ b/tests/e2e-long-running/tempostack-retention-global/05-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces-grafana status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-long-running/tempostack-retention-global/verify-traces-grafana-ret-assert.yaml b/tests/e2e-long-running/tempostack-retention-global/verify-traces-grafana-ret-assert.yaml index f6d3a4998..4179326ae 100644 --- a/tests/e2e-long-running/tempostack-retention-global/verify-traces-grafana-ret-assert.yaml +++ b/tests/e2e-long-running/tempostack-retention-global/verify-traces-grafana-ret-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces-grafana-ret status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-long-running/tempostack-retention-global/verify-traces-jaeger-ret-assert.yaml b/tests/e2e-long-running/tempostack-retention-global/verify-traces-jaeger-ret-assert.yaml index 19895c419..a9642c166 100644 --- a/tests/e2e-long-running/tempostack-retention-global/verify-traces-jaeger-ret-assert.yaml +++ b/tests/e2e-long-running/tempostack-retention-global/verify-traces-jaeger-ret-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces-jaeger-ret status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift-ossm/ossm-monolithic-otel/install-otel-collector.yaml b/tests/e2e-openshift-ossm/ossm-monolithic-otel/install-otel-collector.yaml index 30dcfe56f..ec42c4985 100644 --- a/tests/e2e-openshift-ossm/ossm-monolithic-otel/install-otel-collector.yaml +++ b/tests/e2e-openshift-ossm/ossm-monolithic-otel/install-otel-collector.yaml @@ -6,7 +6,7 @@ metadata: spec: config: | receivers: - zipkin: + zipkin: {} otlp: protocols: grpc: diff --git a/tests/e2e-openshift-ossm/ossm-tempostack-otel/install-otel-collector.yaml b/tests/e2e-openshift-ossm/ossm-tempostack-otel/install-otel-collector.yaml index 89bf7d061..e77119bcd 100644 --- a/tests/e2e-openshift-ossm/ossm-tempostack-otel/install-otel-collector.yaml +++ b/tests/e2e-openshift-ossm/ossm-tempostack-otel/install-otel-collector.yaml @@ -6,7 +6,7 @@ metadata: spec: config: | receivers: - zipkin: + zipkin: {} otlp: protocols: grpc: diff --git a/tests/e2e-openshift-serverless/otel-tempo-serverless/create-otel-collector.yaml b/tests/e2e-openshift-serverless/otel-tempo-serverless/create-otel-collector.yaml index cc1009c29..8736b7574 100644 --- a/tests/e2e-openshift-serverless/otel-tempo-serverless/create-otel-collector.yaml +++ b/tests/e2e-openshift-serverless/otel-tempo-serverless/create-otel-collector.yaml @@ -7,7 +7,7 @@ spec: mode: deployment config: | receivers: - zipkin: + zipkin: {} processors: exporters: otlp: diff --git a/tests/e2e-openshift-serverless/otel-tempo-serverless/verify-traces-assert.yaml b/tests/e2e-openshift-serverless/otel-tempo-serverless/verify-traces-assert.yaml index 7ced823e4..7640bf442 100644 --- a/tests/e2e-openshift-serverless/otel-tempo-serverless/verify-traces-assert.yaml +++ b/tests/e2e-openshift-serverless/otel-tempo-serverless/verify-traces-assert.yaml @@ -4,6 +4,4 @@ metadata: name: verify-traces namespace: chainsaw-otel-tempo-serverless status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift-serverless/tempo-serverless/verify-traces-assert.yaml b/tests/e2e-openshift-serverless/tempo-serverless/verify-traces-assert.yaml index 955ee90ee..57a357507 100644 --- a/tests/e2e-openshift-serverless/tempo-serverless/verify-traces-assert.yaml +++ b/tests/e2e-openshift-serverless/tempo-serverless/verify-traces-assert.yaml @@ -4,6 +4,4 @@ metadata: name: verify-traces namespace: chainsaw-tempo-serverless status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/component-replicas/generate-traces-assert.yaml b/tests/e2e-openshift/component-replicas/generate-traces-assert.yaml index 4e388748f..2692c8b16 100644 --- a/tests/e2e-openshift/component-replicas/generate-traces-assert.yaml +++ b/tests/e2e-openshift/component-replicas/generate-traces-assert.yaml @@ -4,9 +4,7 @@ metadata: name: generate-traces-grpc namespace: chainsaw-replicas status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -14,6 +12,4 @@ metadata: name: generate-traces-http namespace: chainsaw-replicas status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/component-replicas/verify-traces-assert.yaml b/tests/e2e-openshift/component-replicas/verify-traces-assert.yaml index 5a330ee66..22042f477 100644 --- a/tests/e2e-openshift/component-replicas/verify-traces-assert.yaml +++ b/tests/e2e-openshift/component-replicas/verify-traces-assert.yaml @@ -4,9 +4,7 @@ metadata: name: verify-traces-grpc namespace: chainsaw-replicas status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -14,9 +12,7 @@ metadata: name: verify-traces-traceql-grpc namespace: chainsaw-replicas status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -24,9 +20,7 @@ metadata: name: verify-traces-http namespace: chainsaw-replicas status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -34,6 +28,4 @@ metadata: name: verify-traces-traceql-http namespace: chainsaw-replicas status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/monitoring-monolithic/chainsaw-test.yaml b/tests/e2e-openshift/monitoring-monolithic/chainsaw-test.yaml index 84b6d11f3..1aa629205 100644 --- a/tests/e2e-openshift/monitoring-monolithic/chainsaw-test.yaml +++ b/tests/e2e-openshift/monitoring-monolithic/chainsaw-test.yaml @@ -29,8 +29,8 @@ spec: try: - apply: file: verify-traces.yaml - - apply: - file: workload-monitoring-assert.yaml + - assert: + file: verify-traces-assert.yaml - name: Check Tempo Monolithc metrics scraped by user workload monitoring try: - script: diff --git a/tests/e2e-openshift/monitoring-monolithic/verify-traces-assert.yaml b/tests/e2e-openshift/monitoring-monolithic/verify-traces-assert.yaml new file mode 100644 index 000000000..30bbc7ee3 --- /dev/null +++ b/tests/e2e-openshift/monitoring-monolithic/verify-traces-assert.yaml @@ -0,0 +1,6 @@ +apiVersion: batch/v1 +kind: Job +metadata: + name: verify-traces +status: + succeeded: 1 diff --git a/tests/e2e-openshift/monitoring/04-assert.yaml b/tests/e2e-openshift/monitoring/04-assert.yaml index d7426be82..1e6909ccc 100644 --- a/tests/e2e-openshift/monitoring/04-assert.yaml +++ b/tests/e2e-openshift/monitoring/04-assert.yaml @@ -17,6 +17,4 @@ kind: Job metadata: name: verify-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/monolithic-multitenancy-openshift/03-assert.yaml b/tests/e2e-openshift/monolithic-multitenancy-openshift/03-assert.yaml index 55038b28c..1fafdf168 100644 --- a/tests/e2e-openshift/monolithic-multitenancy-openshift/03-assert.yaml +++ b/tests/e2e-openshift/monolithic-multitenancy-openshift/03-assert.yaml @@ -3,15 +3,11 @@ kind: Job metadata: name: generate-traces-grpc status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job metadata: name: generate-traces-http status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/monolithic-multitenancy-openshift/04-assert.yaml b/tests/e2e-openshift/monolithic-multitenancy-openshift/04-assert.yaml index ddf7cd37d..ff19437cf 100644 --- a/tests/e2e-openshift/monolithic-multitenancy-openshift/04-assert.yaml +++ b/tests/e2e-openshift/monolithic-multitenancy-openshift/04-assert.yaml @@ -3,33 +3,25 @@ kind: Job metadata: name: verify-traces-jaegerui-grpc status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job metadata: name: verify-traces-traceql-grpc status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job metadata: name: verify-traces-jaegerui-http status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job metadata: name: verify-traces-traceql-http status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/monolithic-multitenancy-static/01-assert.yaml b/tests/e2e-openshift/monolithic-multitenancy-static/01-assert.yaml index 581543714..e3202b406 100644 --- a/tests/e2e-openshift/monolithic-multitenancy-static/01-assert.yaml +++ b/tests/e2e-openshift/monolithic-multitenancy-static/01-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: setup-hydra status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/monolithic-multitenancy-static/04-assert.yaml b/tests/e2e-openshift/monolithic-multitenancy-static/04-assert.yaml index d63e4dc65..a88d2a37b 100644 --- a/tests/e2e-openshift/monolithic-multitenancy-static/04-assert.yaml +++ b/tests/e2e-openshift/monolithic-multitenancy-static/04-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: generate-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/monolithic-multitenancy-static/05-assert.yaml b/tests/e2e-openshift/monolithic-multitenancy-static/05-assert.yaml index 1e01a9144..8195a9df6 100644 --- a/tests/e2e-openshift/monolithic-multitenancy-static/05-assert.yaml +++ b/tests/e2e-openshift/monolithic-multitenancy-static/05-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces-traceql status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/monolithic-route/check-must-gather.sh b/tests/e2e-openshift/monolithic-route/check-must-gather.sh index b573afcc3..5629d59d3 100755 --- a/tests/e2e-openshift/monolithic-route/check-must-gather.sh +++ b/tests/e2e-openshift/monolithic-route/check-must-gather.sh @@ -15,7 +15,7 @@ REQUIRED_ITEMS=( "*sha*/olm/clusterserviceversion-tempo-operator-*.yaml" "*sha*/olm/operator-opentelemetry-product-openshift-opentelemetry-operator.yaml" "*sha*/olm/operator-tempo-*-tempo-operator.yaml" - "*sha*/olm/subscription-tempo-operator-*-sub.yaml" + "*sha*/olm/subscription-tempo-*.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" "*sha*/namespaces/chainsaw-mono-route/tempomonolithic/mono-route/configmap-tempo-mono-route-serving-cabundle.yaml" @@ -38,4 +38,4 @@ for item in "${REQUIRED_ITEMS[@]}"; do done # Cleanup the must-gather directory -rm -rf $MUST_GATHER_DIR \ No newline at end of file +rm -rf $MUST_GATHER_DIR diff --git a/tests/e2e-openshift/monolithic-single-tenant-auth/generate-traces-assert.yaml b/tests/e2e-openshift/monolithic-single-tenant-auth/generate-traces-assert.yaml index ba5d63b60..63d3b592c 100644 --- a/tests/e2e-openshift/monolithic-single-tenant-auth/generate-traces-assert.yaml +++ b/tests/e2e-openshift/monolithic-single-tenant-auth/generate-traces-assert.yaml @@ -4,6 +4,4 @@ metadata: name: generate-traces namespace: chainsaw-mst status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/monolithic-single-tenant-auth/verify-traces-jaeger-assert.yaml b/tests/e2e-openshift/monolithic-single-tenant-auth/verify-traces-jaeger-assert.yaml index 851cb4308..1de782d13 100644 --- a/tests/e2e-openshift/monolithic-single-tenant-auth/verify-traces-jaeger-assert.yaml +++ b/tests/e2e-openshift/monolithic-single-tenant-auth/verify-traces-jaeger-assert.yaml @@ -4,6 +4,4 @@ metadata: name: verify-traces-jaeger namespace: chainsaw-mst status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/monolithic-single-tenant-auth/verify-traces-traceql-assert.yaml b/tests/e2e-openshift/monolithic-single-tenant-auth/verify-traces-traceql-assert.yaml index 9fe3d31c9..8d7b2ec87 100644 --- a/tests/e2e-openshift/monolithic-single-tenant-auth/verify-traces-traceql-assert.yaml +++ b/tests/e2e-openshift/monolithic-single-tenant-auth/verify-traces-traceql-assert.yaml @@ -4,6 +4,4 @@ metadata: name: verify-traces-traceql namespace: chainsaw-mst status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/multitenancy/03-assert.yaml b/tests/e2e-openshift/multitenancy/03-assert.yaml index 9c5a6a6d8..b851c155d 100644 --- a/tests/e2e-openshift/multitenancy/03-assert.yaml +++ b/tests/e2e-openshift/multitenancy/03-assert.yaml @@ -4,9 +4,7 @@ metadata: name: generate-traces-grpc namespace: chainsaw-multitenancy status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -14,6 +12,4 @@ metadata: name: generate-traces-http namespace: chainsaw-multitenancy status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/multitenancy/04-assert.yaml b/tests/e2e-openshift/multitenancy/04-assert.yaml index c849ba665..aaadeeb4b 100644 --- a/tests/e2e-openshift/multitenancy/04-assert.yaml +++ b/tests/e2e-openshift/multitenancy/04-assert.yaml @@ -4,9 +4,7 @@ metadata: name: verify-traces-grpc namespace: chainsaw-multitenancy status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -14,9 +12,7 @@ metadata: name: verify-traces-traceql-grpc namespace: chainsaw-multitenancy status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -24,9 +20,7 @@ metadata: name: verify-traces-http namespace: chainsaw-multitenancy status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -34,6 +28,4 @@ metadata: name: verify-traces-traceql-http namespace: chainsaw-multitenancy status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/red-metrics/02-install-otel-collector.yaml b/tests/e2e-openshift/red-metrics/02-install-otel-collector.yaml index ce6005912..633211893 100644 --- a/tests/e2e-openshift/red-metrics/02-install-otel-collector.yaml +++ b/tests/e2e-openshift/red-metrics/02-install-otel-collector.yaml @@ -34,7 +34,7 @@ spec: resource_to_telemetry_conversion: enabled: true # by default resource attributes are dropped - logging: + debug: otlp: endpoint: tempo-redmetrics-distributor:4317 @@ -53,7 +53,7 @@ spec: exporters: [otlp, spanmetrics] metrics: receivers: [spanmetrics] - exporters: [prometheus, logging] + exporters: [prometheus, debug] --- apiVersion: monitoring.coreos.com/v1 diff --git a/tests/e2e-openshift/red-metrics/06-assert.yaml b/tests/e2e-openshift/red-metrics/06-assert.yaml index 6e63c0afb..886fd9e7a 100755 --- a/tests/e2e-openshift/red-metrics/06-assert.yaml +++ b/tests/e2e-openshift/red-metrics/06-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-metrics status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/route/check-must-gather.sh b/tests/e2e-openshift/route/check-must-gather.sh index 0a1185b72..e8b570fc5 100755 --- a/tests/e2e-openshift/route/check-must-gather.sh +++ b/tests/e2e-openshift/route/check-must-gather.sh @@ -15,7 +15,7 @@ REQUIRED_ITEMS=( "*sha*/olm/clusterserviceversion-tempo-operator-*.yaml" "*sha*/olm/operator-opentelemetry-product-openshift-opentelemetry-operator.yaml" "*sha*/olm/operator-*-tempo-operator.yaml" - "*sha*/olm/subscription-tempo-operator-*-sub.yaml" + "*sha*/olm/subscription-tempo-*.yaml" "*sha*/namespaces/chainsaw-route/tempostack/simplest/service-tempo-simplest-distributor.yaml" "*sha*/namespaces/chainsaw-route/tempostack/simplest/service-tempo-simplest-ingester.yaml" "*sha*/namespaces/chainsaw-route/tempostack/simplest/deployment-tempo-simplest-distributor.yaml" @@ -48,4 +48,4 @@ for item in "${REQUIRED_ITEMS[@]}"; do done # Cleanup the must-gather directory -rm -rf $MUST_GATHER_DIR \ No newline at end of file +rm -rf $MUST_GATHER_DIR diff --git a/tests/e2e-openshift/tempo-single-tenant-auth/generate-traces-assert.yaml b/tests/e2e-openshift/tempo-single-tenant-auth/generate-traces-assert.yaml index 1ee1b1348..06ad58162 100644 --- a/tests/e2e-openshift/tempo-single-tenant-auth/generate-traces-assert.yaml +++ b/tests/e2e-openshift/tempo-single-tenant-auth/generate-traces-assert.yaml @@ -4,6 +4,4 @@ metadata: name: generate-traces namespace: chainsaw-tst status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/tempo-single-tenant-auth/verify-traces-jaeger-assert.yaml b/tests/e2e-openshift/tempo-single-tenant-auth/verify-traces-jaeger-assert.yaml index 67092c16d..925cd0046 100644 --- a/tests/e2e-openshift/tempo-single-tenant-auth/verify-traces-jaeger-assert.yaml +++ b/tests/e2e-openshift/tempo-single-tenant-auth/verify-traces-jaeger-assert.yaml @@ -4,6 +4,4 @@ metadata: name: verify-traces-jaeger namespace: chainsaw-tst status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/tempo-single-tenant-auth/verify-traces-traceql-assert.yaml b/tests/e2e-openshift/tempo-single-tenant-auth/verify-traces-traceql-assert.yaml index 3a58e4455..80da88669 100644 --- a/tests/e2e-openshift/tempo-single-tenant-auth/verify-traces-traceql-assert.yaml +++ b/tests/e2e-openshift/tempo-single-tenant-auth/verify-traces-traceql-assert.yaml @@ -4,6 +4,4 @@ metadata: name: verify-traces-traceql namespace: chainsaw-tst status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/tls-monolithic-singletenant/03-assert.yaml b/tests/e2e-openshift/tls-monolithic-singletenant/03-assert.yaml index e9ebd41bc..f1b64779a 100644 --- a/tests/e2e-openshift/tls-monolithic-singletenant/03-assert.yaml +++ b/tests/e2e-openshift/tls-monolithic-singletenant/03-assert.yaml @@ -4,9 +4,7 @@ metadata: name: generate-traces-grpc namespace: chainsaw-tls-mono-st status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -14,6 +12,4 @@ metadata: name: generate-traces-http namespace: chainsaw-tls-mono-st status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/tls-monolithic-singletenant/04-assert.yaml b/tests/e2e-openshift/tls-monolithic-singletenant/04-assert.yaml index d61e19490..d15c0f136 100644 --- a/tests/e2e-openshift/tls-monolithic-singletenant/04-assert.yaml +++ b/tests/e2e-openshift/tls-monolithic-singletenant/04-assert.yaml @@ -4,9 +4,7 @@ metadata: name: verify-traces-grpc namespace: chainsaw-tls-mono-st status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -14,6 +12,4 @@ metadata: name: verify-traces-http namespace: chainsaw-tls-mono-st status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/tls-singletenant/03-assert.yaml b/tests/e2e-openshift/tls-singletenant/03-assert.yaml index b142f282a..82fc40647 100644 --- a/tests/e2e-openshift/tls-singletenant/03-assert.yaml +++ b/tests/e2e-openshift/tls-singletenant/03-assert.yaml @@ -4,9 +4,7 @@ metadata: name: generate-traces-grpc namespace: chainsaw-tls-singletenant status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -14,6 +12,4 @@ metadata: name: generate-traces-http namespace: chainsaw-tls-singletenant status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-openshift/tls-singletenant/04-assert.yaml b/tests/e2e-openshift/tls-singletenant/04-assert.yaml index 2ac298b8c..0cf42999a 100644 --- a/tests/e2e-openshift/tls-singletenant/04-assert.yaml +++ b/tests/e2e-openshift/tls-singletenant/04-assert.yaml @@ -4,9 +4,7 @@ metadata: name: verify-traces-grpc namespace: chainsaw-tls-singletenant status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job @@ -14,6 +12,4 @@ metadata: name: verify-traces-http namespace: chainsaw-tls-singletenant status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-upgrade/upgrade/40-assert.yaml b/tests/e2e-upgrade/upgrade/40-assert.yaml index 3f7323066..a88d2a37b 100644 --- a/tests/e2e-upgrade/upgrade/40-assert.yaml +++ b/tests/e2e-upgrade/upgrade/40-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: generate-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-upgrade/upgrade/50-assert.yaml b/tests/e2e-upgrade/upgrade/50-assert.yaml index d9aef19d9..d9ebd7fc4 100644 --- a/tests/e2e-upgrade/upgrade/50-assert.yaml +++ b/tests/e2e-upgrade/upgrade/50-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e-upgrade/upgrade/70-assert.yaml b/tests/e2e-upgrade/upgrade/70-assert.yaml index 9603fe12d..fcdb498a9 100644 --- a/tests/e2e-upgrade/upgrade/70-assert.yaml +++ b/tests/e2e-upgrade/upgrade/70-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces-after-upgrade status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/compatibility/03-assert.yaml b/tests/e2e/compatibility/03-assert.yaml index 3f7323066..a88d2a37b 100644 --- a/tests/e2e/compatibility/03-assert.yaml +++ b/tests/e2e/compatibility/03-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: generate-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/compatibility/04-assert.yaml b/tests/e2e/compatibility/04-assert.yaml index ab9e98db3..2000de515 100644 --- a/tests/e2e/compatibility/04-assert.yaml +++ b/tests/e2e/compatibility/04-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces-jaeger status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/compatibility/05-assert.yaml b/tests/e2e/compatibility/05-assert.yaml index 7eec01bfb..d4baf6efe 100644 --- a/tests/e2e/compatibility/05-assert.yaml +++ b/tests/e2e/compatibility/05-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces-grafana status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/custom-ca/02-assert.yaml b/tests/e2e/custom-ca/02-assert.yaml index 3f7323066..a88d2a37b 100644 --- a/tests/e2e/custom-ca/02-assert.yaml +++ b/tests/e2e/custom-ca/02-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: generate-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/custom-ca/03-assert.yaml b/tests/e2e/custom-ca/03-assert.yaml index d9aef19d9..d9ebd7fc4 100644 --- a/tests/e2e/custom-ca/03-assert.yaml +++ b/tests/e2e/custom-ca/03-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/monolithic-ingestion-mtls/03-assert.yaml b/tests/e2e/monolithic-ingestion-mtls/03-assert.yaml index d63e4dc65..5b558c510 100644 --- a/tests/e2e/monolithic-ingestion-mtls/03-assert.yaml +++ b/tests/e2e/monolithic-ingestion-mtls/03-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: generate-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 diff --git a/tests/e2e/monolithic-ingestion-mtls/04-assert.yaml b/tests/e2e/monolithic-ingestion-mtls/04-assert.yaml index 055af76dc..9ae4ae7ad 100644 --- a/tests/e2e/monolithic-ingestion-mtls/04-assert.yaml +++ b/tests/e2e/monolithic-ingestion-mtls/04-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 diff --git a/tests/e2e/monolithic-memory/03-assert.yaml b/tests/e2e/monolithic-memory/03-assert.yaml index 3f7323066..a88d2a37b 100644 --- a/tests/e2e/monolithic-memory/03-assert.yaml +++ b/tests/e2e/monolithic-memory/03-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: generate-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/monolithic-memory/04-assert.yaml b/tests/e2e/monolithic-memory/04-assert.yaml index ab9e98db3..2000de515 100644 --- a/tests/e2e/monolithic-memory/04-assert.yaml +++ b/tests/e2e/monolithic-memory/04-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces-jaeger status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/monolithic-memory/05-assert.yaml b/tests/e2e/monolithic-memory/05-assert.yaml index 7eec01bfb..d4baf6efe 100644 --- a/tests/e2e/monolithic-memory/05-assert.yaml +++ b/tests/e2e/monolithic-memory/05-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces-grafana status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/monolithic-pv/03-assert.yaml b/tests/e2e/monolithic-pv/03-assert.yaml index 3f7323066..a88d2a37b 100644 --- a/tests/e2e/monolithic-pv/03-assert.yaml +++ b/tests/e2e/monolithic-pv/03-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: generate-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/monolithic-pv/04-assert.yaml b/tests/e2e/monolithic-pv/04-assert.yaml index 055af76dc..d9ebd7fc4 100644 --- a/tests/e2e/monolithic-pv/04-assert.yaml +++ b/tests/e2e/monolithic-pv/04-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/monolithic-receivers-tls/03-assert.yaml b/tests/e2e/monolithic-receivers-tls/03-assert.yaml index 02d0f1afb..b9f26e679 100644 --- a/tests/e2e/monolithic-receivers-tls/03-assert.yaml +++ b/tests/e2e/monolithic-receivers-tls/03-assert.yaml @@ -3,15 +3,11 @@ kind: Job metadata: name: generate-traces-http status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job metadata: name: generate-traces-grpc status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/monolithic-receivers-tls/04-assert.yaml b/tests/e2e/monolithic-receivers-tls/04-assert.yaml index 1178bc292..d05a64d9a 100644 --- a/tests/e2e/monolithic-receivers-tls/04-assert.yaml +++ b/tests/e2e/monolithic-receivers-tls/04-assert.yaml @@ -3,15 +3,11 @@ kind: Job metadata: name: verify-traces-http status: - conditions: - - status: "True" - type: Complete + succeeded: 1 --- apiVersion: batch/v1 kind: Job metadata: name: verify-traces-grpc status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/monolithic-s3-tls/03-assert.yaml b/tests/e2e/monolithic-s3-tls/03-assert.yaml index 3f7323066..a88d2a37b 100644 --- a/tests/e2e/monolithic-s3-tls/03-assert.yaml +++ b/tests/e2e/monolithic-s3-tls/03-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: generate-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/monolithic-s3-tls/04-assert.yaml b/tests/e2e/monolithic-s3-tls/04-assert.yaml index 055af76dc..d9ebd7fc4 100644 --- a/tests/e2e/monolithic-s3-tls/04-assert.yaml +++ b/tests/e2e/monolithic-s3-tls/04-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/receivers-mtls/03-assert.yaml b/tests/e2e/receivers-mtls/03-assert.yaml index 3f7323066..a88d2a37b 100644 --- a/tests/e2e/receivers-mtls/03-assert.yaml +++ b/tests/e2e/receivers-mtls/03-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: generate-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/receivers-mtls/04-assert.yaml b/tests/e2e/receivers-mtls/04-assert.yaml index d9aef19d9..d9ebd7fc4 100644 --- a/tests/e2e/receivers-mtls/04-assert.yaml +++ b/tests/e2e/receivers-mtls/04-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/receivers-tls/03-assert.yaml b/tests/e2e/receivers-tls/03-assert.yaml index 3f7323066..a88d2a37b 100644 --- a/tests/e2e/receivers-tls/03-assert.yaml +++ b/tests/e2e/receivers-tls/03-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: generate-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/e2e/receivers-tls/04-assert.yaml b/tests/e2e/receivers-tls/04-assert.yaml index d9aef19d9..d9ebd7fc4 100644 --- a/tests/e2e/receivers-tls/04-assert.yaml +++ b/tests/e2e/receivers-tls/04-assert.yaml @@ -3,6 +3,4 @@ kind: Job metadata: name: verify-traces status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file diff --git a/tests/operator-metrics/max-loops/01-assert-job.yaml b/tests/operator-metrics/max-loops/01-assert-job.yaml index 9fbedde5d..4c7297892 100644 --- a/tests/operator-metrics/max-loops/01-assert-job.yaml +++ b/tests/operator-metrics/max-loops/01-assert-job.yaml @@ -4,6 +4,4 @@ metadata: name: verify-metrics namespace: ($TEMPO_NAMESPACE) status: - conditions: - - status: "True" - type: Complete + succeeded: 1 \ No newline at end of file