diff --git a/tests/e2e/allinone-ingress/00-assert.yaml b/tests/e2e/allinone-ingress/00-assert.yaml index 17842bb97..77db0ca4c 100644 --- a/tests/e2e/allinone-ingress/00-assert.yaml +++ b/tests/e2e/allinone-ingress/00-assert.yaml @@ -1,3 +1,4 @@ +# Assert there is an ingress entry for the Jaeger query apiVersion: networking.k8s.io/v1 kind: Ingress metadata: diff --git a/tests/e2e/allinone-ingress/00-install.yaml b/tests/e2e/allinone-ingress/00-install.yaml index 7fc0ff65a..28894d783 100644 --- a/tests/e2e/allinone-ingress/00-install.yaml +++ b/tests/e2e/allinone-ingress/00-install.yaml @@ -1,3 +1,4 @@ +# Install the Jaeger intance apiVersion: jaegertracing.io/v1 kind: Jaeger metadata: diff --git a/tests/e2e/allinone-ingress/01-assert.yaml b/tests/e2e/allinone-ingress/01-assert.yaml new file mode 100644 index 000000000..3b011f3ac --- /dev/null +++ b/tests/e2e/allinone-ingress/01-assert.yaml @@ -0,0 +1,7 @@ +# Assert the spans are reported +apiVersion: batch/v1 +kind: Job +metadata: + name: report-span +status: + succeeded: 1 diff --git a/tests/e2e/allinone-ingress/01-report-span.yaml b/tests/e2e/allinone-ingress/01-report-span.yaml index 3ac53067a..9ec7bb221 100644 --- a/tests/e2e/allinone-ingress/01-report-span.yaml +++ b/tests/e2e/allinone-ingress/01-report-span.yaml @@ -1,3 +1,4 @@ +# Report some spans apiVersion: batch/v1 kind: Job metadata: @@ -19,4 +20,4 @@ spec: - name: JAEGER_QUERY value: "http://my-jaeger-query:16686/api/traces" restartPolicy: OnFailure - backoffLimit: 10 \ No newline at end of file + backoffLimit: 10 diff --git a/tests/e2e/allinone-ingress/02-check-ingress.yaml b/tests/e2e/allinone-ingress/02-check-ingress.yaml index 097a128b3..15459b7ad 100644 --- a/tests/e2e/allinone-ingress/02-check-ingress.yaml +++ b/tests/e2e/allinone-ingress/02-check-ingress.yaml @@ -1,6 +1,6 @@ +# Check the spans werer reported successfully and Jaeger query is reachable from +# localhost apiVersion: kuttl.dev/v1beta1 kind: TestStep commands: - - command: "kubectl wait --for=condition=complete --timeout=30s job/report-span" - namespaced: true - - script: "go run ../../assert-jobs/query/main.go --service-name=my-test-service" \ No newline at end of file + - script: "go run ../../assert-jobs/query/main.go --service-name=my-test-service"