feat: upgrade gateway-api-trait resources to GWAPI v0.6.0

Signed-off-by: bitliu <[email protected]>
kubevela · Jan 12, 2023 · 6730fb0 · 6730fb0
1 parent 524aeff
commit 6730fb0
Show file tree

Hide file tree

Showing 15 changed files with 2,878 additions and 786 deletions.
diff --git a/experimental/addons/envoy-gateway/metadata.yaml b/experimental/addons/envoy-gateway/metadata.yaml
@@ -11,5 +11,4 @@ deployTo:
   runtimeCluster: true
 
 system:
-  vela: ">=v1.5.0"
   kubernetes: ">=v1.24"
diff --git a/experimental/addons/gateway-traits/metadata.yaml b/experimental/addons/gateway-traits/metadata.yaml
@@ -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

diff --git a/experimental/addons/gateway-traits/readme.md b/experimental/addons/gateway-traits/readme.md
@@ -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
diff --git a/...y-traits/resources/crds/gatewayclass.yaml → ...way.networking.k8s.io_gatewayclasses.yaml b/...y-traits/resources/crds/gatewayclass.yaml → ...way.networking.k8s.io_gatewayclasses.yaml
@@ -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
@@ -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:
@@ -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.
@@ -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
@@ -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
@@ -218,7 +222,7 @@ spec:
         - spec
         type: object
     served: true
-    storage: true
+    storage: false
     subresources:
       status: {}
   - additionalPrinterColumns:
@@ -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.
@@ -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
@@ -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
@@ -419,12 +424,12 @@ spec:
         - spec
         type: object
     served: true
-    storage: false
+    storage: true
     subresources:
       status: {}
 status:
   acceptedNames:
     kind: ""
     plural: ""
   conditions: []
-  storedVersions: []
+  storedVersions: []