Skip to content

Commit f1e9726

Browse files
saedx1saedx1
authored
Merge branch 'main' into patch-2
2 parents 48ea40b + 1a0c440 commit f1e9726

22 files changed

+95
-92
lines changed

‎.github/workflows/build-plus.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
labels: |
101101
org.opencontainers.image.description=NGINX Plus Ingress Controller for Kubernetes
102102
env:
103-
DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
103+
DOCKER_METADATA_ANNOTATIONS_LEVELS: ${{ contains(inputs.target, 'aws') && 'manifest' || 'manifest,index' }}
104104

105105
- name: Set base name variable
106106
id: base_name

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070

7171
# Initializes the CodeQL tools for scanning.
7272
- name: Initialize CodeQL
73-
uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
73+
uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
7474
with:
7575
languages: ${{ matrix.language }}
7676
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -89,7 +89,7 @@ jobs:
8989
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
9090
# If this step fails, then you should remove it and run the build manually (see below)
9191
- name: Autobuild
92-
uses: github/codeql-action/autobuild@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
92+
uses: github/codeql-action/autobuild@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
9393

9494
# ℹ️ Command-line programs to run using the OS shell.
9595
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -102,6 +102,6 @@ jobs:
102102
# ./location_of_script_within_repo/buildscript.sh
103103

104104
- name: Perform CodeQL Analysis
105-
uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
105+
uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
106106
with:
107107
category: "/language:${{matrix.language}}"

‎.github/workflows/image-promotion.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ jobs:
143143
fi
144144
145145
- name: Upload SARIF file
146-
uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
146+
uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
147147
if: steps.check-sarif.outputs.sarif_has_results == 'true'
148148
with:
149149
sarif_file: govulncheck.sarif
@@ -468,7 +468,7 @@ jobs:
468468
overwrite: true
469469

470470
- name: Upload Scan results to GitHub Security tab
471-
uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
471+
uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
472472
with:
473473
sarif_file: "${{ steps.directory.outputs.directory }}/"
474474

@@ -557,7 +557,7 @@ jobs:
557557
overwrite: true
558558

559559
- name: Upload Scan results to GitHub Security tab
560-
uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
560+
uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
561561
with:
562562
sarif_file: "${{ steps.directory.outputs.directory }}/"
563563

@@ -653,7 +653,7 @@ jobs:
653653
overwrite: true
654654

655655
- name: Upload Scan results to GitHub Security tab
656-
uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
656+
uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
657657
with:
658658
sarif_file: "${{ steps.directory.outputs.directory }}/"
659659
continue-on-error: true

‎.github/workflows/lint-format.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- name: Checkout Repository
6464
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6565

66-
- uses: reviewdog/action-actionlint@08ef4afa963243489a457cca426f705ce4e0d1a5 # v1.60.0
66+
- uses: reviewdog/action-actionlint@534eb894142bcf31616e5436cbe4214641c58101 # v1.61.0
6767
with:
6868
actionlint_flags: -shellcheck ""
6969

@@ -84,7 +84,7 @@ jobs:
8484
- name: Checkout Repository
8585
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
8686

87-
- uses: DavidAnson/markdownlint-cli2-action@eb5ca3ab411449c66620fe7f1b3c9e10547144b0 # v18.0.0
87+
- uses: DavidAnson/markdownlint-cli2-action@a23dae216ce3fee4db69da41fed90d2a4af801cf # v19.0.0
8888
with:
8989
config: .markdownlint-cli2.yaml
9090
globs: "**/*.md"

‎.github/workflows/release-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
.github/scripts/release-notes-update.sh ${{ github.event.inputs.new_version }} ${{ github.event.inputs.new_helm_version }} "${{ github.event.inputs.k8s_versions }}" "${{ github.event.inputs.release_date }}"
7171
7272
- name: Create Pull Request
73-
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
73+
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
7474
with:
7575
token: ${{ secrets.NGINX_PAT }}
7676
commit-message: Release ${{ github.event.inputs.new_version }}

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ jobs:
404404
role-to-assume: ${{ secrets.AWS_ROLE_MARKETPLACE }}
405405

406406
- name: Publish to AWS Marketplace
407-
uses: nginxinc/aws-marketplace-publish@47db7444063941b7e5b509cd8cd0be6f25ecb35b # v1.0.6
407+
uses: nginxinc/aws-marketplace-publish@108e752101152582ed409c5faed859a891e0d7aa # v1.0.7
408408
continue-on-error: true
409409
with:
410410
version: ${{ inputs.nic_version }}

‎.github/workflows/scorecards.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,6 @@ jobs:
5757

5858
# Upload the results to GitHub's code scanning dashboard.
5959
- name: "Upload to code-scanning"
60-
uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
60+
uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
6161
with:
6262
sarif_file: results.sarif

‎.github/workflows/update-docker-sha.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
echo $GITHUB_OUTPUT
7676
7777
- name: Create Pull Request
78-
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
78+
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
7979
id: pr
8080
with:
8181
token: ${{ secrets.NGINX_PAT }}

‎.github/workflows/update-kubernetes-version.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
if: ${{ steps.search.outputs.found == 'false' }}
4444

4545
- name: Create Pull Request
46-
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
46+
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
4747
with:
4848
token: ${{ secrets.NGINX_PAT }}
4949
commit-message: update kubernetes version to ${{ steps.k8s-version.outputs.version }} in helm schema

‎.github/workflows/version-bump.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
CHART_VERSION: ${{ inputs.helm_chart_version }}
4949

5050
- name: Create Pull Request
51-
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
51+
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
5252
with:
5353
token: ${{ secrets.NGINX_PAT }}
5454
commit-message: Version Bump for ${{ github.event.inputs.ic_version }}

0 commit comments

Comments
 (0)