Skip to content

Commit

Permalink
Merge branch 'main' into add_k8s_demo_example
Browse files Browse the repository at this point in the history
  • Loading branch information
TylerHelmuth authored Nov 30, 2023
2 parents 1357aff + d3668a6 commit 63fb987
Show file tree
Hide file tree
Showing 47 changed files with 157 additions and 111 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.74.1
version: 0.75.0
description: OpenTelemetry Collector Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand All @@ -11,4 +11,4 @@ maintainers:
- name: dmitryax
- name: TylerHelmuth
icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
appVersion: 0.89.0
appVersion: 0.90.0
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.75.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm

data:
relay: |
exporters:
Expand Down
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.75.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm

data:
relay: |
exporters:
Expand Down
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.75.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/version: "0.90.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: a8af9c0a12838647083fd589c78de92b7bc6450c9d62a50b1b23adbc1ad38178

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -41,7 +42,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-contrib:0.89.0"
image: "otel/opentelemetry-collector-contrib:0.90.0"
imagePullPolicy: IfNotPresent
ports:

Expand Down
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.75.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/version: "0.90.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: 5611a03bc4db8788512259d1d3d06379348098905d66fc6334fc9129a8d11beb

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

Expand Down
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.75.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm

component: standalone-collector
spec:
type: ClusterIP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.75.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm
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.75.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm

data:
relay: |
exporters:
Expand Down
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.75.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/version: "0.90.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: ea795f4918fb1a6e95ea0baa63569478121c1e1e9c9305012b5dc5d27e12b553

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -41,7 +42,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-contrib:0.89.0"
image: "otel/opentelemetry-collector-contrib:0.90.0"
imagePullPolicy: IfNotPresent
ports:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.75.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm
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.75.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm

data:
relay: |
exporters:
Expand Down
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.75.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/version: "0.90.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: c642fe4ea6fa25f54bc2097ab29921749f26452dc65359c938cb89e1853d2d9b

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -41,7 +42,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-contrib:0.89.0"
image: "otel/opentelemetry-collector-contrib:0.90.0"
imagePullPolicy: IfNotPresent
ports:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.75.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm
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.75.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm

data:
relay: |
exporters:
Expand Down
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.75.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/version: "0.90.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: a403c4503121b209d6fb8d2ee139eab823d1fb8c4c40db4ac19a3b7eedd184da

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -41,7 +42,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-contrib:0.89.0"
image: "otel/opentelemetry-collector-contrib:0.90.0"
imagePullPolicy: IfNotPresent
ports:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.75.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm
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.75.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm

data:
relay: |
exporters:
Expand Down
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.75.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/version: "0.90.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: a403c4503121b209d6fb8d2ee139eab823d1fb8c4c40db4ac19a3b7eedd184da

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -41,7 +42,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-contrib:0.89.0"
image: "otel/opentelemetry-collector-contrib:0.90.0"
imagePullPolicy: IfNotPresent
ports:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
name: example-opentelemetry-collector
namespace: default
labels:
helm.sh/chart: opentelemetry-collector-0.74.1
helm.sh/chart: opentelemetry-collector-0.75.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm
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.75.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.89.0"
app.kubernetes.io/version: "0.90.0"
app.kubernetes.io/managed-by: Helm

data:
relay: |
exporters:
Expand Down
Loading

0 comments on commit 63fb987

Please sign in to comment.