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/hotrod/kubernetes/README.md

@@ -1,17 +1,69 @@
 # Hot R.O.D. - Rides on Demand on Kubernetes
 
-Example k8s manifests for deploying the [hotrod app](..) to your k8s environment of choice. e.g. minikube, k3s, EKS, GKE
+Example deployment for the [hotrod app](..) using Helm charts in your Kubernetes environment (Kind, minikube, k3s, EKS, GKE).
+
+## Prerequisites
+
+- Kubernetes cluster
+- Helm 3.x installed
+- kubectl configured
 
 ## Usage
 
+### Deploy with Default Configuration
+
 ```bash
-kustomize build . | kubectl apply -f -
-kubectl port-forward -n example-hotrod service/example-hotrod 8080:frontend
-# In another terminal
-kubectl port-forward -n example-hotrod service/jaeger 16686:frontend
+cd examples/oci
+./deploy-all.sh clean
+```
+
+### Deploy with Local Images (for development)
 
-# To cleanup
-kustomize build . | kubectl delete -f -
+```bash
+# For Jaeger v2 with local images
+cd examples/oci
+./deploy-all.sh local <image-tag>
 ```
 
-Access Jaeger UI at <http://localhost:16686> and HotROD app at <http://localhost:8080>
+### Deploy Modes
+
+- **`upgrade`** (default): Upgrade existing deployment or install if not present
+- **`local`**: Deploy using local registry images (localhost:5000)
+- **`clean`**: Clean install (removes existing deployment first)
+
+### Access Applications
+
+After deployment completes, use port-forwarding:
+
+```bash
+# Jaeger UI
+kubectl port-forward svc/jaeger-query 16686:16686
+
+# HotROD application
+kubectl port-forward svc/jaeger-hotrod 8080:80
+
+# Prometheus (optional)
+kubectl port-forward svc/prometheus 9090:9090
+
+# Grafana (optional)
+kubectl port-forward svc/prometheus-grafana 9091:80
+```
+
+Then access:
+- 🔍 **Jaeger UI**: http://localhost:16686/jaeger
+- 🚕 **HotROD App**: http://localhost:8080
+- 📈 **Prometheus**: http://localhost:9090
+- 📊 **Grafana**: http://localhost:9091
+
+## Configuration
+
+The deployment uses:
+- **Helm charts** from [jaeger-helm-charts](https://github.com/jaegertracing/helm-charts)
+- **Prometheus** for metrics collection
+- **Load generator** for creating sample traces
+
+Configuration files:
+- `jaeger-values.yaml` - Jaeger Helm chart values
+- `config.yaml` - Jaeger configuration
+- `ui-config.json` - Jaeger UI configuration
+- `monitoring-values.yaml` - Prometheus configuration

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."