Validate Jaeger demo configurations in CI workflow

.github/workflows/ci-deploy-demo.yml

@@ -33,11 +33,10 @@ jobs:
 
     - name: Deploy using appropriate script
       run: |
-        cd ./examples/oci
         if [ "${{ github.event_name }}" = "schedule" ]; then
           echo "🕒 Scheduled run - using deploy-all.sh (upgrade mode)"
-          bash ./deploy-all.sh
+          bash ./examples/oci/deploy-all.sh
         else
           echo "🔄 Manual run - using deploy-all.sh with clean mode (uninstall/install)"
-          bash ./deploy-all.sh clean
+          bash ./examples/oci/deploy-all.sh clean
         fi         

.github/workflows/ci-docker-hotrod.yml

@@ -24,6 +24,9 @@ jobs:
       matrix:
         runtime: [docker, k8s]
         jaeger-version: [v1, v2]
+        exclude:
+          - runtime: k8s
+            jaeger-version: v1
 
     steps:
     - uses: step-security/harden-runner@ec9f2d5744a09debf3a187a3f4f675c53b671911 # v2.13.0
@@ -64,10 +67,6 @@ jobs:
       with:
         version: 'latest'
 
-    - name: Install Kustomize
-      if: matrix.runtime == 'k8s'
-      uses: imranismail/setup-kustomize@2ba527d4d055ab63514ba50a99456fc35684947f # v2
-
     - name: Create k8s Kind Cluster
       if: matrix.runtime == 'k8s'
       uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1

examples/oci/config.yaml

@@ -13,7 +13,12 @@ service:
       service.name: jaeger
     metrics:
       level: detailed
-      address: 0.0.0.0:8888
+      readers:
+        - pull:
+            exporter:
+              prometheus:
+                host: 0.0.0.0
+                port: 8888
     logs:
       level: DEBUG
 

examples/oci/deploy-all.sh

@@ -6,6 +6,7 @@
 set -euo pipefail
 
 MODE="${1:-upgrade}"
+IMAGE_TAG="${2:-latest}"
 
 if [[ "$MODE" == "upgrade" ]]; then
   HELM_JAEGER_CMD="upgrade --install --force"
@@ -23,11 +24,15 @@ else
   HELM_PROM_CMD="install"
 fi
 
-# Clone Jaeger Helm Charts (v2 branch) if not already present
+# Navigate to the script's directory (examples/oci)
+cd $(dirname $0)
+
+# Clone Jaeger Helm Charts if not already present
 if [ ! -d "helm-charts" ]; then
   echo "📥 Cloning Jaeger Helm Charts..."
   git clone https://github.com/jaegertracing/helm-charts.git
   cd helm-charts
+  echo "Using v2 branch for Jaeger v2..."
   git checkout v2
   echo "Adding required Helm repositories..."
   helm repo add bitnami https://charts.bitnami.com/bitnami
@@ -40,25 +45,34 @@ else
   echo "📁 Jaeger Helm Charts already exist. Skipping clone."
 fi
 
-# Navigate into examples/oci if not already in it
-if [[ "$(basename $PWD)" != "oci" ]]; then
-  if [ -d "./examples/oci" ]; then
-    echo "📂 Changing to ./examples/oci directory..."
-    cd ./examples/oci
-  else
-    echo "❌ Cannot find ./examples/oci directory. Exiting."
-    exit 1
-  fi
-fi
+# Set image repositories and deploy based on mode
+if [[ "$MODE" == "local" ]]; then
 
-echo "🟣 Deploying Jaeger..."
-helm $HELM_JAEGER_CMD jaeger ./helm-charts/charts/jaeger \
-  --set provisionDataStore.cassandra=false \
-  --set allInOne.enabled=true \
-  --set storage.type=memory \
-  --set-file userconfig="./config.yaml" \
-  --set-file uiconfig="./ui-config.json" \
-  -f ./jaeger-values.yaml
+  echo "🟣 Deploying Jaeger with local registry images..."
+  helm $HELM_JAEGER_CMD jaeger ./helm-charts/charts/jaeger \
+    --set provisionDataStore.cassandra=false \
+    --set allInOne.enabled=true \
+    --set storage.type=memory \
+    --set hotrod.enabled=true \
+    --set allInOne.image.repository="localhost:5000/jaegertracing/jaeger" \
+    --set allInOne.image.tag="${IMAGE_TAG}"  \
+    --set allInOne.image.pullPolicy="Never" \
+    --set hotrod.image.repository="localhost:5000/jaegertracing/example-hotrod" \
+    --set hotrod.image.tag="${IMAGE_TAG}"  \
+    --set hotrod.image.pullPolicy="Never" \
+    --set-file userconfig="./config.yaml" \
+    --set-file uiconfig="./ui-config.json" \
+    -f ./jaeger-values.yaml
+else
+  echo "🟣 Deploying Jaeger..."
+  helm $HELM_JAEGER_CMD jaeger ./helm-charts/charts/jaeger \
+    --set provisionDataStore.cassandra=false \
+    --set allInOne.enabled=true \
+    --set storage.type=memory \
+    --set-file userconfig="./config.yaml" \
+    --set-file uiconfig="./ui-config.json" \
+    -f ./jaeger-values.yaml
+fi
 
 echo "🟢 Deploying Prometheus..."
 kubectl apply -f prometheus-svc.yaml
@@ -90,4 +104,8 @@ echo "Then open:"
 echo "🔍 Jaeger: http://localhost:16686/jaeger"
 echo "📈 Prometheus: http://localhost:9090"
 echo "📊 Grafana: http://localhost:9091"
