Merge branch 'main' into main

Signed-off-by: Pavel Nikolov <pavelnikolov@users.noreply.github.com>
jaegertracing · Nov 28, 2023 · fa30ccd · fa30ccd
2 parents 1e14d22 + c5707b4
commit fa30ccd
Show file tree

Hide file tree

Showing 25 changed files with 579 additions and 102 deletions.
diff --git a/charts/jaeger-operator/COMPATIBILITY.md b/charts/jaeger-operator/COMPATIBILITY.md
@@ -2,6 +2,10 @@ The following table shows the compatibility of `Jaeger Operator helm chart` with
 
 | Chart version             | Jaeger Operator | Kubernetes      | Strimzi Operator   | Cert-Manager |
 |---------------------------|-----------------|-----------------|--------------------|--------------|
+| 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+      |
+| 2.45.0                    | v1.45.x         | v1.19 to v1.26  | v0.23              | v1.6.1+      |
 | 2.42.0                    | v1.43.x         | v1.19 to v1.26  | v0.23              | v1.6.1+      |
 | 2.41.0                    | v1.42.x         | v1.19 to v1.24  | v0.23              | v1.6.1+      |
 | (Missing)                 |                 | v1.19 to v1.23  | 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.43.0
-appVersion: 1.43.0
+version: 2.49.0
+appVersion: 1.49.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
@@ -19,6 +19,7 @@ This chart bootstraps a jaeger-operator deployment on a [Kubernetes](http://kube
 - cert-manager 1.6.1+ installed, or certificate for webhook service in a secret
 
 ## Check compability matrix
+
 See the compatibility matrix [here](./COMPATIBILITY.md).
 
 ## Installing the Chart
@@ -29,7 +30,7 @@ Add the Jaeger Tracing Helm repository:
 $ helm repo add jaegertracing https://jaegertracing.github.io/helm-charts
 ```
 
-To install the chart with the release name `my-release` in `observability` namespace: 
+To install the chart with the release name `my-release` in `observability` namespace:
 
 ```console
 $ helm install my-release jaegertracing/jaeger-operator -n observability
@@ -54,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.43.0`                        |
+| `image.tag`                | Controller container image tag                                                                              | `1.49.0`                        |
 | `image.pullPolicy`         | Controller container image pull policy                                                                      | `IfNotPresent`                  |
 | `jaeger.create`            | Jaeger instance will be created                                                                             | `false`                         |
 | `jaeger.spec`              | Jaeger instance specification                                                                               | `{}`                            |
@@ -67,7 +68,7 @@ The following table lists the configurable parameters of the jaeger-operator cha
 | `rbac.pspEnabled`          | Pod security policy for pod will be created and included in rbac role                                       | `false`                         |
 | `rbac.clusterRole`         | ClusterRole will be used by operator ServiceAccount                                                         | `false`                         |
 | `serviceAccount.name`      | Service account name to use. If not set and create is true, a name is generated using the fullname template | `nil`                           |
-| `extraEnv`                 | Additional environment variables passed to the operator. For example:   name: LOG-LEVEL   value: debug      | `[]`                            |
+| `extraEnv`                 | Additional environment variables passed to the operator. For example: name: LOG-LEVEL value: debug          | `[]`                            |
 | `resources`                | K8s pod resources                                                                                           | `None`                          |
 | `nodeSelector`             | Node labels for pod assignment                                                                              | `{}`                            |
 | `tolerations`              | Toleration labels for pod assignment                                                                        | `[]`                            |