Skip to content

Commit a2303ba

Browse files
authored
Document sed workaround on Mac OS X (#1568)
* Document sed workaround on Mac OS X Describe how to update the operator chart on Mac OS X which comes with a different sed flavour. Also fix list numbering. Split from #1566 * Bump chart patch version
1 parent 45a5b75 commit a2303ba

24 files changed

+59
-44
lines changed

charts/opentelemetry-operator/CONTRIBUTING.md

+20-5
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,23 @@
33
## Bumping Default Operator Version
44

55
1. Increase the minor version of the chart by one and set the patch version to zero.
6-
1. Update the chart's `appVersion` to match the new operator version.
7-
1. In the values.yaml, update `manager.collectorImage.tag` to match the version of the collector managed by default by the operator.
8-
1. Run `make generate-examples CHARTS=opentelemetry-operator`.
9-
1. Run `make update-operator-crds` to update the CRDs in this chart to match the operator's.
10-
1. Review the [Operator release notes](https://github.com/open-telemetry/opentelemetry-operator/releases). If any changes affect the helm chart, adjust the helm chart accordingly.
6+
2. Update the chart's `appVersion` to match the new operator version.
7+
3. In the values.yaml, update `manager.collectorImage.tag` to match the version of the collector managed by default by the operator.
8+
4. Run `make generate-examples CHARTS=opentelemetry-operator`.
9+
5. Run `make update-operator-crds` to update the CRDs in this chart to match the operator's.
10+
6. Review the [Operator release notes](https://github.com/open-telemetry/opentelemetry-operator/releases). If any changes affect the helm chart, adjust the helm chart accordingly.
11+
12+
### sed on Mac OS X
13+
14+
If you're performing the above steps on Mac OS X, you may need to install `gnu-sed` via Homebrew
15+
as the pre-installed `sed` version has some incompatible differences:
16+
17+
```sh
18+
brew install gnu-sed
19+
```
20+
21+
Then, you can use it for make instead of the system's `sed`:
22+
23+
```sh
24+
PATH="$(brew --prefix)/opt/gnu-sed/libexec/gnubin:$PATH" make ...
25+
```

charts/opentelemetry-operator/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: opentelemetry-operator
3-
version: 0.82.1
3+
version: 0.82.2
44
description: OpenTelemetry Operator Helm chart for Kubernetes
55
type: application
66
home: https://opentelemetry.io/

charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
annotations:
77
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.82.1
9+
helm.sh/chart: opentelemetry-operator-0.82.2
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.119.0"
1212
app.kubernetes.io/managed-by: Helm
@@ -91,7 +91,7 @@ metadata:
9191
annotations:
9292
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
9393
labels:
94-
helm.sh/chart: opentelemetry-operator-0.82.1
94+
helm.sh/chart: opentelemetry-operator-0.82.2
9595
app.kubernetes.io/name: opentelemetry-operator
9696
app.kubernetes.io/version: "0.119.0"
9797
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: cert-manager.io/v1
44
kind: Certificate
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.82.1
7+
helm.sh/chart: opentelemetry-operator-0.82.2
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.119.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -30,7 +30,7 @@ apiVersion: cert-manager.io/v1
3030
kind: Issuer
3131
metadata:
3232
labels:
33-
helm.sh/chart: opentelemetry-operator-0.82.1
33+
helm.sh/chart: opentelemetry-operator-0.82.2
3434
app.kubernetes.io/name: opentelemetry-operator
3535
app.kubernetes.io/version: "0.119.0"
3636
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRole
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.82.1
7+
helm.sh/chart: opentelemetry-operator-0.82.2
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.119.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -257,7 +257,7 @@ apiVersion: rbac.authorization.k8s.io/v1
257257
kind: ClusterRole
258258
metadata:
259259
labels:
260-
helm.sh/chart: opentelemetry-operator-0.82.1
260+
helm.sh/chart: opentelemetry-operator-0.82.2
261261
app.kubernetes.io/name: opentelemetry-operator
262262
app.kubernetes.io/version: "0.119.0"
263263
app.kubernetes.io/managed-by: Helm
@@ -276,7 +276,7 @@ apiVersion: rbac.authorization.k8s.io/v1
276276
kind: ClusterRole
277277
metadata:
278278
labels:
279-
helm.sh/chart: opentelemetry-operator-0.82.1
279+
helm.sh/chart: opentelemetry-operator-0.82.2
280280
app.kubernetes.io/name: opentelemetry-operator
281281
app.kubernetes.io/version: "0.119.0"
282282
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRoleBinding
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.82.1
7+
helm.sh/chart: opentelemetry-operator-0.82.2
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.119.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -26,7 +26,7 @@ apiVersion: rbac.authorization.k8s.io/v1
2626
kind: ClusterRoleBinding
2727
metadata:
2828
labels:
29-
helm.sh/chart: opentelemetry-operator-0.82.1
29+
helm.sh/chart: opentelemetry-operator-0.82.2
3030
app.kubernetes.io/name: opentelemetry-operator
3131
app.kubernetes.io/version: "0.119.0"
3232
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apps/v1
44
kind: Deployment
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.82.1
7+
helm.sh/chart: opentelemetry-operator-0.82.2
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.119.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -24,7 +24,7 @@ spec:
2424
annotations:
2525
kubectl.kubernetes.io/default-container: manager
2626
labels:
27-
helm.sh/chart: opentelemetry-operator-0.82.1
27+
helm.sh/chart: opentelemetry-operator-0.82.2
2828
app.kubernetes.io/name: opentelemetry-operator
2929
app.kubernetes.io/version: "0.119.0"
3030
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/role.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: Role
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.82.1
7+
helm.sh/chart: opentelemetry-operator-0.82.2
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.119.0"
1010
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: RoleBinding
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.82.1
7+
helm.sh/chart: opentelemetry-operator-0.82.2
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.119.0"
1010
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/service.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: v1
44
kind: Service
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.82.1
7+
helm.sh/chart: opentelemetry-operator-0.82.2
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.119.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -32,7 +32,7 @@ apiVersion: v1
3232
kind: Service
3333
metadata:
3434
labels:
35-
helm.sh/chart: opentelemetry-operator-0.82.1
35+
helm.sh/chart: opentelemetry-operator-0.82.2
3636
app.kubernetes.io/name: opentelemetry-operator
3737
app.kubernetes.io/version: "0.119.0"
3838
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: opentelemetry-operator
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.82.1
9+
helm.sh/chart: opentelemetry-operator-0.82.2
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.119.0"
1212
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: "example-opentelemetry-operator-cert-manager"
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.82.1
9+
helm.sh/chart: opentelemetry-operator-0.82.2
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.119.0"
1212
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: "example-opentelemetry-operator-metrics"
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.82.1
9+
helm.sh/chart: opentelemetry-operator-0.82.2
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.119.0"
1212
app.kubernetes.io/managed-by: Helm
@@ -44,7 +44,7 @@ metadata:
4444
name: "example-opentelemetry-operator-webhook"
4545
namespace: default
4646
labels:
47-
helm.sh/chart: opentelemetry-operator-0.82.1
47+
helm.sh/chart: opentelemetry-operator-0.82.2
4848
app.kubernetes.io/name: opentelemetry-operator
4949
app.kubernetes.io/version: "0.119.0"
5050
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
annotations:
77
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.82.1
9+
helm.sh/chart: opentelemetry-operator-0.82.2
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.119.0"
1212
app.kubernetes.io/managed-by: Helm
@@ -91,7 +91,7 @@ metadata:
9191
annotations:
9292
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
9393
labels:
94-
helm.sh/chart: opentelemetry-operator-0.82.1
94+
helm.sh/chart: opentelemetry-operator-0.82.2
9595
app.kubernetes.io/name: opentelemetry-operator
9696
app.kubernetes.io/version: "0.119.0"
9797
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/certmanager.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: cert-manager.io/v1
44
kind: Certificate
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.82.1
7+
helm.sh/chart: opentelemetry-operator-0.82.2
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.119.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -30,7 +30,7 @@ apiVersion: cert-manager.io/v1
3030
kind: Issuer
3131
metadata:
3232
labels:
33-
helm.sh/chart: opentelemetry-operator-0.82.1
33+
helm.sh/chart: opentelemetry-operator-0.82.2
3434
app.kubernetes.io/name: opentelemetry-operator
3535
app.kubernetes.io/version: "0.119.0"
3636
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/clusterrole.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRole
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.82.1
7+
helm.sh/chart: opentelemetry-operator-0.82.2
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.119.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -257,7 +257,7 @@ apiVersion: rbac.authorization.k8s.io/v1
257257
kind: ClusterRole
258258
metadata:
259259
labels:
260-
helm.sh/chart: opentelemetry-operator-0.82.1
260+
helm.sh/chart: opentelemetry-operator-0.82.2
261261
app.kubernetes.io/name: opentelemetry-operator
262262
app.kubernetes.io/version: "0.119.0"
263263
app.kubernetes.io/managed-by: Helm
@@ -276,7 +276,7 @@ apiVersion: rbac.authorization.k8s.io/v1
276276
kind: ClusterRole
277277
metadata:
278278
labels:
279-
helm.sh/chart: opentelemetry-operator-0.82.1
279+
helm.sh/chart: opentelemetry-operator-0.82.2
280280
app.kubernetes.io/name: opentelemetry-operator
281281
app.kubernetes.io/version: "0.119.0"
282282
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/clusterrolebinding.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRoleBinding
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.82.1
7+
helm.sh/chart: opentelemetry-operator-0.82.2
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.119.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -26,7 +26,7 @@ apiVersion: rbac.authorization.k8s.io/v1
2626
kind: ClusterRoleBinding
2727
metadata:
2828
labels:
29-
helm.sh/chart: opentelemetry-operator-0.82.1
29+
helm.sh/chart: opentelemetry-operator-0.82.2
3030
app.kubernetes.io/name: opentelemetry-operator
3131
app.kubernetes.io/version: "0.119.0"
3232
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apps/v1
44
kind: Deployment
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.82.1
7+
helm.sh/chart: opentelemetry-operator-0.82.2
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.119.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -24,7 +24,7 @@ spec:
2424
annotations:
2525
kubectl.kubernetes.io/default-container: manager
2626
labels:
27-
helm.sh/chart: opentelemetry-operator-0.82.1
27+
helm.sh/chart: opentelemetry-operator-0.82.2
2828
app.kubernetes.io/name: opentelemetry-operator
2929
app.kubernetes.io/version: "0.119.0"
3030
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/role.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: Role
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.82.1
7+
helm.sh/chart: opentelemetry-operator-0.82.2
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.119.0"
1010
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/rolebinding.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: RoleBinding
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.82.1
7+
helm.sh/chart: opentelemetry-operator-0.82.2
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.119.0"
1010
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/service.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: v1
44
kind: Service
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.82.1
7+
helm.sh/chart: opentelemetry-operator-0.82.2
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.119.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -32,7 +32,7 @@ apiVersion: v1
3232
kind: Service
3333
metadata:
3434
labels:
35-
helm.sh/chart: opentelemetry-operator-0.82.1
35+
helm.sh/chart: opentelemetry-operator-0.82.2
3636
app.kubernetes.io/name: opentelemetry-operator
3737
app.kubernetes.io/version: "0.119.0"
3838
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/serviceaccount.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: opentelemetry-operator
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.82.1
9+
helm.sh/chart: opentelemetry-operator-0.82.2
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.119.0"
1212
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/tests/test-certmanager-connection.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: "example-opentelemetry-operator-cert-manager"
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.82.1
9+
helm.sh/chart: opentelemetry-operator-0.82.2
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.119.0"
1212
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/tests/test-service-connection.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: "example-opentelemetry-operator-metrics"
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.82.1
9+
helm.sh/chart: opentelemetry-operator-0.82.2
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.119.0"
1212
app.kubernetes.io/managed-by: Helm
@@ -44,7 +44,7 @@ metadata:
4444
name: "example-opentelemetry-operator-webhook"
4545
namespace: default
4646
labels:
47-
helm.sh/chart: opentelemetry-operator-0.82.1
47+
helm.sh/chart: opentelemetry-operator-0.82.2
4848
app.kubernetes.io/name: opentelemetry-operator
4949
app.kubernetes.io/version: "0.119.0"
5050
app.kubernetes.io/managed-by: Helm

0 commit comments

Comments
 (0)