Skip to content

Commit 3d64de1

Browse files
authored
chore(helm): remove Jaeger (#1334)
Because - we are replacing the observability stack with Grafana Stack. This commit - removes Jaeger
1 parent b24855c commit 3d64de1

File tree

7 files changed

+24
-94
lines changed

7 files changed

+24
-94
lines changed

Makefile.helper

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ define HELM
4141
$(if $(filter true,$(1)),--set ray-cluster.head.resources.requests.memory=0,) \
4242
$(if $(filter true,$(1)),--set ray-cluster.worker.resources.requests.cpu=0,) \
4343
$(if $(filter true,$(1)),--set ray-cluster.worker.resources.requests.memory=0,) \
44-
$(if $(filter true,$(1)),--set jaeger.enabled=false,) \
4544
$(if $(filter true,$(1)),--set opentelemetry-collector.enabled=false,) \
4645
$(if $(filter true,$(1)),--set kube-prometheus-stack.enabled=false,) \
4746
$(if $(filter true,$(1)),--set 'pipelineBackend.extraEnv[0].name=CFG_COMPONENT_SECRETS_GITHUB_OAUTHCLIENTID',) \

charts/core/Chart.lock

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
11
dependencies:
2-
- name: influxdb2
3-
repository: https://helm.influxdata.com
4-
version: 2.1.1
5-
- name: milvus
6-
repository: https://zilliztech.github.io/milvus-helm
7-
version: 4.1.30
8-
- name: kuberay-operator
9-
repository: https://ray-project.github.io/kuberay-helm
10-
version: 1.3.2
11-
- name: ray-cluster
12-
repository: https://ray-project.github.io/kuberay-helm
13-
version: 1.3.2
14-
- name: elasticsearch
15-
repository: https://helm.elastic.co
16-
version: 8.5.1
17-
- name: jaeger
18-
repository: https://jaegertracing.github.io/helm-charts
19-
version: 3.4.1
20-
- name: opentelemetry-collector
21-
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
22-
version: 0.119.0
23-
- name: kube-prometheus-stack
24-
repository: https://prometheus-community.github.io/helm-charts
25-
version: 70.3.0
26-
digest: sha256:88794c7d365f8054f541d840ad013d6693a03c21801b3b2e554f72655089617a
27-
generated: "2025-05-12T19:56:27.622185+01:00"
2+
- name: influxdb2
3+
repository: https://helm.influxdata.com
4+
version: 2.1.1
5+
- name: milvus
6+
repository: https://zilliztech.github.io/milvus-helm
7+
version: 4.1.30
8+
- name: kuberay-operator
9+
repository: https://ray-project.github.io/kuberay-helm
10+
version: 1.3.2
11+
- name: ray-cluster
12+
repository: https://ray-project.github.io/kuberay-helm
13+
version: 1.3.2
14+
- name: elasticsearch
15+
repository: https://helm.elastic.co
16+
version: 8.5.1
17+
- name: opentelemetry-collector
18+
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
19+
version: 0.119.0
20+
- name: kube-prometheus-stack
21+
repository: https://prometheus-community.github.io/helm-charts
22+
version: 70.3.0
23+
digest: sha256:d5ac0a0622d650e502e16aa7945f82ded2cfe62669792cb4dd9ccc8b900d87a9
24+
generated: "2025-07-27T00:27:03.685644+01:00"

charts/core/Chart.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ dependencies:
3838
repository: https://helm.elastic.co
3939
version: 8.5.1
4040
condition: elasticsearch.enabled
41-
- name: jaeger
42-
repository: https://jaegertracing.github.io/helm-charts
43-
version: 3.4.1
44-
condition: jaeger.enabled
4541
- name: opentelemetry-collector
4642
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
4743
version: 0.119.0

charts/core/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ The Helm chart of Instill Core
1010
|------------|------|---------|
1111
| https://helm.elastic.co | elasticsearch | 8.5.1 |
1212
| https://helm.influxdata.com | influxdb2 | 2.1.1 |
13-
| https://jaegertracing.github.io/helm-charts | jaeger | 3.4.1 |
1413
| https://open-telemetry.github.io/opentelemetry-helm-charts | opentelemetry-collector | 0.119.0 |
1514
| https://prometheus-community.github.io/helm-charts | kube-prometheus-stack | 70.3.0 |
1615
| https://ray-project.github.io/kuberay-helm | kuberay-operator | 1.3.2 |

charts/core/templates/NOTES.txt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ Get the application URL by running these commands:
1212
{{- else if eq .Values.expose.type "nodePort" }}
1313
export APIGATEWAY_NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "core.apiGateway" . }})
1414
export CONSOLE_NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "core.console" . }})
15-
{{- if .Values.jaeger.enabled }}
16-
export JAEGER_NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services jaeger-query)
17-
{{- end }}
1815
{{- if and (index .Values "kube-prometheus-stack" "enabled") (index .Values "kube-prometheus-stack" "prometheus" "enabled") }}
1916
export PROMETHEUS_NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services prometheus)
2017
{{- end }}
@@ -34,10 +31,6 @@ echo http://$SERVICE_IP:{{ .Values.service.port }}
3431
export API_GATEWAY_CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} ${API_GATEWAY_POD_NAME} -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
3532
export CONSOLE_POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/component=console,app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
3633
export CONSOLE_CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} ${CONSOLE_POD_NAME} -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
37-
{{- if .Values.jaeger.enabled }}
38-
export JAEGER_POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/component=query,app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
39-
export JAEGER_CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} ${JAEGER_POD_NAME} -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
40-
{{- end }}
4134
{{- if and (index .Values "kube-prometheus-stack" "enabled") (index .Values "kube-prometheus-stack" "prometheus" "enabled") }}
4235
export PROMETHEUS_POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name=prometheus,app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
4336
export PROMETHEUS_CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} ${PROMETHEUS_POD_NAME} -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
@@ -51,11 +44,6 @@ echo http://$SERVICE_IP:{{ .Values.service.port }}
5144
echo "Access to the api-gateway http://localhost:8080 and console http://localhost:3000 by:"
5245
echo "kubectl --namespace {{ .Release.Namespace }} port-forward ${API_GATEWAY_POD_NAME} 8080:${API_GATEWAY_CONTAINER_PORT}"
5346
echo "kubectl --namespace {{ .Release.Namespace }} port-forward ${CONSOLE_POD_NAME} 3000:${CONSOLE_CONTAINER_PORT}"
54-
{{- if .Values.jaeger.enabled }}
55-
echo "Access to the observability stack"
56-
echo "Jaeger UI at http://localhost:16686 by:"
57-
echo "kubectl --namespace {{ .Release.Namespace }} port-forward ${JAEGER_POD_NAME} 16686:${JAEGER_CONTAINER_PORT}"
58-
{{- end }}
5947
{{- if and (index .Values "kube-prometheus-stack" "enabled") (index .Values "kube-prometheus-stack" "prometheus" "enabled") }}
6048
echo "Prometheus UI at http://localhost:9090 by:"
6149
echo "kubectl --namespace {{ .Release.Namespace }} port-forward ${PROMETHEUS_POD_NAME} 9090:${PROMETHEUS_CONTAINER_PORT}"

