Skip to content

Commit

Permalink
[collector] Make it possible to mount configMap by chart name (#1105)
Browse files Browse the repository at this point in the history 
* update with configMap field with mount option

* update comment

* update schema

* change name to `includeMount`

* bump version

* re-generate examples

* use existingName field instead

* Merge remote-tracking branch 'upstream/main' into chunter/configmap-mount-option

* update comment and move logic to template

* Apply suggestions from code review

Co-authored-by: Tyler Helmuth <[email protected]>

* safe-guard configMap creation

* add configMap error message

---------

Co-authored-by: Tyler Helmuth <[email protected]>
  • Loading branch information
@chunter0 @TylerHelmuth
chunter0 and TylerHelmuth authored Apr 25, 2024
1 parent f4e3920 commit 45400c8
Show file tree
Hide file tree
Showing 60 changed files with 253 additions and 68 deletions.
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/Chart.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-collector
version: 0.90.0
version: 0.90.1
description: OpenTelemetry Collector Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand Down
2 changes: 1 addition & 1 deletion ...s/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 15fc29f0412e8fb040e0c4afb0630858515689556f2f9894c988d737774b1bbe
checksum/config: 7618c600037fed13a7012d91ff439972a5daaed7739e2e6b06d373adaebd8fe3

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand All @@ -25,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 9d7bcf58076ad026ec219a4fa6a198607ac23df34e1f1a6b92fdd16a4250cb23
checksum/config: f1b75c1e3303eba43470a3c9f7264c4b468e1ff29238e4f5b76835ea99eabfd3

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
2 changes: 1 addition & 1 deletion ...ts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
2 changes: 1 addition & 1 deletion ...s/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 171f95ba4d33ddb93369052e497697a8eab224c553b3cd8c9de05e7d3ab8d1c1
checksum/config: 3724edcc6741df35d8a3306ec9321db3276fda19f74cfe7c4389ab5d63683957

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion ...ts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: d91efb8155269b3ccc445be1a68983aaa68587748d09105190094fc308b9f73c
checksum/config: fd76f0b7a2a534457476dc9a6e5add7f1e19edca886b6f08a231a38333803ddf

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
2 changes: 1 addition & 1 deletion .../opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: e4e999083984e7579cd645eac55ac23b2b11d7c81abc0da33169fc37c4b1906a
checksum/config: ebae76c494b26902e0a8fdb99a5c035830b1bd64117c6077c4f15c71d45fc8e9

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion ...s/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: e4e999083984e7579cd645eac55ac23b2b11d7c81abc0da33169fc37c4b1906a
checksum/config: ebae76c494b26902e0a8fdb99a5c035830b1bd64117c6077c4f15c71d45fc8e9

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand All @@ -25,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 9d7bcf58076ad026ec219a4fa6a198607ac23df34e1f1a6b92fdd16a4250cb23
checksum/config: f1b75c1e3303eba43470a3c9f7264c4b468e1ff29238e4f5b76835ea99eabfd3

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand All @@ -25,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 5e8381cd2d216fe373a7c3ce775a89f9d36336294e86f479a28f056ac853eb7b
checksum/config: 54253c964eb970c46c6c5dcb7e1a4c1cf9a7686aca9a1753bb59ec4213dd18d6

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
2 changes: 1 addition & 1 deletion ...entelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
2 changes: 1 addition & 1 deletion .../opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
2 changes: 1 addition & 1 deletion ...lemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrole.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ClusterRole
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
2 changes: 1 addition & 1 deletion ...ts/opentelemetry-collector/examples/kubernetesAttributes/rendered/clusterrolebinding.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ kind: ClusterRoleBinding
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
4 changes: 2 additions & 2 deletions charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/deployment.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand All @@ -25,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: f672df6ee9245c92b88cc008c857a9eb079539e26213212e7c727735014ef39c
checksum/config: 2cc25d0576702c267f564d005fee784344b7a6136febbb2336b15ca7b5dea220

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/kubernetesAttributes/rendered/service.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.90.0
helm.sh/chart: opentelemetry-collector-0.90.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.99.0"
Expand Down
Loading

0 comments on commit 45400c8

Please sign in to comment.