Skip to content

Commit 19a8207

Browse files
authored
Merge branch 'release-3.7' into cherry-pick-release-3.7-7c4fd3e270e5e342146f0906b987b6947f559a38
2 parents 514775a + 31c8918 commit 19a8207

20 files changed

+101
-91
lines changed

.github/actions/smoke-tests/action.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ runs:
8282
-v "/var/run/docker.sock:/var/run/docker.sock" \
8383
-v ~/.docker:/root/.docker \
8484
-v ${{ github.workspace }}/tests:/workspace/tests \
85+
-v ${{ github.workspace }}/examples/common-secrets:/workspace/examples/common-secrets \
8586
-v ${{ github.workspace }}/deployments:/workspace/deployments \
8687
-v ${{ github.workspace }}/charts:/workspace/charts \
8788
-v ${{ github.workspace }}/config:/workspace/config \

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ repos:
9191
- id: markdownlint-cli2
9292

9393
- repo: https://github.com/rhysd/actionlint
94-
rev: v1.7.3
94+
rev: v1.7.4
9595
hooks:
9696
- id: actionlint
9797
name: Lint GitHub Actions workflow files

config/crd/bases/appprotectdos.f5.com_dosprotectedresources.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.4
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: dosprotectedresources.appprotectdos.f5.com
88
spec:
99
group: appprotectdos.f5.com

config/crd/bases/externaldns.nginx.org_dnsendpoints.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.4
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: dnsendpoints.externaldns.nginx.org
88
spec:
99
group: externaldns.nginx.org

config/crd/bases/k8s.nginx.org_globalconfigurations.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.4
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: globalconfigurations.k8s.nginx.org
88
spec:
99
group: k8s.nginx.org

config/crd/bases/k8s.nginx.org_policies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.4
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: policies.k8s.nginx.org
88
spec:
99
group: k8s.nginx.org

config/crd/bases/k8s.nginx.org_transportservers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.4
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: transportservers.k8s.nginx.org
88
spec:
99
group: k8s.nginx.org

config/crd/bases/k8s.nginx.org_virtualserverroutes.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.4
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: virtualserverroutes.k8s.nginx.org
88
spec:
99
group: k8s.nginx.org

config/crd/bases/k8s.nginx.org_virtualservers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.4
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: virtualservers.k8s.nginx.org
88
spec:
99
group: k8s.nginx.org

deploy/crds-nap-dos.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ apiVersion: apiextensions.k8s.io/v1
148148
kind: CustomResourceDefinition
149149
metadata:
150150
annotations:
151-
controller-gen.kubebuilder.io/version: v0.16.4
151+
controller-gen.kubebuilder.io/version: v0.16.5
152152
name: dosprotectedresources.appprotectdos.f5.com
153153
spec:
154154
group: appprotectdos.f5.com

0 commit comments

Comments
 (0)