Skip to content

Commit

Permalink
Merge branch 'master' into fix_grpc_flags_openshift
Browse files Browse the repository at this point in the history
  • Loading branch information
rubenvp8510 authored Oct 20, 2021
2 parents 0682946 + d9e6533 commit bfae969
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 4 deletions.
1 change: 1 addition & 0 deletions tests/e2e/allinone-ingress/00-assert.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Assert there is an ingress entry for the Jaeger query
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
Expand Down
1 change: 1 addition & 0 deletions tests/e2e/allinone-ingress/00-install.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Install the Jaeger intance
apiVersion: jaegertracing.io/v1
kind: Jaeger
metadata:
Expand Down
7 changes: 7 additions & 0 deletions tests/e2e/allinone-ingress/01-assert.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Assert the spans are reported
apiVersion: batch/v1
kind: Job
metadata:
name: report-span
status:
succeeded: 1
3 changes: 2 additions & 1 deletion tests/e2e/allinone-ingress/01-report-span.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Report some spans
apiVersion: batch/v1
kind: Job
metadata:
Expand All @@ -19,4 +20,4 @@ spec:
- name: JAEGER_QUERY
value: "http://my-jaeger-query:16686/api/traces"
restartPolicy: OnFailure
backoffLimit: 10
backoffLimit: 10
6 changes: 3 additions & 3 deletions tests/e2e/allinone-ingress/02-check-ingress.yaml
Original file line number Diff line number Diff line change
@@ -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"
- script: "go run ../../assert-jobs/query/main.go --service-name=my-test-service"

0 comments on commit bfae969

Please sign in to comment.