Merge branch 'main' into main

Signed-off-by: Pavel Nikolov <pavelnikolov@users.noreply.github.com>
jaegertracing · Jan 22, 2024 · 7166d75 · 7166d75
2 parents afc57a5 + f0594b7
commit 7166d75
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 6 deletions.
diff --git 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.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+      |
 | 2.46.0                    | v1.46.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
@@ -1,8 +1,8 @@
 apiVersion: v1
 description: jaeger-operator Helm chart for Kubernetes
 name: jaeger-operator
-version: 2.49.0
-appVersion: 1.49.0
+version: 2.50.1
+appVersion: 1.52.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
@@ -55,11 +55,11 @@ The command removes all the Kubernetes components associated with the chart and
 The following table lists the configurable parameters of the jaeger-operator chart and their default values.
 
 | Parameter                  | Description                                                                                                 | Default                         |
-| :------------------------- | :---------------------------------------------------------------------------------------------------------- | :------------------------------ |
+| :------------------------- | :---------------------------------------------------------------------------------------------------------- |:--------------------------------|
 | `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.49.0`                        |
+| `image.tag`                | Controller container image tag                                                                              | `1.52.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
@@ -4,7 +4,7 @@
 
 image:
   repository: jaegertracing/jaeger-operator
-  tag: 1.49.0
+  tag: 1.52.0
   pullPolicy: IfNotPresent
   imagePullSecrets: []
 

diff --git 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: 0.74.0
+version: 0.74.1
 # CronJobs require v1.21
 kubeVersion: ">= 1.21-0"
 keywords:

diff --git a/charts/jaeger/templates/ingester-deploy.yaml b/charts/jaeger/templates/ingester-deploy.yaml
@@ -50,6 +50,10 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if .Values.ingester.initContainers }}
+      initContainers:
+      {{- toYaml .Values.ingester.initContainers | nindent 8 }}
+      {{- end}}
       containers:
       - name: {{ include "jaeger.fullname" . }}-ingester
         securityContext:

diff --git a/charts/jaeger/templates/query-deploy.yaml b/charts/jaeger/templates/query-deploy.yaml
@@ -44,6 +44,10 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if .Values.query.initContainers }}
+      initContainers:
+      {{- toYaml .Values.query.initContainers | nindent 8 }}
+      {{- end}} 
       containers:
       - name: {{ template "jaeger.query.name" . }}
         securityContext:

diff --git a/charts/jaeger/values.yaml b/charts/jaeger/values.yaml
@@ -276,6 +276,7 @@ ingester:
   extraConfigmapMounts: []
   extraEnv: []
   envFrom: []
+  initContainers: []
 
   serviceMonitor:
     enabled: false
@@ -533,6 +534,7 @@ collector:
 query:
   enabled: true
   basePath: /
+  initContainers: []
   oAuthSidecar:
     enabled: false
     resources: