Skip to content

Commit babc5d3

Browse files
authored
Merge branch 'main' into docs/version-notice
2 parents c54112e + a6aa714 commit babc5d3

23 files changed

+112
-108
lines changed

.github/workflows/build-oss.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
if: ${{ github.event_name != 'pull_request' && ! startsWith(github.ref, 'refs/heads/release-') }}
4949

5050
- name: Docker Buildx
51-
uses: docker/setup-buildx-action@16c0bc4a6e6ada2cfd8afd41d22d95379cf7c32a # v2.8.0
51+
uses: docker/setup-buildx-action@4c0219f9ac95b02789c1075625400b2acbff50b1 # v2.9.1
5252

5353
- name: DockerHub Login
5454
uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2.2.0
@@ -158,7 +158,7 @@ jobs:
158158
ignore-unfixed: "true"
159159

160160
- name: Upload Trivy scan results to GitHub Security tab
161-
uses: github/codeql-action/upload-sarif@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1
161+
uses: github/codeql-action/upload-sarif@489225d82a57396c6f426a40e66d461b16b3461d # v2.20.4
162162
continue-on-error: true
163163
with:
164164
sarif_file: "trivy-results-${{ inputs.image }}.sarif"

.github/workflows/build-plus.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
if: github.event_name != 'pull_request'
5353

5454
- name: Docker Buildx
55-
uses: docker/setup-buildx-action@16c0bc4a6e6ada2cfd8afd41d22d95379cf7c32a # v2.8.0
55+
uses: docker/setup-buildx-action@4c0219f9ac95b02789c1075625400b2acbff50b1 # v2.9.1
5656

5757
- name: Authenticate to Google Cloud
5858
id: auth
@@ -204,7 +204,7 @@ jobs:
204204
ignore-unfixed: "true"
205205

206206
- name: Upload Trivy scan results to GitHub Security tab
207-
uses: github/codeql-action/upload-sarif@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1
207+
uses: github/codeql-action/upload-sarif@489225d82a57396c6f426a40e66d461b16b3461d # v2.20.4
208208
continue-on-error: true
209209
with:
210210
sarif_file: "trivy-results-${{ inputs.image }}.sarif"

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ jobs:
171171
path: ${{ github.workspace }}/dist
172172
key: nginx-ingress-${{ github.run_id }}-${{ github.run_number }}
173173
- name: Docker Buildx
174-
uses: docker/setup-buildx-action@16c0bc4a6e6ada2cfd8afd41d22d95379cf7c32a # v2.8.0
174+
uses: docker/setup-buildx-action@4c0219f9ac95b02789c1075625400b2acbff50b1 # v2.9.1
175175
- name: Build Docker Image ${{ matrix.image }}
176176
uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # v4.1.1
177177
with:
@@ -259,7 +259,7 @@ jobs:
259259
- name: Checkout Repository
260260
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
261261
- name: Docker Buildx
262-
uses: docker/setup-buildx-action@16c0bc4a6e6ada2cfd8afd41d22d95379cf7c32a # v2.8.0
262+
uses: docker/setup-buildx-action@4c0219f9ac95b02789c1075625400b2acbff50b1 # v2.9.1
263263
- name: Build Test-Runner Container
264264
uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # v4.1.1
265265
with:

.github/workflows/codeql-analysis.yml

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

4040
# Initializes the CodeQL tools for scanning.
4141
- name: Initialize CodeQL
42-
uses: github/codeql-action/init@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1
42+
uses: github/codeql-action/init@489225d82a57396c6f426a40e66d461b16b3461d # v2.20.4
4343
with:
4444
languages: ${{ matrix.language }}
4545
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +50,7 @@ jobs:
5050
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5151
# If this step fails, then you should remove it and run the build manually (see below)
5252
- name: Autobuild
53-
uses: github/codeql-action/autobuild@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1
53+
uses: github/codeql-action/autobuild@489225d82a57396c6f426a40e66d461b16b3461d # v2.20.4
5454

5555
# ℹ️ Command-line programs to run using the OS shell.
5656
# 📚 https://git.io/JvXDl
@@ -64,4 +64,4 @@ jobs:
6464
# make release
6565

6666
- name: Perform CodeQL Analysis
67-
uses: github/codeql-action/analyze@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1
67+
uses: github/codeql-action/analyze@489225d82a57396c6f426a40e66d461b16b3461d # v2.20.4

.github/workflows/scorecards.yml

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

5555
# Upload the results to GitHub's code scanning dashboard.
5656
- name: "Upload to code-scanning"
57-
uses: github/codeql-action/upload-sarif@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1
57+
uses: github/codeql-action/upload-sarif@489225d82a57396c6f426a40e66d461b16b3461d # v2.20.4
5858
with:
5959
sarif_file: results.sarif

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ repos:
4545
- id: golangci-lint
4646
args: [--new-from-patch=/tmp/diff.patch]
4747
- repo: https://github.com/asottile/pyupgrade
48-
rev: v3.7.0
48+
rev: v3.9.0
4949
hooks:
5050
- id: pyupgrade
5151
- repo: https://github.com/PyCQA/isort
5252
rev: 5.12.0
5353
hooks:
5454
- id: isort
5555
- repo: https://github.com/psf/black
56-
rev: 23.3.0
56+
rev: 23.7.0
5757
hooks:
5858
- id: black
5959
- repo: https://github.com/python-jsonschema/check-jsonschema

deployments/common/crds/appprotectdos.f5.com_dosprotectedresources.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.12.0
5+
controller-gen.kubebuilder.io/version: v0.12.1
66
name: dosprotectedresources.appprotectdos.f5.com
77
spec:
88
group: appprotectdos.f5.com

deployments/common/crds/externaldns.nginx.org_dnsendpoints.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.12.0
5+
controller-gen.kubebuilder.io/version: v0.12.1
66
name: dnsendpoints.externaldns.nginx.org
77
spec:
88
group: externaldns.nginx.org

deployments/common/crds/k8s.nginx.org_globalconfigurations.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.12.0
5+
controller-gen.kubebuilder.io/version: v0.12.1
66
name: globalconfigurations.k8s.nginx.org
77
spec:
88
group: k8s.nginx.org

deployments/common/crds/k8s.nginx.org_policies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.12.0
5+
controller-gen.kubebuilder.io/version: v0.12.1
66
name: policies.k8s.nginx.org
77
spec:
88
group: k8s.nginx.org

0 commit comments

Comments
 (0)