Skip to content

Commit 92649ef

Browse files
canditacandita
committed
NE-1716: Bump Gateway API to v1.0.0
Update CRDS to version 1.0.0: - pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_gatewayclasses.yaml - pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_gateways.yaml - pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_httproutes.yaml - pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_referencegrants.yaml Update imports to v1: - pkg/operator/client/client.go - pkg/operator/controller/gateway-service-dns/controller.go - pkg/operator/controller/gateway-service-dns/controller_test.go - pkg/operator/controller/gatewayclass/controller.go: also update the predicate that excludes Istio objects. - pkg/operator/controller/gatewayclass/servicemeshcontrolplane.go: also update the OSSM version from 2.5 to 2.6. - pkg/operator/controller/names.go - test/e2e/gateway_api_test.go - test/e2e/util_gatewayapi_test.go
1 parent 8126a2f commit 92649ef

File tree

12 files changed

+3025
-828
lines changed

12 files changed

+3025
-828
lines changed

‎pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_gatewayclasses.yaml‎

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/1538
6-
gateway.networking.k8s.io/bundle-version: v0.6.2
5+
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2466
6+
gateway.networking.k8s.io/bundle-version: v1.0.0
77
gateway.networking.k8s.io/channel: standard
88
creationTimestamp: null
99
name: gatewayclasses.gateway.networking.k8s.io
@@ -34,10 +34,7 @@ spec:
3434
name: Description
3535
priority: 1
3636
type: string
37-
deprecated: true
38-
deprecationWarning: The v1alpha2 version of GatewayClass has been deprecated and
39-
will be removed in a future release of the API. Please upgrade to v1beta1.
40-
name: v1alpha2
37+
name: v1
4138
schema:
4239
openAPIV3Schema:
4340
description: "GatewayClass describes a class of Gateways available to the
@@ -49,7 +46,7 @@ spec:
4946
to GatewayClass or associated parameters. If implementations choose to propagate
5047
GatewayClass changes to existing Gateways, that MUST be clearly documented
5148
by the implementation. \n Whenever one or more Gateways are using a GatewayClass,
52-
implementations MUST add the `gateway-exists-finalizer.gateway.networking.k8s.io`
49+
implementations SHOULD add the `gateway-exists-finalizer.gateway.networking.k8s.io`
5350
finalizer on the associated GatewayClass. This ensures that a GatewayClass
5451
associated with a Gateway is not deleted while in use. \n GatewayClass is
5552
a Cluster level resource."
@@ -78,6 +75,9 @@ spec:
7875
minLength: 1
7976
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*\/[A-Za-z0-9\/\-._~%!$&'()*+,;=:]+$
8077
type: string
78+
x-kubernetes-validations:
79+
- message: Value is immutable
80+
rule: self == oldSelf
8181
description:
8282
description: Description helps describe a GatewayClass with more details.
8383
maxLength: 64
@@ -132,7 +132,9 @@ spec:
132132
reason: Waiting
133133
status: Unknown
134134
type: Accepted
135-
description: Status defines the current state of GatewayClass.
135+
description: "Status defines the current state of GatewayClass. \n Implementations
136+
MUST populate status on all GatewayClass resources which specify their
137+
controller name."
136138
properties:
137139
conditions:
138140
default:
@@ -148,14 +150,12 @@ spec:
148150
description: "Condition contains details for one aspect of the current
149151
state of this API Resource. --- This struct is intended for direct
150152
use as an array at the field path .status.conditions. For example,
151-
\n \ttype FooStatus struct{ \t // Represents the observations
152-
of a foo's current state. \t // Known .status.conditions.type
153-
are: \"Available\", \"Progressing\", and \"Degraded\" \t //
154-
+patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
155-
\t // +listMapKey=type \t Conditions []metav1.Condition
153+
\n type FooStatus struct{ // Represents the observations of a
154+
foo's current state. // Known .status.conditions.type are: \"Available\",
155+
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
156+
// +listType=map // +listMapKey=type Conditions []metav1.Condition
156157
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
157-
protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
158-
\t}"
158+
protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
159159
properties:
160160
lastTransitionTime:
161161
description: lastTransitionTime is the last time the condition
@@ -251,7 +251,7 @@ spec:
251251
to GatewayClass or associated parameters. If implementations choose to propagate
252252
GatewayClass changes to existing Gateways, that MUST be clearly documented
253253
by the implementation. \n Whenever one or more Gateways are using a GatewayClass,
254-
implementations MUST add the `gateway-exists-finalizer.gateway.networking.k8s.io`
254+
implementations SHOULD add the `gateway-exists-finalizer.gateway.networking.k8s.io`
255255
finalizer on the associated GatewayClass. This ensures that a GatewayClass
256256
associated with a Gateway is not deleted while in use. \n GatewayClass is
257257
a Cluster level resource."
@@ -280,6 +280,9 @@ spec:
280280
minLength: 1
281281
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*\/[A-Za-z0-9\/\-._~%!$&'()*+,;=:]+$
282282
type: string
283+
x-kubernetes-validations:
284+
- message: Value is immutable
285+
rule: self == oldSelf
283286
description:
284287
description: Description helps describe a GatewayClass with more details.
285288
maxLength: 64
@@ -334,7 +337,9 @@ spec:
334337
reason: Waiting
335338
status: Unknown
336339
type: Accepted
337-
description: Status defines the current state of GatewayClass.
340+
description: "Status defines the current state of GatewayClass. \n Implementations
341+
MUST populate status on all GatewayClass resources which specify their
342+
controller name."
338343
properties:
339344
conditions:
340345
default:
@@ -350,14 +355,12 @@ spec:
350355
description: "Condition contains details for one aspect of the current
351356
state of this API Resource. --- This struct is intended for direct
352357
use as an array at the field path .status.conditions. For example,
353-
\n \ttype FooStatus struct{ \t // Represents the observations
354-
of a foo's current state. \t // Known .status.conditions.type
355-
are: \"Available\", \"Progressing\", and \"Degraded\" \t //
356-
+patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
357-
\t // +listMapKey=type \t Conditions []metav1.Condition
358+
\n type FooStatus struct{ // Represents the observations of a
359+
foo's current state. // Known .status.conditions.type are: \"Available\",
360+
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
361+
// +listType=map // +listMapKey=type Conditions []metav1.Condition
358362
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
359-
protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
360-
\t}"
363+
protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
361364
properties:
362365
lastTransitionTime:
363366
description: lastTransitionTime is the last time the condition
@@ -431,5 +434,5 @@ status:
431434
acceptedNames:
432435
kind: ""
433436
plural: ""
434-
conditions: []
435-
storedVersions: []
437+
conditions: null
438+
storedVersions: null

0 commit comments

Comments
 (0)