From f736f3a1a8ce34fc36431fcb0bdee3617763bb7e Mon Sep 17 00:00:00 2001 From: Tiago Castro Date: Mon, 8 Apr 2024 22:47:37 +0100 Subject: [PATCH] fix(jaeger): update and use the jaeger bundled CRD 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. Signed-off-by: Tiago Castro --- chart/Chart.yaml | 2 +- chart/README.md | 4 +- chart/charts/crds/README.md | 3 -- chart/charts/crds/templates/jaeger.yaml | 50 ------------------------- chart/charts/crds/values.yaml | 11 ------ chart/values.yaml | 10 ++--- 6 files changed, 5 insertions(+), 75 deletions(-) delete mode 100644 chart/charts/crds/templates/jaeger.yaml diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 0ac1c3438..3e49b5ae6 100644 --- 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 index 08de06969..0d78c3447 100644 --- 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.​cache_poll_period | Cache timeout for core agent & diskpool deployment | `"30s"` | | base.​default_req_timeout | Request timeout for rest & core agents | `"5s"` | | base.​imagePullSecrets.​enabled | Enable imagePullSecrets for pulling our container images | `false` | -| base.​jaeger.​enabled | Enable jaeger tracing | `false` | | base.​logging.​color | Enable ansi color code for Pod StdOut/StdErr | `true` | | base.​logging.​format | Valid values for format are pretty, json and compact | `"pretty"` | | base.​logging.​silenceLevel | Silence specific module components | `nil` | | base.​metrics.​enabled | Enable the metrics exporter | `true` | | crds.​csi.​volumeSnapshots.​enabled | Install Volume Snapshot CRDs | `true` | | crds.​enabled | Disables the installation of all CRDs if set to false | `true` | -| crds.​jaeger.​enabled | Install Jaeger CRDs | `true` | | csi.​controller.​logLevel | Log level for the csi controller | `"info"` | | csi.​controller.​preventVolumeModeConversion | Prevent modifying the volume mode when creating a PVC from an existing VolumeSnapshot | `true` | | csi.​controller.​priorityClassName | Set PriorityClass, overrides global | `""` | diff --git a/chart/charts/crds/README.md b/chart/charts/crds/README.md index 8a704da86..7b8aca397 100644 --- 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.​volumeSnapshots.​annotations | Annotations to be added to all CRDs | 
{

}
| | csi.​volumeSnapshots.​enabled | Install Volume Snapshot CRDs | `true` | | csi.​volumeSnapshots.​keep | Keep CRDs on chart uninstall | `true` | -| jaeger.​annotations | Annotations to be added to all CRDs | 
{

}
| -| jaeger.​enabled | Install Jaeger CRDs | `true` | -| jaeger.​keep | Keep CRDs on chart uninstall | `true` | diff --git a/chart/charts/crds/templates/jaeger.yaml b/chart/charts/crds/templates/jaeger.yaml deleted file mode 100644 index 68d025f6c..000000000 --- a/chart/charts/crds/templates/jaeger.yaml +++ /dev/null @@ -1,50 +0,0 @@ -{{- if .Values.jaeger.enabled -}} -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - name: jaegers.jaegertracing.io - {{- if or (.Values.jaeger.keep) (.Values.jaeger.annotations) }} - annotations: - {{- include "crds.extraAnnotations" .Values.jaeger | nindent 4 }} - {{- end }} - labels: - app: jaeger-operator -spec: - group: jaegertracing.io - names: - kind: Jaeger - listKind: JaegerList - plural: jaegers - singular: jaeger - scope: Namespaced - versions: - - name: v1 - schema: - openAPIV3Schema: - x-kubernetes-preserve-unknown-fields: true - type: object - additionalPrinterColumns: - - description: Jaeger instance's status - jsonPath: .status.phase - name: Status - type: string - - description: Jaeger Version - jsonPath: .status.version - name: Version - type: string - - description: Jaeger deployment strategy - jsonPath: .spec.strategy - name: Strategy - type: string - - description: Jaeger storage type - jsonPath: .spec.storage.type - name: Storage - type: string - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - served: true - storage: true - subresources: - status: {} -{{- end -}} diff --git a/chart/charts/crds/values.yaml b/chart/charts/crds/values.yaml index fdda41f28..d3bb538dd 100644 --- 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 index 5fa62fd8a..375a8d4c3 100644 --- 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