Skip to content

Commit 66b6fc1

Browse files
jinja212ushan
authored andcommitted
[opentelemetry-collector] Fix calculation for gomemlimit (open-telemetry#1015)
* set gomemlimit correctly * minor fixes * update chart version * update var * remove unittest * remove unittest
1 parent 09e95af commit 66b6fc1

Some content is hidden

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

48 files changed

+105
-96
lines changed

.github/workflows/collector-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Test Collector Chart
22

33
on:
44
pull_request:
5-
paths:
5+
paths:
66
- 'charts/opentelemetry-collector/**'
77
branches:
88
- main

charts/opentelemetry-collector/.helmignore

+4
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,7 @@
2121
.idea/
2222
*.tmproj
2323
.vscode/
24+
25+
# Ignore unittest
26+
tests/
27+
*/__snapshot__/*

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.78.3
3+
version: 0.79.0
44
description: OpenTelemetry Collector Helm chart for Kubernetes
55
type: application
66
home: https://opentelemetry.io/

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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

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

+3-3
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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -23,7 +23,7 @@ spec:
2323
template:
2424
metadata:
2525
annotations:
26-
checksum/config: 0596edff913b094144864511340802bd33b446b9d0e89d9df7b9e8a34e2ba28d
26+
checksum/config: ad79aa42fdd475d53d3e6fd56fa705649856442c7a35fcf1dcfaca5ab12057a5
2727

2828
labels:
2929
app.kubernetes.io/name: opentelemetry-collector
@@ -77,7 +77,7 @@ spec:
7777
apiVersion: v1
7878
fieldPath: status.podIP
7979
- name: GOMEMLIMIT
80-
value: 156MiB
80+
value: "152MiB"
8181
livenessProbe:
8282
httpGet:
8383
path: /

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

+3-3
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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -25,7 +25,7 @@ spec:
2525
template:
2626
metadata:
2727
annotations:
28-
checksum/config: f0aa5d67c8ca9f4782e35fd49e28063db4eeb63783d98b134f49b364520631bd
28+
checksum/config: d17778a299fc1bb0e399ff9432eadf5f32ef1fad02fa10e9e8d63f001cbf0d00
2929

3030
labels:
3131
app.kubernetes.io/name: opentelemetry-collector
@@ -73,7 +73,7 @@ spec:
7373
apiVersion: v1
7474
fieldPath: status.podIP
7575
- name: GOMEMLIMIT
76-
value: 156MiB
76+
value: "152MiB"
7777
livenessProbe:
7878
httpGet:
7979
path: /

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/daemonset-collector-logs/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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/daemonset-collector-logs/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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -23,7 +23,7 @@ spec:
2323
template:
2424
metadata:
2525
annotations:
26-
checksum/config: 93dcfdd0a9e47bb0d48c9cc4e6a993edb6c98319808a36fade0af16fdcc449c7
26+
checksum/config: 05dbd92979697bde217e12082ec752cd05f7ffcdda42050ee3498a6755e55fd3
2727

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

charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/daemonset-hostmetrics/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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/daemonset-hostmetrics/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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -23,7 +23,7 @@ spec:
2323
template:
2424
metadata:
2525
annotations:
26-
checksum/config: cc03902a5aaf4ef0b6e974705c56a4b64b740ef0981295dcf43875f8086ec8d5
26+
checksum/config: c09371bc21fb9da37cb73c3e23dcf4df47e7107194ccbdd26b6221204b7af779
2727

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

charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -23,7 +23,7 @@ spec:
2323
template:
2424
metadata:
2525
annotations:
26-
checksum/config: 8e650593a941669729575a0daa31494a4687e1e7f7a75e98cffb703eff4063ac
26+
checksum/config: c4f670fce5212135720de5d7378c0e500c56c6a214afd3872c23b388d92bcfe6
2727

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

charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/daemonset-only/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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/daemonset-only/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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -23,7 +23,7 @@ spec:
2323
template:
2424
metadata:
2525
annotations:
26-
checksum/config: 8e650593a941669729575a0daa31494a4687e1e7f7a75e98cffb703eff4063ac
26+
checksum/config: c4f670fce5212135720de5d7378c0e500c56c6a214afd3872c23b388d92bcfe6
2727

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

charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/deployment-only/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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml

+3-3
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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -25,7 +25,7 @@ spec:
2525
template:
2626
metadata:
2727
annotations:
28-
checksum/config: f0aa5d67c8ca9f4782e35fd49e28063db4eeb63783d98b134f49b364520631bd
28+
checksum/config: d17778a299fc1bb0e399ff9432eadf5f32ef1fad02fa10e9e8d63f001cbf0d00
2929

3030
labels:
3131
app.kubernetes.io/name: opentelemetry-collector
@@ -73,7 +73,7 @@ spec:
7373
apiVersion: v1
7474
fieldPath: status.podIP
7575
- name: GOMEMLIMIT
76-
value: 3276MiB
76+
value: "3276MiB"
7777
livenessProbe:
7878
httpGet:
7979
path: /

charts/opentelemetry-collector/examples/deployment-only/rendered/service.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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/deployment-otlp-traces/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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/deployment-otlp-traces/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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -25,7 +25,7 @@ spec:
2525
template:
2626
metadata:
2727
annotations:
28-
checksum/config: 3d0781eaf11d660c68f0729bfd30ebe66da994f342ed1df199fd6c04c3253bc3
28+
checksum/config: b6c8cbf5880861357f01cf855775628283f0336c9a48b71f0a91720fe18bd62b
2929

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

charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/deployment-use-existing-configMap/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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"
@@ -73,7 +73,7 @@ spec:
7373
apiVersion: v1
7474
fieldPath: status.podIP
7575
- name: GOMEMLIMIT
76-
value: 156MiB
76+
value: "152MiB"
7777
livenessProbe:
7878
httpGet:
7979
path: /

charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.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.78.3
9+
helm.sh/chart: opentelemetry-collector-0.79.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.92.0"

0 commit comments

Comments
 (0)