Skip to content
This repository has been archived by the owner on Jul 11, 2023. It is now read-only.

Add tracing options when Jaeger deployment is enabled for the demo script #3947

Merged
merged 4 commits into from
Aug 11, 2021
Merged

Add tracing options when Jaeger deployment is enabled for the demo script #3947

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da3e319
add tracing enabled depending on if jaeger will be deployed for full …
trstringer Aug 11, 2021
c92e81b
remove trailing space
trstringer Aug 11, 2021
7e31321
rename var
trstringer Aug 11, 2021
2dbb88c
use K8S_NAMESPACE env var instead of hard-coded osm-system
trstringer Aug 11, 2021
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
7 changes: 6 additions & 1 deletion demo/run-osm-demo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ ENABLE_DEBUG_SERVER="${ENABLE_DEBUG_SERVER:-true}"
ENABLE_EGRESS="${ENABLE_EGRESS:-false}"
DEPLOY_GRAFANA="${DEPLOY_GRAFANA:-false}"
DEPLOY_JAEGER="${DEPLOY_JAEGER:-false}"
TRACING_ADDRESS="${TRACING_ADDRESS:-jaeger.${K8S_NAMESPACE}.svc.cluster.local}"
ENABLE_FLUENTBIT="${ENABLE_FLUENTBIT:-false}"
DEPLOY_PROMETHEUS="${DEPLOY_PROMETHEUS:-false}"
DEPLOY_WITH_SAME_SA="${DEPLOY_WITH_SAME_SA:-false}"
Expand Down Expand Up @@ -87,7 +88,7 @@ fi

if [ "$PUBLISH_IMAGES" = true ]; then
make docker-push
fi
fi

./scripts/create-container-registry-creds.sh "$K8S_NAMESPACE"

Expand All @@ -110,6 +111,8 @@ if [ "$CERT_MANAGER" = "vault" ]; then
--set=OpenServiceMesh.enableEgress="$ENABLE_EGRESS" \
--set=OpenServiceMesh.deployGrafana="$DEPLOY_GRAFANA" \
--set=OpenServiceMesh.deployJaeger="$DEPLOY_JAEGER" \
--set=OpenServiceMesh.tracing.enable="$DEPLOY_JAEGER" \
--set=OpenServiceMesh.tracing.address="$TRACING_ADDRESS" \
--set=OpenServiceMesh.enableFluentbit="$ENABLE_FLUENTBIT" \
--set=OpenServiceMesh.deployPrometheus="$DEPLOY_PROMETHEUS" \
--set=OpenServiceMesh.envoyLogLevel="$ENVOY_LOG_LEVEL" \
Expand All @@ -130,6 +133,8 @@ else
--set=OpenServiceMesh.enableEgress="$ENABLE_EGRESS" \
--set=OpenServiceMesh.deployGrafana="$DEPLOY_GRAFANA" \
--set=OpenServiceMesh.deployJaeger="$DEPLOY_JAEGER" \
--set=OpenServiceMesh.tracing.enable="$DEPLOY_JAEGER" \
--set=OpenServiceMesh.tracing.address="$TRACING_ADDRESS" \
--set=OpenServiceMesh.enableFluentbit="$ENABLE_FLUENTBIT" \
--set=OpenServiceMesh.deployPrometheus="$DEPLOY_PROMETHEUS" \
--set=OpenServiceMesh.envoyLogLevel="$ENVOY_LOG_LEVEL" \
Expand Down