Skip to content

Commit 6b4a59c

Browse files
hellspawn679rgaduputmehulyurishkuro
authored
Jaeger v2 with v1 (#613)
* Jaeger allInOne allow different storage types (#603) Signed-off-by: Reddysekhar Gaduputi <[email protected]> upgrade jaeger-operator to latest 1.61.0 (#605) Signed-off-by: Blair Bowden <[email protected]> added all-in-one deployment and configmap for jaeger-v2 Signed-off-by: Mehul <[email protected]> lint fix Signed-off-by: Mehul <[email protected]> fixed Signed-off-by: Mehul <[email protected]> lint fix Signed-off-by: Mehul <[email protected]> lint fix Signed-off-by: Mehul <[email protected]> fixed using pre-hook Signed-off-by: Mehul <[email protected]> fixed --config flag is not been passed Signed-off-by: mehul <[email protected]> release ns for config-map.yaml Signed-off-by: mehul <[email protected]> testing ci Signed-off-by: mehul <[email protected]> testing ci Signed-off-by: mehul <[email protected]> fixed ns Signed-off-by: mehul <[email protected]> fixed ns Signed-off-by: mehul <[email protected]> fixed template Signed-off-by: mehul <[email protected]> removed sampling Signed-off-by: mehul <[email protected]> removed adaptive sampling from processors Signed-off-by: mehul <[email protected]> Revert "Jaeger v2 test2" Signed-off-by: mehul <[email protected]> attempt to create v2 chart in v1 Signed-off-by: mehul <[email protected]> enabled collector query and agent Signed-off-by: mehul <[email protected]> version bump Signed-off-by: mehul <[email protected]> testing-v2-ci Signed-off-by: mehul <[email protected]> testing-v2-ci Signed-off-by: mehul <[email protected]> added --helm-extra-set-args flag Signed-off-by: mehul <[email protected]> fixed healthcheck port-v2 Signed-off-by: mehul <[email protected]> Fix health check path Signed-off-by: Yuri Shkuro <[email protected]> minor changes Signed-off-by: mehul <[email protected]> * minor changes Signed-off-by: mehul <[email protected]> * added image changes Signed-off-by: mehul <[email protected]> * fix lint Signed-off-by: mehul <[email protected]> * removed v1 allInOne and added jaeger-v2 Signed-off-by: mehul <[email protected]> * removed v2 references Signed-off-by: mehul <[email protected]> * added allInOne again Signed-off-by: mehul <[email protected]> * minor fix Signed-off-by: mehul <[email protected]> * fixed how the config is being passed Signed-off-by: mehul <[email protected]> * fixed mirror template change Signed-off-by: mehul <[email protected]> * use --set-file for user config Signed-off-by: mehul <[email protected]> * removed config-test and updated configmap template Signed-off-by: mehul <[email protected]> * fixed Signed-off-by: mehul <[email protected]> * fixed minor naming Signed-off-by: mehul <[email protected]> * indentation Signed-off-by: Yuri Shkuro <[email protected]> --------- Signed-off-by: mehul <[email protected]> Signed-off-by: mehul gautam <[email protected]> Signed-off-by: mehul <[email protected]> Signed-off-by: Yuri Shkuro <[email protected]> Co-authored-by: Reddysekhar Gaduputi <[email protected]> Co-authored-by: mehul <[email protected]> Co-authored-by: Yuri Shkuro <[email protected]>
1 parent 05e6fa3 commit 6b4a59c

File tree

6 files changed

+176
-48
lines changed

6 files changed

+176
-48
lines changed

‎.github/workflows/lint-test.yaml

+10-39
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Run chart-testing (lint)
3939
run: ct lint --config ct.yaml
4040

41-
test-with-cassandra:
41+
test-with-all-in-one:
4242
runs-on: ubuntu-latest
4343
steps:
4444
- uses: actions/checkout@v2
@@ -47,43 +47,14 @@ jobs:
4747

4848
- uses: ./.github/actions/prepare-k8s
4949

50-
- name: Run cassandra-chart-testing (install)
51-
run: ct install --config ct.yaml
52-
test-with-allInOne:
53-
runs-on: ubuntu-latest
54-
steps:
55-
- uses: actions/checkout@v2
56-
with:
57-
fetch-depth: 0
58-
59-
- uses: ./.github/actions/prepare-k8s
60-
61-
- name: Run allInOne-chart-testing (install)
50+
- name: Run chart-testing (install)
6251
run: |
63-
ct install --config ct.yaml --helm-extra-set-args "
64-
--set provisionDataStore.cassandra=false
65-
--set storage.type=memory
66-
--set allInOne.enabled=true
67-
--set agent.enabled=false
68-
--set collector.enabled=false
69-
--set query.enabled=false"
70-
test-with-elasticsearch:
71-
runs-on: ubuntu-latest
72-
steps:
73-
- uses: actions/checkout@v2
74-
with:
75-
fetch-depth: 0
76-
77-
- uses: ./.github/actions/prepare-k8s
52+
ct install --config ct.yaml \
53+
--helm-extra-set-args "
54+
--set provisionDataStore.cassandra=false \
55+
--set storage.type=memory \
56+
--set allInOne.enabled=true \
57+
--set agent.enabled=false \
58+
--set collector.enabled=false \
59+
--set query.enabled=false "
7860
79-
- name: Run elasticsearch-chart-testing (install)
80-
run: |
81-
ct install --config ct.yaml --helm-extra-set-args "
82-
--set provisionDataStore.cassandra=false
83-
--set provisionDataStore.elasticsearch=true
84-
--set storage.type=elasticsearch
85-
--set elasticsearch.master.masterOnly=false
86-
--set elasticsearch.master.replicaCount=1
87-
--set elasticsearch.data.replicaCount=0
88-
--set elasticsearch.coordinating.replicaCount=0
89-
--set elasticsearch.ingest.replicaCount=0"

‎charts/jaeger/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: v2
2-
appVersion: 1.53.0
2+
appVersion: 2.0.0-rc2
33
description: A Jaeger Helm chart for Kubernetes
44
name: jaeger
55
type: application
6-
version: 3.3.2
6+
version: 4.0.0
77
# CronJobs require v1.21
88
kubeVersion: ">= 1.21-0"
99
keywords:

‎charts/jaeger/templates/_helpers.tpl

+77-2
Original file line numberDiff line numberDiff line change
@@ -563,14 +563,14 @@ If not tag is provided, it defaults to .Chart.AppVersion.
563563
{{- end -}}
564564

565565
{{/*
566-
Create image name for all in one image
566+
Create image name for all-in-one image
567567
*/}}
568568
{{- define "allInOne.image" -}}
569569
{{- include "renderImage" ( dict "imageRoot" .Values.allInOne.image "context" $ ) -}}
570570
{{- end -}}
571571

572572
{{/*
573-
Create pull secrets for all in one image
573+
Create pull secrets for all-in-one image
574574
*/}}
575575
{{- define "allInOne.imagePullSecrets" -}}
576576
{{- include "common.images.renderPullSecrets" (dict "images" (list .Values.allInOne.image) "context" $) -}}
@@ -723,3 +723,78 @@ Create pull secrets for hotrod image
723723
{{- define "hotrod.imagePullSecrets" -}}
724724
{{- include "common.images.renderPullSecrets" (dict "images" (list .Values.hotrod.image) "context" $) -}}
725725
{{- end }}
726+
727+
728+
{{- define "jaeger.extensionsConfig" -}}
729+
{{- if .Values.extensions }}
730+
{{ toYaml .Values.extensions | nindent 6 }}
731+
{{- else }}
732+
{{ toYaml .Values.config.extensions | nindent 6 }}
733+
{{- end }}
734+
{{- end }}
735+
736+
{{- define "jaeger.receiversConfig" -}}
737+
{{- if .Values.receivers }}
738+
{{ toYaml .Values.receivers | nindent 6 }}
739+
{{- else }}
740+
{{ toYaml .Values.config.receivers | nindent 6 }}
741+
{{- end }}
742+
{{- end }}
743+
744+
{{- define "jaeger.processorsConfig" -}}
745+
{{- if .Values.processors }}
746+
{{ toYaml .Values.processors | nindent 6 }}
747+
{{- else }}
748+
{{ toYaml .Values.config.processors | nindent 6 }}
749+
{{- end }}
750+
{{- end }}
751+
752+
{{- define "jaeger.exportersConfig" -}}
753+
{{- if .Values.exporters }}
754+
{{ toYaml .Values.exporters | nindent 6 }}
755+
{{- else }}
756+
{{ toYaml .Values.config.exporters | nindent 6 }}
757+
{{- end }}
758+
{{- end }}
759+
760+
761+
762+
{{- define "jaeger.serviceExtensions" -}}
763+
{{- if and .Values.service .Values.service.extensions -}}
764+
[{{ join ", " .Values.service.extensions }}]
765+
{{- else -}}
766+
[{{ join ", " .Values.config.service.extensions }}]
767+
{{- end -}}
768+
{{- end }}
769+
770+
{{- define "jaeger.serviceReceivers" -}}
771+
{{- if and .Values.service .Values.service.pipelines .Values.service.pipelines.traces .Values.service.pipelines.traces.receivers -}}
772+
[{{ join ", " .Values.service.pipelines.traces.receivers }}]
773+
{{- else -}}
774+
[{{ join ", " .Values.config.service.pipelines.traces.receivers }}]
775+
{{- end -}}
776+
{{- end }}
777+
778+
{{- define "jaeger.serviceProcessors" -}}
779+
{{- if and .Values.service .Values.service.pipelines .Values.service.pipelines.traces .Values.service.pipelines.traces.processors -}}
780+
[{{ join ", " .Values.service.pipelines.traces.processors }}]
781+
{{- else -}}
782+
[{{ join ", " .Values.config.service.pipelines.traces.processors }}]
783+
{{- end -}}
784+
{{- end }}
785+
786+
{{- define "jaeger.serviceExporters" -}}
787+
{{- if and .Values.service .Values.service.pipelines .Values.service.pipelines.traces .Values.service.pipelines.traces.exporters -}}
788+
[{{ join ", " .Values.service.pipelines.traces.exporters }}]
789+
{{- else -}}
790+
[{{ join ", " .Values.config.service.pipelines.traces.exporters }}]
791+
{{- end -}}
792+
{{- end }}
793+
794+
{{- define "jaeger.namespace" -}}
795+
{{- if .Values.namespaceOverride -}}
796+
{{- .Values.namespaceOverride -}}
797+
{{- else -}}
798+
{{- .Release.Namespace -}}
799+
{{- end -}}
800+
{{- end -}}

‎charts/jaeger/templates/allinone-deploy.yaml

+19-4
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ spec:
5858
imagePullPolicy: {{ .Values.allInOne.image.pullPolicy }}
5959
name: jaeger
6060
args:
61+
{{ if .Values.userconfig }}
62+
- "--config"
63+
- "/etc/jaeger/user-config.yaml"
64+
{{- end }}
6165
{{- range $arg := .Values.allInOne.args }}
6266
- "{{ tpl $arg $ }}"
6367
{{- end }}
@@ -80,11 +84,13 @@ spec:
8084
protocol: TCP
8185
- containerPort: 4318
8286
protocol: TCP
87+
- containerPort: 13133
88+
protocol: TCP
8389
livenessProbe:
8490
failureThreshold: 5
8591
httpGet:
86-
path: /
87-
port: 14269
92+
path: /status
93+
port: 13133
8894
scheme: HTTP
8995
initialDelaySeconds: 5
9096
periodSeconds: 15
@@ -93,8 +99,8 @@ spec:
9399
readinessProbe:
94100
failureThreshold: 3
95101
httpGet:
96-
path: /
97-
port: 14269
102+
path: /status
103+
port: 13133
98104
scheme: HTTP
99105
initialDelaySeconds: 1
100106
periodSeconds: 10
@@ -105,6 +111,10 @@ spec:
105111
{{- toYaml . | nindent 12 }}
106112
{{- end }}
107113
volumeMounts:
114+
{{ if .Values.userconfig }}
115+
- name: user-config
116+
mountPath: /etc/jaeger
117+
{{- end }}
108118
{{- if not .Values.storage.badger.ephemeral }}
109119
- name: badger-data
110120
mountPath: {{ .Values.storage.badger.persistence.mountPath }}
@@ -123,6 +133,11 @@ spec:
123133
{{- toYaml .Values.allInOne.podSecurityContext | nindent 8 }}
124134
serviceAccountName: {{ template "jaeger.fullname" . }}
125135
volumes:
136+
{{ if .Values.userconfig }}
137+
- name: user-config
138+
configMap:
139+
name: user-config
140+
{{- end }}
126141
{{- if not .Values.storage.badger.ephemeral }}
127142
- name: badger-data
128143
persistentVolumeClaim:

‎charts/jaeger/templates/user-config.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{{ if .Values.userconfig }}
2+
apiVersion: v1
3+
kind: ConfigMap
4+
metadata:
5+
name: user-config
6+
namespace: {{ include "jaeger.namespace" . }}
7+
labels:
8+
{{- include "jaeger.labels" . | nindent 4 }}
9+
data:
10+
user-config.yaml: |
11+
{{- .Values.userconfig | nindent 4 }}
12+
{{- end }}

‎charts/jaeger/values.yaml

+56-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,61 @@
22
# This is a YAML-formatted file.
33
# Jaeger values are grouped by component. Cassandra values override subchart values
44

5+
# Will use for user provided config
6+
userconfig:
7+
8+
config:
9+
service:
10+
extensions: [jaeger_storage, jaeger_query, healthcheckv2]
11+
pipelines:
12+
traces:
13+
receivers: [otlp, jaeger, zipkin]
14+
processors: [batch]
15+
exporters: [jaeger_storage_exporter]
16+
17+
extensions:
18+
healthcheckv2:
19+
use_v2: true
20+
http:
21+
endpoint: 0.0.0.0:13133
22+
23+
# pprof:
24+
# endpoint: 0.0.0.0:1777
25+
# zpages:
26+
# endpoint: 0.0.0.0:55679
27+
28+
jaeger_query:
29+
storage:
30+
traces: primary_store
31+
traces_archive: archive_store
32+
33+
jaeger_storage:
34+
backends:
35+
primary_store:
36+
memory:
37+
max_traces: 100000
38+
archive_store:
39+
memory:
40+
max_traces: 100000
41+
42+
receivers:
43+
otlp:
44+
protocols:
45+
grpc:
46+
http:
47+
jaeger:
48+
protocols:
49+
grpc:
50+
zipkin:
51+
52+
processors:
53+
batch:
54+
55+
exporters:
56+
jaeger_storage_exporter:
57+
trace_storage: primary_store
58+
# The following settings apply to Jaeger v1 and partially to Jaeger v2
59+
560
global:
661
imageRegistry:
762

@@ -24,7 +79,7 @@ allInOne:
2479
replicas: 1
2580
image:
2681
registry: ""
27-
repository: jaegertracing/all-in-one
82+
repository: jaegertracing/jaeger
2883
tag: ""
2984
digest: ""
3085
pullPolicy: IfNotPresent

0 commit comments

Comments
 (0)