Skip to content

Commit 9a6914d

Browse files
authored
Merge branch 'main' into otel-ebpf-instrumentation
2 parents f71d691 + 7bae7d6 commit 9a6914d

File tree

99 files changed

+243
-243
lines changed

Some content is hidden

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

99 files changed

+243
-243
lines changed

.github/workflows/ossf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ jobs:
4242
# Upload the results to GitHub's code scanning dashboard (optional).
4343
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
45+
uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
4646
with:
4747
sarif_file: results.sarif

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.126.0
3+
version: 0.127.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.127.0
15+
appVersion: 0.128.0

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.126.0
8+
helm.sh/chart: opentelemetry-collector-0.127.0
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
11-
app.kubernetes.io/version: "0.127.0"
11+
app.kubernetes.io/version: "0.128.0"
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.126.0
8+
helm.sh/chart: opentelemetry-collector-0.127.0
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
11-
app.kubernetes.io/version: "0.127.0"
11+
app.kubernetes.io/version: "0.128.0"
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.126.0
9+
helm.sh/chart: opentelemetry-collector-0.127.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.127.0"
12+
app.kubernetes.io/version: "0.128.0"
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.126.0
9+
helm.sh/chart: opentelemetry-collector-0.127.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.127.0"
12+
app.kubernetes.io/version: "0.128.0"
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: cb980eef7e78eda3c73af467d64394a5317fcc659365a696d9d39a1cfd42dff4
28+
checksum/config: 1c895c8d3a478a69d5bf654475f656939d911f88191d1834ed63a1ffcc69c2e9
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: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:0.127.0"
48+
image: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:0.128.0"
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.126.0
9+
helm.sh/chart: opentelemetry-collector-0.127.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.127.0"
12+
app.kubernetes.io/version: "0.128.0"
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.126.0
9+
helm.sh/chart: opentelemetry-collector-0.127.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.127.0"
12+
app.kubernetes.io/version: "0.128.0"
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.126.0
9+
helm.sh/chart: opentelemetry-collector-0.127.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.127.0"
12+
app.kubernetes.io/version: "0.128.0"
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.126.0
9+
helm.sh/chart: opentelemetry-collector-0.127.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.127.0"
12+
app.kubernetes.io/version: "0.128.0"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/component: standalone-collector
1515
data:

0 commit comments

Comments
 (0)