Skip to content

Commit

Permalink
bump collector (#830)
Browse files Browse the repository at this point in the history
  • Loading branch information
TylerHelmuth authored Jul 5, 2023
1 parent 8087515 commit 2361f16
Show file tree
Hide file tree
Showing 35 changed files with 91 additions and 87 deletions.
6 changes: 5 additions & 1 deletion charts/opentelemetry-collector/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# Collector Chart Contributing Guide

All changes to the chart require a bump to the version in `chart.yaml`. See the [Contributing Guide](https://github.com/open-telemetry/opentelemetry-helm-charts/blob/main/CONTRIBUTING.md#versioning) for our versioning requirements.

Once the chart version is bumped, the examples must be regenerated. You can regenerate examples by running `make generate-examples CHARTS=opentelemetry-collector`.

## Bumping Default Collector Version

1. Increase the minor version of the chart by one and set the patch version to zero.
2. Update the chart's `appVersion` to match the new collector version. This version will be used as the image tag by default.
3. Review the corresponding release notes in [Collector Core](https://github.com/open-telemetry/opentelemetry-collector/releases), [Collector Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases), and [Collector Releases](https://github.com/open-telemetry/opentelemetry-collector-releases/releases). If any changes affect the helm charts, adjust the helm chart accordingly.
4. Run `make generate-examples`.
4. Run `make generate-examples CHARTS=opentelemetry-collector`.
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-collector
version: 0.61.2
version: 0.62.0
description: OpenTelemetry Collector Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand All @@ -11,4 +11,4 @@ maintainers:
- name: dmitryax
- name: TylerHelmuth
icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
appVersion: 0.80.0
appVersion: 0.81.0
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: ConfigMap
metadata:
name: example-opentelemetry-collector-agent
labels:
helm.sh/chart: opentelemetry-collector-0.61.2
helm.sh/chart: opentelemetry-collector-0.62.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.80.0"
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/managed-by: Helm
data:
relay: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: ConfigMap
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.61.2
helm.sh/chart: opentelemetry-collector-0.62.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.80.0"
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/managed-by: Helm
data:
relay: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: DaemonSet
metadata:
name: example-opentelemetry-collector-agent
labels:
helm.sh/chart: opentelemetry-collector-0.61.2
helm.sh/chart: opentelemetry-collector-0.62.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.80.0"
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/managed-by: Helm
spec:
selector:
Expand All @@ -21,7 +21,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 52fce4823bbdcf841af25e729855298ac3b07f123e3e99ca22cdbd40d95e1743
checksum/config: 56ca660abc0568694973dc87ba0cde628563df3599f6032596c863cba4d11947

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -40,7 +40,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-contrib:0.80.0"
image: "otel/opentelemetry-collector-contrib:0.81.0"
imagePullPolicy: IfNotPresent
ports:
- name: jaeger-compact
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: Deployment
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.61.2
helm.sh/chart: opentelemetry-collector-0.62.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.80.0"
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 22ba89a7693f2f5551a9558a6a0f0ca2e03f5c0420258cdbfc082aaf8500ff03
checksum/config: ec1e4e6ed87ac31ccf6a9dcf32bfbf888e20a017391765c0f849946d61d73321

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -42,7 +42,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-contrib:0.80.0"
image: "otel/opentelemetry-collector-contrib:0.81.0"
imagePullPolicy: IfNotPresent
ports:
- name: jaeger-compact
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: Service
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.61.2
helm.sh/chart: opentelemetry-collector-0.62.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.80.0"
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/managed-by: Helm
component: standalone-collector
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ kind: ServiceAccount
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.61.2
helm.sh/chart: opentelemetry-collector-0.62.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.80.0"
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/managed-by: Helm
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: ConfigMap
metadata:
name: example-opentelemetry-collector-agent
labels:
helm.sh/chart: opentelemetry-collector-0.61.2
helm.sh/chart: opentelemetry-collector-0.62.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.80.0"
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/managed-by: Helm
data:
relay: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: DaemonSet
metadata:
name: example-opentelemetry-collector-agent
labels:
helm.sh/chart: opentelemetry-collector-0.61.2
helm.sh/chart: opentelemetry-collector-0.62.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.80.0"
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/managed-by: Helm
spec:
selector:
Expand All @@ -21,7 +21,7 @@ spec:
template:
metadata:
annotations:
checksum/config: b02463f7c45fc4fd3de88e22697d46a7aec92aca4c60ceb8f8f20de9623dd2c5
checksum/config: 89741e2f664c1e69066c035c9a4fa19850909b9e6200d22d211590a04452bb17

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -40,7 +40,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-contrib:0.80.0"
image: "otel/opentelemetry-collector-contrib:0.81.0"
imagePullPolicy: IfNotPresent
ports:
- name: jaeger-compact
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ kind: ServiceAccount
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.61.2
helm.sh/chart: opentelemetry-collector-0.62.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.80.0"
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/managed-by: Helm
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: ConfigMap
metadata:
name: example-opentelemetry-collector-agent
labels:
helm.sh/chart: opentelemetry-collector-0.61.2
helm.sh/chart: opentelemetry-collector-0.62.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.80.0"
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/managed-by: Helm
data:
relay: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: DaemonSet
metadata:
name: example-opentelemetry-collector-agent
labels:
helm.sh/chart: opentelemetry-collector-0.61.2
helm.sh/chart: opentelemetry-collector-0.62.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.80.0"
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/managed-by: Helm
spec:
selector:
Expand All @@ -21,7 +21,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 2b789821ee4c7f685c325c90c116c020bfb5b0161239ae926454f9a4cc7fa30a
checksum/config: 19c2c58035984f4d67af47741693157fb99371694be48fc42cd3316cab129607

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -40,7 +40,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-contrib:0.80.0"
image: "otel/opentelemetry-collector-contrib:0.81.0"
imagePullPolicy: IfNotPresent
ports:
- name: jaeger-compact
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ kind: ServiceAccount
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.61.2
helm.sh/chart: opentelemetry-collector-0.62.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.80.0"
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/managed-by: Helm
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: ConfigMap
metadata:
name: example-opentelemetry-collector-agent
labels:
helm.sh/chart: opentelemetry-collector-0.61.2
helm.sh/chart: opentelemetry-collector-0.62.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.80.0"
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/managed-by: Helm
data:
relay: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: DaemonSet
metadata:
name: example-opentelemetry-collector-agent
labels:
helm.sh/chart: opentelemetry-collector-0.61.2
helm.sh/chart: opentelemetry-collector-0.62.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.80.0"
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/managed-by: Helm
spec:
selector:
Expand All @@ -21,7 +21,7 @@ spec:
template:
metadata:
annotations:
checksum/config: b0327a7fbe8c50380595221358647eaeb7bb1f64539ce07f810297503a0352a0
checksum/config: 03d14059c640b7e67fbf22129cf6dc351ace5ecdad607f06db418b63fd0bece7

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -40,7 +40,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-contrib:0.80.0"
image: "otel/opentelemetry-collector-contrib:0.81.0"
imagePullPolicy: IfNotPresent
ports:
- name: jaeger-compact
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ kind: ServiceAccount
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.61.2
helm.sh/chart: opentelemetry-collector-0.62.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.80.0"
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/managed-by: Helm
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: ConfigMap
metadata:
name: example-opentelemetry-collector-agent
labels:
helm.sh/chart: opentelemetry-collector-0.61.2
helm.sh/chart: opentelemetry-collector-0.62.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.80.0"
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/managed-by: Helm
data:
relay: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: DaemonSet
metadata:
name: example-opentelemetry-collector-agent
labels:
helm.sh/chart: opentelemetry-collector-0.61.2
helm.sh/chart: opentelemetry-collector-0.62.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.80.0"
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/managed-by: Helm
spec:
selector:
Expand All @@ -21,7 +21,7 @@ spec:
template:
metadata:
annotations:
checksum/config: b0327a7fbe8c50380595221358647eaeb7bb1f64539ce07f810297503a0352a0
checksum/config: 03d14059c640b7e67fbf22129cf6dc351ace5ecdad607f06db418b63fd0bece7

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -40,7 +40,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-contrib:0.80.0"
image: "otel/opentelemetry-collector-contrib:0.81.0"
imagePullPolicy: IfNotPresent
ports:
- name: jaeger-compact
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ kind: ServiceAccount
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.61.2
helm.sh/chart: opentelemetry-collector-0.62.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.80.0"
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/managed-by: Helm
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: ConfigMap
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.61.2
helm.sh/chart: opentelemetry-collector-0.62.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.80.0"
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/managed-by: Helm
data:
relay: |
Expand Down
Loading

0 comments on commit 2361f16

Please sign in to comment.