Skip to content

Commit

Permalink
Merge branch 'main' of github.com:open-telemetry/opentelemetry-helm-c…
Browse files Browse the repository at this point in the history
…harts into main-rebase2
  • Loading branch information
povilasv committed Feb 9, 2024
2 parents 6d93c1b + 842212d commit a30a13d
Show file tree
Hide file tree
Showing 285 changed files with 4,475 additions and 2,161 deletions.
1 change: 1 addition & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@ jobs:
run: |
cd charts/opentelemetry-collector
jfrog rt upload --access-token ${{ secrets.ARTIFACTORY_NONUSER_ACCESS_TOKEN }} "${{ env.CHART_NAME }}-*.tgz" coralogix-charts --url ${{ env.ARTIFACTORY_URL }}
4 changes: 4 additions & 0 deletions charts/opentelemetry-collector/.helmignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,7 @@
.idea/
*.tmproj
.vscode/

# Ignore unittest
tests/
*/__snapshot__/*
6 changes: 6 additions & 0 deletions charts/opentelemetry-collector/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

## OpenTelemetry Collector

### v0.80.0 / 2024-02-09
- [CHORE] Pull upstream changes
- [CHORE] Bump Collector to 0.93.0
- [Fix] Go memory limit
- [Feat] Log Collector retry on failure enabled.

### v0.79.3 / 2024-02-05
- [FIX] Fix Target Allocator endpointslices issue

Expand Down
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.79.4
version: 0.80.0
description: OpenTelemetry Collector Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand All @@ -13,4 +13,4 @@ icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
maintainers:
- name: povilasv
- name: matej-g
appVersion: 0.92.0
appVersion: 0.93.0
9 changes: 9 additions & 0 deletions charts/opentelemetry-collector/ci/hpa-deployment-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
mode: deployment

autoscaling:
enabled: true
minReplicas: 1
maxReplicas: 10
behavior: {}
targetCPUUtilizationPercentage: 80
targetMemoryUtilizationPercentage: 80
9 changes: 9 additions & 0 deletions charts/opentelemetry-collector/ci/hpa-statefulset-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
mode: statefulset

autoscaling:
enabled: true
minReplicas: 1
maxReplicas: 10
behavior: {}
targetCPUUtilizationPercentage: 80
targetMemoryUtilizationPercentage: 80
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.79.4
helm.sh/chart: opentelemetry-collector-0.80.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm

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.79.4
helm.sh/chart: opentelemetry-collector-0.80.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm

roleRef:
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.79.4
helm.sh/chart: opentelemetry-collector-0.80.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm

data:
Expand All @@ -22,7 +22,8 @@ data:
tls:
insecure: true
extensions:
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
processors:
batch: {}
memory_limiter:
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.79.4
helm.sh/chart: opentelemetry-collector-0.80.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm

data:
Expand All @@ -18,7 +18,8 @@ data:
debug: {}
logging: {}
extensions:
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
k8s_observer:
auth_type: serviceAccount
observe_pods: true
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.79.4
helm.sh/chart: opentelemetry-collector-0.80.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm

spec:
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: f12182ebbd36987032adcd72742d11d7b8c854c787c1630543c47febb23315ac
checksum/config: 8c154b28d236ff770885f610b4f54aa2f61d566fe06ed37acaac094ea69f96c7

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

Expand Down Expand Up @@ -82,7 +82,7 @@ spec:
apiVersion: v1
fieldPath: status.hostIP
- name: GOMEMLIMIT
value: 156MiB
value: "152MiB"
livenessProbe:
httpGet:
path: /
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.79.4
helm.sh/chart: opentelemetry-collector-0.80.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm

spec:
Expand All @@ -25,7 +25,7 @@ spec:
template:
metadata:
annotations:
checksum/config: eb5dc08c9d23a9400daa08e674e1a6479ffcb2a10d8b23800a12522b0de84382
checksum/config: 9943f41243e67925857f94cdffabed51a1881f88dd40c904e341ceba28353a16

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

Expand Down Expand Up @@ -73,7 +73,7 @@ spec:
apiVersion: v1
fieldPath: status.podIP
- name: GOMEMLIMIT
value: 156MiB
value: "152MiB"
livenessProbe:
httpGet:
path: /
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.79.4
helm.sh/chart: opentelemetry-collector-0.80.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm

component: standalone-collector
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.79.4
helm.sh/chart: opentelemetry-collector-0.80.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm
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.79.4
helm.sh/chart: opentelemetry-collector-0.80.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm

data:
Expand All @@ -18,7 +18,8 @@ data:
debug: {}
logging: {}
extensions:
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
processors:
batch: {}
memory_limiter:
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.79.4
helm.sh/chart: opentelemetry-collector-0.80.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm

spec:
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 79281680d02aef44b275bfb5efcdb75f4a75d0c744bcf5f3559eb835726d1411
checksum/config: a692d5940e882f8d8efab130e54fbd831c6a83b1ffb04e2edac59ecc668e9201

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -42,7 +42,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-contrib:0.92.0"
image: "otel/opentelemetry-collector-contrib:0.93.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.79.4
helm.sh/chart: opentelemetry-collector-0.80.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm
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.79.4
helm.sh/chart: opentelemetry-collector-0.80.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm

data:
Expand All @@ -18,7 +18,8 @@ data:
debug: {}
logging: {}
extensions:
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
processors:
batch: {}
memory_limiter:
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.79.4
helm.sh/chart: opentelemetry-collector-0.80.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm

spec:
Expand All @@ -23,7 +23,7 @@ spec:
template:
metadata:
annotations:
checksum/config: 2ab23f97fe7b5941c36772ce9725ed51c0fdb1ad6b7e3c85a17d4cd38cd7f832
checksum/config: 9e2c733798733e804f0f3840abda595a272a852f3ed54c14212a18bbcbe14d10

labels:
app.kubernetes.io/name: opentelemetry-collector
Expand All @@ -42,7 +42,7 @@ spec:
- --config=/conf/relay.yaml
securityContext:
{}
image: "otel/opentelemetry-collector-contrib:0.92.0"
image: "otel/opentelemetry-collector-contrib:0.93.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.79.4
helm.sh/chart: opentelemetry-collector-0.80.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm
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.79.4
helm.sh/chart: opentelemetry-collector-0.80.0
app.kubernetes.io/name: opentelemetry-collector
app.kubernetes.io/instance: example
app.kubernetes.io/version: "0.92.0"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm

data:
Expand All @@ -18,7 +18,8 @@ data:
debug: {}
logging: {}
extensions:
health_check: {}
health_check:
endpoint: ${env:MY_POD_IP}:13133
processors:
batch: {}
memory_limiter:
Expand Down
Loading

0 comments on commit a30a13d

Please sign in to comment.