Skip to content

Commit

Permalink
Merge branch 'main' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
JaredTan95 authored Jan 24, 2025
2 parents fa8bed5 + b2ff25e commit f352c0e
Show file tree
Hide file tree
Showing 65 changed files with 166 additions and 153 deletions.
4 changes: 2 additions & 2 deletions 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.113.0
version: 0.115.0
description: OpenTelemetry Collector Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand All @@ -12,4 +12,4 @@ maintainers:
- name: jaronoff97
- name: TylerHelmuth
icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
appVersion: 0.117.0
appVersion: 0.118.0
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: ClusterRole
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.113.0
helm.sh/chart: opentelemetry-collector-0.115.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.117.0"
app.kubernetes.io/version: "0.118.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: standalone-collector
rules:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: ClusterRoleBinding
metadata:
name: example-opentelemetry-collector
labels:
helm.sh/chart: opentelemetry-collector-0.113.0
helm.sh/chart: opentelemetry-collector-0.115.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.117.0"
app.kubernetes.io/version: "0.118.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: standalone-collector
roleRef:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.113.0
helm.sh/chart: opentelemetry-collector-0.115.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.117.0"
app.kubernetes.io/version: "0.118.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: standalone-collector
data:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.113.0
helm.sh/chart: opentelemetry-collector-0.115.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.117.0"
app.kubernetes.io/version: "0.118.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: standalone-collector
spec:
Expand All @@ -25,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 2aa97c9ee8d0b653a692a1a2fc93fce1aec36dbf6cdb26e5b331b38efc2bfb96
checksum/config: 3dc9e6eeb990a2574b2fa16a64baae703c7692b1d7fabdaecee7245874861ec2

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -45,7 +45,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-k8s:0.117.0"
image: "otel/opentelemetry-collector-k8s:0.118.0"
imagePullPolicy: IfNotPresent
ports:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.113.0
helm.sh/chart: opentelemetry-collector-0.115.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.117.0"
app.kubernetes.io/version: "0.118.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: standalone-collector
component: standalone-collector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.113.0
helm.sh/chart: opentelemetry-collector-0.115.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.117.0"
app.kubernetes.io/version: "0.118.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: standalone-collector
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.113.0
helm.sh/chart: opentelemetry-collector-0.115.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.117.0"
app.kubernetes.io/version: "0.118.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: agent-collector
data:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.113.0
helm.sh/chart: opentelemetry-collector-0.115.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.117.0"
app.kubernetes.io/version: "0.118.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: standalone-collector
data:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.113.0
helm.sh/chart: opentelemetry-collector-0.115.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.117.0"
app.kubernetes.io/version: "0.118.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: agent-collector
spec:
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 9abe86f63c7131f712493b1a657a7e4191cd170d1d5c6a00a9b6b429a4db2c3e
checksum/config: 8adf6b42453cb5e36a96c2751970d14ba8a5f41e89b03499a7b668104abf19df

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -43,7 +43,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-k8s:0.117.0"
image: "otel/opentelemetry-collector-k8s:0.118.0"
imagePullPolicy: IfNotPresent
ports:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.113.0
helm.sh/chart: opentelemetry-collector-0.115.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.117.0"
app.kubernetes.io/version: "0.118.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: standalone-collector
spec:
Expand All @@ -25,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 1a5fb2ba1ebf2e3d5d476a3beff37f957eb8a06f73ff477d2927a298822a37be
checksum/config: 06426862204315218953a2b24b1f1194e3f964f6fdcd5535932ca395489ecbfc

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -45,7 +45,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-k8s:0.117.0"
image: "otel/opentelemetry-collector-k8s:0.118.0"
imagePullPolicy: IfNotPresent
ports:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.113.0
helm.sh/chart: opentelemetry-collector-0.115.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.117.0"
app.kubernetes.io/version: "0.118.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: standalone-collector
component: standalone-collector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.113.0
helm.sh/chart: opentelemetry-collector-0.115.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.117.0"
app.kubernetes.io/version: "0.118.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: standalone-collector
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.113.0
helm.sh/chart: opentelemetry-collector-0.115.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.117.0"
app.kubernetes.io/version: "0.118.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: agent-collector
data:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.113.0
helm.sh/chart: opentelemetry-collector-0.115.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.117.0"
app.kubernetes.io/version: "0.118.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: agent-collector
spec:
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: d1b091860c4779e9484a906d7f45808499500f52a02f5b7240f5a03054a8eb5a
checksum/config: fb9dba5ca570816b7bbd06f550e8a5ce1dc457972bd52de104e7c2d50c94950a

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -43,7 +43,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-k8s:0.117.0"
image: "otel/opentelemetry-collector-k8s:0.118.0"
imagePullPolicy: IfNotPresent
ports:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.113.0
helm.sh/chart: opentelemetry-collector-0.115.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.117.0"
app.kubernetes.io/version: "0.118.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: agent-collector
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.113.0
helm.sh/chart: opentelemetry-collector-0.115.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.117.0"
app.kubernetes.io/version: "0.118.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: agent-collector
data:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.113.0
helm.sh/chart: opentelemetry-collector-0.115.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.117.0"
app.kubernetes.io/version: "0.118.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: agent-collector
spec:
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: e6ef9ec896110603f481c04de8a8a864583518f07c57144ac5eab901b8fa4692
checksum/config: abac5308d1e771f809260cb4077a0ac094dc413a98e8346d0e2eb5396f0a8905

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -43,7 +43,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-k8s:0.117.0"
image: "otel/opentelemetry-collector-k8s:0.118.0"
imagePullPolicy: IfNotPresent
ports:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.113.0
helm.sh/chart: opentelemetry-collector-0.115.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.117.0"
app.kubernetes.io/version: "0.118.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: agent-collector
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.113.0
helm.sh/chart: opentelemetry-collector-0.115.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.117.0"
app.kubernetes.io/version: "0.118.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: agent-collector
data:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ metadata:
name: example-opentelemetry-collector-agent
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.113.0
helm.sh/chart: opentelemetry-collector-0.115.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.117.0"
app.kubernetes.io/version: "0.118.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: agent-collector
spec:
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 90b17dca7b751f71c3b09d9abf55fb7dc218a104629a60e5cb9a190717c2f9cd
checksum/config: 8137278a695ef3dad6c47ca7890190d1666a320cf7f801b6c173b736046088b7

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -43,7 +43,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-k8s:0.117.0"
image: "otel/opentelemetry-collector-k8s:0.118.0"
imagePullPolicy: IfNotPresent
ports:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.113.0
helm.sh/chart: opentelemetry-collector-0.115.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.117.0"
app.kubernetes.io/version: "0.118.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: agent-collector
Loading

0 comments on commit f352c0e

Please sign in to comment.