Skip to content

Commit

Permalink
Merge branch 'main' into set-healthcheck-endpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
TylerHelmuth authored Jan 23, 2024
2 parents 09f6ade + bf85e1b commit 51fcea6
Show file tree
Hide file tree
Showing 23 changed files with 596 additions and 287 deletions.
2 changes: 1 addition & 1 deletion charts/opentelemetry-demo/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
type: application
name: opentelemetry-demo
version: 0.27.2
version: 0.28.0
description: opentelemetry demo helm chart
home: https://opentelemetry.io/
sources:
Expand Down
80 changes: 42 additions & 38 deletions charts/opentelemetry-demo/README.md

Large diffs are not rendered by default.

27 changes: 25 additions & 2 deletions charts/opentelemetry-demo/UPGRADING.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,32 @@
# Upgrade guidelines

## To 0.28

The `configuration` property for components has been removed in favor of the new `mountedConfigMaps` property.
This new property allows you to specify the contents of the configuration using the `data` sub-property. You will also
need to specify the `mountPath` to use, and give the configuration a name. The old `configuration` property used
`/etc/config` and `config` as values for these respectively. The following example shows how to migrate from the old
`configuration` property to the new `mountedConfigMaps` property:

```yaml
# Old configuration property
configuration:
my-config.yaml: |
# Contents of my-config.yaml
# New mountedConfigMaps property
mountedConfigMaps:
- name: config
mountPath: /etc/config
data:
my-config.yaml: |
# Contents of my-config.yaml
```
## To 0.24
This release uses the [kubernetes attributes processor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/k8sattributesprocessor)
to add kubernetes metadata as resource attributes. If you override the processors array in your config, you will
This release uses the [kubernetes attributes processor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/k8sattributesprocessor)
to add kubernetes metadata as resource attributes. If you override the processors array in your config, you will
need to add the k8s attributes processor manually to restore `service.instance.id`
resource attribute.

Expand Down
Loading

0 comments on commit 51fcea6

Please sign in to comment.