-echo "🚕 HotROD: http://localhost:8080"
+echo "🚕 HotROD: http://localhost:8080"
+echo ""
+echo "📝 Note: If you made changes to Jaeger configuration files (e.g., config.yaml, ui-config.json), you may need to run this script in clean mode:"
+echo "    ./deploy-all.sh clean"
+echo "Or manually restart the CI workflow to ensure your changes are applied."

scripts/build/build-hotrod-image.sh

@@ -3,7 +3,7 @@
 # Copyright (c) 2024 The Jaeger Authors.
 # SPDX-License-Identifier: Apache-2.0
 
-set -euf -o pipefail
+set -exuf -o pipefail
 
 print_help() {
   echo "Usage: $0 [-h] [-l] [-o] [-p platforms] [-v jaeger_version]"
@@ -75,8 +75,7 @@ dump_logs() {
 
   echo "::group:: Logs"
   if [ "$runtime" == "k8s" ]; then
-    kubectl logs -n example-hotrod -l app=example-hotrod
-    kubectl logs -n example-hotrod -l app=jaeger
+    kubectl logs -l app.kubernetes.io/name=jaeger
   else
     docker compose -f "$compose_file" logs
   fi
@@ -95,7 +94,8 @@ teardown() {
     if [[ -n "${JAEGER_PORT_FWD_PID:-}" ]]; then
       kill "$JAEGER_PORT_FWD_PID" || true
     fi
-    kubectl delete namespace example-hotrod --ignore-not-found=true
+    helm uninstall jaeger --ignore-not-found || true
+    helm uninstall prometheus --ignore-not-found || true
   else
     docker compose -f "$docker_compose_file" down
   fi
@@ -132,12 +132,29 @@ if [[ "${runtime}" == "k8s" ]]; then
   fi
 
   echo '::group:: run on Kubernetes'
-  kustomize build ./examples/hotrod/kubernetes | kubectl apply -n example-hotrod -f -
-  kubectl wait --for=condition=available --timeout=180s -n example-hotrod deployment/example-hotrod
+  echo '::group:: Loading images into Kind cluster'
 
-  kubectl port-forward -n example-hotrod service/example-hotrod 8080:frontend &
+  docker pull localhost:5000/jaegertracing/jaeger:"${GITHUB_SHA}"
+  docker pull localhost:5000/jaegertracing/example-hotrod:"${GITHUB_SHA}"
+
+  # Get the actual cluster name
+  CLUSTER_NAME=$(kind get clusters | head -n1)
+  if [[ -n "$CLUSTER_NAME" ]]; then
+    echo "Loading images into '$CLUSTER_NAME' cluster..."
+    kind load docker-image localhost:5000/jaegertracing/jaeger:"${GITHUB_SHA}" --name "$CLUSTER_NAME"
+    kind load docker-image localhost:5000/jaegertracing/example-hotrod:"${GITHUB_SHA}" --name "$CLUSTER_NAME"
+  else
+    echo "No Kind clusters found!"
+    exit 1
+  fi
+
+  bash ./examples/oci/deploy-all.sh local "${GITHUB_SHA}"
+  kubectl wait --for=condition=available --timeout=180s deployment/jaeger-hotrod
+  kubectl wait --for=condition=available --timeout=180s deployment/jaeger
+
+  kubectl port-forward svc/jaeger-hotrod 8080:80 &
   HOTROD_PORT_FWD_PID=$!
-  kubectl port-forward -n example-hotrod service/jaeger 16686:frontend &
+  kubectl port-forward svc/jaeger-query 16686:16686 &
   JAEGER_PORT_FWD_PID=$!
   echo '::endgroup::'
 
@@ -147,22 +164,30 @@ else
   echo '::endgroup::'
 fi
 
+if [[ "${runtime}" == "k8s" ]]; then
+  HOTROD_URL="http://localhost:8080/hotrod"
+  JAEGER_QUERY_URL="http://localhost:16686/jaeger"
+else
+  HOTROD_URL="http://localhost:8080"
+  JAEGER_QUERY_URL="http://localhost:16686"
+fi
+
 i=0
-while [[ "$(curl -s -o /dev/null -w '%{http_code}' localhost:8080)" != "200" && $i -lt 30 ]]; do
+while [[ "$(curl -s -o /dev/null -w '%{http_code}' ${HOTROD_URL})" != "200" && $i -lt 30 ]]; do
   sleep 1
   i=$((i+1))
 done
 
 echo '::group:: check HTML'
 echo 'Check that home page contains text Rides On Demand'
-body=$(curl localhost:8080)
+body=$(curl ${HOTROD_URL})
 if [[ $body != *"Rides On Demand"* ]]; then
   echo "String \"Rides On Demand\" is not present on the index page"
   exit 1
 fi
 echo '::endgroup::'
 
-response=$(curl -i -X POST "http://localhost:8080/dispatch?customer=123")
+response=$(curl -i -X POST "${HOTROD_URL}/dispatch?customer=123")
 TRACE_ID=$(echo "$response" | grep -Fi "Traceresponse:" | awk '{print $2}' | cut -d '-' -f 2)
 
 if [ -n "$TRACE_ID" ]; then
@@ -172,7 +197,6 @@ else
   exit 1
 fi
 
-JAEGER_QUERY_URL="http://localhost:16686"
 EXPECTED_SPANS=35
 MAX_RETRIES=30
 SLEEP_INTERVAL=3
@@ -208,3 +232,4 @@ success="true"
 # Ensure the image is published after successful test (maybe with -l flag if on a pull request).
 # This is where all those multi-platform binaries we built earlier are utilized.
 bash scripts/build/build-upload-a-docker-image.sh "${FLAGS[@]}" -c example-hotrod -d examples/hotrod -p "${platforms}"
+