Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[collector] support add additionalLabels for otel col resources #968

Merged
merged 6 commits into from
Nov 28, 2023
Merged

[collector] support add additionalLabels for otel col resources #968

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bbb959d
support add additionalLabels for all resources
JaredTan95 Nov 22, 2023
6a1a191
add comments
JaredTan95 Nov 22, 2023
101b187
Update charts/opentelemetry-collector/values.yaml
JaredTan95 Nov 22, 2023
8d8b462
add comments
JaredTan95 Nov 23, 2023
4d2e6ae
Merge branch 'add_etra_lables_in_otel_col_-deployment' of https://git…
JaredTan95 Nov 23, 2023
2ef1477
Update charts/opentelemetry-collector/values.yaml
JaredTan95 Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-collector
version: 0.74.1
version: 0.74.2
description: OpenTelemetry Collector Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand Down
3 changes: 2 additions & 1 deletion ...s/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/managed-by: Helm

data:
relay: |
exporters:
Expand Down
3 changes: 2 additions & 1 deletion charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/managed-by: Helm

data:
relay: |
exporters:
Expand Down
5 changes: 3 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/managed-by: Helm

spec:
selector:
matchLabels:
Expand All @@ -22,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 0b15386e43e068c6ebe4c4599f0136ecbd0afd2dccdef53963b296935a8b9e32
checksum/config: bb65602a02a78f7c82b4bbff68a34d6def5d457a5c464933f67be0c5e2efcc99

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
5 changes: 3 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/managed-by: Helm

spec:
replicas: 1
revisionHistoryLimit: 10
Expand All @@ -24,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 7023632f5ae9f2bc503e44f13f87843863026c69e43b7f38db6d99be59f08e7e
checksum/config: 85eebfedba2d58ea7cd8bda6c8e946608e1a5005395ddcc8c64461ada8c14516

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
3 changes: 2 additions & 1 deletion charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/managed-by: Helm

component: standalone-collector
spec:
type: ClusterIP
Expand Down
2 changes: 1 addition & 1 deletion ...ts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml
View file
Open in desktop
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.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
Expand Down
3 changes: 2 additions & 1 deletion ...s/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/managed-by: Helm

data:
relay: |
exporters:
Expand Down
5 changes: 3 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/managed-by: Helm

spec:
selector:
matchLabels:
Expand All @@ -22,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 3ef7cec9bf589bfce7e983369836fb61574a93fa61dca41eba67764dfe85f590
checksum/config: 3f6327adb6da5c85daad977e3b3bdc1a9714ab68dcb236035d2460793dfb4437

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
Open in desktop
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.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
Expand Down
3 changes: 2 additions & 1 deletion charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/managed-by: Helm

data:
relay: |
exporters:
Expand Down
5 changes: 3 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/managed-by: Helm

spec:
selector:
matchLabels:
Expand All @@ -22,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: d3dbaacbaa7e1904c5a1bd44abd823fdc154605e9c685df20bd2c616fd69e938
checksum/config: 5e01d5015d0985240f6e01399cd999f92a59539f638604a34dfeda7d6047d9b4

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
Open in desktop
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.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
Expand Down
3 changes: 2 additions & 1 deletion .../opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/managed-by: Helm

data:
relay: |
exporters:
Expand Down
5 changes: 3 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/managed-by: Helm

spec:
selector:
matchLabels:
Expand All @@ -22,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 881ee4f4175f3a1b984618875b00312eac21aaa72b77401f3ddbfa3fb26d4493
checksum/config: 1194a1d17f8f9e09efce799d09d85c962cbd0f6523a09f4bf5a0c3ce920cc735

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
Open in desktop
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.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
Expand Down
3 changes: 2 additions & 1 deletion charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/managed-by: Helm

data:
relay: |
exporters:
Expand Down
5 changes: 3 additions & 2 deletions charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/managed-by: Helm

spec:
selector:
matchLabels:
Expand All @@ -22,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 881ee4f4175f3a1b984618875b00312eac21aaa72b77401f3ddbfa3fb26d4493
checksum/config: 1194a1d17f8f9e09efce799d09d85c962cbd0f6523a09f4bf5a0c3ce920cc735

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
Open in desktop
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.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
Expand Down
3 changes: 2 additions & 1 deletion charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/managed-by: Helm

data:
relay: |
exporters:
Expand Down
5 changes: 3 additions & 2 deletions charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/managed-by: Helm

spec:
replicas: 3
revisionHistoryLimit: 10
Expand All @@ -24,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 7023632f5ae9f2bc503e44f13f87843863026c69e43b7f38db6d99be59f08e7e
checksum/config: 85eebfedba2d58ea7cd8bda6c8e946608e1a5005395ddcc8c64461ada8c14516

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
3 changes: 2 additions & 1 deletion charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/managed-by: Helm

component: standalone-collector
spec:
type: ClusterIP
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml
View file
Open in desktop
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.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
Expand Down
3 changes: 2 additions & 1 deletion charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/managed-by: Helm

data:
relay: |
exporters:
Expand Down
5 changes: 3 additions & 2 deletions charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/managed-by: Helm

spec:
replicas: 1
revisionHistoryLimit: 10
Expand All @@ -24,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 9ae10f743eb72d7a0bb2df50d7318725363e8cdcaedc42423a7d292361328267
checksum/config: 1ae576ab1132625f2d34a4d4eb3bdceceed05579c70638df166176bfbb3fc6cb

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand Down
3 changes: 2 additions & 1 deletion charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.74.2
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/managed-by: Helm

component: standalone-collector
spec:
type: ClusterIP
Expand Down
Loading