Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(jaeger): update and use the jaeger bundled CRD #473

Merged
merged 4 commits into from
Apr 10, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions chart/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ This removes all the Kubernetes components associated with the chart and deletes
| | crds | 0.0.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 |

Expand Down Expand Up @@ -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 | `""` |
Expand Down
3 changes: 0 additions & 3 deletions chart/charts/crds/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` |

50 changes: 0 additions & 50 deletions chart/charts/crds/templates/jaeger.yaml

This file was deleted.

11 changes: 0 additions & 11 deletions chart/charts/crds/values.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -18,4 +8,3 @@ csi:
annotations: {}
# Example for Argo CD to prevent CRDs from being recycled
# argocd.argoproj.io/sync-options: Prune=false

10 changes: 3 additions & 7 deletions chart/values.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
Loading