Skip to content

Commit

Permalink
[chore] merge upstream/main (#25)
Browse files Browse the repository at this point in the history
* Bump collector version to 0.80.0 (open-telemetry#815)

* [opentelemetry-collector] recombine cri multi-line logs (open-telemetry#818)

* [demo] Bump OTel Collector chart version (open-telemetry#821)

See: open-telemetry#817 (comment)

Signed-off-by: Goutham <gouthamve@gmail.com>

* Feat/extra env from (open-telemetry#820)

* feat(collector-chart): add extraEnvFrom support

* chore(examples): adding examples

* bump operator (open-telemetry#823)

* bump collector (open-telemetry#830)

* JAC: fix checksum config in statefulset template (open-telemetry#827)

* Adds short usage instructions to UPGRADING.md (open-telemetry#826)

* Adds short usage instructions to UPGRADING.md

* Updated chart version and regenerated examples

* Bump operator (open-telemetry#832)

* Fix typo in README.md (open-telemetry#831)

* Add new helm command to README.md, fix typos (open-telemetry#836)

* Add new helm command to README.md, fix typos

+ Add link to logging exporter

* bump operator chart version

* Revert "bump operator chart version"

This reverts commit 91430ff.

* bump operator patch version

* Add externalTrafficPolicy value for service type LoadBalancer (open-telemetry#838)

Signed-off-by: Alban HURTAUD <alban.hurtaud@amadeus.com>

* [collector] Respect pipeline order when enabling kubernetesAttributes (open-telemetry#844)

* fix pipeline order when enabling k8sattributes

* bump collector and document breakage

* kubernetesAttributes example

* regenerate examples

* Update charts/opentelemetry-collector/UPGRADING.md

Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>

---------

Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>

* [collector] Allow disabling service even for deployment and statefulset (open-telemetry#843)

* Allow disabling all ports

* temp

* generate examples

* Bump version

* bump collector to 0.82.0 (open-telemetry#847)

* charts/opentelemetry-collector: recommended CPU limit pushes just over threshold (open-telemetry#851)

* charts/opentelemetry-collector: fix CPU limit

While "256m" is a valid setting, the intention was likely to allow
4 pods to be scheduled on a single CPU, which we will currently
overshoot by 24/1000, since there are only 1000 units in a CPU
fraction.

Adjust to "250m", which would allow exactly 4 pods to share a CPU.

See e.g. https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#meaning-of-cpu

* Update charts/opentelemetry-collector/values.yaml

Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>

---------

Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>

* Upgrade operator to v0.82.0 (open-telemetry#854)

* Upgrade operator to v0.82.0

* ci: fix operator E2E tests

* [collector] Allow disabling all ports (open-telemetry#842)

* Allow disabling all ports

* bump patch version instead

* chore(demo): update chart dependencies (open-telemetry#856)

* update chart dependencies

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* update chart dependencies

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* update chart dependencies

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

---------

Signed-off-by: Pierre Tessier <pierre@pierretessier.com>

* Bump collector version (open-telemetry#861)

* Update clusterrole (open-telemetry#860)

---------

Signed-off-by: Goutham <gouthamve@gmail.com>
Signed-off-by: Alban HURTAUD <alban.hurtaud@amadeus.com>
Signed-off-by: Pierre Tessier <pierre@pierretessier.com>
Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com>
Co-authored-by: Goutham Veeramachaneni <gouthamve+github@gmail.com>
Co-authored-by: PaoloGallina <paologallina1992@gmail.com>
Co-authored-by: Jorge Andreu Calatayud <11544239+jorgeancal@users.noreply.github.com>
Co-authored-by: Peter Kern <peter@nomagic.net>
Co-authored-by: Jan Katins <jasc@gmx.net>
Co-authored-by: Marcin Ziółkowski <62351083+MA3CIN@users.noreply.github.com>
Co-authored-by: Alban Hurtaud <alban.hurtaud@amadeus.com>
Co-authored-by: Jakob Demler <jakob.demler@jedox.com>
Co-authored-by: Kevin Burke <kevin.burke@segment.com>
Co-authored-by: Mikołaj Świątek <mail+sumo@mikolajswiatek.com>
Co-authored-by: Pierre Tessier <pierre@pierretessier.com>
  • Loading branch information
13 people committed Aug 18, 2023
1 parent d15075c commit 14df4e0
Show file tree
Hide file tree
Showing 209 changed files with 3,539 additions and 920 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.70.1
version: 0.71.0
description: OpenTelemetry Collector Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand All @@ -12,4 +12,4 @@ sources:
icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
maintainers:
- name: povilasv
appVersion: 0.81.0
appVersion: 0.83.0
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ The collector can be configured to collects cluster-level metrics from the Kuber
This feature is disabled by default. It has the following requirements:

- It requires [k8sclusterreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/k8sclusterreceiver) to be included in the collector, such as [contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib) version of the collector image.
- It requires statefulset or deployment mode with a signle replica.
- It requires statefulset or deployment mode with a single replica.

To enable this feature, set the `presets.clusterMetrics.enabled` property to `true`.

Expand Down
12 changes: 11 additions & 1 deletion charts/opentelemetry-collector/UPGRADING.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Upgrade guidelines

These upgrade guidelines only contain instructions for version upgrades which require manual modifications on the user's side.
If the version you want to upgrade to is not listed here, then there is nothing to do for you.
Just upgrade and enjoy.

## 0.62 to 0.63

The `kubernetesAttributes` preset now respects order of processors in logs, metrics and traces pipelines.
This implicitly might break your pipelines if you relied on having the `k8sAttributes` processor rendered as the first processor but also explicitly listed it in the signal's pipeline somewhere else.

## 0.55.2 to 0.56

The `tpl` function has been added to references of pod labels and ingress hosts. This adds the ability to add some reusability in
Expand Down Expand Up @@ -38,7 +47,8 @@ As of v0.54.0 Collector chart, the default resource limits are removed. If you w
```
resources:
limits:
cpu: 256m
# CPU units are in fractions of 1000; memory in powers of 2
cpu: 250m
memory: 512Mi
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: ClusterRole
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.70.1
helm.sh/chart: opentelemetry-collector-0.71.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.83.0"
app.kubernetes.io/managed-by: Helm
rules:
- apiGroups: [""]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: ClusterRoleBinding
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.70.1
helm.sh/chart: opentelemetry-collector-0.71.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.83.0"
app.kubernetes.io/managed-by: Helm
roleRef:
apiGroup: rbac.authorization.k8s.io
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-agent
labels:
helm.sh/chart: opentelemetry-collector-0.70.1
helm.sh/chart: opentelemetry-collector-0.71.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.83.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.70.1
helm.sh/chart: opentelemetry-collector-0.71.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.83.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.70.1
helm.sh/chart: opentelemetry-collector-0.71.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.83.0"
app.kubernetes.io/managed-by: Helm
spec:
selector:
Expand All @@ -21,7 +21,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 9afdc4232355af0e9611ba8e323cc8abc04f1319755b5987ab98b9d7cc968780
checksum/config: fea94006711e3ea281444424ef285096ea6e4dd8b8f4b9f271980ee550f0c71e

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -40,9 +40,10 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-contrib:0.81.0"
image: "otel/opentelemetry-collector-contrib:0.83.0"
imagePullPolicy: IfNotPresent
ports:

- name: jaeger-compact
containerPort: 6831
protocol: UDP
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.70.1
helm.sh/chart: opentelemetry-collector-0.71.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.83.0"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 1bf6bb08b9d58489b954e01f68c16917b1315518c920ab02a295471986245b8d
checksum/config: 1b343b804ab9820604b361a3e67f9c4ed8adc5843e4d6b7f163f443b50bf336f

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -42,9 +42,10 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-contrib:0.81.0"
image: "otel/opentelemetry-collector-contrib:0.83.0"
imagePullPolicy: IfNotPresent
ports:

- name: jaeger-compact
containerPort: 6831
protocol: UDP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ kind: Service
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.70.1
helm.sh/chart: opentelemetry-collector-0.71.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.83.0"
app.kubernetes.io/managed-by: Helm
component: standalone-collector
spec:
type: ClusterIP
ports:
ports:

- name: jaeger-compact
port: 6831
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.70.1
helm.sh/chart: opentelemetry-collector-0.71.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.83.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.70.1
helm.sh/chart: opentelemetry-collector-0.71.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.83.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.70.1
helm.sh/chart: opentelemetry-collector-0.71.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.83.0"
app.kubernetes.io/managed-by: Helm
spec:
selector:
Expand All @@ -21,7 +21,7 @@ spec:
template:
metadata:
annotations:
checksum/config: f28a32619bda74ce1925837002d78c7c92f2084a2278431f9736008e385c7353
checksum/config: 1e90988584dfeaa687ae82210ec0ed112a579c45ca060b352f2acad6425f83f4

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -40,9 +40,10 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-contrib:0.81.0"
image: "otel/opentelemetry-collector-contrib:0.83.0"
imagePullPolicy: IfNotPresent
ports:

- name: jaeger-compact
containerPort: 6831
protocol: UDP
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.70.1
helm.sh/chart: opentelemetry-collector-0.71.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.83.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.70.1
helm.sh/chart: opentelemetry-collector-0.71.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.83.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.70.1
helm.sh/chart: opentelemetry-collector-0.71.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.83.0"
app.kubernetes.io/managed-by: Helm
spec:
selector:
Expand All @@ -21,7 +21,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 8aa26522f8adbb5938a527c79e098322fc6d9e964ef2b533abdd221aee8b8331
checksum/config: 84a6c7eae469b2fb5718dfb4dc686dae09d36d816bc6580d24ef959b1aa9c436

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -40,9 +40,10 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-contrib:0.81.0"
image: "otel/opentelemetry-collector-contrib:0.83.0"
imagePullPolicy: IfNotPresent
ports:

- name: jaeger-compact
containerPort: 6831
protocol: UDP
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.70.1
helm.sh/chart: opentelemetry-collector-0.71.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.83.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.70.1
helm.sh/chart: opentelemetry-collector-0.71.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.83.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.70.1
helm.sh/chart: opentelemetry-collector-0.71.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.83.0"
app.kubernetes.io/managed-by: Helm
spec:
selector:
Expand All @@ -21,7 +21,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 8aa26522f8adbb5938a527c79e098322fc6d9e964ef2b533abdd221aee8b8331
checksum/config: 84a6c7eae469b2fb5718dfb4dc686dae09d36d816bc6580d24ef959b1aa9c436

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -40,9 +40,10 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-contrib:0.81.0"
image: "otel/opentelemetry-collector-contrib:0.83.0"
imagePullPolicy: IfNotPresent
ports:

- name: jaeger-compact
containerPort: 6831
protocol: UDP
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.70.1
helm.sh/chart: opentelemetry-collector-0.71.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.83.0"
app.kubernetes.io/managed-by: Helm
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: ClusterRole
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.70.1
helm.sh/chart: opentelemetry-collector-0.71.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.81.0"
app.kubernetes.io/version: "0.83.0"
app.kubernetes.io/managed-by: Helm
rules:
- apiGroups: [""]
Expand Down
Loading

0 comments on commit 14df4e0

Please sign in to comment.