charts/core/templates/_helpers.tpl

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -405,17 +405,6 @@ Influxdb2
405405
{{- end -}}
406406
{{- end -}}
407407

408-
{{/*
409-
Jaeger
410-
*/}}
411-
{{- define "core.jaeger" -}}
412-
{{- printf "%s-jaeger-collector" (include "core.fullname" .) -}}
413-
{{- end -}}
414-
415-
{{- define "core.jaeger.port" -}}
416-
{{- printf "14268" -}}
417-
{{- end -}}
418-
419408
{{/*
420409
OpenTelemetry
421410
*/}}

charts/core/values.yaml

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1647,36 +1647,6 @@ elasticsearch:
16471647
xpack.security.enabled: false
16481648
## -- The configuration of external Elasticsearch
16491649
external:
1650-
# -- The configuration of Jaeger
1651-
jaeger:
1652-
enabled: true
1653-
provisionDataStore:
1654-
cassandra: false
1655-
storage:
1656-
type: elasticsearch
1657-
elasticsearch:
1658-
host: core-elasticsearch-master
1659-
port: 9200
1660-
user: elastic
1661-
password: password
1662-
collector:
1663-
initContainers:
1664-
- name: wait-for-elasticsearch
1665-
image: curlimages/curl:8.00.1
1666-
command: ["sh", "-c"]
1667-
args:
1668-
- >
1669-
while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://core-elasticsearch-master:9200)" != "200" ]]; do echo waiting for elasticsearch; sleep 1; done
1670-
1671-
query:
1672-
initContainers:
1673-
- name: wait-for-elasticsearch
1674-
image: curlimages/curl:8.00.1
1675-
command: ["sh", "-c"]
1676-
args:
1677-
- >
1678-
while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://core-elasticsearch-master:9200)" != "200" ]]; do echo waiting for elasticsearch; sleep 1; done
1679-
16801650
# -- The configuration of OpenTelemetry Collector
16811651
opentelemetry-collector:
16821652
enabled: true
@@ -1686,12 +1656,6 @@ opentelemetry-collector:
16861656
image:
16871657
repository: "otel/opentelemetry-collector-k8s"
16881658
ports:
1689-
jaeger-compact:
1690-
enabled: false
1691-
jaeger-thrift:
1692-
enabled: false
1693-
jaeger-grpc:
1694-
enabled: false
16951659
zipkin:
16961660
enabled: false
16971661
otlp-http:
@@ -1707,7 +1671,6 @@ opentelemetry-collector:
17071671
protocol: TCP
17081672
config:
17091673
receivers:
1710-
jaeger: {}
17111674
prometheus: {}
17121675
zipkin: {}
17131676
otlp:
@@ -1724,7 +1687,7 @@ opentelemetry-collector:
17241687
exporters:
17251688
debug: {}
17261689
otlp:
1727-
endpoint: core-jaeger-collector:14250
1690+
endpoint:
17281691
tls:
17291692
insecure: true
17301693
service:
@@ -1754,7 +1717,6 @@ opentelemetry-collector:
17541717
- batch
17551718
receivers:
17561719
- otlp
1757-
- jaeger
17581720
# -- The configuration of Prometheus Stack
17591721
kube-prometheus-stack:
17601722
enabled: true

0 commit comments

Comments
 (0)