From 36f1f3f671861465d670662e93ec48b9f4f64b4a Mon Sep 17 00:00:00 2001 From: Cory Lucas Date: Fri, 3 May 2024 17:23:13 -0400 Subject: [PATCH 01/25] correct indentation of imagePullSecrets in indexer and lookback cronjobs (#568) Signed-off-by: mehul --- charts/jaeger/Chart.yaml | 2 +- charts/jaeger/templates/es-index-cleaner-cronjob.yaml | 2 +- charts/jaeger/templates/es-lookback-cronjob.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml index 1710e6ac..951a7383 100644 --- a/charts/jaeger/Chart.yaml +++ b/charts/jaeger/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.53.0 description: A Jaeger Helm chart for Kubernetes name: jaeger type: application -version: 3.0.4 +version: 3.0.5 # CronJobs require v1.21 kubeVersion: ">= 1.21-0" keywords: diff --git a/charts/jaeger/templates/es-index-cleaner-cronjob.yaml b/charts/jaeger/templates/es-index-cleaner-cronjob.yaml index cf3f58aa..e7155aca 100644 --- a/charts/jaeger/templates/es-index-cleaner-cronjob.yaml +++ b/charts/jaeger/templates/es-index-cleaner-cronjob.yaml @@ -38,7 +38,7 @@ spec: {{- end }} spec: serviceAccountName: {{ template "jaeger.esIndexCleaner.serviceAccountName" . }} - {{- include "esIndexCleaner.imagePullSecrets" . | nindent 12 }} + {{- include "esIndexCleaner.imagePullSecrets" . | nindent 10 }} securityContext: {{- toYaml .Values.esIndexCleaner.podSecurityContext | nindent 12 }} containers: diff --git a/charts/jaeger/templates/es-lookback-cronjob.yaml b/charts/jaeger/templates/es-lookback-cronjob.yaml index c5f70dc2..d5e4716c 100644 --- a/charts/jaeger/templates/es-lookback-cronjob.yaml +++ b/charts/jaeger/templates/es-lookback-cronjob.yaml @@ -38,7 +38,7 @@ spec: {{- end }} spec: serviceAccountName: {{ template "jaeger.esLookback.serviceAccountName" . }} - {{- include "esLookback.imagePullSecrets" . | nindent 12 }} + {{- include "esLookback.imagePullSecrets" . | nindent 10 }} securityContext: {{- toYaml .Values.esLookback.podSecurityContext | nindent 12 }} restartPolicy: OnFailure From 4780e1bd91f0b19b910b9235d6b693d3e7d52b2b Mon Sep 17 00:00:00 2001 From: Pavel Nikolov Date: Sat, 4 May 2024 10:21:44 +0200 Subject: [PATCH 02/25] Update Chart.yaml Signed-off-by: Pavel Nikolov Signed-off-by: mehul --- charts/jaeger/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml index 951a7383..3fe98c68 100644 --- a/charts/jaeger/Chart.yaml +++ b/charts/jaeger/Chart.yaml @@ -12,7 +12,7 @@ keywords: - tracing - instrumentation home: https://jaegertracing.io -icon: https://camo.githubusercontent.com/afa87494e0753b4b1f5719a2f35aa5263859dffb/687474703a2f2f6a61656765722e72656164746865646f63732e696f2f656e2f6c61746573742f696d616765732f6a61656765722d766563746f722e737667 +icon: https://www.jaegertracing.io/img/jaeger-icon-reverse-color.svg sources: - https://hub.docker.com/u/jaegertracing/ maintainers: From 4269683c8b5691619e1e0741e13bb86f4a9046fc Mon Sep 17 00:00:00 2001 From: Pavel Nikolov Date: Sat, 4 May 2024 10:23:05 +0200 Subject: [PATCH 03/25] Bump chart version Signed-off-by: Pavel Nikolov Signed-off-by: mehul --- charts/jaeger/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml index 3fe98c68..00bacfe0 100644 --- a/charts/jaeger/Chart.yaml +++ b/charts/jaeger/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.53.0 description: A Jaeger Helm chart for Kubernetes name: jaeger type: application -version: 3.0.5 +version: 3.0.6 # CronJobs require v1.21 kubeVersion: ">= 1.21-0" keywords: From 7d84655bc44f65afa55c4f5631cf2f36cf326594 Mon Sep 17 00:00:00 2001 From: Cory Lucas Date: Mon, 6 May 2024 16:56:32 -0400 Subject: [PATCH 04/25] quote host name in ingress templates (#572) Signed-off-by: mehul --- charts/jaeger/Chart.yaml | 2 +- charts/jaeger/templates/collector-ing.yaml | 2 +- charts/jaeger/templates/hotrod-ing.yaml | 2 +- charts/jaeger/templates/query-ing.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml index 00bacfe0..5d54db89 100644 --- a/charts/jaeger/Chart.yaml +++ b/charts/jaeger/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.53.0 description: A Jaeger Helm chart for Kubernetes name: jaeger type: application -version: 3.0.6 +version: 3.0.7 # CronJobs require v1.21 kubeVersion: ">= 1.21-0" keywords: diff --git a/charts/jaeger/templates/collector-ing.yaml b/charts/jaeger/templates/collector-ing.yaml index e9c726a0..61d9ca11 100644 --- a/charts/jaeger/templates/collector-ing.yaml +++ b/charts/jaeger/templates/collector-ing.yaml @@ -22,7 +22,7 @@ spec: {{- end }} rules: {{- range .Values.collector.ingress.hosts }} - - host: {{ include "jaeger.collector.ingressHost" . }} + - host: {{ include "jaeger.collector.ingressHost" . | quote }} http: paths: - path: {{ $basePath }} diff --git a/charts/jaeger/templates/hotrod-ing.yaml b/charts/jaeger/templates/hotrod-ing.yaml index a5fa0721..abfaffbe 100644 --- a/charts/jaeger/templates/hotrod-ing.yaml +++ b/charts/jaeger/templates/hotrod-ing.yaml @@ -20,7 +20,7 @@ spec: {{- end }} rules: {{- range $host := .Values.hotrod.ingress.hosts }} - - host: {{ $host }} + - host: {{ $host | quote}} http: paths: - path: / diff --git a/charts/jaeger/templates/query-ing.yaml b/charts/jaeger/templates/query-ing.yaml index 7b8a5f2f..c86fd5c8 100644 --- a/charts/jaeger/templates/query-ing.yaml +++ b/charts/jaeger/templates/query-ing.yaml @@ -22,7 +22,7 @@ spec: {{- end }} rules: {{- range $host := .Values.query.ingress.hosts }} - - host: {{ $host }} + - host: {{ $host | quote }} http: paths: - path: {{ $basePath }} From 026c45438427d22b78dca78895d4ef71def3f5c1 Mon Sep 17 00:00:00 2001 From: Steven Date: Wed, 22 May 2024 17:32:57 -0400 Subject: [PATCH 05/25] Fix typo preventing use of global.imageRegistry (#577) Signed-off-by: mehul --- charts/jaeger/Chart.yaml | 2 +- charts/jaeger/templates/_helpers.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml index 5d54db89..1c7cfb1d 100644 --- a/charts/jaeger/Chart.yaml +++ b/charts/jaeger/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.53.0 description: A Jaeger Helm chart for Kubernetes name: jaeger type: application -version: 3.0.7 +version: 3.0.8 # CronJobs require v1.21 kubeVersion: ">= 1.21-0" keywords: diff --git a/charts/jaeger/templates/_helpers.tpl b/charts/jaeger/templates/_helpers.tpl index 7cf5e82b..3bb14071 100644 --- a/charts/jaeger/templates/_helpers.tpl +++ b/charts/jaeger/templates/_helpers.tpl @@ -565,7 +565,7 @@ If not tag is provided, it defaults to .Chart.AppVersion. */}} {{- define "renderImage" -}} {{- $image := merge .imageRoot (dict "tag" .context.Chart.AppVersion) -}} -{{- include "common.images.image" (dict "imageRoot" $image "global" .context.Values.Global) -}} +{{- include "common.images.image" (dict "imageRoot" $image "global" .context.Values.global) -}} {{- end -}} {{/* From 5cbfc491d31df409ac972f140b2a74b69d353c79 Mon Sep 17 00:00:00 2001 From: Jimmy Ungerman Date: Thu, 23 May 2024 11:54:55 -0600 Subject: [PATCH 06/25] upgrade jaeger-operator to latest 1.57 version (#573) Signed-off-by: Jimmy Ungerman Signed-off-by: mehul --- charts/jaeger-operator/COMPATIBILITY.md | 1 + charts/jaeger-operator/Chart.yaml | 4 ++-- charts/jaeger-operator/README.md | 2 +- charts/jaeger-operator/values.yaml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/charts/jaeger-operator/COMPATIBILITY.md b/charts/jaeger-operator/COMPATIBILITY.md index 95218d8a..84a7d434 100644 --- a/charts/jaeger-operator/COMPATIBILITY.md +++ b/charts/jaeger-operator/COMPATIBILITY.md @@ -2,6 +2,7 @@ The following table shows the compatibility of `Jaeger Operator helm chart` with | Chart version | Jaeger Operator | Kubernetes | Strimzi Operator | Cert-Manager | |---------------------------|-----------------|-----------------|--------------------|--------------| +| 2.54.0 | v1.57.x | v1.19 to v1.29 | v0.32 | v1.6.1+ | | 2.50.0 | v1.52.x | v1.19 to v1.28 | v0.32 | v1.6.1+ | | 2.49.0 | v1.49.x | v1.19 to v1.28 | v0.32 | v1.6.1+ | | 2.47.0 | v1.47.x | v1.19 to v1.26 | v0.23 | v1.6.1+ | diff --git a/charts/jaeger-operator/Chart.yaml b/charts/jaeger-operator/Chart.yaml index 97e82942..9f107c0a 100644 --- a/charts/jaeger-operator/Chart.yaml +++ b/charts/jaeger-operator/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: jaeger-operator Helm chart for Kubernetes name: jaeger-operator -version: 2.53.0 -appVersion: 1.52.0 +version: 2.54.0 +appVersion: 1.57.0 home: https://www.jaegertracing.io/ icon: https://www.jaegertracing.io/img/jaeger-icon-reverse-color.svg sources: diff --git a/charts/jaeger-operator/README.md b/charts/jaeger-operator/README.md index 86af5381..ed3b98aa 100644 --- a/charts/jaeger-operator/README.md +++ b/charts/jaeger-operator/README.md @@ -59,7 +59,7 @@ The following table lists the configurable parameters of the jaeger-operator cha | `serviceExtraLabels` | Additional labels to jaeger-operator service | `{}` | | `extraLabels` | Additional labels to jaeger-operator deployment | `{}` | | `image.repository` | Controller container image repository | `jaegertracing/jaeger-operator` | -| `image.tag` | Controller container image tag | `1.52.0` | +| `image.tag` | Controller container image tag | `1.57.0` | | `image.pullPolicy` | Controller container image pull policy | `IfNotPresent` | | `jaeger.create` | Jaeger instance will be created | `false` | | `jaeger.spec` | Jaeger instance specification | `{}` | diff --git a/charts/jaeger-operator/values.yaml b/charts/jaeger-operator/values.yaml index 9c70a163..587c6f97 100644 --- a/charts/jaeger-operator/values.yaml +++ b/charts/jaeger-operator/values.yaml @@ -4,7 +4,7 @@ image: repository: jaegertracing/jaeger-operator - tag: 1.52.0 + tag: 1.57.0 pullPolicy: IfNotPresent imagePullSecrets: [] From 7f77941758de5ed2907bcd249084f58600bb2eb3 Mon Sep 17 00:00:00 2001 From: Pavel Nikolov Date: Sat, 25 May 2024 10:33:34 +0200 Subject: [PATCH 07/25] fix storage val in readme Signed-off-by: mehul --- charts/jaeger/Chart.yaml | 2 +- charts/jaeger/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml index 1c7cfb1d..5ccfa5e1 100644 --- a/charts/jaeger/Chart.yaml +++ b/charts/jaeger/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.53.0 description: A Jaeger Helm chart for Kubernetes name: jaeger type: application -version: 3.0.8 +version: 3.0.9 # CronJobs require v1.21 kubeVersion: ">= 1.21-0" keywords: diff --git a/charts/jaeger/README.md b/charts/jaeger/README.md index 3fc9e7ec..767c6a07 100644 --- a/charts/jaeger/README.md +++ b/charts/jaeger/README.md @@ -302,7 +302,7 @@ provisionDataStore: allInOne: enabled: true storage: - type: none + type: memory agent: enabled: false collector: From d2f428b02001c602b75974c30ca0e59f55867877 Mon Sep 17 00:00:00 2001 From: Pavel Nikolov Date: Tue, 28 May 2024 09:05:59 +0200 Subject: [PATCH 08/25] Add missing quotes in readme Signed-off-by: mehul --- charts/jaeger/Chart.yaml | 2 +- charts/jaeger/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml index 5ccfa5e1..d26d4fe6 100644 --- a/charts/jaeger/Chart.yaml +++ b/charts/jaeger/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.53.0 description: A Jaeger Helm chart for Kubernetes name: jaeger type: application -version: 3.0.9 +version: 3.0.10 # CronJobs require v1.21 kubeVersion: ">= 1.21-0" keywords: diff --git a/charts/jaeger/README.md b/charts/jaeger/README.md index 767c6a07..b31f84fb 100644 --- a/charts/jaeger/README.md +++ b/charts/jaeger/README.md @@ -399,7 +399,7 @@ extraObjects: - apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: {{ .Release.Name }}-someRoleBinding + name: "{{ .Release.Name }}-someRoleBinding" roleRef: apiGroup: rbac.authorization.k8s.io kind: Role From 7837343f816e56e023004da0644fd4c3c2dbc679 Mon Sep 17 00:00:00 2001 From: Reddysekhar Gaduputi Date: Wed, 26 Jun 2024 15:15:29 +0530 Subject: [PATCH 09/25] [jaeger] add new options, improvements into allInOne (#586) * [jaeger] allInOne add option automountServiceAccountToken for serviceaccount Signed-off-by: Reddysekhar Gaduputi * [jaeger] allInOne add affinity support Signed-off-by: Reddysekhar Gaduputi * [jaeger] allInOne add topologySpreadConstraints support Signed-off-by: Reddysekhar Gaduputi * [jaeger] allInOne add podSecurityContext and containerSecurityContext support Signed-off-by: Reddysekhar Gaduputi --------- Signed-off-by: Reddysekhar Gaduputi Signed-off-by: mehul --- charts/jaeger/Chart.yaml | 2 +- charts/jaeger/templates/allinone-deploy.yaml | 14 +++++++++++--- charts/jaeger/templates/allinone-sa.yaml | 1 + charts/jaeger/values.yaml | 8 ++++++++ 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml index d26d4fe6..89e14260 100644 --- a/charts/jaeger/Chart.yaml +++ b/charts/jaeger/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.53.0 description: A Jaeger Helm chart for Kubernetes name: jaeger type: application -version: 3.0.10 +version: 3.1.0 # CronJobs require v1.21 kubeVersion: ">= 1.21-0" keywords: diff --git a/charts/jaeger/templates/allinone-deploy.yaml b/charts/jaeger/templates/allinone-deploy.yaml index 87788207..71bc2ffd 100644 --- a/charts/jaeger/templates/allinone-deploy.yaml +++ b/charts/jaeger/templates/allinone-deploy.yaml @@ -52,6 +52,8 @@ spec: {{- with .Values.allInOne.envFrom }} envFrom: {{- toYaml . | nindent 12 }} {{- end }} + securityContext: + {{- toYaml .Values.allInOne.securityContext | nindent 12 }} image: {{ include "allInOne.image" . }} imagePullPolicy: {{ .Values.allInOne.image.pullPolicy }} name: jaeger @@ -118,9 +120,7 @@ spec: readOnly: {{ .readOnly }} {{- end }} securityContext: - runAsUser: 10001 - runAsGroup: 10001 - fsGroup: 10001 + {{- toYaml .Values.allInOne.podSecurityContext | nindent 8 }} serviceAccountName: {{ template "jaeger.fullname" . }} volumes: {{- if not .Values.storage.badger.ephemeral }} @@ -138,6 +138,14 @@ spec: secret: secretName: {{ .secretName }} {{- end }} + {{- with .Values.allInOne.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.allInOne.topologySpreadConstraints }} + topologySpreadConstraints: + {{- toYaml . | nindent 8 }} + {{- end }} {{- with .Values.allInOne.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/jaeger/templates/allinone-sa.yaml b/charts/jaeger/templates/allinone-sa.yaml index 6e2a536a..a0fbb5a0 100644 --- a/charts/jaeger/templates/allinone-sa.yaml +++ b/charts/jaeger/templates/allinone-sa.yaml @@ -10,4 +10,5 @@ metadata: annotations: {{- toYaml . | nindent 4 }} {{- end }} +automountServiceAccountToken: {{ .Values.allInOne.serviceAccount.automountServiceAccountToken }} {{- end -}} diff --git a/charts/jaeger/values.yaml b/charts/jaeger/values.yaml index 778ba1dd..627df4b6 100644 --- a/charts/jaeger/values.yaml +++ b/charts/jaeger/values.yaml @@ -49,6 +49,7 @@ allInOne: # } serviceAccount: annotations: {} + automountServiceAccountToken: true service: headless: true collector: @@ -86,6 +87,13 @@ allInOne: # cpu: 256m # memory: 128Mi nodeSelector: {} + affinity: {} + topologySpreadContraints: [] + podSecurityContext: + runAsUser: 10001 + runAsGroup: 10001 + fsGroup: 10001 + securityContext: {} storage: # allowed values (cassandra, elasticsearch, grpc-plugin, badger, memory) From 971a196a7b4042857ec9374bc851cc5e9152d93e Mon Sep 17 00:00:00 2001 From: chenlujjj <953546398@qq.com> Date: Thu, 11 Jul 2024 22:33:53 +0800 Subject: [PATCH 10/25] [jaeger] allInOne add option tolerations (#588) Signed-off-by: chenlujjj <953546398@qq.com> Signed-off-by: mehul --- charts/jaeger/Chart.yaml | 2 +- charts/jaeger/templates/allinone-deploy.yaml | 6 +++++- charts/jaeger/values.yaml | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml index 89e14260..e00c2e52 100644 --- a/charts/jaeger/Chart.yaml +++ b/charts/jaeger/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.53.0 description: A Jaeger Helm chart for Kubernetes name: jaeger type: application -version: 3.1.0 +version: 3.1.1 # CronJobs require v1.21 kubeVersion: ">= 1.21-0" keywords: diff --git a/charts/jaeger/templates/allinone-deploy.yaml b/charts/jaeger/templates/allinone-deploy.yaml index 71bc2ffd..91e27943 100644 --- a/charts/jaeger/templates/allinone-deploy.yaml +++ b/charts/jaeger/templates/allinone-deploy.yaml @@ -30,7 +30,7 @@ spec: prometheus.io/port: "14269" prometheus.io/scrape: "true" spec: - {{- include "allInOne.imagePullSecrets" . | nindent 6 }} + {{- include "allInOne.imagePullSecrets" . | nindent 6 }} containers: - env: {{- if .Values.allInOne.extraEnv }} @@ -150,4 +150,8 @@ spec: nodeSelector: {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.allInOne.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} {{- end -}} diff --git a/charts/jaeger/values.yaml b/charts/jaeger/values.yaml index 627df4b6..836835a9 100644 --- a/charts/jaeger/values.yaml +++ b/charts/jaeger/values.yaml @@ -87,6 +87,7 @@ allInOne: # cpu: 256m # memory: 128Mi nodeSelector: {} + tolerations: [] affinity: {} topologySpreadContraints: [] podSecurityContext: From 65140644584ab375ee0dc05eba5924e8146e159a Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Mon, 15 Jul 2024 22:53:10 -0400 Subject: [PATCH 11/25] Link to sub-READMEs Signed-off-by: Yuri Shkuro Signed-off-by: mehul --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 929eaadc..26be2249 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,10 @@ $ helm repo add jaegertracing https://jaegertracing.github.io/helm-charts You can then run `helm search repo jaegertracing` to see the charts. +See additional documentation: + * [Jaeger chart](./charts/jaeger) + * [Jaeger Operator chart](./charts/jaeger-operator) + ## Contributing We'd love to have you contribute! Please refer to our [contribution guidelines](CONTRIBUTING.md) for details. From 224088bfa8a5f32b05298280ddeb64cdd7786dd7 Mon Sep 17 00:00:00 2001 From: Vishu Kamble Date: Sun, 28 Jul 2024 14:09:05 -0500 Subject: [PATCH 12/25] [jaeger] Add ability to edit port name and target port name in query and collector services (#590) Signed-off-by: mehul --- charts/jaeger/Chart.yaml | 2 +- charts/jaeger/templates/collector-svc.yaml | 4 ++-- charts/jaeger/templates/query-svc.yaml | 4 ++-- charts/jaeger/values.yaml | 6 ++++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml index e00c2e52..582770d3 100644 --- a/charts/jaeger/Chart.yaml +++ b/charts/jaeger/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.53.0 description: A Jaeger Helm chart for Kubernetes name: jaeger type: application -version: 3.1.1 +version: 3.1.2 # CronJobs require v1.21 kubeVersion: ">= 1.21-0" keywords: diff --git a/charts/jaeger/templates/collector-svc.yaml b/charts/jaeger/templates/collector-svc.yaml index 81ee16a5..4bf54003 100644 --- a/charts/jaeger/templates/collector-svc.yaml +++ b/charts/jaeger/templates/collector-svc.yaml @@ -60,9 +60,9 @@ spec: protocol: TCP targetPort: {{ .Values.collector.service.otlp.http.name }} {{- end }} - - name: admin + - name: {{ .Values.collector.service.admin.name }} port: 14269 - targetPort: admin + targetPort: {{ .Values.collector.service.admin.targetPort }} selector: {{- include "jaeger.selectorLabels" . | nindent 4 }} app.kubernetes.io/component: collector diff --git a/charts/jaeger/templates/query-svc.yaml b/charts/jaeger/templates/query-svc.yaml index 35c120a7..37f7d160 100644 --- a/charts/jaeger/templates/query-svc.yaml +++ b/charts/jaeger/templates/query-svc.yaml @@ -23,10 +23,10 @@ spec: port: 16685 protocol: TCP targetPort: grpc - - name: admin + - name: {{ .Values.query.service.admin.name }} port: 16687 protocol: TCP - targetPort: admin + targetPort: {{ .Values.query.service.admin.targetPort }} selector: {{- include "jaeger.selectorLabels" . | nindent 4 }} app.kubernetes.io/component: query diff --git a/charts/jaeger/values.yaml b/charts/jaeger/values.yaml index 836835a9..9cf04128 100644 --- a/charts/jaeger/values.yaml +++ b/charts/jaeger/values.yaml @@ -510,6 +510,9 @@ collector: # name: otlp-http # port: 4318 # nodePort: + admin: + name: admin + targetPort: admin ingress: enabled: false # For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName @@ -693,6 +696,9 @@ query: # targetPort: 8080 # Specify a specific node port when type is NodePort # nodePort: 32500 + admin: + name: admin + targetPort: admin ingress: enabled: false # For Kubernetes >= 1.18 you should specify the ingress-controller via the field ingressClassName From b4eba187cfb565c7b7f2223359734c09c9345103 Mon Sep 17 00:00:00 2001 From: shivendoodeshmukh Date: Wed, 31 Jul 2024 02:04:36 +0530 Subject: [PATCH 13/25] [jaeger-operator] Add ingressclasses to role.yaml so that the CRD has correct permissions when rbac.cluster.Role is set (#591) * Update role.yaml to solve issue 581 Signed-off-by: shivendoodeshmukh * Bump Chart Version Signed-off-by: shivendoodeshmukh --------- Signed-off-by: shivendoodeshmukh Signed-off-by: mehul --- charts/jaeger-operator/Chart.yaml | 2 +- charts/jaeger-operator/templates/role.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/jaeger-operator/Chart.yaml b/charts/jaeger-operator/Chart.yaml index 9f107c0a..24986de7 100644 --- a/charts/jaeger-operator/Chart.yaml +++ b/charts/jaeger-operator/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: jaeger-operator Helm chart for Kubernetes name: jaeger-operator -version: 2.54.0 +version: 2.55.0 appVersion: 1.57.0 home: https://www.jaegertracing.io/ icon: https://www.jaegertracing.io/img/jaeger-icon-reverse-color.svg diff --git a/charts/jaeger-operator/templates/role.yaml b/charts/jaeger-operator/templates/role.yaml index ccc308d9..291f32d8 100644 --- a/charts/jaeger-operator/templates/role.yaml +++ b/charts/jaeger-operator/templates/role.yaml @@ -130,6 +130,7 @@ rules: - extensions resources: - ingresses + - ingressclasses verbs: - create - delete From 5bf976f0b5aaf4b2384cdd87675cd43922a5e1bc Mon Sep 17 00:00:00 2001 From: Martin Kravec Date: Wed, 7 Aug 2024 18:30:40 +0200 Subject: [PATCH 14/25] Fix Update role.yaml to solve issue 581 (#592) Signed-off-by: Martin Kravec Signed-off-by: mehul --- charts/jaeger-operator/Chart.yaml | 2 +- charts/jaeger-operator/templates/role.yaml | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/charts/jaeger-operator/Chart.yaml b/charts/jaeger-operator/Chart.yaml index 24986de7..07c6d549 100644 --- a/charts/jaeger-operator/Chart.yaml +++ b/charts/jaeger-operator/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: jaeger-operator Helm chart for Kubernetes name: jaeger-operator -version: 2.55.0 +version: 2.56.0 appVersion: 1.57.0 home: https://www.jaegertracing.io/ icon: https://www.jaegertracing.io/img/jaeger-icon-reverse-color.svg diff --git a/charts/jaeger-operator/templates/role.yaml b/charts/jaeger-operator/templates/role.yaml index 291f32d8..9125ffd5 100644 --- a/charts/jaeger-operator/templates/role.yaml +++ b/charts/jaeger-operator/templates/role.yaml @@ -130,7 +130,6 @@ rules: - extensions resources: - ingresses - - ingressclasses verbs: - create - delete @@ -234,6 +233,13 @@ rules: - patch - update - watch +- apiGroups: + - networking.k8s.io + resources: + - ingressclasses + verbs: + - list + - watch - apiGroups: - rbac.authorization.k8s.io resources: From 86b3c3178e521db3ef9f07e2a7d5931b704e27d2 Mon Sep 17 00:00:00 2001 From: Andreas Seelinger Date: Wed, 28 Aug 2024 11:21:37 +0200 Subject: [PATCH 15/25] [jaeger] Add securityContext for spark cron job (#587) Signed-off-by: Andreas Seelinger Signed-off-by: Pavel Nikolov Co-authored-by: Pavel Nikolov Signed-off-by: mehul --- charts/jaeger/Chart.yaml | 2 +- charts/jaeger/templates/spark-cronjob.yaml | 4 ++++ charts/jaeger/values.yaml | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml index 582770d3..a0e637e9 100644 --- a/charts/jaeger/Chart.yaml +++ b/charts/jaeger/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.53.0 description: A Jaeger Helm chart for Kubernetes name: jaeger type: application -version: 3.1.2 +version: 3.1.3 # CronJobs require v1.21 kubeVersion: ">= 1.21-0" keywords: diff --git a/charts/jaeger/templates/spark-cronjob.yaml b/charts/jaeger/templates/spark-cronjob.yaml index c1f60eeb..f58efa8f 100644 --- a/charts/jaeger/templates/spark-cronjob.yaml +++ b/charts/jaeger/templates/spark-cronjob.yaml @@ -38,6 +38,8 @@ spec: spec: serviceAccountName: {{ template "jaeger.spark.serviceAccountName" . }} {{- include "spark.imagePullSecrets" . | nindent 10 }} + securityContext: + {{- toYaml .Values.spark.podSecurityContext | nindent 12 }} containers: - name: {{ include "jaeger.fullname" . }}-spark image: {{ include "spark.image" . }} @@ -76,6 +78,8 @@ spec: subPath: {{ .subPath }} readOnly: {{ .readOnly }} {{- end }} + securityContext: + {{- toYaml .Values.spark.securityContext | nindent 14 }} restartPolicy: OnFailure volumes: {{- range .Values.spark.extraConfigmapMounts }} diff --git a/charts/jaeger/values.yaml b/charts/jaeger/values.yaml index 9cf04128..096133da 100644 --- a/charts/jaeger/values.yaml +++ b/charts/jaeger/values.yaml @@ -790,6 +790,8 @@ query: spark: enabled: false + securityContext: {} + podSecurityContext: {} annotations: {} image: registry: "" From fb7d6805596502918df8ed56d4683d09854c5712 Mon Sep 17 00:00:00 2001 From: Pavel Nikolov Date: Wed, 28 Aug 2024 14:23:14 +0200 Subject: [PATCH 16/25] Add cassandra schema job toleration (#598) Signed-off-by: Pavel Nikolov Signed-off-by: mehul --- charts/jaeger/Chart.yaml | 2 +- charts/jaeger/templates/cassandra-schema-job.yaml | 4 ++++ charts/jaeger/values.yaml | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml index a0e637e9..2e9400ee 100644 --- a/charts/jaeger/Chart.yaml +++ b/charts/jaeger/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.53.0 description: A Jaeger Helm chart for Kubernetes name: jaeger type: application -version: 3.1.3 +version: 3.2.0 # CronJobs require v1.21 kubeVersion: ">= 1.21-0" keywords: diff --git a/charts/jaeger/templates/cassandra-schema-job.yaml b/charts/jaeger/templates/cassandra-schema-job.yaml index f5ee5a45..b6aec4e9 100644 --- a/charts/jaeger/templates/cassandra-schema-job.yaml +++ b/charts/jaeger/templates/cassandra-schema-job.yaml @@ -96,6 +96,10 @@ spec: secret: secretName: {{ .Values.storage.cassandra.tls.secretName }} {{- end }} + {{- with .Values.schema.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} {{- end -}} {{- end -}} {{- end -}} diff --git a/charts/jaeger/values.yaml b/charts/jaeger/values.yaml index 096133da..e7715b21 100644 --- a/charts/jaeger/values.yaml +++ b/charts/jaeger/values.yaml @@ -232,6 +232,7 @@ kafka: # use by Jaeger schema: annotations: {} + tolerations: [] image: registry: "" repository: jaegertracing/jaeger-cassandra-schema From 7110c61eae6fdb3dd158382c8d081eff895d3313 Mon Sep 17 00:00:00 2001 From: Luca Toscano Date: Wed, 11 Sep 2024 16:16:08 +0200 Subject: [PATCH 17/25] [jaeger] Add securityContext for the oauth sidecar in query-deploy.yaml (#600) The sidecar is missing the securityContext entry, and it makes it difficult to apply specific settings in the context of K8s PSS (migrating from PSP for example). Signed-off-by: Luca Toscano Signed-off-by: mehul --- charts/jaeger/Chart.yaml | 2 +- charts/jaeger/templates/query-deploy.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml index 2e9400ee..3ab0bca2 100644 --- a/charts/jaeger/Chart.yaml +++ b/charts/jaeger/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.53.0 description: A Jaeger Helm chart for Kubernetes name: jaeger type: application -version: 3.2.0 +version: 3.2.1 # CronJobs require v1.21 kubeVersion: ">= 1.21-0" keywords: diff --git a/charts/jaeger/templates/query-deploy.yaml b/charts/jaeger/templates/query-deploy.yaml index 7aef1c62..da8f1aa1 100644 --- a/charts/jaeger/templates/query-deploy.yaml +++ b/charts/jaeger/templates/query-deploy.yaml @@ -136,6 +136,8 @@ spec: port: admin {{- if .Values.query.oAuthSidecar.enabled }} - name: {{ template "jaeger.agent.name" . }}-oauth2-sidecar + securityContext: + {{- toYaml .Values.query.securityContext | nindent 10 }} image: {{ include "oAuthSidecar.image" . }} imagePullPolicy: {{ .Values.query.oAuthSidecar.image.pullPolicy }} args: From 6d51b0603a532e6184140549e84d651d9639163b Mon Sep 17 00:00:00 2001 From: Kendi Date: Thu, 12 Sep 2024 17:15:54 +0300 Subject: [PATCH 18/25] [jaeger] Add missing loadBalancerIp to collector-svc template (#601) Signed-off-by: Kendi Paet Signed-off-by: mehul --- charts/jaeger/Chart.yaml | 2 +- charts/jaeger/templates/collector-svc.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml index 3ab0bca2..33530522 100644 --- a/charts/jaeger/Chart.yaml +++ b/charts/jaeger/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.53.0 description: A Jaeger Helm chart for Kubernetes name: jaeger type: application -version: 3.2.1 +version: 3.3.0 # CronJobs require v1.21 kubeVersion: ">= 1.21-0" keywords: diff --git a/charts/jaeger/templates/collector-svc.yaml b/charts/jaeger/templates/collector-svc.yaml index 4bf54003..efa820d1 100644 --- a/charts/jaeger/templates/collector-svc.yaml +++ b/charts/jaeger/templates/collector-svc.yaml @@ -70,5 +70,8 @@ spec: clusterIP: {{ .Values.collector.service.clusterIP }} {{- end }} type: {{ .Values.collector.service.type }} + {{- if and (eq .Values.collector.service.type "LoadBalancer") .Values.collector.service.loadBalancerIP }} + loadBalancerIP: {{ .Values.collector.service.loadBalancerIP }} + {{- end -}} {{- template "loadBalancerSourceRanges" .Values.collector }} {{- end -}} From ce10d098143611e3a38354ab173635a1aac627c9 Mon Sep 17 00:00:00 2001 From: Reddysekhar Gaduputi Date: Fri, 20 Sep 2024 10:19:51 +0530 Subject: [PATCH 19/25] Jaeger allInOne allow different storage types (#603) Signed-off-by: Reddysekhar Gaduputi Signed-off-by: mehul --- charts/jaeger/Chart.yaml | 2 +- charts/jaeger/templates/_helpers.tpl | 10 ---------- charts/jaeger/templates/allinone-deploy.yaml | 2 +- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml index 33530522..7b103ab6 100644 --- a/charts/jaeger/Chart.yaml +++ b/charts/jaeger/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.53.0 description: A Jaeger Helm chart for Kubernetes name: jaeger type: application -version: 3.3.0 +version: 3.3.1 # CronJobs require v1.21 kubeVersion: ">= 1.21-0" keywords: diff --git a/charts/jaeger/templates/_helpers.tpl b/charts/jaeger/templates/_helpers.tpl index 3bb14071..f4db73be 100644 --- a/charts/jaeger/templates/_helpers.tpl +++ b/charts/jaeger/templates/_helpers.tpl @@ -408,16 +408,6 @@ memory related environment variables {{- end }} {{- end -}} -{{/* -allInOne currently only supports memory/badger storage type. -*/}} -{{- define "allInOne.storage.type" -}} -{{ $type := .Values.storage.type }} -{{- if or (eq $type "memory") (eq $type "badger") -}} -{{ .Values.storage.type }} -{{- end -}} -{{- end -}} - {{/* Cassandra, Elasticsearch, or grpc-plugin, badger, memory related environment variables depending on which is used diff --git a/charts/jaeger/templates/allinone-deploy.yaml b/charts/jaeger/templates/allinone-deploy.yaml index 91e27943..aae25811 100644 --- a/charts/jaeger/templates/allinone-deploy.yaml +++ b/charts/jaeger/templates/allinone-deploy.yaml @@ -37,7 +37,7 @@ spec: {{- toYaml .Values.allInOne.extraEnv | nindent 12 }} {{- end }} - name: SPAN_STORAGE_TYPE - value: {{ include "allInOne.storage.type" . | required "Invalid storage type provided. Use either badger or memory for allInOne" }} + value: {{ .Values.storage.type }} {{- include "storage.env" . | nindent 12 }} - name: COLLECTOR_ZIPKIN_HOST_PORT value: :9411 From e5352db4bfe14b16e9d2334a0983228f0a67151c Mon Sep 17 00:00:00 2001 From: Blair Bowden Date: Mon, 30 Sep 2024 19:29:36 -0400 Subject: [PATCH 20/25] upgrade jaeger-operator to latest 1.61.0 (#605) Signed-off-by: Blair Bowden Signed-off-by: mehul --- charts/jaeger-operator/COMPATIBILITY.md | 1 + charts/jaeger-operator/Chart.yaml | 4 ++-- charts/jaeger-operator/README.md | 2 +- charts/jaeger-operator/values.yaml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/charts/jaeger-operator/COMPATIBILITY.md b/charts/jaeger-operator/COMPATIBILITY.md index 84a7d434..0e9bcedd 100644 --- a/charts/jaeger-operator/COMPATIBILITY.md +++ b/charts/jaeger-operator/COMPATIBILITY.md @@ -2,6 +2,7 @@ The following table shows the compatibility of `Jaeger Operator helm chart` with | Chart version | Jaeger Operator | Kubernetes | Strimzi Operator | Cert-Manager | |---------------------------|-----------------|-----------------|--------------------|--------------| +| 2.57.0 | v1.61.x | v1.19 to v1.29 | v0.32 | v1.6.1+ | | 2.54.0 | v1.57.x | v1.19 to v1.29 | v0.32 | v1.6.1+ | | 2.50.0 | v1.52.x | v1.19 to v1.28 | v0.32 | v1.6.1+ | | 2.49.0 | v1.49.x | v1.19 to v1.28 | v0.32 | v1.6.1+ | diff --git a/charts/jaeger-operator/Chart.yaml b/charts/jaeger-operator/Chart.yaml index 07c6d549..215b889c 100644 --- a/charts/jaeger-operator/Chart.yaml +++ b/charts/jaeger-operator/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: jaeger-operator Helm chart for Kubernetes name: jaeger-operator -version: 2.56.0 -appVersion: 1.57.0 +version: 2.57.0 +appVersion: 1.61.0 home: https://www.jaegertracing.io/ icon: https://www.jaegertracing.io/img/jaeger-icon-reverse-color.svg sources: diff --git a/charts/jaeger-operator/README.md b/charts/jaeger-operator/README.md index ed3b98aa..b6883412 100644 --- a/charts/jaeger-operator/README.md +++ b/charts/jaeger-operator/README.md @@ -59,7 +59,7 @@ The following table lists the configurable parameters of the jaeger-operator cha | `serviceExtraLabels` | Additional labels to jaeger-operator service | `{}` | | `extraLabels` | Additional labels to jaeger-operator deployment | `{}` | | `image.repository` | Controller container image repository | `jaegertracing/jaeger-operator` | -| `image.tag` | Controller container image tag | `1.57.0` | +| `image.tag` | Controller container image tag | `1.61.0` | | `image.pullPolicy` | Controller container image pull policy | `IfNotPresent` | | `jaeger.create` | Jaeger instance will be created | `false` | | `jaeger.spec` | Jaeger instance specification | `{}` | diff --git a/charts/jaeger-operator/values.yaml b/charts/jaeger-operator/values.yaml index 587c6f97..ce72640a 100644 --- a/charts/jaeger-operator/values.yaml +++ b/charts/jaeger-operator/values.yaml @@ -4,7 +4,7 @@ image: repository: jaegertracing/jaeger-operator - tag: 1.57.0 + tag: 1.61.0 pullPolicy: IfNotPresent imagePullSecrets: [] From 4dc1c310ac0cdd56ab67a65fea547681b5e387b0 Mon Sep 17 00:00:00 2001 From: Mehul Date: Tue, 1 Oct 2024 15:49:30 +0000 Subject: [PATCH 21/25] added all-in-one deployment and configmap for jaeger-v2 Signed-off-by: Mehul Signed-off-by: mehul --- charts/jaeger-v2/.helmignore | 21 +++ charts/jaeger-v2/Chart.lock | 15 ++ charts/jaeger-v2/Chart.yaml | 46 ++++++ charts/jaeger-v2/readme.md | 167 +++++++++++++++++++++ charts/jaeger-v2/templates/_helpers.tpl | 62 ++++++++ charts/jaeger-v2/templates/config-map.yaml | 35 +++++ charts/jaeger-v2/templates/deployment.yaml | 46 ++++++ charts/jaeger-v2/values.yaml | 71 +++++++++ 8 files changed, 463 insertions(+) create mode 100644 charts/jaeger-v2/.helmignore create mode 100644 charts/jaeger-v2/Chart.lock create mode 100644 charts/jaeger-v2/Chart.yaml create mode 100644 charts/jaeger-v2/readme.md create mode 100644 charts/jaeger-v2/templates/_helpers.tpl create mode 100644 charts/jaeger-v2/templates/config-map.yaml create mode 100644 charts/jaeger-v2/templates/deployment.yaml create mode 100644 charts/jaeger-v2/values.yaml diff --git a/charts/jaeger-v2/.helmignore b/charts/jaeger-v2/.helmignore new file mode 100644 index 00000000..f0c13194 --- /dev/null +++ b/charts/jaeger-v2/.helmignore @@ -0,0 +1,21 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj diff --git a/charts/jaeger-v2/Chart.lock b/charts/jaeger-v2/Chart.lock new file mode 100644 index 00000000..89e13342 --- /dev/null +++ b/charts/jaeger-v2/Chart.lock @@ -0,0 +1,15 @@ +dependencies: +- name: cassandra + repository: https://charts.helm.sh/incubator + version: 0.15.3 +- name: elasticsearch + repository: https://charts.bitnami.com/bitnami + version: 20.0.4 +- name: kafka + repository: https://charts.bitnami.com/bitnami + version: 26.6.2 +- name: common + repository: https://charts.bitnami.com/bitnami + version: 2.23.0 +digest: sha256:b13c6270d6d45478b47d03157f7a1c44add98be0809d83b22597a0c800781c10 +generated: "2024-10-01T10:23:03.372102011Z" diff --git a/charts/jaeger-v2/Chart.yaml b/charts/jaeger-v2/Chart.yaml new file mode 100644 index 00000000..7b103ab6 --- /dev/null +++ b/charts/jaeger-v2/Chart.yaml @@ -0,0 +1,46 @@ +apiVersion: v2 +appVersion: 1.53.0 +description: A Jaeger Helm chart for Kubernetes +name: jaeger +type: application +version: 3.3.1 +# CronJobs require v1.21 +kubeVersion: ">= 1.21-0" +keywords: + - jaeger + - opentracing + - tracing + - instrumentation +home: https://jaegertracing.io +icon: https://www.jaegertracing.io/img/jaeger-icon-reverse-color.svg +sources: + - https://hub.docker.com/u/jaegertracing/ +maintainers: + - name: dvonthenen + email: david.vonthenen@dell.com + - name: mehta-ankit + email: ankit.mehta@appian.com + - name: mikelorant + email: michael.lorant@fairfaxmedia.com.au + - name: naseemkullah + email: naseem@transit.app + - name: pavelnikolov + email: me@pavelnikolov.net + - name: jkowall + email: jkowall@kowall.net +dependencies: + - name: cassandra + version: 0.15.3 + repository: https://charts.helm.sh/incubator + condition: provisionDataStore.cassandra + - name: elasticsearch + version: 20.0.4 + repository: https://charts.bitnami.com/bitnami + condition: provisionDataStore.elasticsearch + - name: kafka + version: 26.6.2 + repository: https://charts.bitnami.com/bitnami + condition: provisionDataStore.kafka + - name: common + repository: https://charts.bitnami.com/bitnami + version: 2.x.x diff --git a/charts/jaeger-v2/readme.md b/charts/jaeger-v2/readme.md new file mode 100644 index 00000000..4d2954cb --- /dev/null +++ b/charts/jaeger-v2/readme.md @@ -0,0 +1,167 @@ +# Jaeger Helm Chart Deployment (Version 2) Documentation + +## Overview + +This document outlines the steps to deploy the Jaeger Helm chart (version 2) and provides information on how to use a custom `values.yaml` configuration file during installation. The Jaeger Helm chart includes multiple sub-charts for data stores like Cassandra, Elasticsearch, and Kafka. + +## Directory Structure + +The structure of the Jaeger Helm chart is as follows: + +```bash +kali@PC:~/LFX/helm-charts/charts/jaeger-v2$ tree +. +├── Chart.lock +├── Chart.yaml +├── charts +│ ├── cassandra-0.15.3.tgz +│ ├── common-2.23.0.tgz +│ ├── elasticsearch-20.0.4.tgz +│ └── kafka-26.6.2.tgz +├── readme.md +├── templates +│ ├── _helpers.tpl +│ ├── config-map.yaml +│ └── deployment.yaml +└── values.yaml + +3 directories, 11 files +``` + +### Key Files +- **Chart.yaml**: Contains metadata about the Helm chart such as the chart version, name, and dependencies. +- **templates/**: This directory contains Kubernetes manifests that are templated by Helm and used for the deployment of the Jaeger application. Key templates include: + - `config-map.yaml`: Configures the ConfigMap for the application. + - `deployment.yaml`: Contains the template for the Kubernetes deployment of Jaeger. +- **values.yaml**: This file contains default configuration values for the chart, which are applied unless overridden by a custom file. +- **charts/**: Contains Helm chart dependencies such as Cassandra, Elasticsearch, Kafka, and common utilities. +- **readme.md**: Provides chart-specific documentation. + +## Helm Installation + +You can install the Jaeger Helm chart with the following commands: + +### Basic Installation + +To install the Jaeger chart using the default values from the included `values.yaml`: + +```bash +helm install ./ +``` + +- `` is the name you want to give your release. + +### Installation with Custom Values + +If you want to use a custom configuration, you can pass a custom `values.yaml` file. This allows you to override the default values specified in the chart’s `values.yaml`. + +Use the following command to install the chart with a custom values file: + +```bash +helm install ./ -f +``` + +- Replace `` with the desired name for your Helm release. +- Replace `` with the path to your custom configuration file. + +### Example: + +```bash +helm install jaeger-v2 ./ -f my-config-values.yaml +``` + +This command installs the Jaeger chart and uses `my-config-values.yaml` for overriding any configuration specified in the default `values.yaml`. + +## Custom Values + +When deploying Jaeger using a custom values file, any configuration set in the file will take precedence over the default settings in `values.yaml`. For example, you can modify parameters for `receivers`, `processors`, `exporters`, and more within your custom values file. + +### Example Custom `values.yaml` + +```yaml + + service: + extensions: [jaeger_storage, jaeger_query, remote_sampling, healthcheckv2] + pipelines: + traces: + receivers: [otlp, jaeger, zipkin] + processors: [batch, adaptive_sampling] + exporters: [jaeger_storage_exporter] + + extensions: + healthcheckv2: + use_v2: true + http: {} + + + jaeger_query: + storage: + traces: some_store + traces_archive: another_store + ui: + config_file: ./cmd/jaeger/config-ui.json + + jaeger_storage: + backends: + some_store: + memory: + max_traces: 90000 + another_store: + memory: + max_traces: 90000 + + remote_sampling: + adaptive: + sampling_store: some_store + initial_sampling_probability: 0.2 + http: {} + grpc: {} + + receivers: + otlp: + protocols: + grpc: {} + http: {} + + jaeger: + protocols: + grpc: {} + thrift_binary: {} + thrift_compact: {} + thrift_http: {} + + zipkin: {} + + processors: + batch: {} + adaptive_sampling: {} + + exporters: + jaeger_storage_exporter: + trace_storage: some_store +``` + +## Dependencies + +This Helm chart comes with pre-packaged dependencies for data stores: +- **Cassandra**: Version `0.15.3` +- **Elasticsearch**: Version `20.0.4` +- **Kafka**: Version `26.6.2` +- **Common**: Version `2.23.0` + +These dependencies can be managed through the `charts/` directory, and they are installed as part of the Jaeger deployment. + +## Uninstallation + +To uninstall the Helm release, use the following command: + +```bash +helm uninstall +``` + +This will remove all Kubernetes resources created by the chart, including ConfigMaps, Deployments, Services, and StatefulSets. + +## Conclusion + +This document provides a summary of how to install and configure the Jaeger Helm chart (version 2) with both default and custom values. Custom configurations can be applied via a user-defined `values.yaml` file using the `-f` flag during installation.# Jaeger Helm Chart Deployment (Version 2) Documentation + diff --git a/charts/jaeger-v2/templates/_helpers.tpl b/charts/jaeger-v2/templates/_helpers.tpl new file mode 100644 index 00000000..84836006 --- /dev/null +++ b/charts/jaeger-v2/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "jaeger-v2.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "jaeger-v2.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "jaeger-v2.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "jaeger-v2.labels" -}} +helm.sh/chart: {{ include "jaeger-v2.chart" . }} +{{ include "jaeger-v2.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "jaeger-v2.selectorLabels" -}} +app.kubernetes.io/name: {{ include "jaeger-v2.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "jaeger-v2.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "jaeger-v2.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/charts/jaeger-v2/templates/config-map.yaml b/charts/jaeger-v2/templates/config-map.yaml new file mode 100644 index 00000000..c3ba5821 --- /dev/null +++ b/charts/jaeger-v2/templates/config-map.yaml @@ -0,0 +1,35 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: my-config + namespace: default +data: + config.yaml: | + service: + extensions: {{ toYaml .Values.service.extensions | indent 6 }} + pipelines: + traces: + receivers: {{ toYaml .Values.service.pipelines.traces.receivers | indent 10 }} + processors: {{ toYaml .Values.service.pipelines.traces.processors | indent 10 }} + exporters: {{ toYaml .Values.service.pipelines.traces.exporters | indent 10 }} + + extensions: + healthcheckv2: {{ toYaml .Values.extensions.healthcheckv2 | indent 6 }} + + jaeger_query: + storage: {{ toYaml .Values.extensions.jaeger_query.storage | indent 8 }} + ui: {{ toYaml .Values.extensions.jaeger_query.ui | indent 8 }} + jaeger_storage: {{ toYaml .Values.extensions.jaeger_storage | indent 6 }} + remote_sampling: {{ toYaml .Values.extensions.remote_sampling | indent 6 }} + + receivers: + otlp: {{ toYaml .Values.receivers.otlp | indent 6 }} + jaeger: {{ toYaml .Values.receivers.jaeger | indent 6 }} + zipkin: {{ toYaml .Values.receivers.zipkin | indent 6 }} + + processors: + batch: {{ toYaml .Values.processors.batch | indent 6 }} + adaptive_sampling: {{ toYaml .Values.processors.adaptive_sampling | indent 6 }} + + exporters: + jaeger_storage_exporter: {{ toYaml .Values.exporters.jaeger_storage_exporter | indent 6 }} \ No newline at end of file diff --git a/charts/jaeger-v2/templates/deployment.yaml b/charts/jaeger-v2/templates/deployment.yaml new file mode 100644 index 00000000..0fe8cf91 --- /dev/null +++ b/charts/jaeger-v2/templates/deployment.yaml @@ -0,0 +1,46 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: jaeger + labels: + app: jaeger +spec: + replicas: 1 + selector: + matchLabels: + app: jaeger + template: + metadata: + labels: + app: jaeger + spec: + containers: + - name: jaeger + image: jaegertracing/jaeger:latest + + ports: + - containerPort: 16686 + name: ui + - containerPort: 14268 + name: collector + - containerPort: 14250 + name: grpc + - containerPort: 9411 + name: zipkin + env: + - name: COLLECTOR_ZIPKIN_HOST_PORT + value: ":9411" + resources: # Corrected the typo here + limits: + cpu: 500m + memory: 512Mi + requests: + cpu: 100m + memory: 256Mi + volumeMounts: + - name: config-volume + mountPath: /etc/jaeger + volumes: + - name: config-volume + configMap: + name: my-config \ No newline at end of file diff --git a/charts/jaeger-v2/values.yaml b/charts/jaeger-v2/values.yaml new file mode 100644 index 00000000..af0e338f --- /dev/null +++ b/charts/jaeger-v2/values.yaml @@ -0,0 +1,71 @@ + + service: + extensions: [jaeger_storage, jaeger_query, remote_sampling, healthcheckv2] + pipelines: + traces: + receivers: [otlp, jaeger, zipkin] + processors: [batch, adaptive_sampling] + exporters: [jaeger_storage_exporter] + + extensions: + healthcheckv2: + use_v2: true + http: {} + + jaeger_query: + storage: + traces: some_store + traces_archive: another_store + ui: + config_file: ./cmd/jaeger/config-ui.json + + jaeger_storage: + backends: + some_store: + memory: + max_traces: 100000 + another_store: + memory: + max_traces: 100000 + + remote_sampling: + adaptive: + sampling_store: some_store + initial_sampling_probability: 0.1 + http: {} + grpc: {} + + receivers: + otlp: + protocols: + grpc: {} + http: {} + + jaeger: + protocols: + grpc: {} + thrift_binary: {} + thrift_compact: {} + thrift_http: {} + + zipkin: {} + + processors: + batch: {} + adaptive_sampling: {} + + exporters: + jaeger_storage_exporter: {} + +image: "jaegertracing/jaeger:latest" +ports: + - name: http + port: 4317 + - name: grpc + port: 4318 + +provisionDataStore: + cassandra: false + elasticsearch: false + kafka: false + From f14ffe385b884da1adafda7d3f785f453ce8b3d8 Mon Sep 17 00:00:00 2001 From: Mehul Date: Tue, 1 Oct 2024 16:54:13 +0000 Subject: [PATCH 22/25] lint fix Signed-off-by: Mehul Signed-off-by: mehul --- charts/jaeger-v2/values.yaml | 100 ++++++++++++++++------------------- 1 file changed, 47 insertions(+), 53 deletions(-) diff --git a/charts/jaeger-v2/values.yaml b/charts/jaeger-v2/values.yaml index af0e338f..15b12550 100644 --- a/charts/jaeger-v2/values.yaml +++ b/charts/jaeger-v2/values.yaml @@ -1,68 +1,62 @@ +service: + extensions: [jaeger_storage, jaeger_query, remote_sampling, healthcheckv2] + pipelines: + traces: + receivers: [otlp, jaeger, zipkin] + processors: [batch, adaptive_sampling] + exporters: [jaeger_storage_exporter] - service: - extensions: [jaeger_storage, jaeger_query, remote_sampling, healthcheckv2] - pipelines: - traces: - receivers: [otlp, jaeger, zipkin] - processors: [batch, adaptive_sampling] - exporters: [jaeger_storage_exporter] +extensions: + healthcheckv2: + use_v2: true + http: {} - extensions: - healthcheckv2: - use_v2: true - http: {} + jaeger_query: + storage: + traces: some_store + traces_archive: another_store + ui: + config_file: ./cmd/jaeger/config-ui.json - jaeger_query: - storage: - traces: some_store - traces_archive: another_store - ui: - config_file: ./cmd/jaeger/config-ui.json + jaeger_storage: + backends: + some_store: + memory: + max_traces: 100000 + another_store: + memory: + max_traces: 100000 - jaeger_storage: - backends: - some_store: - memory: - max_traces: 100000 - another_store: - memory: - max_traces: 100000 + remote_sampling: + adaptive: + sampling_store: some_store + initial_sampling_probability: 0.1 + http: {} + grpc: {} - remote_sampling: - adaptive: - sampling_store: some_store - initial_sampling_probability: 0.1 - http: {} +receivers: + otlp: + protocols: grpc: {} + http: {} - receivers: - otlp: - protocols: - grpc: {} - http: {} - - jaeger: - protocols: - grpc: {} - thrift_binary: {} - thrift_compact: {} - thrift_http: {} + jaeger: + protocols: + grpc: {} + thrift_binary: {} + thrift_compact: {} + thrift_http: {} - zipkin: {} + zipkin: {} - processors: - batch: {} - adaptive_sampling: {} +processors: + batch: {} + adaptive_sampling: {} - exporters: - jaeger_storage_exporter: {} +exporters: + jaeger_storage_exporter: {} image: "jaegertracing/jaeger:latest" -ports: - - name: http - port: 4317 - - name: grpc - port: 4318 provisionDataStore: cassandra: false From dfec4580d1bc9c562d899908af245b367c824cc2 Mon Sep 17 00:00:00 2001 From: Mehul Date: Tue, 1 Oct 2024 17:32:04 +0000 Subject: [PATCH 23/25] fixed hostname for es provisionDataStore.elasticsearch and added ci test for it Signed-off-by: mehul --- .github/workflows/lint-test.yaml | 24 ++- charts/jaeger-v2/.helmignore | 21 --- charts/jaeger-v2/Chart.lock | 15 -- charts/jaeger-v2/Chart.yaml | 46 ----- charts/jaeger-v2/readme.md | 167 ------------------ charts/jaeger-v2/templates/_helpers.tpl | 62 ------- charts/jaeger-v2/templates/config-map.yaml | 35 ---- charts/jaeger-v2/templates/deployment.yaml | 46 ----- charts/jaeger-v2/values.yaml | 65 ------- charts/jaeger/Chart.yaml | 2 +- charts/jaeger/templates/_helpers.tpl | 6 +- charts/jaeger/templates/collector-deploy.yaml | 14 ++ charts/jaeger/templates/query-deploy.yaml | 21 ++- 13 files changed, 61 insertions(+), 463 deletions(-) delete mode 100644 charts/jaeger-v2/.helmignore delete mode 100644 charts/jaeger-v2/Chart.lock delete mode 100644 charts/jaeger-v2/Chart.yaml delete mode 100644 charts/jaeger-v2/readme.md delete mode 100644 charts/jaeger-v2/templates/_helpers.tpl delete mode 100644 charts/jaeger-v2/templates/config-map.yaml delete mode 100644 charts/jaeger-v2/templates/deployment.yaml delete mode 100644 charts/jaeger-v2/values.yaml diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 5b00b5be..b458ae1d 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -68,5 +68,27 @@ jobs: run: | cmctl check api --wait=5m - - name: Run chart-testing (install) + - name: Run cassandra-chart-testing (install) run: ct install --config ct.yaml + + - name: Run allInOne-chart-testing (install) + run: | + ct install --config ct.yaml --helm-extra-set-args " + --set provisionDataStore.cassandra=false + --set storage.type=memory + --set allInOne.enabled=true + --set agent.enabled=false + --set collector.enabled=false + --set query.enabled=false" + + - name: Run elastic-search-chart-testing (install) + run: | + ct install --config ct.yaml --helm-extra-set-args " + --set provisionDataStore.cassandra=false + --set provisionDataStore.elasticsearch=true + --set storage.type=elasticsearch + --set elasticsearch.master.masterOnly=false + --set elasticsearch.master.replicaCount=1 + --set elasticsearch.data.replicaCount=0 + --set elasticsearch.coordinating.replicaCount=0 + --set elasticsearch.ingest.replicaCount=0" diff --git a/charts/jaeger-v2/.helmignore b/charts/jaeger-v2/.helmignore deleted file mode 100644 index f0c13194..00000000 --- a/charts/jaeger-v2/.helmignore +++ /dev/null @@ -1,21 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj diff --git a/charts/jaeger-v2/Chart.lock b/charts/jaeger-v2/Chart.lock deleted file mode 100644 index 89e13342..00000000 --- a/charts/jaeger-v2/Chart.lock +++ /dev/null @@ -1,15 +0,0 @@ -dependencies: -- name: cassandra - repository: https://charts.helm.sh/incubator - version: 0.15.3 -- name: elasticsearch - repository: https://charts.bitnami.com/bitnami - version: 20.0.4 -- name: kafka - repository: https://charts.bitnami.com/bitnami - version: 26.6.2 -- name: common - repository: https://charts.bitnami.com/bitnami - version: 2.23.0 -digest: sha256:b13c6270d6d45478b47d03157f7a1c44add98be0809d83b22597a0c800781c10 -generated: "2024-10-01T10:23:03.372102011Z" diff --git a/charts/jaeger-v2/Chart.yaml b/charts/jaeger-v2/Chart.yaml deleted file mode 100644 index 7b103ab6..00000000 --- a/charts/jaeger-v2/Chart.yaml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: v2 -appVersion: 1.53.0 -description: A Jaeger Helm chart for Kubernetes -name: jaeger -type: application -version: 3.3.1 -# CronJobs require v1.21 -kubeVersion: ">= 1.21-0" -keywords: - - jaeger - - opentracing - - tracing - - instrumentation -home: https://jaegertracing.io -icon: https://www.jaegertracing.io/img/jaeger-icon-reverse-color.svg -sources: - - https://hub.docker.com/u/jaegertracing/ -maintainers: - - name: dvonthenen - email: david.vonthenen@dell.com - - name: mehta-ankit - email: ankit.mehta@appian.com - - name: mikelorant - email: michael.lorant@fairfaxmedia.com.au - - name: naseemkullah - email: naseem@transit.app - - name: pavelnikolov - email: me@pavelnikolov.net - - name: jkowall - email: jkowall@kowall.net -dependencies: - - name: cassandra - version: 0.15.3 - repository: https://charts.helm.sh/incubator - condition: provisionDataStore.cassandra - - name: elasticsearch - version: 20.0.4 - repository: https://charts.bitnami.com/bitnami - condition: provisionDataStore.elasticsearch - - name: kafka - version: 26.6.2 - repository: https://charts.bitnami.com/bitnami - condition: provisionDataStore.kafka - - name: common - repository: https://charts.bitnami.com/bitnami - version: 2.x.x diff --git a/charts/jaeger-v2/readme.md b/charts/jaeger-v2/readme.md deleted file mode 100644 index 4d2954cb..00000000 --- a/charts/jaeger-v2/readme.md +++ /dev/null @@ -1,167 +0,0 @@ -# Jaeger Helm Chart Deployment (Version 2) Documentation - -## Overview - -This document outlines the steps to deploy the Jaeger Helm chart (version 2) and provides information on how to use a custom `values.yaml` configuration file during installation. The Jaeger Helm chart includes multiple sub-charts for data stores like Cassandra, Elasticsearch, and Kafka. - -## Directory Structure - -The structure of the Jaeger Helm chart is as follows: - -```bash -kali@PC:~/LFX/helm-charts/charts/jaeger-v2$ tree -. -├── Chart.lock -├── Chart.yaml -├── charts -│ ├── cassandra-0.15.3.tgz -│ ├── common-2.23.0.tgz -│ ├── elasticsearch-20.0.4.tgz -│ └── kafka-26.6.2.tgz -├── readme.md -├── templates -│ ├── _helpers.tpl -│ ├── config-map.yaml -│ └── deployment.yaml -└── values.yaml - -3 directories, 11 files -``` - -### Key Files -- **Chart.yaml**: Contains metadata about the Helm chart such as the chart version, name, and dependencies. -- **templates/**: This directory contains Kubernetes manifests that are templated by Helm and used for the deployment of the Jaeger application. Key templates include: - - `config-map.yaml`: Configures the ConfigMap for the application. - - `deployment.yaml`: Contains the template for the Kubernetes deployment of Jaeger. -- **values.yaml**: This file contains default configuration values for the chart, which are applied unless overridden by a custom file. -- **charts/**: Contains Helm chart dependencies such as Cassandra, Elasticsearch, Kafka, and common utilities. -- **readme.md**: Provides chart-specific documentation. - -## Helm Installation - -You can install the Jaeger Helm chart with the following commands: - -### Basic Installation - -To install the Jaeger chart using the default values from the included `values.yaml`: - -```bash -helm install ./ -``` - -- `` is the name you want to give your release. - -### Installation with Custom Values - -If you want to use a custom configuration, you can pass a custom `values.yaml` file. This allows you to override the default values specified in the chart’s `values.yaml`. - -Use the following command to install the chart with a custom values file: - -```bash -helm install ./ -f -``` - -- Replace `` with the desired name for your Helm release. -- Replace `` with the path to your custom configuration file. - -### Example: - -```bash -helm install jaeger-v2 ./ -f my-config-values.yaml -``` - -This command installs the Jaeger chart and uses `my-config-values.yaml` for overriding any configuration specified in the default `values.yaml`. - -## Custom Values - -When deploying Jaeger using a custom values file, any configuration set in the file will take precedence over the default settings in `values.yaml`. For example, you can modify parameters for `receivers`, `processors`, `exporters`, and more within your custom values file. - -### Example Custom `values.yaml` - -```yaml - - service: - extensions: [jaeger_storage, jaeger_query, remote_sampling, healthcheckv2] - pipelines: - traces: - receivers: [otlp, jaeger, zipkin] - processors: [batch, adaptive_sampling] - exporters: [jaeger_storage_exporter] - - extensions: - healthcheckv2: - use_v2: true - http: {} - - - jaeger_query: - storage: - traces: some_store - traces_archive: another_store - ui: - config_file: ./cmd/jaeger/config-ui.json - - jaeger_storage: - backends: - some_store: - memory: - max_traces: 90000 - another_store: - memory: - max_traces: 90000 - - remote_sampling: - adaptive: - sampling_store: some_store - initial_sampling_probability: 0.2 - http: {} - grpc: {} - - receivers: - otlp: - protocols: - grpc: {} - http: {} - - jaeger: - protocols: - grpc: {} - thrift_binary: {} - thrift_compact: {} - thrift_http: {} - - zipkin: {} - - processors: - batch: {} - adaptive_sampling: {} - - exporters: - jaeger_storage_exporter: - trace_storage: some_store -``` - -## Dependencies - -This Helm chart comes with pre-packaged dependencies for data stores: -- **Cassandra**: Version `0.15.3` -- **Elasticsearch**: Version `20.0.4` -- **Kafka**: Version `26.6.2` -- **Common**: Version `2.23.0` - -These dependencies can be managed through the `charts/` directory, and they are installed as part of the Jaeger deployment. - -## Uninstallation - -To uninstall the Helm release, use the following command: - -```bash -helm uninstall -``` - -This will remove all Kubernetes resources created by the chart, including ConfigMaps, Deployments, Services, and StatefulSets. - -## Conclusion - -This document provides a summary of how to install and configure the Jaeger Helm chart (version 2) with both default and custom values. Custom configurations can be applied via a user-defined `values.yaml` file using the `-f` flag during installation.# Jaeger Helm Chart Deployment (Version 2) Documentation - diff --git a/charts/jaeger-v2/templates/_helpers.tpl b/charts/jaeger-v2/templates/_helpers.tpl deleted file mode 100644 index 84836006..00000000 --- a/charts/jaeger-v2/templates/_helpers.tpl +++ /dev/null @@ -1,62 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "jaeger-v2.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "jaeger-v2.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "jaeger-v2.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "jaeger-v2.labels" -}} -helm.sh/chart: {{ include "jaeger-v2.chart" . }} -{{ include "jaeger-v2.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "jaeger-v2.selectorLabels" -}} -app.kubernetes.io/name: {{ include "jaeger-v2.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "jaeger-v2.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "jaeger-v2.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/charts/jaeger-v2/templates/config-map.yaml b/charts/jaeger-v2/templates/config-map.yaml deleted file mode 100644 index c3ba5821..00000000 --- a/charts/jaeger-v2/templates/config-map.yaml +++ /dev/null @@ -1,35 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: my-config - namespace: default -data: - config.yaml: | - service: - extensions: {{ toYaml .Values.service.extensions | indent 6 }} - pipelines: - traces: - receivers: {{ toYaml .Values.service.pipelines.traces.receivers | indent 10 }} - processors: {{ toYaml .Values.service.pipelines.traces.processors | indent 10 }} - exporters: {{ toYaml .Values.service.pipelines.traces.exporters | indent 10 }} - - extensions: - healthcheckv2: {{ toYaml .Values.extensions.healthcheckv2 | indent 6 }} - - jaeger_query: - storage: {{ toYaml .Values.extensions.jaeger_query.storage | indent 8 }} - ui: {{ toYaml .Values.extensions.jaeger_query.ui | indent 8 }} - jaeger_storage: {{ toYaml .Values.extensions.jaeger_storage | indent 6 }} - remote_sampling: {{ toYaml .Values.extensions.remote_sampling | indent 6 }} - - receivers: - otlp: {{ toYaml .Values.receivers.otlp | indent 6 }} - jaeger: {{ toYaml .Values.receivers.jaeger | indent 6 }} - zipkin: {{ toYaml .Values.receivers.zipkin | indent 6 }} - - processors: - batch: {{ toYaml .Values.processors.batch | indent 6 }} - adaptive_sampling: {{ toYaml .Values.processors.adaptive_sampling | indent 6 }} - - exporters: - jaeger_storage_exporter: {{ toYaml .Values.exporters.jaeger_storage_exporter | indent 6 }} \ No newline at end of file diff --git a/charts/jaeger-v2/templates/deployment.yaml b/charts/jaeger-v2/templates/deployment.yaml deleted file mode 100644 index 0fe8cf91..00000000 --- a/charts/jaeger-v2/templates/deployment.yaml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: jaeger - labels: - app: jaeger -spec: - replicas: 1 - selector: - matchLabels: - app: jaeger - template: - metadata: - labels: - app: jaeger - spec: - containers: - - name: jaeger - image: jaegertracing/jaeger:latest - - ports: - - containerPort: 16686 - name: ui - - containerPort: 14268 - name: collector - - containerPort: 14250 - name: grpc - - containerPort: 9411 - name: zipkin - env: - - name: COLLECTOR_ZIPKIN_HOST_PORT - value: ":9411" - resources: # Corrected the typo here - limits: - cpu: 500m - memory: 512Mi - requests: - cpu: 100m - memory: 256Mi - volumeMounts: - - name: config-volume - mountPath: /etc/jaeger - volumes: - - name: config-volume - configMap: - name: my-config \ No newline at end of file diff --git a/charts/jaeger-v2/values.yaml b/charts/jaeger-v2/values.yaml deleted file mode 100644 index 15b12550..00000000 --- a/charts/jaeger-v2/values.yaml +++ /dev/null @@ -1,65 +0,0 @@ -service: - extensions: [jaeger_storage, jaeger_query, remote_sampling, healthcheckv2] - pipelines: - traces: - receivers: [otlp, jaeger, zipkin] - processors: [batch, adaptive_sampling] - exporters: [jaeger_storage_exporter] - -extensions: - healthcheckv2: - use_v2: true - http: {} - - jaeger_query: - storage: - traces: some_store - traces_archive: another_store - ui: - config_file: ./cmd/jaeger/config-ui.json - - jaeger_storage: - backends: - some_store: - memory: - max_traces: 100000 - another_store: - memory: - max_traces: 100000 - - remote_sampling: - adaptive: - sampling_store: some_store - initial_sampling_probability: 0.1 - http: {} - grpc: {} - -receivers: - otlp: - protocols: - grpc: {} - http: {} - - jaeger: - protocols: - grpc: {} - thrift_binary: {} - thrift_compact: {} - thrift_http: {} - - zipkin: {} - -processors: - batch: {} - adaptive_sampling: {} - -exporters: - jaeger_storage_exporter: {} - -image: "jaegertracing/jaeger:latest" - -provisionDataStore: - cassandra: false - elasticsearch: false - kafka: false - diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml index 7b103ab6..be86e1c2 100644 --- a/charts/jaeger/Chart.yaml +++ b/charts/jaeger/Chart.yaml @@ -3,7 +3,7 @@ appVersion: 1.53.0 description: A Jaeger Helm chart for Kubernetes name: jaeger type: application -version: 3.3.1 +version: 3.3.2 # CronJobs require v1.21 kubeVersion: ">= 1.21-0" keywords: diff --git a/charts/jaeger/templates/_helpers.tpl b/charts/jaeger/templates/_helpers.tpl index f4db73be..f6f6b13f 100644 --- a/charts/jaeger/templates/_helpers.tpl +++ b/charts/jaeger/templates/_helpers.tpl @@ -268,7 +268,11 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this */}} {{- define "elasticsearch.client.url" -}} {{- $port := .Values.storage.elasticsearch.port | toString -}} -{{- printf "%s://%s:%s" .Values.storage.elasticsearch.scheme .Values.storage.elasticsearch.host $port }} +{{- $host := .Values.storage.elasticsearch.host }} +{{- if .Values.provisionDataStore.elasticsearch }} +{{- $host = printf "%s-elasticsearch" .Release.Name }} +{{- end }} +{{- printf "%s://%s:%s" .Values.storage.elasticsearch.scheme $host $port }} {{- end -}} {{- define "jaeger.hotrod.tracing.host" -}} diff --git a/charts/jaeger/templates/collector-deploy.yaml b/charts/jaeger/templates/collector-deploy.yaml index dfdd1dc7..4a351479 100644 --- a/charts/jaeger/templates/collector-deploy.yaml +++ b/charts/jaeger/templates/collector-deploy.yaml @@ -32,6 +32,20 @@ spec: {{- toYaml .Values.collector.podLabels | nindent 8 }} {{- end }} spec: + {{- if .Values.provisionDataStore.elasticsearch }} + initContainers: + - name: elasticsearch-checker + image: curlimages/curl + command: + - sh + - "-c" + - | + url="{{ include "elasticsearch.client.url" . }}" + until [ "$(curl -s -o /dev/null -w '%{http_code}' "$url/_cluster/health")" = "200" ]; do + echo "Waiting for Elasticsearch at $url" + sleep 5 + done + {{- end}} {{- with .Values.collector.priorityClassName }} priorityClassName: {{ . }} {{- end }} diff --git a/charts/jaeger/templates/query-deploy.yaml b/charts/jaeger/templates/query-deploy.yaml index da8f1aa1..c3cfd7e1 100644 --- a/charts/jaeger/templates/query-deploy.yaml +++ b/charts/jaeger/templates/query-deploy.yaml @@ -44,10 +44,25 @@ spec: {{- toYaml .Values.query.podSecurityContext | nindent 8 }} serviceAccountName: {{ template "jaeger.query.serviceAccountName" . }} {{- include "query.imagePullSecrets" . | nindent 6 }} - {{- if .Values.query.initContainers }} + {{- if or .Values.query.initContainers .Values.provisionDataStore.elasticsearch }} initContainers: - {{- toYaml .Values.query.initContainers | nindent 8 }} - {{- end}} + {{- if .Values.query.initContainers }} + {{- toYaml .Values.query.initContainers | nindent 8 }} + {{- end }} + {{- if .Values.provisionDataStore.elasticsearch }} + - name: elasticsearch-checker + image: curlimages/curl + command: + - sh + - "-c" + - | + url="{{ include "elasticsearch.client.url" . }}" + until [ "$(curl -s -o /dev/null -w '%{http_code}' "$url/_cluster/health")" = "200" ]; do + echo "waiting for Elasticsearch at $url" + sleep 5 + done + {{- end }} + {{- end }} containers: - name: {{ template "jaeger.query.name" . }} securityContext: From 18b296e6236adcc29b347cf4611af27e1a87c4c7 Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Thu, 31 Oct 2024 10:59:34 -0400 Subject: [PATCH 24/25] Share setup sub-action in CI (#615) * Share setup sub-action in CI Signed-off-by: Yuri Shkuro Signed-off-by: mehul Update Chart.yaml Signed-off-by: Pavel Nikolov --- .github/actions/prepare-k8s/action.yaml | 51 +++++++++++++++++ .github/workflows/lint-test.yaml | 76 ++++++++++++------------- 2 files changed, 87 insertions(+), 40 deletions(-) create mode 100644 .github/actions/prepare-k8s/action.yaml diff --git a/.github/actions/prepare-k8s/action.yaml b/.github/actions/prepare-k8s/action.yaml new file mode 100644 index 00000000..4c80097c --- /dev/null +++ b/.github/actions/prepare-k8s/action.yaml @@ -0,0 +1,51 @@ +name: Prepare K8s for Helm tests +runs: + using: "composite" + steps: + - name: Set up Helm + uses: azure/setup-helm@v4 + with: + version: v3.14.4 + + # Python is required because `ct lint` runs Yamale (https://github.com/23andMe/Yamale) and + # yamllint (https://github.com/adrienverge/yamllint) which require Python + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: 3.7 + + - name: Set up chart-testing + uses: helm/chart-testing-action@v2.6.1 + with: + version: v3.10.1 + + - name: Create kind cluster + uses: helm/kind-action@v1.9.0 + + - name: Install kubectl + uses: azure/setup-kubectl@v4.0.0 + with: + version: 'v1.28.8' + id: install + + - name: Set up cert-manager + shell: bash + run: | + kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml --namespace ingress-nginx + kubectl label node --all ingress-ready=true + kubectl describe pod --selector=app.kubernetes.io/component=controller -n ingress-nginx + kubectl wait --namespace ingress-nginx --for=condition=ready pod --selector=app.kubernetes.io/component=controller --timeout=5m + kubectl apply --validate=false -f https://github.com/jetstack/cert-manager/releases/download/v1.6.1/cert-manager.yaml + + - name: Set up cmctl + shell: bash + run: | + curl -sSL -o cmctl.tar.gz https://github.com/cert-manager/cert-manager/releases/download/v1.6.1/cmctl-linux-amd64.tar.gz + tar xzf cmctl.tar.gz + sudo mv cmctl /usr/local/bin + cmctl version + + - name: Check if cert-manager is up + shell: bash + run: | + cmctl check api --wait=5m diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index b458ae1d..1e26bc0f 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -3,11 +3,10 @@ name: Lint and Test Charts on: pull_request jobs: - lint-test: + lint: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v2 + - uses: actions/checkout@v2 with: fetch-depth: 0 @@ -39,37 +38,25 @@ jobs: - name: Run chart-testing (lint) run: ct lint --config ct.yaml - - name: Create kind cluster - uses: helm/kind-action@v1.9.0 - if: steps.list-changed.outputs.changed == 'true' - - - name: Install kubectl - uses: azure/setup-kubectl@v4.0.0 + test-with-cassandra: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 with: - version: 'v1.28.8' - id: install - - - name: Set up cert-manager - run: | - kubectl apply -f https://raw.githubusercontent.com/kubernetes/ingress-nginx/main/deploy/static/provider/kind/deploy.yaml --namespace ingress-nginx - kubectl label node --all ingress-ready=true - kubectl describe pod --selector=app.kubernetes.io/component=controller -n ingress-nginx - kubectl wait --namespace ingress-nginx --for=condition=ready pod --selector=app.kubernetes.io/component=controller --timeout=5m - kubectl apply --validate=false -f https://github.com/jetstack/cert-manager/releases/download/v1.6.1/cert-manager.yaml + fetch-depth: 0 - - name: Set up cmctl - run: | - curl -sSL -o cmctl.tar.gz https://github.com/cert-manager/cert-manager/releases/download/v1.6.1/cmctl-linux-amd64.tar.gz - tar xzf cmctl.tar.gz - sudo mv cmctl /usr/local/bin - cmctl version - - - name: Check if cert-manager is up - run: | - cmctl check api --wait=5m + - uses: ./.github/actions/prepare-k8s - name: Run cassandra-chart-testing (install) run: ct install --config ct.yaml + test-with-allInOne: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - uses: ./.github/actions/prepare-k8s - name: Run allInOne-chart-testing (install) run: | @@ -80,15 +67,24 @@ jobs: --set agent.enabled=false --set collector.enabled=false --set query.enabled=false" + + test-with-elasticsearch: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 - - name: Run elastic-search-chart-testing (install) - run: | - ct install --config ct.yaml --helm-extra-set-args " - --set provisionDataStore.cassandra=false - --set provisionDataStore.elasticsearch=true - --set storage.type=elasticsearch - --set elasticsearch.master.masterOnly=false - --set elasticsearch.master.replicaCount=1 - --set elasticsearch.data.replicaCount=0 - --set elasticsearch.coordinating.replicaCount=0 - --set elasticsearch.ingest.replicaCount=0" + - uses: ./.github/actions/prepare-k8s + + - name: Run elasticsearch-chart-testing (install) + run: | + ct install --config ct.yaml --helm-extra-set-args " + --set provisionDataStore.cassandra=false + --set provisionDataStore.elasticsearch=true + --set storage.type=elasticsearch + --set elasticsearch.master.masterOnly=false + --set elasticsearch.master.replicaCount=1 + --set elasticsearch.data.replicaCount=0 + --set elasticsearch.coordinating.replicaCount=0 + --set elasticsearch.ingest.replicaCount=0" From 1b91023c127268a1827faf34b2684334f46730a5 Mon Sep 17 00:00:00 2001 From: Reddysekhar Gaduputi Date: Wed, 26 Jun 2024 15:15:29 +0530 Subject: [PATCH 25/25] [jaeger] add new options, improvements into allInOne (#586) * [jaeger] allInOne add option automountServiceAccountToken for serviceaccount Signed-off-by: Reddysekhar Gaduputi * [jaeger] allInOne add affinity support Signed-off-by: Reddysekhar Gaduputi * [jaeger] allInOne add topologySpreadConstraints support Signed-off-by: Reddysekhar Gaduputi * [jaeger] allInOne add podSecurityContext and containerSecurityContext support Signed-off-by: Reddysekhar Gaduputi --------- Signed-off-by: Reddysekhar Gaduputi --- charts/jaeger/values.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/charts/jaeger/values.yaml b/charts/jaeger/values.yaml index e7715b21..f598ffc5 100644 --- a/charts/jaeger/values.yaml +++ b/charts/jaeger/values.yaml @@ -87,7 +87,10 @@ allInOne: # cpu: 256m # memory: 128Mi nodeSelector: {} +<<<<<<< HEAD tolerations: [] +======= +>>>>>>> 1dca639 ([jaeger] add new options, improvements into allInOne (#586)) affinity: {} topologySpreadContraints: [] podSecurityContext: