Skip to content

Commit a269a71

Browse files
StarefossenStarefossen
authored
Merge branch 'main' into patch-1
2 parents 4a490ab + b08f214 commit a269a71

File tree

155 files changed

+781
-555
lines changed

Some content is hidden

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

155 files changed

+781
-555
lines changed

‎.github/workflows/operator-test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
git clone -b v"$appVersion" --single-branch https://github.com/open-telemetry/opentelemetry-operator.git ./opentelemetry-operator
4747
4848
- name: Install chainsaw
49-
uses: kyverno/[email protected].11
49+
uses: kyverno/[email protected].12
5050

5151
- name: Install metrics-server
5252
run: |
@@ -99,7 +99,7 @@ jobs:
9999
git clone -b v"$appVersion" --single-branch https://github.com/open-telemetry/opentelemetry-operator.git ./opentelemetry-operator
100100
101101
- name: Install chainsaw
102-
uses: kyverno/[email protected].11
102+
uses: kyverno/[email protected].12
103103

104104
- name: Install metrics-server
105105
run: |

‎.github/workflows/release.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ on:
77

88
jobs:
99
release:
10+
permissions:
11+
contents: write # to push chart release and create a release (helm/chart-releaser-action)
12+
packages: write # needed for ghcr access
13+
1014
runs-on: ubuntu-latest
1115
steps:
1216
- name: Checkout
@@ -39,3 +43,20 @@ jobs:
3943
env:
4044
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
4145
CR_GENERATE_RELEASE_NOTES: true
46+
47+
- name: Login to GitHub Container Registry
48+
uses: docker/login-action@v3
49+
with:
50+
registry: ghcr.io
51+
username: ${{ github.actor }}
52+
password: ${{ secrets.GITHUB_TOKEN }}
53+
54+
- name: Push charts to GHCR
55+
run: |
56+
shopt -s nullglob
57+
for pkg in .cr-release-packages/*; do
58+
if [ -z "${pkg:-}" ]; then
59+
break
60+
fi
61+
helm push "${pkg}" "oci://ghcr.io/${GITHUB_REPOSITORY}"
62+
done

‎charts/opentelemetry-collector/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: opentelemetry-collector
3-
version: 0.110.5
3+
version: 0.111.0
44
description: OpenTelemetry Collector Helm chart for Kubernetes
55
type: application
66
home: https://opentelemetry.io/
@@ -12,4 +12,4 @@ maintainers:
1212
- name: jaronoff97
1313
- name: TylerHelmuth
1414
icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
15-
appVersion: 0.114.0
15+
appVersion: 0.115.1

‎charts/opentelemetry-collector/ci/deployment-values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ resources:
1919
podLabels:
2020
testLabel: "{{ .Values.global.test }}"
2121

22+
additionalLabels:
23+
testLabel: "{{ .Values.global.test }}"
24+
someLabel: "someValue"
25+
2226
ingress:
2327
enabled: true
2428
hosts:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ kind: ClusterRole
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.110.5
8+
helm.sh/chart: opentelemetry-collector-0.111.0
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
11-
app.kubernetes.io/version: "0.114.0"
11+
app.kubernetes.io/version: "0.115.1"
1212
app.kubernetes.io/managed-by: Helm
1313
app.kubernetes.io/component: standalone-collector
1414
rules:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ kind: ClusterRoleBinding
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.110.5
8+
helm.sh/chart: opentelemetry-collector-0.111.0
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
11-
app.kubernetes.io/version: "0.114.0"
11+
app.kubernetes.io/version: "0.115.1"
1212
app.kubernetes.io/managed-by: Helm
1313
app.kubernetes.io/component: standalone-collector
1414
roleRef:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.110.5
9+
helm.sh/chart: opentelemetry-collector-0.111.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.114.0"
12+
app.kubernetes.io/version: "0.115.1"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/component: standalone-collector
1515
data:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.110.5
9+
helm.sh/chart: opentelemetry-collector-0.111.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.114.0"
12+
app.kubernetes.io/version: "0.115.1"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/component: standalone-collector
1515
spec:
@@ -25,7 +25,7 @@ spec:
2525
template:
2626
metadata:
2727
annotations:
28-
checksum/config: 7108dcd2498add47cd17fda4bef427fef07c2a34c7b32fedb1bb1b2e5017224f
28+
checksum/config: fb838b69c59e42351e2da87402a447eb1f73f3379f9461572c4eab443d68afd4
2929

3030
labels:
3131
app.kubernetes.io/name: opentelemetry-collector
@@ -45,7 +45,7 @@ spec:
4545
- --config=/conf/relay.yaml
4646
securityContext:
4747
{}
48-
image: "otel/opentelemetry-collector-k8s:0.114.0"
48+
image: "otel/opentelemetry-collector-k8s:0.115.1"
4949
imagePullPolicy: IfNotPresent
5050
ports:
5151

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.110.5
9+
helm.sh/chart: opentelemetry-collector-0.111.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.114.0"
12+
app.kubernetes.io/version: "0.115.1"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/component: standalone-collector
1515
component: standalone-collector

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.110.5
9+
helm.sh/chart: opentelemetry-collector-0.111.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.114.0"
12+
app.kubernetes.io/version: "0.115.1"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/component: standalone-collector

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.110.5
9+
helm.sh/chart: opentelemetry-collector-0.111.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.114.0"
12+
app.kubernetes.io/version: "0.115.1"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/component: agent-collector
1515
data:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.110.5
9+
helm.sh/chart: opentelemetry-collector-0.111.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.114.0"
12+
app.kubernetes.io/version: "0.115.1"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/component: standalone-collector
1515
data:

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.110.5
9+
helm.sh/chart: opentelemetry-collector-0.111.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.114.0"
12+
app.kubernetes.io/version: "0.115.1"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/component: agent-collector
1515
spec:
@@ -23,7 +23,7 @@ spec:
2323
template:
2424
metadata:
2525
annotations:
26-
checksum/config: 7f8860527b6b74118b8eeea2a3a825fadf69829e4ea1f60c51a13b5b57825239
26+
checksum/config: 587a43cbf60546f4021c581b98258e107d2e60cac67751494a2615a35db568fa
2727

2828
labels:
2929
app.kubernetes.io/name: opentelemetry-collector
@@ -43,7 +43,7 @@ spec:
4343
- --config=/conf/relay.yaml
4444
securityContext:
4545
{}
46-
image: "otel/opentelemetry-collector-k8s:0.114.0"
46+
image: "otel/opentelemetry-collector-k8s:0.115.1"
4747
imagePullPolicy: IfNotPresent
4848
ports:
4949

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.110.5
9+
helm.sh/chart: opentelemetry-collector-0.111.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.114.0"
12+
app.kubernetes.io/version: "0.115.1"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/component: standalone-collector
1515
spec:
@@ -25,7 +25,7 @@ spec:
2525
template:
2626
metadata:
2727
annotations:
28-
checksum/config: 5455da45cbd6f8e6a4446147db013fba2471defd4979823c817371453958a7d6
28+
checksum/config: c9490d094ad2470e15af08f5e4cb8d3a71462e3f3a9d27739052f3e6c8cb98cb
2929

3030
labels:
3131
app.kubernetes.io/name: opentelemetry-collector
@@ -45,7 +45,7 @@ spec:
4545
- --config=/conf/relay.yaml
4646
securityContext:
4747
{}
48-
image: "otel/opentelemetry-collector-k8s:0.114.0"
48+
image: "otel/opentelemetry-collector-k8s:0.115.1"
4949
imagePullPolicy: IfNotPresent
5050
ports:
5151

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.110.5
9+
helm.sh/chart: opentelemetry-collector-0.111.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.114.0"
12+
app.kubernetes.io/version: "0.115.1"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/component: standalone-collector
1515
component: standalone-collector

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.110.5
9+
helm.sh/chart: opentelemetry-collector-0.111.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.114.0"
12+
app.kubernetes.io/version: "0.115.1"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/component: standalone-collector

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.110.5
9+
helm.sh/chart: opentelemetry-collector-0.111.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.114.0"
12+
app.kubernetes.io/version: "0.115.1"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/component: agent-collector
1515
data:

‎charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.110.5
9+
helm.sh/chart: opentelemetry-collector-0.111.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.114.0"
12+
app.kubernetes.io/version: "0.115.1"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/component: agent-collector
1515
spec:
@@ -23,7 +23,7 @@ spec:
2323
template:
2424
metadata:
2525
annotations:
26-
checksum/config: 0a6053922e699018150128418ac53e0a2aee7837b686781756c5431cc2fe304b
26+
checksum/config: 9356a2d96e747791b06c987e7ac2b8daa28b35daa8dab6f672a41ca675d19ebb
2727

2828
labels:
2929
app.kubernetes.io/name: opentelemetry-collector
@@ -43,7 +43,7 @@ spec:
4343
- --config=/conf/relay.yaml
4444
securityContext:
4545
{}
46-
image: "otel/opentelemetry-collector-k8s:0.114.0"
46+
image: "otel/opentelemetry-collector-k8s:0.115.1"
4747
imagePullPolicy: IfNotPresent
4848
ports:
4949

‎charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.110.5
9+
helm.sh/chart: opentelemetry-collector-0.111.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.114.0"
12+
app.kubernetes.io/version: "0.115.1"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/component: agent-collector

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.110.5
9+
helm.sh/chart: opentelemetry-collector-0.111.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.114.0"
12+
app.kubernetes.io/version: "0.115.1"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/component: agent-collector
1515
data:

‎charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ metadata:
66
name: example-opentelemetry-collector-agent
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.110.5
9+
helm.sh/chart: opentelemetry-collector-0.111.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.114.0"
12+
app.kubernetes.io/version: "0.115.1"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/component: agent-collector
1515
spec:
@@ -23,7 +23,7 @@ spec:
2323
template:
2424
metadata:
2525
annotations:
26-
checksum/config: c5a93489ab73022c6ffe4458f95ea9e2d7c76060ae3d7f6e63c14c09056c2981
26+
checksum/config: e4e634183a85da33e028a51de708a8b77c15fa2932e0c8aa242bee64d21fc5a0
2727

2828
labels:
2929
app.kubernetes.io/name: opentelemetry-collector
@@ -43,7 +43,7 @@ spec:
4343
- --config=/conf/relay.yaml
4444
securityContext:
4545
{}
46-
image: "otel/opentelemetry-collector-k8s:0.114.0"
46+
image: "otel/opentelemetry-collector-k8s:0.115.1"
4747
imagePullPolicy: IfNotPresent
4848
ports:
4949

‎charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.110.5
9+
helm.sh/chart: opentelemetry-collector-0.111.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.114.0"
12+
app.kubernetes.io/version: "0.115.1"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/component: agent-collector

0 commit comments

Comments
 (0)