Skip to content

Commit

Permalink
add config param to set custom pod labels (open-telemetry#85)
Browse files Browse the repository at this point in the history
  • Loading branch information
rabunkosar-dd authored Oct 7, 2021
1 parent a326feb commit 4f0b553
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion 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.5.11
version: 0.5.12
description: OpenTelemetry Collector Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand Down
3 changes: 3 additions & 0 deletions charts/opentelemetry-collector/templates/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ spec:
labels:
{{- include "opentelemetry-collector.selectorLabels" . | nindent 8 }}
component: agent-collector
{{- with .Values.agentCollector.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
{{- $podValues := deepCopy .Values.agentCollector | mustMergeOverwrite (deepCopy .Values) }}
{{- $podData := dict "Values" $podValues "configmapSuffix" "-agent" "isAgent" true }}
Expand Down
3 changes: 3 additions & 0 deletions charts/opentelemetry-collector/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ spec:
labels:
{{- include "opentelemetry-collector.selectorLabels" . | nindent 8 }}
component: standalone-collector
{{- with .Values.standaloneCollector.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
{{- $podValues := deepCopy .Values.standaloneCollector | mustMergeOverwrite (deepCopy .Values) }}
{{- $podData := dict "Values" $podValues "configmapSuffix" "" "isAgent" false }}
Expand Down
4 changes: 4 additions & 0 deletions charts/opentelemetry-collector/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,8 @@ agentCollector:

podAnnotations: {}

podLabels: {}

# Configuration override that will be merged into the agent's default config
configOverride: {}
# The following config override can be used to enable host receiver
Expand Down Expand Up @@ -219,6 +221,8 @@ standaloneCollector:

podAnnotations: {}

podLabels: {}

annotations: {}

# Configuration override that will be merged into the standalone collector default config
Expand Down

0 comments on commit 4f0b553

Please sign in to comment.