Skip to content

Commit daedffa

Browse files
Re-organize the notes about upgrading the CRDs
1 parent 47b5215 commit daedffa

File tree

2 files changed

+26
-9
lines changed

2 files changed

+26
-9
lines changed

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

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,6 @@ kube-prometheus-stack:
8080
8181
#### Update custom resource definition for OpenTelemetry operator
8282
83-
```shell
84-
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
85-
86-
kubectl apply -f https://raw.githubusercontent.com/open-telemetry/opentelemetry-helm-charts/opentelemetry-operator-0.56.1/charts/opentelemetry-operator/crds/crd-opentelemetryinstrumentation.yaml
87-
88-
kubectl apply -f https://raw.githubusercontent.com/open-telemetry/opentelemetry-helm-charts/opentelemetry-operator-0.56.1/charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml`
89-
```
90-
9183
:::note
9284
Starting v4.12.0, please use the CRDs below
9385
:::
@@ -98,13 +90,29 @@ kubectl apply --server-side -f https://raw.githubusercontent.com/SumoLogic/sumol
9890
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
9991

10092
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
93+
```
10194

95+
Then, annotate and label these CRDs as below
96+
97+
```shell
10298
kubectl annotate crds instrumentations.opentelemetry.io opentelemetrycollectors.opentelemetry.io opampbridges.opentelemetry.io \
10399
meta.helm.sh/release-name=${RELEASE_NAME} \
104100
meta.helm.sh/release-namespace=${RELEASE_NAMESPACE}
105101
kubectl label crds instrumentations.opentelemetry.io opentelemetrycollectors.opentelemetry.io opampbridges.opentelemetry.io app.kubernetes.io/managed-by=Helm
106102
```
107103

104+
:::note
105+
CRDs prior to v4.12.0 are below
106+
:::
107+
108+
```shell
109+
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
110+
111+
kubectl apply -f https://raw.githubusercontent.com/open-telemetry/opentelemetry-helm-charts/opentelemetry-operator-0.56.1/charts/opentelemetry-operator/crds/crd-opentelemetryinstrumentation.yaml
112+
113+
kubectl apply -f https://raw.githubusercontent.com/open-telemetry/opentelemetry-helm-charts/opentelemetry-operator-0.56.1/charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml`
114+
```
115+
108116
### How to revert to the v3 defaults
109117

110118
Set the following in your configuration:

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Ensure that the following CRDs from the OpenTelemetry operator are installed and
3737
Please follow instructions below to install the appropriate CRD versions
3838
:::
3939

40-
#### CRDS to install (v4.12.0 and later)
40+
#### CRDs to install (v4.12.0 and later)
4141

4242
```shell
4343
kubectl delete crd instrumentations.opentelemetry.io
@@ -53,6 +53,15 @@ kubectl apply --server-side -f https://raw.githubusercontent.com/SumoLogic/sumol
5353
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
5454
```
5555

56+
Then, annotate and label these CRDs as below
57+
58+
```shell
59+
kubectl annotate crds instrumentations.opentelemetry.io opentelemetrycollectors.opentelemetry.io opampbridges.opentelemetry.io \
60+
meta.helm.sh/release-name=${RELEASE_NAME} \
61+
meta.helm.sh/release-namespace=${RELEASE_NAMESPACE}
62+
kubectl label crds instrumentations.opentelemetry.io opentelemetrycollectors.opentelemetry.io opampbridges.opentelemetry.io app.kubernetes.io/managed-by=Helm
63+
```
64+
5665
#### CRDs to install (before v4.12.0)
5766

5867
```shell

0 commit comments

Comments
 (0)