E57B Go cherry picks (#5064) · nginx/kubernetes-ingress@30748f6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 30748f6

Browse files
pdabelf5pdabelf5
authored
Go cherry picks (#5064)
* Bump the go group with 1 update (#4909) * Bump the go group with 1 update Bumps the go group with 1 update: [sigs.k8s.io/controller-tools](https://github.com/kubernetes-sigs/controller-tools). Updates `sigs.k8s.io/controller-tools` from 0.13.0 to 0.14.0 - [Release notes](https://github.com/kubernetes-sigs/controller-tools/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-tools/blob/master/RELEASE.md) - [Commits](kubernetes-sigs/controller-tools@v0.13.0...v0.14.0) --- updated-dependencies: - dependency-name: sigs.k8s.io/controller-tools dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go ... Signed-off-by: dependabot[bot] <support@github.com> * update kubebuilder annotation version --------- Signed-off-by: dependabot[bot] <support@github.com> * Bump the go group with 1 update (#4924) Bumps the go group with 1 update: [github.com/prometheus/common](https://github.com/prometheus/common). Updates `github.com/prometheus/common` from 0.45.0 to 0.46.0 - [Release notes](https://github.com/prometheus/common/releases) - [Commits](prometheus/common@v0.45.0...v0.46.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go ... Signed-off-by: dependabot[bot] <support@github.com> * Bump the go group with 5 updates (#4939) Bumps the go group with 5 updates: | Package | From | To | | --- | --- | --- | | [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) | `1.26.3` | `1.26.4` | | [github.com/spiffe/go-spiffe/v2](https://github.com/spiffe/go-spiffe) | `2.1.6` | `2.1.7` | | [k8s.io/api](https://github.com/kubernetes/api) | `0.29.0` | `0.29.1` | | [k8s.io/client-go](https://github.com/kubernetes/client-go) | `0.29.0` | `0.29.1` | | [k8s.io/code-generator](https://github.com/kubernetes/code-generator) | `0.29.0` | `0.29.1` | Updates `github.com/aws/aws-sdk-go-v2/config` from 1.26.3 to 1.26.4 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](aws/aws-sdk-go-v2@config/v1.26.3...config/v1.26.4) Updates `github.com/spiffe/go-spiffe/v2` from 2.1.6 to 2.1.7 - [Release notes](https://github.com/spiffe/go-spiffe/releases) - [Changelog](https://github.com/spiffe/go-spiffe/blob/main/CHANGELOG.md) - [Commits](spiffe/go-spiffe@v2.1.6...v2.1.7) Updates `k8s.io/api` from 0.29.0 to 0.29.1 - [Commits](kubernetes/api@v0.29.0...v0.29.1) Updates `k8s.io/client-go` from 0.29.0 to 0.29.1 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.29.0...v0.29.1) Updates `k8s.io/code-generator` from 0.29.0 to 0.29.1 - [Commits](kubernetes/code-generator@v0.29.0...v0.29.1) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/config dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: github.com/spiffe/go-spiffe/v2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: k8s.io/api dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: k8s.io/client-go dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go - dependency-name: k8s.io/code-generator dependency-type: direct:production FF8 update-type: version-update:semver-patch dependency-group: go ... Signed-off-by: dependabot[bot] <support@github.com> * Bump the go group with 1 update (#4949) Bumps the go group with 1 update: [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2). Updates `github.com/aws/aws-sdk-go-v2/config` from 1.26.4 to 1.26.5 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](aws/aws-sdk-go-v2@config/v1.26.4...config/v1.26.5) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/config dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go ... Signed-off-by: dependabot[bot] <support@github.com> * Bump the go group with 1 update (#4971) Bumps the go group with 1 update: [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2). Updates `github.com/aws/aws-sdk-go-v2/config` from 1.26.5 to 1.26.6 - [Release notes](https://github.com/aws/aws-sdk-go-v2/releases) - [Commits](aws/aws-sdk-go-v2@config/v1.26.5...config/v1.26.6) --- updated-dependencies: - dependency-name: github.com/aws/aws-sdk-go-v2/config dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Paul Abel <128620221+pdabelf5@users.noreply.github.com> * Bump the go group with 1 update (#5022) Bumps the go group with 1 update: [github.com/cert-manager/cert-manager](https://github.com/cert-manager/cert-manager). Updates `github.com/cert-manager/cert-manager` from 1.13.3 to 1.14.0 - [Release notes](https://github.com/cert-manager/cert-manager/releases) - [Commits](cert-manager/cert-manager@v1.13.3...v1.14.0) --- updated-dependencies: - dependency-name: github.com/cert-manager/cert-manager dependency-type: direct:production update-type: version-update:semver-minor dependency-group: go ... Signed-off-by: dependabot[bot] <support@github.com> * Bump the go group with 1 update (#5034) Bumps the go group with 1 update: [github.com/cert-manager/cert-manager](https://github.com/cert-manager/cert-manager). Updates `github.com/cert-manager/cert-manager` from 1.14.0 to 1.14.1 - [Release notes](https://github.com/cert-manager/cert-manager/releases) - [Commits](cert-manager/cert-manager@v1.14.0...v1.14.1) --- updated-dependencies: - dependency-name: github.com/cert-manager/cert-manager dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go ... Signed-off-by: dependabot[bot] <support@github.com> * Bump the go group with 1 update (#5055) Bumps the go group with 1 update: [github.com/cert-manager/cert-manager](https://github.com/cert-manager/cert-manager). Updates `github.com/cert-manager/cert-manager` from 1.14.1 to 1.14.2 - [Release notes](https://github.com/cert-manager/cert-manager/releases) - [Commits](cert-manager/cert-manager@v1.14.1...v1.14.2) --- updated-dependencies: - dependency-name: github.com/cert-manager/cert-manager dependency-type: direct:production update-type: version-update:semver-patch dependency-group: go ... Signed-off-by: dependabot[bot] <support@github.com> --------- Signed-off-by: dependabot[bot] <support@github.com>
1 parent 4e84ae8 commit 30748f6

11 files changed

+465
-382
lines changed

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

Lines changed: 12 additions & 7 deletions
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.13.0
6+
controller-gen.kubebuilder.io/version: v0.14.0
77
name: dosprotectedresources.appprotectdos.f5.com
88
spec:
99
group: appprotectdos.f5.com
@@ -22,14 +22,19 @@ spec:
2222
description: DosProtectedResource defines a Dos protected resource.
2323
properties:
2424
apiVersion:
25-
description: 'APIVersion defines the versioned schema of this representation
26-
of an object. Servers should convert recognized schemas to the latest
27-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
25+
description: |-
26+
APIVersion defines the versioned schema of this representation of an object.
27+
Servers should convert recognized schemas to the latest internal value, and
28+
may reject unrecognized values.
29+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2830
type: string
2931
kind:
30-
description: 'Kind is a string value representing the REST resource this
31-
object represents. Servers may infer this from the endpoint the client
32-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
32+
description: |-
33+
Kind is a string value representing the REST resource this object represents.
34+
Servers may infer this from the endpoint the client submits requests to.
35+
Cannot be updated.
36+
In CamelCase.
37+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3338
type: string
3439
metadata:
3540
type: object

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

Lines changed: 12 additions & 7 deletions
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.13.0
6+
controller-gen.kubebuilder.io/version: v0.14.0
77
name: dnsendpoints.externaldns.nginx.org
88
spec:
99
group: externaldns.nginx.org
@@ -20,14 +20,19 @@ spec:
2020
description: DNSEndpoint is the CRD wrapper for Endpoint
2121
properties:
2222
apiVersion:
23-
description: 'APIVersion defines the versioned schema of this representation
24-
of an object. Servers should convert recognized schemas to the latest
25-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23+
description: |-
24+
APIVersion defines the versioned schema of this representation of an object.
25+
Servers should convert recognized schemas to the latest internal value, and
26+
may reject unrecognized values.
27+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2628
type: string
2729
kind:
28-
description: 'Kind is a string value representing the REST resource this
29-
object represents. Servers may infer this from the endpoint the client
30-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
30+
description: |-
31+
Kind is a string value representing the REST resource this object represents.
32+
Servers may infer this from the endpoint the client submits requests to.
33+
Cannot be updated.
34+
In CamelCase.
35+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3136
type: string
3237
metadata:
3338
type: object

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

Lines changed: 23 additions & 13 deletions
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.13.0
6+
controller-gen.kubebuilder.io/version: v0.14.0
77
name: globalconfigurations.k8s.nginx.org
88
spec:
99
group: k8s.nginx.org
@@ -22,14 +22,19 @@ spec:
2222
description: GlobalConfiguration defines the GlobalConfiguration resource.
2323
properties:
2424
apiVersion:
25-
description: 'APIVersion defines the versioned schema of this representation
26-
of an object. Servers should convert recognized schemas to the latest
27-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
25+
description: |-
26+
APIVersion defines the versioned schema of this representation of an object.
27+
Servers should convert recognized schemas to the latest internal value, and
28+
may reject unrecognized values.
29+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2830
type: string
2931
kind:
30-
description: 'Kind is a string value representing the REST resource this
31-
object represents. Servers may infer this from the endpoint the client
32-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
32+
description: |-
33+
Kind is a string value representing the REST resource this object represents.
34+
Servers may infer this from the endpoint the client submits requests to.
35+
Cannot be updated.
36+
In CamelCase.
37+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3338
type: string
3439
metadata:
3540
type: object
@@ -61,14 +66,19 @@ spec:
6166
description: GlobalConfiguration defines the GlobalConfiguration resource.
6267
properties:
6368
apiVersion:
64-
description: 'APIVersion defines the versioned schema of this representation
65-
of an object. Servers should convert recognized schemas to the latest
66-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
69+
description: |-
70+
APIVersion defines the versioned schema of this representation of an object.
71+
Servers should convert recognized schemas to the latest internal value, and
72+
may reject unrecognized values.
73+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
6774
type: string
6875
kind:
69-
description: 'Kind is a string value representing the REST resource this
70-
object represents. Servers may infer this from the endpoint the client
71-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
76+
description: |-
77+
Kind is a string value representing the REST resource this object represents.
78+
Servers may infer this from the endpoint the client submits requests to.
79+
Cannot be updated.
80+
In CamelCase.
81+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
7282
type: string
7383
metadata:
7484
type: object

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

Lines changed: 34 additions & 21 deletions
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.13.0
6+
controller-gen.kubebuilder.io/version: v0.14.0
77
name: policies.k8s.nginx.org
88
spec:
99
group: k8s.nginx.org
@@ -32,21 +32,27 @@ spec:
3232
resources.
3333
properties:
3434
apiVersion:
35-
description: 'APIVersion defines the versioned schema of this representation
36-
of an object. Servers should convert recognized schemas to the latest
37-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
35+
description: |-
36+
APIVersion defines the versioned schema of this representation of an object.
37+
Servers should convert recognized schemas to the latest internal value, and
38+
may reject unrecognized values.
39+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3840
type: string
3941
kind:
40-
description: 'Kind is a string value representing the REST resource this
41-
object represents. Servers may infer this from the endpoint the client
42-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
42+
description: |-
43+
Kind is a string value representing the REST resource this object represents.
44+
Servers may infer this from the endpoint the client submits requests to.
45+
Cannot be updated.
46+
In CamelCase.
47+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
4348
type: string
4449
metadata:
4550
type: object
4651
spec:
47-
description: PolicySpec is the spec of the Policy resource. The spec includes
48-
multiple fields, where each field represents a different policy. Only
49-
one policy (field) is allowed.
52+
description: |-
53+
PolicySpec is the spec of the Policy resource.
54+
The spec includes multiple fields, where each field represents a different policy.
55+
Only one policy (field) is allowed.
5056
properties:
5157
accessControl:
5258
description: AccessControl defines an access policy based on the source
@@ -62,8 +68,9 @@ spec:
6268
type: array
6369
type: object
6470
basicAuth:
65-
description: 'BasicAuth holds HTTP Basic authentication configuration
66-
policy status: preview'
71+
description: |-
72+
BasicAuth holds HTTP Basic authentication configuration
73+
policy status: preview
6774
properties:
6875
realm:
6976
type: string
@@ -223,21 +230,27 @@ spec:
< 370C /div>
223230
resources.
224231
properties:
225232
apiVersion:
226-
description: 'APIVersion defines the versioned schema of this representation
227-
of an object. Servers should convert recognized schemas to the latest
228-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
233+
description: |-
234+
APIVersion defines the versioned schema of this representation of an object.
235+
Servers should convert recognized schemas to the latest internal value, and
236+
may reject unrecognized values.
237+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
229238
type: string
230239
kind:
231-
description: 'Kind is a string value representing the REST resource this
232-
object represents. Servers may infer this from the endpoint the client
233-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
240+
description: |-
241+
Kind is a string value representing the REST resource this object represents.
242+
Servers may infer this from the endpoint the client submits requests to.
243+
Cannot be updated.
244+
In CamelCase.
245+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
234246
type: string
235247
metadata:
236248
type: object
237249
spec:
238-
description: PolicySpec is the spec of the Policy resource. The spec includes
239-
multiple fields, where each field represents a different policy. Only
240-
one policy (field) is allowed.
250+
description: |-
251+
PolicySpec is the spec of the Policy resource.
252+
The spec includes multiple fields, where each field represents a different policy.
253+
Only one policy (field) is allowed.
241254
properties:
242255
accessControl:
243256
description: AccessControl defines an access policy based on the source

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

Lines changed: 23 additions & 13 deletions
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.13.0
6+
controller-gen.kubebuilder.io/version: v0.14.0
77
name: transportservers.k8s.nginx.org
88
spec:
99
group: k8s.nginx.org
@@ -34,14 +34,19 @@ spec:
3434
description: TransportServer defines the TransportServer resource.
3535
properties:
3636
apiVersion:
37-
description: 'APIVersion defines the versioned schema of this representation
38-
of an object. Servers should convert recognized schemas to the latest
39-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
37+
description: |-
38+
APIVersion defines the versioned schema of this representation of an object.
39+
Servers should convert recognized schemas to the latest internal value, and
40+
may reject unrecognized values.
41+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
4042
type: string
4143
kind:
42-
description: 'Kind is a string value representing the REST resource this
43-
object represents. Servers may infer this from the endpoint the client
44-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
44+
description: |-
45+
Kind is a string value representing the REST resource this object represents.
46+
Servers may infer this from the endpoint the client submits requests to.
47+
Cannot be updated.
48+
In CamelCase.
49+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
4550
type: string
4651
metadata:
4752
type: object
@@ -186,14 +191,19 @@ spec:
186191
description: TransportServer defines the TransportServer resource.
187192
properties:
188193
apiVersion:
189-
description: 'APIVersion defines the versioned schema of this representation
190-
of an object. Servers should convert recognized schemas to the latest
191-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
194+
description: |-
195+
APIVersion defines the versioned schema of this representation of an object.
196+
Servers should convert recognized schemas to the latest internal value, and
197+
may reject unrecognized values.
198+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
192199
type: string
193200
kind:
194-
description: 'Kind is a string value representing the REST resource this
195-
object represents. Servers may infer this from the endpoint the client
196-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kin 370C ds'
201+
description: |-
202+
Kind is a string value representing the REST resource this object represents.
203+
Servers may infer this from the endpoint the client submits requests to.
204+
Cannot be updated.
205+
In CamelCase.
206+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
197207
type: string
198208
metadata:
199209
type: object

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

Lines changed: 12 additions & 7 deletions
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.13.0
6+
controller-gen.kubebuilder.io/version: v0.14.0
77
name: virtualserverroutes.k8s.nginx.org
88
spec:
99
group: k8s.nginx.org
@@ -44,14 +44,19 @@ spec:
4444
description: VirtualServerRoute defines the VirtualServerRoute resource.
4545
properties:
4646
apiVersion:
47-
description: 'APIVersion defines the versioned schema of this representation
48-
of an object. Servers should convert recognized schemas to the latest
49-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
47+
description: |-
48+
APIVersion defines the versioned schema of this representation of an object.
49+
Servers should convert recognized schemas to the latest internal value, and
50+
may reject unrecognized values.
51+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
5052
type: string
5153
kind:
52-
description: 'Kind is a string value representing the REST resource this
53-
object represents. Servers may infer this from the endpoint the client
54-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
54+
description: |-
55+
Kind is a string value representing the REST resource this object represents.
56+
Servers may infer this from the endpoint the client submits requests to.
57+
Cannot be updated.
58+
In CamelCase.
59+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
5560
type: string
5661
metadata:
5762
type: object

0 commit comments

Comments
 (0)
0