Skip to content

Commit

Permalink
NE-1716: Bump Gateway API to v1.0.0
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@candita
candita committed Oct 30, 2024
1 parent 8126a2f commit 92649ef
Show file tree
Hide file tree
Showing 12 changed files with 3,025 additions and 828 deletions.
55 changes: 29 additions & 26 deletions pkg/manifests/assets/gateway-api/gateway.networking.k8s.io_gatewayclasses.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/1538
gateway.networking.k8s.io/bundle-version: v0.6.2
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2466
gateway.networking.k8s.io/bundle-version: v1.0.0
gateway.networking.k8s.io/channel: standard
creationTimestamp: null
name: gatewayclasses.gateway.networking.k8s.io
Expand Down Expand Up @@ -34,10 +34,7 @@ spec:
name: Description
priority: 1
type: string
deprecated: true
deprecationWarning: The v1alpha2 version of GatewayClass has been deprecated and
will be removed in a future release of the API. Please upgrade to v1beta1.
name: v1alpha2
name: v1
schema:
openAPIV3Schema:
description: "GatewayClass describes a class of Gateways available to the
Expand All @@ -49,7 +46,7 @@ spec:
to GatewayClass or associated parameters. If implementations choose to propagate
GatewayClass changes to existing Gateways, that MUST be clearly documented
by the implementation. \n Whenever one or more Gateways are using a GatewayClass,
implementations MUST add the `gateway-exists-finalizer.gateway.networking.k8s.io`
implementations SHOULD add the `gateway-exists-finalizer.gateway.networking.k8s.io`
finalizer on the associated GatewayClass. This ensures that a GatewayClass
associated with a Gateway is not deleted while in use. \n GatewayClass is
a Cluster level resource."
Expand Down Expand Up @@ -78,6 +75,9 @@ spec:
minLength: 1
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*\/[A-Za-z0-9\/\-._~%!$&'()*+,;=:]+$
type: string
x-kubernetes-validations:
- message: Value is immutable
rule: self == oldSelf
description:
description: Description helps describe a GatewayClass with more details.
maxLength: 64
Expand Down Expand Up @@ -132,7 +132,9 @@ spec:
reason: Waiting
status: Unknown
type: Accepted
description: Status defines the current state of GatewayClass.
description: "Status defines the current state of GatewayClass. \n Implementations
MUST populate status on all GatewayClass resources which specify their
controller name."
properties:
conditions:
default:
Expand All @@ -148,14 +150,12 @@ spec:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
\n \ttype FooStatus struct{ \t // Represents the observations
of a foo's current state. \t // Known .status.conditions.type
are: \"Available\", \"Progressing\", and \"Degraded\" \t //
+patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
\t // +listMapKey=type \t Conditions []metav1.Condition
\n type FooStatus struct{ // Represents the observations of a
foo's current state. // Known .status.conditions.type are: \"Available\",
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
// +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
\t}"
protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
Expand Down Expand Up @@ -251,7 +251,7 @@ spec:
to GatewayClass or associated parameters. If implementations choose to propagate
GatewayClass changes to existing Gateways, that MUST be clearly documented
by the implementation. \n Whenever one or more Gateways are using a GatewayClass,
implementations MUST add the `gateway-exists-finalizer.gateway.networking.k8s.io`
implementations SHOULD add the `gateway-exists-finalizer.gateway.networking.k8s.io`
finalizer on the associated GatewayClass. This ensures that a GatewayClass
associated with a Gateway is not deleted while in use. \n GatewayClass is
a Cluster level resource."
Expand Down Expand Up @@ -280,6 +280,9 @@ spec:
minLength: 1
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*\/[A-Za-z0-9\/\-._~%!$&'()*+,;=:]+$
type: string
x-kubernetes-validations:
- message: Value is immutable
rule: self == oldSelf
description:
description: Description helps describe a GatewayClass with more details.
maxLength: 64
Expand Down Expand Up @@ -334,7 +337,9 @@ spec:
reason: Waiting
status: Unknown
type: Accepted
description: Status defines the current state of GatewayClass.
description: "Status defines the current state of GatewayClass. \n Implementations
MUST populate status on all GatewayClass resources which specify their
controller name."
properties:
conditions:
default:
Expand All @@ -350,14 +355,12 @@ spec:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
\n \ttype FooStatus struct{ \t // Represents the observations
of a foo's current state. \t // Known .status.conditions.type
are: \"Available\", \"Progressing\", and \"Degraded\" \t //
+patchMergeKey=type \t // +patchStrategy=merge \t // +listType=map
\t // +listMapKey=type \t Conditions []metav1.Condition
\n type FooStatus struct{ // Represents the observations of a
foo's current state. // Known .status.conditions.type are: \"Available\",
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
// +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
\t}"
protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
Expand Down Expand Up @@ -431,5 +434,5 @@ status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
conditions: null
storedVersions: null
Loading

0 comments on commit 92649ef

Please sign in to comment.