Skip to content

Commit a0ba310

Browse files
Add note to update CRDs before upgrading to helm chart version 4.12.0
1 parent 6f77c18 commit a0ba310

File tree

2 files changed

+60
-9
lines changed

2 files changed

+60
-9
lines changed

docs/send-data/kubernetes/v4/how-to-upgrade.md

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,23 @@ kubectl apply -f https://raw.githubusercontent.com/open-telemetry/opentelemetry-
8888
kubectl apply -f https://raw.githubusercontent.com/open-telemetry/opentelemetry-helm-charts/opentelemetry-operator-0.56.1/charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml`
8989
```
9090

91+
:::note
92+
Starting v4.12.0, please use the CRDs below
93+
:::
94+
95+
```shell
96+
kubectl apply --server-side -f https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/refs/tags/v4.12.0/deploy/helm/sumologic/crds/crd-opentelemetry.io_opampbridges.yaml --force-conflicts
97+
98+
kubectl apply --server-side -f https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/refs/tags/v4.12.0/deploy/helm/sumologic/crds/crd-opentelemetrycollector.yaml --force-conflicts
99+
100+
kubectl apply --server-side -f https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/refs/tags/v4.12.0/deploy/helm/sumologic/crds/crd-opentelemetryinstrumentation.yaml --force-conflicts
101+
102+
kubectl annotate crds instrumentations.opentelemetry.io opentelemetrycollectors.opentelemetry.io opampbridges.opentelemetry.io \
103+
meta.helm.sh/release-name=${RELEASE_NAME} \
104+
meta.helm.sh/release-namespace=${RELEASE_NAMESPACE}
105+
kubectl label crds instrumentations.opentelemetry.io opentelemetrycollectors.opentelemetry.io opampbridges.opentelemetry.io app.kubernetes.io/managed-by=Helm
106+
```
107+
91108
### How to revert to the v3 defaults
92109

93110
Set the following in your configuration:
@@ -108,6 +125,28 @@ kube-prometheus-stack:
108125
enabled: true
109126
```
110127
128+
Starting v4.12.0, please use the configuration below
129+
130+
```yaml
131+
sumologic:
132+
metrics:
133+
collector:
134+
otelcol:
135+
enabled: false
136+
remoteWriteProxy:
137+
enabled: true
138+
139+
kube-prometheus-stack:
140+
prometheus:
141+
enabled: true
142+
prometheusOperator:
143+
enabled: true
144+
145+
opentelemetry-operator:
146+
crds:
147+
create: true
148+
```
149+
111150
## Remove remaining Fluent Bit and Fluentd configuration
112151
113152
If you've already switched to OTel, skip straight to the [next major section](#switch-to-otlp-sources).

docs/send-data/kubernetes/v4/important-changes.md

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,33 @@ By default, the OpenTelemetry Collector is now used for metrics collection inste
3333

3434
Ensure that the following CRDs from the OpenTelemetry operator are installed and updated using the following commands.
3535

36-
##### Instrumentation CRD (relevant for metrics and traces)
36+
:::note
37+
Please follow instructions below to install the appropriate CRD versions
38+
:::
3739

38-
```
39-
kubectl apply -f https://raw.githubusercontent.com/open-telemetry/opentelemetry-helm-charts/opentelemetry-operator-0.56.1/charts/opentelemetry-operator/crds/crd-opentelemetryinstrumentation.yaml
40-
```
40+
#### CRDS to install (v4.12.0 and later)
4141

42-
##### OpenTelemetry collector CRD
42+
```shell
43+
kubectl delete crd instrumentations.opentelemetry.io
4344

44-
```
45-
kubectl apply -f https://raw.githubusercontent.com/open-telemetry/opentelemetry-helm-charts/opentelemetry-operator-0.56.1/charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml
46-
```
45+
kubectl delete crd opentelemetrycollectors.opentelemetry.io
4746

48-
##### OpAMP Bridge CRD
47+
kubectl delete crd opampbridges.opentelemetry.io
4948

49+
kubectl apply --server-side -f https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/refs/tags/v4.12.0/deploy/helm/sumologic/crds/crd-opentelemetry.io_opampbridges.yaml --force-conflicts
50+
51+
kubectl apply --server-side -f https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/refs/tags/v4.12.0/deploy/helm/sumologic/crds/crd-opentelemetrycollector.yaml --force-conflicts
52+
53+
kubectl apply --server-side -f https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/refs/tags/v4.12.0/deploy/helm/sumologic/crds/crd-opentelemetryinstrumentation.yaml --force-conflicts
5054
```
55+
56+
#### CRDs to install (before v4.12.0)
57+
58+
```shell
59+
kubectl apply -f https://raw.githubusercontent.com/open-telemetry/opentelemetry-helm-charts/opentelemetry-operator-0.56.1/charts/opentelemetry-operator/crds/crd-opentelemetryinstrumentation.yaml
60+
61+
kubectl apply -f https://raw.githubusercontent.com/open-telemetry/opentelemetry-helm-charts/opentelemetry-operator-0.56.1/charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml
62+
5163
kubectl apply -f https://raw.githubusercontent.com/open-telemetry/opentelemetry-helm-charts/opentelemetry-operator-0.56.1/charts/opentelemetry-operator/crds/crd-opentelemetry.io_opampbridges.yaml
5264
```
5365

0 commit comments

Comments
 (0)