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

feat(opentelemetry-collector): use Kubernetes recommended label for c… #1396

Merged
merged 12 commits into from
Nov 25, 2024
Merged

feat(opentelemetry-collector): use Kubernetes recommended label for c… #1396

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
425bbfd
feat(opentelemetry-collector): use Kubernetes recommended label for c…
nlamirault Oct 23, 2024
01bef31
Merge branch 'main' into feat/labels
nlamirault Oct 30, 2024
2bbbb59
feat(helm): use also previous label
nlamirault Oct 30, 2024
62b3d91
Merge branch 'main' into feat/labels
nlamirault Nov 15, 2024
5a33ed8
feat(helm): chart version
nlamirault Nov 18, 2024
9a8b868
feat(helm): generate examples
nlamirault Nov 18, 2024
7857082
feat(helm): generate examples
nlamirault Nov 23, 2024
596c04a
feat(helm): generate examples
nlamirault Nov 23, 2024
e11baae
feat(helm): generate examples
nlamirault Nov 23, 2024
ddc44dd
feat(helm): cleanup
nlamirault Nov 23, 2024
dd05f98
Merge branch 'main' into feat/labels
nlamirault Nov 23, 2024
f3b4301
feat(helm): generate examples
nlamirault Nov 23, 2024
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.109.0
version: 0.109.1
description: OpenTelemetry Collector Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrole.yaml
View file
Open in desktop
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.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrolebinding.yaml
View file
Open in desktop
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.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/alternate-config/rendered/configmap.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.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
Expand Down
6 changes: 4 additions & 2 deletions charts/opentelemetry-collector/examples/alternate-config/rendered/deployment.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.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
Expand All @@ -19,17 +19,19 @@ spec:
matchLabels:
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/component: standalone-collector
component: standalone-collector
strategy:
type: RollingUpdate
template:
metadata:
annotations:
checksum/config: 05adf31e71768d6f4a0a72f54616072733e1605d80713238ee85456aafe75403
checksum/config: d09bb954f05097234ca2ca47357c05c5bd1bb25fe70f03258008e289f24488de

labels:
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/component: standalone-collector
component: standalone-collector

spec:
Expand Down
4 changes: 3 additions & 1 deletion charts/opentelemetry-collector/examples/alternate-config/rendered/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
app.kubernetes.io/managed-by: Helm

app.kubernetes.io/component: standalone-collector
component: standalone-collector
spec:
type: ClusterIP
Expand Down Expand Up @@ -45,5 +46,6 @@ spec:
selector:
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/component: standalone-collector
component: standalone-collector
internalTrafficPolicy: Cluster
2 changes: 1 addition & 1 deletion charts/opentelemetry-collector/examples/alternate-config/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.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
Expand Down
2 changes: 1 addition & 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,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
Expand Down
2 changes: 1 addition & 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,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
Expand Down
6 changes: 4 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,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
Expand All @@ -17,17 +17,19 @@ spec:
matchLabels:
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/component: agent-collector
component: agent-collector
updateStrategy:
type: RollingUpdate
template:
metadata:
annotations:
checksum/config: 45bec5a8c8f33cc8d7481ff6d7c0dd4235104c3257bb9c0761f62a157d70c97a
checksum/config: 4959044424ecab992c1e632b8a032b00a81aa670f27144bd35694068a49fe883

labels:
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/component: agent-collector
component: agent-collector

spec:
Expand Down
6 changes: 4 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,7 +6,7 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
Expand All @@ -19,17 +19,19 @@ spec:
matchLabels:
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/component: standalone-collector
component: standalone-collector
strategy:
type: RollingUpdate
template:
metadata:
annotations:
checksum/config: 3ece6cc294f0ed92854413f33366d43d4b73621c702b50e6564565795cb9fbd0
checksum/config: 3b5129dd4c32bc4eeac4d483146043f70a1cce77e30c58fc359e3d3fb2291376

labels:
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/component: standalone-collector
component: standalone-collector

spec:
Expand Down
4 changes: 3 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,12 +6,13 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
app.kubernetes.io/managed-by: Helm

app.kubernetes.io/component: standalone-collector
component: standalone-collector
spec:
type: ClusterIP
Expand Down Expand Up @@ -45,5 +46,6 @@ spec:
selector:
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/component: standalone-collector
component: standalone-collector
internalTrafficPolicy: Cluster
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.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
Expand Down
2 changes: 1 addition & 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,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
Expand Down
6 changes: 4 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,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
Expand All @@ -17,17 +17,19 @@ spec:
matchLabels:
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/component: agent-collector
component: agent-collector
updateStrategy:
type: RollingUpdate
template:
metadata:
annotations:
checksum/config: 8bfee756de57aa564d26f9f90a47f3e28bfe2e238a54df8307b9dd6e5f224115
checksum/config: a8e2d661b2151661b51c9efa3bc5ebed03fa7b7d8b6c70714fd806e33f80feef

labels:
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/component: agent-collector
component: agent-collector

spec:
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.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
Expand Down
2 changes: 1 addition & 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,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
Expand Down
6 changes: 4 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,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
Expand All @@ -17,17 +17,19 @@ spec:
matchLabels:
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/component: agent-collector
component: agent-collector
updateStrategy:
type: RollingUpdate
template:
metadata:
annotations:
checksum/config: ec9d9c8763d31b396c761305de250e8604d4856eabaad9e5b107152439e535da
checksum/config: 3ce302653c161f06729b02a8f6352c5902f75aca32c857ed6c5566508485d119

labels:
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/component: agent-collector
component: agent-collector

spec:
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.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
Expand Down
2 changes: 1 addition & 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,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
Expand Down
6 changes: 4 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,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
Expand All @@ -17,17 +17,19 @@ spec:
matchLabels:
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/component: agent-collector
component: agent-collector
updateStrategy:
type: RollingUpdate
template:
metadata:
annotations:
checksum/config: d656a64cb8fdb962bc6f3d46e9ff2fbeebeb02b66e0424049d70795227d376bd
checksum/config: 3a514f4982185e59818c5a7e3eb60b9d36e58a0406a7edc6f8391458f50c7fd4

labels:
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/component: agent-collector
component: agent-collector

spec:
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.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
Expand Down
2 changes: 1 addition & 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,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
Expand Down
6 changes: 4 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,7 +6,7 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
Expand All @@ -17,17 +17,19 @@ spec:
matchLabels:
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/component: agent-collector
component: agent-collector
updateStrategy:
type: RollingUpdate
template:
metadata:
annotations:
checksum/config: d656a64cb8fdb962bc6f3d46e9ff2fbeebeb02b66e0424049d70795227d376bd
checksum/config: 3a514f4982185e59818c5a7e3eb60b9d36e58a0406a7edc6f8391458f50c7fd4

labels:
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/component: agent-collector
component: agent-collector

spec:
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.109.0
helm.sh/chart: opentelemetry-collector-0.109.1
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.113.0"
Expand Down
Loading
Loading