Skip to content

Commit

Permalink
feat: upgrade gateway-api-trait resources to GWAPI v0.6.0
Browse files Browse the repository at this point in the history
Signed-off-by: bitliu <[email protected]>
  • Loading branch information
Xunzhuo committed Jan 12, 2023
1 parent 524aeff commit 6730fb0
Show file tree
Hide file tree
Showing 15 changed files with 2,878 additions and 786 deletions.
1 change: 0 additions & 1 deletion experimental/addons/envoy-gateway/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@ deployTo:
runtimeCluster: true

system:
vela: ">=v1.5.0"
kubernetes: ">=v1.24"
8 changes: 4 additions & 4 deletions experimental/addons/gateway-traits/metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: gateway-traits
version: v0.0.1
description: traits(HttpRoute, HttpsRoute, tcpRoute) for gateway
name: gateway-api
version: v0.6.0
icon: https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/main/site-src/images/k8s-favicon.png
description: The GWAPI traits (Gateway, HTTPRoute, TLSRoute, TCPRoute, UDPRoute, GRPCRoute, ReferenceGrant) for API Gateway.

tags:
- Gateway
- Trait

deployTo:
controlPlane: true
Expand Down
14 changes: 8 additions & 6 deletions experimental/addons/gateway-traits/readme.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
# gateway-traits
# gateway-api

This addon provides traits(HttpRoute, HttpsRoute, tcpRoute) for gateway.
This addon provides GWAPI traits (Gateway, HTTPRoute, TLSRoute, TCPRoute, UDPRoute, GRPCRoute, ReferenceGrant) for API Gateway.

## Preconditions
## Usage

Enable one of the following plugins or use another gateway controller implementation.
Enable one of the following addons or use another gateway controller implementation. (listed in alphabetical order)

* traefik
* envoy-gateway

* istio-gateway

* istio-gateway
* traefik
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/1086
gateway.networking.k8s.io/bundle-version: v0.5.0
api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/1538
gateway.networking.k8s.io/bundle-version: v0.6.0
gateway.networking.k8s.io/channel: experimental
creationTimestamp: null
name: gatewayclasses.gateway.networking.k8s.io
Expand Down Expand Up @@ -34,6 +34,9 @@ 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
schema:
openAPIV3Schema:
Expand Down Expand Up @@ -87,7 +90,7 @@ spec:
resource, i.e. ConfigMap, or an implementation-specific custom resource.
The resource can be cluster-scoped or namespace-scoped. \n If the
referent cannot be found, the GatewayClass's \"InvalidParameters\"
status condition will be true. \n Support: Custom"
status condition will be true. \n Support: Implementation-specific"
properties:
group:
description: Group is the group of the referent.
Expand Down Expand Up @@ -135,7 +138,7 @@ spec:
default:
- lastTransitionTime: "1970-01-01T00:00:00Z"
message: Waiting for controller
reason: Waiting
reason: Pending
status: Unknown
type: Accepted
description: "Conditions is the current status from the controller
Expand All @@ -145,13 +148,14 @@ 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,
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 // other fields }"
\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
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
\t}"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
Expand Down Expand Up @@ -218,7 +222,7 @@ spec:
- spec
type: object
served: true
storage: true
storage: false
subresources:
status: {}
- additionalPrinterColumns:
Expand Down Expand Up @@ -288,7 +292,7 @@ spec:
resource, i.e. ConfigMap, or an implementation-specific custom resource.
The resource can be cluster-scoped or namespace-scoped. \n If the
referent cannot be found, the GatewayClass's \"InvalidParameters\"
status condition will be true. \n Support: Custom"
status condition will be true. \n Support: Implementation-specific"
properties:
group:
description: Group is the group of the referent.
Expand Down Expand Up @@ -336,7 +340,7 @@ spec:
default:
- lastTransitionTime: "1970-01-01T00:00:00Z"
message: Waiting for controller
reason: Waiting
reason: Pending
status: Unknown
type: Accepted
description: "Conditions is the current status from the controller
Expand All @@ -346,13 +350,14 @@ 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,
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 // other fields }"
\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
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
protobuf:\"bytes,1,rep,name=conditions\"` \n \t // other fields
\t}"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
Expand Down Expand Up @@ -419,12 +424,12 @@ spec:
- spec
type: object
served: true
storage: false
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
storedVersions: []
Loading

0 comments on commit 6730fb0

Please sign in to comment.