Skip to content

Commit b8d11b6

Browse files
TylerHelmuthdmitryaxJaredTan95
authored
[collector] Provide alternateConfig option for use in subcharts to workaround null issue (#1301)
* Allow alternate blank config * Fix template for older helm versions * remove debug template * Update values.yaml Co-authored-by: Dmitrii Anoshin <anoshindx@gmail.com> * bump version --------- Co-authored-by: Dmitrii Anoshin <anoshindx@gmail.com> Co-authored-by: Jared Tan <jian.tan@daocloud.io>
1 parent b39f601 commit b8d11b6

File tree

65 files changed

+440
-79
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+440
-79
lines changed

‎charts/opentelemetry-collector/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: opentelemetry-collector
3-
version: 0.103.0
3+
version: 0.104.0
44
description: OpenTelemetry Collector Helm chart for Kubernetes
55
type: application
66
home: https://opentelemetry.io/

‎charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrole.yaml

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
---
2+
# Source: opentelemetry-collector/templates/clusterrole.yaml
3+
apiVersion: rbac.authorization.k8s.io/v1
4+
kind: ClusterRole
5+
metadata:
6+
name: example-opentelemetry-collector
7+
labels:
8+
helm.sh/chart: opentelemetry-collector-0.104.0
9+
app.kubernetes.io/name: opentelemetry-collector
10+
app.kubernetes.io/instance: example
11+
app.kubernetes.io/version: "0.108.0"
12+
app.kubernetes.io/managed-by: Helm
13+
14+
rules:
15+
- apiGroups: [""]
16+
resources: ["pods", "namespaces"]
17+
verbs: ["get", "watch", "list"]
18+
- apiGroups: ["apps"]
19+
resources: ["replicasets"]
20+
verbs: ["get", "list", "watch"]
21+
- apiGroups: ["extensions"]
22+
resources: ["replicasets"]
23+
verbs: ["get", "list", "watch"]
24+
- apiGroups: [""]
25+
resources: ["events", "namespaces", "namespaces/status", "nodes", "nodes/spec", "pods", "pods/status", "replicationcontrollers", "replicationcontrollers/status", "resourcequotas", "services" ]
26+
verbs: ["get", "list", "watch"]
27+
- apiGroups: ["apps"]
28+
resources: ["daemonsets", "deployments", "replicasets", "statefulsets"]
29+
verbs: ["get", "list", "watch"]
30+
- apiGroups: ["extensions"]
31+
resources: ["daemonsets", "deployments", "replicasets"]
32+
verbs: ["get", "list", "watch"]
33+
- apiGroups: ["batch"]
34+
resources: ["jobs", "cronjobs"]
35+
verbs: ["get", "list", "watch"]
36+
- apiGroups: ["autoscaling"]
37+
resources: ["horizontalpodautoscalers"]
38+
verbs: ["get", "list", "watch"]
39+
- apiGroups: ["events.k8s.io"]
40+
resources: ["events"]
41+
verbs: ["watch", "list"]

‎charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrolebinding.yaml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
# Source: opentelemetry-collector/templates/clusterrolebinding.yaml
3+
apiVersion: rbac.authorization.k8s.io/v1
4+
kind: ClusterRoleBinding
5+
metadata:
6+
name: example-opentelemetry-collector
7+
labels:
8+
helm.sh/chart: opentelemetry-collector-0.104.0
9+
app.kubernetes.io/name: opentelemetry-collector
10+
app.kubernetes.io/instance: example
11+
app.kubernetes.io/version: "0.108.0"
12+
app.kubernetes.io/managed-by: Helm
13+
14+
roleRef:
15+
apiGroup: rbac.authorization.k8s.io
16+
kind: ClusterRole
17+
name: example-opentelemetry-collector
18+
subjects:
19+
- kind: ServiceAccount
20+
name: example-opentelemetry-collector
21+
namespace: default

‎charts/opentelemetry-collector/examples/alternate-config/rendered/configmap.yaml

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
---
2+
# Source: opentelemetry-collector/templates/configmap.yaml
3+
apiVersion: v1
4+
kind: ConfigMap
5+
metadata:
6+
name: example-opentelemetry-collector
7+
namespace: default
8+
labels:
9+
helm.sh/chart: opentelemetry-collector-0.104.0
10+
app.kubernetes.io/name: opentelemetry-collector
11+
app.kubernetes.io/instance: example
12+
app.kubernetes.io/version: "0.108.0"
13+
app.kubernetes.io/managed-by: Helm
14+
15+
data:
16+
relay: |
17+
exporters:
18+
debug: {}
19+
processors:
20+
k8sattributes:
21+
extract:
22+
metadata:
23+
- k8s.namespace.name
24+
- k8s.deployment.name
25+
- k8s.statefulset.name
26+
- k8s.daemonset.name
27+
- k8s.cronjob.name
28+
- k8s.job.name
29+
- k8s.node.name
30+
- k8s.pod.name
31+
- k8s.pod.uid
32+
- k8s.pod.start_time
33+
passthrough: false
34+
pod_association:
35+
- sources:
36+
- from: resource_attribute
37+
name: k8s.pod.ip
38+
- sources:
39+
- from: resource_attribute
40+
name: k8s.pod.uid
41+
- sources:
42+
- from: connection
43+
receivers:
44+
k8s_cluster:
45+
collection_interval: 10s
46+
k8sobjects:
47+
objects:
48+
- exclude_watch_type:
49+
- DELETED
50+
group: events.k8s.io
51+
mode: watch
52+
name: events
53+
service:
54+
pipelines:
55+
logs:
56+
exporters:
57+
- debug
58+
processors:
59+
- k8sattributes
60+
receivers:
61+
- k8sobjects
62+
metrics:
63+
exporters:
64+
- debug
65+
processors:
66+
- k8sattributes
67+
receivers:
68+
- k8s_cluster

‎charts/opentelemetry-collector/examples/alternate-config/rendered/deployment.yaml

+100
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
---
2+
# Source: opentelemetry-collector/templates/deployment.yaml
3+
apiVersion: apps/v1
4+
kind: Deployment
5+
metadata:
6+
name: example-opentelemetry-collector
7+
namespace: default
8+
labels:
9+
helm.sh/chart: opentelemetry-collector-0.104.0
10+
app.kubernetes.io/name: opentelemetry-collector
11+
app.kubernetes.io/instance: example
12+
app.kubernetes.io/version: "0.108.0"
13+
app.kubernetes.io/managed-by: Helm
14+
15+
spec:
16+
replicas: 1
17+
revisionHistoryLimit: 10
18+
selector:
19+
matchLabels:
20+
app.kubernetes.io/name: opentelemetry-collector
21+
app.kubernetes.io/instance: example
22+
component: standalone-collector
23+
strategy:
24+
type: RollingUpdate
25+
template:
26+
metadata:
27+
annotations:
28+
checksum/config: b9ee8f766c36fa6c45f49fdc4a2d4107c8afcd5faf20ab829f12b54d12dde201
29+
30+
labels:
31+
app.kubernetes.io/name: opentelemetry-collector
32+
app.kubernetes.io/instance: example
33+
component: standalone-collector
34+
35+
spec:
36+
37+
serviceAccountName: example-opentelemetry-collector
38+
securityContext:
39+
{}
40+
containers:
41+
- name: opentelemetry-collector
42+
command:
43+
- /otelcol-k8s
44+
args:
45+
- --config=/conf/relay.yaml
46+
securityContext:
47+
{}
48+
image: "otel/opentelemetry-collector-k8s:0.108.0"
49+
imagePullPolicy: IfNotPresent
50+
ports:
51+
52+
- name: jaeger-compact
53+
containerPort: 6831
54+
protocol: UDP
55+
- name: jaeger-grpc
56+
containerPort: 14250
57+
protocol: TCP
58+
- name: jaeger-thrift
59+
containerPort: 14268
60+
protocol: TCP
61+
- name: otlp
62+
containerPort: 4317
63+
protocol: TCP
64+
- name: otlp-http
65+
containerPort: 4318
66+
protocol: TCP
67+
- name: zipkin
68+
containerPort: 9411
69+
protocol: TCP
70+
env:
71+
- name: MY_POD_IP
72+
valueFrom:
73+
fieldRef:
74+
apiVersion: v1
75+
fieldPath: status.podIP
76+
- name: GOMEMLIMIT
77+
value: "3276MiB"
78+
livenessProbe:
79+
httpGet:
80+
path: /
81+
port: 13133
82+
readinessProbe:
83+
httpGet:
84+
path: /
85+
port: 13133
86+
resources:
87+
limits:
88+
cpu: 2
89+
memory: 4Gi
90+
volumeMounts:
91+
- mountPath: /conf
92+
name: opentelemetry-collector-configmap
93+
volumes:
94+
- name: opentelemetry-collector-configmap
95+
configMap:
96+
name: example-opentelemetry-collector
97+
items:
98+
- key: relay
99+
path: relay.yaml
100+
hostNetwork: false

‎charts/opentelemetry-collector/examples/alternate-config/rendered/service.yaml

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
---
2+
# Source: opentelemetry-collector/templates/service.yaml
3+
apiVersion: v1
4+
kind: Service
5+
metadata:
6+
name: example-opentelemetry-collector
7+
namespace: default
8+
labels:
9+
helm.sh/chart: opentelemetry-collector-0.104.0
10+
app.kubernetes.io/name: opentelemetry-collector
11+
app.kubernetes.io/instance: example
12+
app.kubernetes.io/version: "0.108.0"
13+
app.kubernetes.io/managed-by: Helm
14+
15+
component: standalone-collector
16+
spec:
17+
type: ClusterIP
18+
ports:
19+
20+
- name: jaeger-compact
21+
port: 6831
22+
targetPort: 6831
23+
protocol: UDP
24+
- name: jaeger-grpc
25+
port: 14250
26+
targetPort: 14250
27+
protocol: TCP
28+
- name: jaeger-thrift
29+
port: 14268
30+
targetPort: 14268
31+
protocol: TCP
32+
- name: otlp
33+
port: 4317
34+
targetPort: 4317
35+
protocol: TCP
36+
appProtocol: grpc
37+
- name: otlp-http
38+
port: 4318
39+
targetPort: 4318
40+
protocol: TCP
41+
- name: zipkin
42+
port: 9411
43+
targetPort: 9411
44+
protocol: TCP
45+
selector:
46+
app.kubernetes.io/name: opentelemetry-collector
47+
app.kubernetes.io/instance: example
48+
component: standalone-collector
49+
internalTrafficPolicy: Cluster

‎charts/opentelemetry-collector/examples/alternate-config/rendered/serviceaccount.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
# Source: opentelemetry-collector/templates/serviceaccount.yaml
3+
apiVersion: v1
4+
kind: ServiceAccount
5+
metadata:
6+
name: example-opentelemetry-collector
7+
namespace: default
8+
labels:
9+
helm.sh/chart: opentelemetry-collector-0.104.0
10+
app.kubernetes.io/name: opentelemetry-collector
11+
app.kubernetes.io/instance: example
12+
app.kubernetes.io/version: "0.108.0"
13+
app.kubernetes.io/managed-by: Helm

‎charts/opentelemetry-collector/examples/alternate-config/values.yaml

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
mode: deployment
2+
3+
image:
4+
repository: "otel/opentelemetry-collector-k8s"
5+
6+
command:
7+
name: "otelcol-k8s"
8+
9+
replicaCount: 1
10+
11+
resources:
12+
limits:
13+
cpu: 2
14+
memory: 4Gi
15+
16+
presets:
17+
clusterMetrics:
18+
enabled: true
19+
kubernetesAttributes:
20+
enabled: true
21+
kubernetesEvents:
22+
enabled: true
23+
24+
alternateConfig:
25+
exporters:
26+
debug: {}
27+
service:
28+
pipelines:
29+
logs:
30+
exporters:
31+
- debug
32+
metrics:
33+
exporters:
34+
- debug

‎charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.103.0
9+
helm.sh/chart: opentelemetry-collector-0.104.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.108.0"

‎charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.103.0
9+
helm.sh/chart: opentelemetry-collector-0.104.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.108.0"

‎charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.103.0
9+
helm.sh/chart: opentelemetry-collector-0.104.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.108.0"
@@ -23,7 +23,7 @@ spec:
2323
template:
2424
metadata:
2525
annotations:
26-
checksum/config: a7aeccb5f9f0128c581ced25b423b60bd130885d25179ac94c325e011e4df354
26+
checksum/config: 885667b513b9bf70dba20a85fc7d3d8fe2d81f6d9c5a0e7bb9be12bfeb37fc8f
2727

2828
labels:
2929
app.kubernetes.io/name: opentelemetry-collector

‎charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.103.0
9+
helm.sh/chart: opentelemetry-collector-0.104.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.108.0"
@@ -25,7 +25,7 @@ spec:
2525
template:
2626
metadata:
2727
annotations:
28-
checksum/config: 1eb50b6ff752ed29085af31ddc42f0e46602f38d62360076a0df48fdd2194b55
28+
checksum/config: 9e8cb877b7d9067b4e70fcd59d275effd0d698ca0ce187a7f416acc0ca74efb6
2929

3030
labels:
3131
app.kubernetes.io/name: opentelemetry-collector

0 commit comments

Comments
 (0)