Skip to content

Commit 952c77a

Browse files
Multiple minor changes in Jaeger demo deployment in OKE (#7427)
## Which problem is this PR solving? - Part of #7115 - Fix the issue where hotrod redirected to jaeger-ui to localhost - Deleted unused YAML in one of the previous PRs but that was indeed needed to help jaeger access the prometheus database when created with helm . - add --force flag to ensure upgrade are not done inplace but by recreating the pods ## How was this change tested? - locally on a kind cluster ## Checklist - [ ] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [ ] I have signed all commits - [ ] I have added unit tests for the new functionality - [ ] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `npm run lint` and `npm run test` --------- Signed-off-by: chahat sagar <[email protected]>
1 parent b3de96a commit 952c77a

File tree

3 files changed

+35
-4
lines changed

3 files changed

+35
-4
lines changed

examples/oci/deploy-all.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fi
3535

3636
# Deploy Jaeger (All-in-One with memory storage)
3737
echo "🟣 Step 1: Installing Jaeger..."
38-
helm upgrade --install jaeger ./helm-charts/charts/jaeger \
38+
helm upgrade --install --force jaeger ./helm-charts/charts/jaeger \
3939
--set provisionDataStore.cassandra=false \
4040
--set allInOne.enabled=true \
4141
--set storage.type=memory \
@@ -44,9 +44,8 @@ helm upgrade --install jaeger ./helm-charts/charts/jaeger \
4444

4545
# Deploy Prometheus Monitoring Stack
4646
echo "🟢 Step 2: Deploying Prometheus Monitoring stack..."
47-
helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
48-
helm repo update
49-
helm upgrade --install prometheus -f monitoring-values.yaml prometheus-community/kube-prometheus-stack
47+
kubectl apply -f prometheus-svc.yaml
48+
helm upgrade --install --force prometheus -f monitoring-values.yaml prometheus-community/kube-prometheus-stack
5049

5150
# Create ConfigMap for Trace Generator
5251
echo "🔵 Step 3: Creating ConfigMap for Trace Generator..."

examples/oci/jaeger-values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ hotrod:
77
extraArgs:
88
- --otel-exporter=otlp
99
- --basepath=/hotrod
10+
- --jaeger-ui=https://demo.jaegertracing.io
1011
livenessProbe:
1112
path: /hotrod
1213
readinessProbe:

examples/oci/prometheus-svc.yaml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
name: prometheus
5+
labels:
6+
app.kubernetes.io/name: prometheus
7+
spec:
8+
selector:
9+
app.kubernetes.io/name: prometheus
10+
app.kubernetes.io/instance: prometheus-kube-prometheus-prometheus
11+
ports:
12+
- name: http
13+
port: 9090
14+
targetPort: 9090
15+
16+
---
17+
apiVersion: v1
18+
kind: Service
19+
metadata:
20+
name: jaeger-collector-prometheus
21+
spec:
22+
selector:
23+
app.kubernetes.io/name: jaeger
24+
app.kubernetes.io/instance: jaeger
25+
ports:
26+
- name: prometheus
27+
port: 8889
28+
targetPort: 8889
29+
- name: metrics
30+
port: 8888
31+
targetPort: 8888

0 commit comments

Comments
 (0)