Skip to content

Commit fb4a932

Browse files
authored
Merge branch 'main' into main
2 parents d380aae + 50d87c7 commit fb4a932

File tree

239 files changed

+2820
-750
lines changed

Some content is hidden

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

239 files changed

+2820
-750
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717

1818
charts/opentelemetry-collector/ @open-telemetry/helm-approvers @dmitryax @TylerHelmuth @povilasv
1919
charts/opentelemetry-operator/ @open-telemetry/helm-approvers @Allex1 @jvoravong
20-
charts/opentelemetry-demo/ @open-telemetry/helm-approvers @puckpuck
20+
charts/opentelemetry-demo/ @open-telemetry/helm-approvers @puckpuck @julianocosta89
2121
charts/opentelemetry-kube-stack/ @open-telemetry/helm-approvers @jaronoff97
2222
charts/opentelemetry-target-allocator/ @open-telemetry/helm-approvers @atoulme

.github/workflows/ossf-scorecard.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
persist-credentials: false
2525

26-
- uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
26+
- uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
2727
with:
2828
results_file: results.sarif
2929
results_format: sarif
@@ -33,7 +33,7 @@ jobs:
3333
# uploads of run results in SARIF format to the repository Actions tab.
3434
# https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
3535
- name: "Upload artifact"
36-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
36+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
3737
with:
3838
name: SARIF file
3939
path: results.sarif
@@ -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@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.29.5
45+
uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
4646
with:
4747
sarif_file: results.sarif

.github/workflows/stale.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
pull-requests: write # for actions/stale to close stale PRs
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
16+
- uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
1717
with:
1818
repo-token: ${{ secrets.GITHUB_TOKEN }}
1919
stale-pr-message: 'This PR was marked stale due to lack of activity. It will be closed in 14 days.'

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ For more information about the maintainer role, see the [community repository](h
5555
- [Alex Birca](https://github.com/Allex1), Adobe
5656
- [Jared Tan](https://github.com/JaredTan95), DaoCloud
5757
- [Josh Voravong](https://github.com/jvoravong), Splunk
58+
- [Juliano Costa](https://github.com/julianocosta89), Datadog
5859
- [Pierre Tessier](https://github.com/puckpuck), Honeycomb
5960
- [Povilas](https://github.com/povilasv), Coralogix
6061

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.136.1
3+
version: 0.138.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.136.0
15+
appVersion: 0.138.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.136.1
8+
helm.sh/chart: opentelemetry-collector-0.138.0
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
11-
app.kubernetes.io/version: "0.136.0"
11+
app.kubernetes.io/version: "0.138.0"
1212
app.kubernetes.io/managed-by: Helm
1313
app.kubernetes.io/part-of: opentelemetry-collector
1414
app.kubernetes.io/component: standalone-collector

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.136.1
8+
helm.sh/chart: opentelemetry-collector-0.138.0
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
11-
app.kubernetes.io/version: "0.136.0"
11+
app.kubernetes.io/version: "0.138.0"
1212
app.kubernetes.io/managed-by: Helm
1313
app.kubernetes.io/part-of: opentelemetry-collector
1414
app.kubernetes.io/component: standalone-collector

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.136.1
9+
helm.sh/chart: opentelemetry-collector-0.138.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.136.0"
12+
app.kubernetes.io/version: "0.138.0"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/part-of: opentelemetry-collector
1515
app.kubernetes.io/component: standalone-collector

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.136.1
9+
helm.sh/chart: opentelemetry-collector-0.138.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.136.0"
12+
app.kubernetes.io/version: "0.138.0"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/part-of: opentelemetry-collector
1515
app.kubernetes.io/component: standalone-collector
@@ -26,7 +26,7 @@ spec:
2626
template:
2727
metadata:
2828
annotations:
29-
checksum/config: 78d05f3a098536abe3f6af9f5b8284e846fc3abe93016155c128cb2ea8437c46
29+
checksum/config: ae723df5ba6f4d83ef399f6c4de248364913f44b16c7cc44aacdcd904337068c
3030

3131
labels:
3232
app.kubernetes.io/name: opentelemetry-collector
@@ -47,7 +47,7 @@ spec:
4747
- --config=/conf/relay.yaml
4848
securityContext:
4949
{}
50-
image: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:0.136.0"
50+
image: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:0.138.0"
5151
imagePullPolicy: IfNotPresent
5252
ports:
5353

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.136.1
9+
helm.sh/chart: opentelemetry-collector-0.138.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.136.0"
12+
app.kubernetes.io/version: "0.138.0"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/part-of: opentelemetry-collector
1515
app.kubernetes.io/component: standalone-collector

0 commit comments

Comments
 (0)