Skip to content

Commit 080f225

Browse files
authored
Merge branch 'main' into tests/nfr-tests-edge
2 parents 3fc2961 + 1af3332 commit 080f225

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
ref: ${{ (inputs.tag != '' && !inputs.dry_run && inputs.image != 'operator') && format('refs/tags/{0}', inputs.tag) || github.ref }}
5454

5555
- name: Download Artifacts
56-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
56+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
5757
with:
5858
name: dist-${{ github.run_id }}
5959
path: ${{ github.workspace }}/dist
@@ -193,7 +193,7 @@ jobs:
193193
fail-build: false
194194

195195
- name: Upload scan result to GitHub Security tab
196-
uses: github/codeql-action/upload-sarif@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
196+
uses: github/codeql-action/upload-sarif@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
197197
if: ${{ !inputs.dry_run }}
198198
continue-on-error: true
199199
with:

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
- name: Output Variables
150150
id: vars
151151
run: |
152-
K8S_KIND_VERSION=v1.34.0 # renovate: datasource=docker depName=kindest/node
152+
K8S_KIND_VERSION=v1.34.2 # renovate: datasource=docker depName=kindest/node
153153
echo "go_path=$(go env GOPATH)" >> $GITHUB_OUTPUT
154154
echo "min_k8s_version=v1.25.16" >> $GITHUB_OUTPUT
155155
echo "k8s_latest=${K8S_KIND_VERSION}" >> $GITHUB_OUTPUT
@@ -199,7 +199,7 @@ jobs:
199199
token: ${{ secrets.CODECOV_TOKEN }}
200200

201201
- name: Upload Coverage Report
202-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
202+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
203203
with:
204204
name: cover-${{ github.run_id }}.html
205205
path: ${{ github.workspace }}/cover.html
@@ -324,7 +324,7 @@ jobs:
324324
echo "json=$json" >> $GITHUB_OUTPUT
325325
326326
- name: Upload Artifacts
327-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
327+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
328328
with:
329329
name: dist-${{ github.run_id }}
330330
path: ${{ github.workspace }}/dist
@@ -359,7 +359,7 @@ jobs:
359359
go-version: stable
360360

361361
- name: Download Artifacts
362-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
362+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
363363
with:
364364
name: dist-${{ github.run_id }}
365365
path: ${{ github.workspace }}/dist

.github/workflows/conformance.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ jobs:
187187

188188
- name: Upload profile to GitHub
189189
if: ${{ inputs.enable-experimental }}
190-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
190+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
191191
with:
192192
name: conformance-profile-${{ inputs.image }}-${{ inputs.k8s-version }}-${{ steps.ngf-meta.outputs.version }}
193193
path: ./tests/conformance-profile.yaml
@@ -208,7 +208,7 @@ jobs:
208208

209209
- name: Upload profile to GitHub
210210
if: ${{ inputs.enable-experimental }} # add experimental flag to filter result upload
211-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
211+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
212212
with:
213213
name: conformance-profile-inference-${{ inputs.image }}-${{ inputs.k8s-version }}-${{ steps.ngf-meta.outputs.version }}-${{ github.run_id }}
214214
path: ./tests/conformance-profile-inference.yaml

.github/workflows/helm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
fetch-depth: 0
3030

3131
- name: Download Artifacts
32-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
32+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
3333
with:
3434
name: dist-${{ github.run_id }}
3535
path: ${{ github.workspace }}/dist

.github/workflows/nfr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ jobs:
159159
fi
160160
161161
- name: Upload Artifacts
162-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
162+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
163163
with:
164164
name: results-${{ matrix.type }}
165165
path: tests/results/**/*-${{ matrix.type }}.*
@@ -185,7 +185,7 @@ jobs:
185185
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
186186

187187
- name: Download Artifacts
188-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
188+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
189189
with:
190190
path: tests/results/
191191
merge-multiple: true

.github/workflows/scorecards.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ jobs:
5252
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
5353
# format to the repository Actions tab.
5454
- name: "Upload artifact"
55-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
55+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
5656
with:
5757
name: SARIF file
5858
path: results.sarif
5959
retention-days: 5
6060

6161
# Upload the results to GitHub's code scanning dashboard.
6262
- name: "Upload to code-scanning"
63-
uses: github/codeql-action/upload-sarif@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
63+
uses: github/codeql-action/upload-sarif@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
6464
with:
6565
sarif_file: results.sarif

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ GO_LINKER_FLAGS = $(GO_LINKER_FLAGS_OPTIMIZATIONS) $(GO_LINKER_FlAGS_VARS)
2626
# renovate: datasource=github-tags depName=golangci/golangci-lint
2727
GOLANGCI_LINT_VERSION = v2.7.2
2828
# renovate: datasource=docker depName=kindest/node
29-
KIND_K8S_VERSION = v1.34.0
29+
KIND_K8S_VERSION = v1.34.2
3030
# renovate: datasource=github-tags depName=norwoodj/helm-docs
3131
HELM_DOCS_VERSION = v1.14.2
3232
# renovate: datasource=github-tags depName=ahmetb/gen-crd-api-reference-docs

tests/framework/collector.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const (
1313
collectorChartReleaseName = "otel-collector"
1414
//nolint:lll
1515
// renovate: datasource=helm depName=opentelemetry-collector registryUrl=https://open-telemetry.github.io/opentelemetry-helm-charts
16-
collectorChartVersion = "0.141.0"
16+
collectorChartVersion = "0.141.1"
1717
)
1818

1919
// InstallCollector installs the otel-collector.

0 commit comments

Comments
 (0)