chore(bors): merge pull request #472

472: fix(jaeger): update and use the jaeger bundled CRD r=tiagolobocastro a=tiagolobocastro It seems otherwise there's a race condition in which CRD gets installed depending on the helm version. We don't actually need to use our own CRD for jaeger anymore, so let's instead if the bundled one from jaeger-operator. Updates jaeger-operator. Note that as of now cert-manager is a required dependency for jaeger. <! Co-authored-by: Tiago Castro <[email protected]>
openebs · Apr 9, 2024 · 6423ebc · 6423ebc
2 parents 1f41bcc + f736f3a
commit 6423ebc
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 75 deletions.
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
@@ -32,7 +32,7 @@ dependencies:
     repository: https://charts.bitnami.com/bitnami
     version: 8.6.0
   - name: jaeger-operator
-    version: 2.25.0
+    version: 2.50.1
     repository: https://jaegertracing.github.io/helm-charts
     condition: base.jaeger.enabled
   - name: loki-stack

diff --git a/chart/README.md b/chart/README.md
@@ -57,7 +57,7 @@ This removes all the Kubernetes components associated with the chart and deletes
 |  | crds | 2.6.0 |
 | https://charts.bitnami.com/bitnami | etcd | 8.6.0 |
 | https://grafana.github.io/helm-charts | loki-stack | 2.9.11 |
-| https://jaegertracing.github.io/helm-charts | jaeger-operator | 2.25.0 |
+| https://jaegertracing.github.io/helm-charts | jaeger-operator | 2.50.1 |
 | https://nats-io.github.io/k8s/helm/charts/ | nats | 0.19.14 |
 | https://openebs.github.io/dynamic-localpv-provisioner | localpv-provisioner | 4.0.0 |
 
@@ -101,14 +101,12 @@ This removes all the Kubernetes components associated with the chart and deletes
 | base.&ZeroWidthSpace;cache_poll_period | Cache timeout for core agent & diskpool deployment | `"30s"` |
 | base.&ZeroWidthSpace;default_req_timeout | Request timeout for rest & core agents | `"5s"` |
 | base.&ZeroWidthSpace;imagePullSecrets.&ZeroWidthSpace;enabled | Enable imagePullSecrets for pulling our container images | `false` |
-| base.&ZeroWidthSpace;jaeger.&ZeroWidthSpace;enabled | Enable jaeger tracing | `false` |
 | base.&ZeroWidthSpace;logging.&ZeroWidthSpace;color | Enable ansi color code for Pod StdOut/StdErr | `true` |
 | base.&ZeroWidthSpace;logging.&ZeroWidthSpace;format | Valid values for format are pretty, json and compact | `"pretty"` |
 | base.&ZeroWidthSpace;logging.&ZeroWidthSpace;silenceLevel | Silence specific module components | `nil` |
 | base.&ZeroWidthSpace;metrics.&ZeroWidthSpace;enabled | Enable the metrics exporter | `true` |
 | crds.&ZeroWidthSpace;csi.&ZeroWidthSpace;volumeSnapshots.&ZeroWidthSpace;enabled | Install Volume Snapshot CRDs | `true` |
 | crds.&ZeroWidthSpace;enabled | Disables the installation of all CRDs if set to false | `true` |
-| crds.&ZeroWidthSpace;jaeger.&ZeroWidthSpace;enabled | Install Jaeger CRDs | `true` |
 | csi.&ZeroWidthSpace;controller.&ZeroWidthSpace;logLevel | Log level for the csi controller | `"info"` |
 | csi.&ZeroWidthSpace;controller.&ZeroWidthSpace;preventVolumeModeConversion | Prevent modifying the volume mode when creating a PVC from an existing VolumeSnapshot | `true` |
 | csi.&ZeroWidthSpace;controller.&ZeroWidthSpace;priorityClassName | Set PriorityClass, overrides global | `""` |

diff --git a/chart/charts/crds/README.md b/chart/charts/crds/README.md
@@ -9,7 +9,4 @@ A Helm chart that collects CustomResourceDefinitions (CRDs) from Mayastor.
 | csi.&ZeroWidthSpace;volumeSnapshots.&ZeroWidthSpace;annotations | Annotations to be added to all CRDs | <pre>{<br><br>}</pre> |
 | csi.&ZeroWidthSpace;volumeSnapshots.&ZeroWidthSpace;enabled | Install Volume Snapshot CRDs | `true` |
 | csi.&ZeroWidthSpace;volumeSnapshots.&ZeroWidthSpace;keep | Keep CRDs on chart uninstall | `true` |
-| jaeger.&ZeroWidthSpace;annotations | Annotations to be added to all CRDs | <pre>{<br><br>}</pre> |
-| jaeger.&ZeroWidthSpace;enabled | Install Jaeger CRDs | `true` |
-| jaeger.&ZeroWidthSpace;keep | Keep CRDs on chart uninstall | `true` |
 
diff --git a/chart/charts/crds/templates/jaeger.yaml b/chart/charts/crds/templates/jaeger.yaml
diff --git a/chart/charts/crds/values.yaml b/chart/charts/crds/values.yaml
@@ -1,13 +1,3 @@
-jaeger:
-  # -- Install Jaeger CRDs
-  enabled: true
-  # -- Keep CRDs on chart uninstall
-  keep: true
-  # -- Annotations to be added to all CRDs
-  annotations: {}
-    # Example for Argo CD to prevent CRDs from being recycled
-    # argocd.argoproj.io/sync-options: Prune=false
-
 csi:
   volumeSnapshots:
     # -- Install Volume Snapshot CRDs
@@ -18,4 +8,3 @@ csi:
     annotations: {}
     # Example for Argo CD to prevent CRDs from being recycled
     # argocd.argoproj.io/sync-options: Prune=false
-
diff --git a/chart/values.yaml b/chart/values.yaml
@@ -1,9 +1,6 @@
 crds:
   # -- Disables the installation of all CRDs if set to false
   enabled: true
-  jaeger:
-    # -- Install Jaeger CRDs
-    enabled: true
   csi:
     volumeSnapshots:
       # -- Install Volume Snapshot CRDs
@@ -103,7 +100,9 @@ base:
     enabled: true
 
   jaeger:
-    # -- Enable jaeger tracing
+    # Enable jaeger tracing (for development only).
+    # Since version 1.31 the Jaeger Operator uses webhooks to validate Jaeger custom resources (CRs).
+    # This requires an installed version of the cert-manager.
     enabled: false
     initContainer: true
     agent:
@@ -143,9 +142,6 @@ operators:
 jaeger-operator:
   # Name of jaeger operator
   name: "{{ .Release.Name }}"
-  crd:
-    # Install jaeger CRDs
-    install: false
   jaeger:
     # Install jaeger-operator
     create: false