8000 Merge branch 'main' into chore/update-schema-ref · nginx/kubernetes-ingress@61c51e2 · GitHub
[go: up one dir, main page]

Skip to content

Commit 61c51e2

Browse files
authored
Merge branch 'main' into chore/update-schema-ref
2 parents 02a9d82 + 35e440b commit 61c51e2

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.github/workflows/build-oss.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
fetch-depth: 0
3535

3636
- name: Fetch Cached Artifacts
37-
uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920 # v3.2.4
37+
uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3.2.5
3838
with:
3939
path: ${{ github.workspace }}/dist
4040
key: nginx-ingress-${{ github.run_id }}-${{ github.run_number }}
@@ -138,7 +138,7 @@ jobs:
138138
IC_VERSION=${{ github.event_name == 'pull_request' && 'CI' || steps.meta.outputs.version }}
139139
140140
- name: Run Trivy vulnerability scanner
141-
uses: aquasecurity/trivy-action@cff3e9a7f62c41dd51975266d0ae235709e39c41 # 0.9.0
141+
uses: aquasecurity/trivy-action@8bd2f9fbda2109502356ff8a6a89da55b1ead252 # 0.9.1
142142
continue-on-error: true
143143
with:
144144
image-ref: nginx/nginx-ingress:${{ steps.meta.outputs.version }}

.github/workflows/build-plus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
fetch-depth: 0
3737

3838
- name: Fetch Cached Artifacts
39-
uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920 # v3.2.4
39+
uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3.2.5
4040
with:
4141
path: ${{ github.workspace }}/dist
4242
key: nginx-ingress-${{ github.run_id }}-${{ github.run_number }}
@@ -144,7 +144,7 @@ jobs:
144144
${{ inputs.nap_modules != '' && contains(inputs.image, 'ubi') && format('"rhel_license={0}"', secrets.RHEL_LICENSE) || '' }}
145145
146146
- name: Run Trivy vulnerability scanner
147-
uses: aquasecurity/trivy-action@cff3e9a7f62c41dd51975266d0ae235709e39c41 # 0.9.0
147+
uses: aquasecurity/trivy-action@8bd2f9fbda2109502356ff8a6a89da55b1ead252 # 0.9.1
148148
continue-on-error: true
149149
with:
150150
image-ref: docker.io/${{ inputs.image }}:${{ steps.meta.outputs.version }}

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ jobs:
132132
AZURE_BUCKET_NAME: ${{ secrets.AZURE_BUCKET_NAME }}
133133

134134
- name: Store Artifacts in Cache
135-
uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920 # v3.2.4
135+
uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3.2.5
136136
with:
137137
path: ${{ github.workspace }}/dist
138138
key: nginx-ingress-${{ github.run_id }}-${{ github.run_number }}
@@ -207,7 +207,7 @@ jobs:
207207
- name: Checkout Repository
208208
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
209209
- name: Fetch Cached Artifacts
210-
uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920 # v3.2.4
210+
uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3.2.5
211211
with:
212212
path: ${{ github.workspace }}/dist
213213
key: nginx-ingress-${{ github.run_id }}-${{ github.run_number }}

.github/workflows/update-docker-images.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
109109
GOPATH: ${{ steps.go.outputs.go_path }}
110110
- name: Store Artifacts in Cache
111-
uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920 # v3.2.4
111+
uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3.2.5
112112
with:
113113
path: ${{ github.workspace }}/dist
114114
key: nginx-ingress-${{ github.run_id }}-${{ github.run_number }}
@@ -136,7 +136,7 @@ jobs:
136136
ref: refs/tags/v${{ needs.variables.outputs.kic-tag }}
137137
if: ${{ matrix.needs-updating == 'true' }}
138138
- name: Fetch Cached Artifacts
139-
uses: actions/cache@627f0f41f6904a5b1efbaed9f96d9eb58e92e920 # v3.2.4
139+
uses: actions/cache@6998d139ddd3e68c71e9e398d8e40b71a2f39812 # v3.2.5
140140
with:
141141
path: ${{ github.workspace }}/dist
142142
key: nginx-ingress-${{ github.run_id }}-${{ github.run_number }}

0 commit comments

Comments
 (0)
0