chore (kubernetes-model-gatewayapi) : Update Kubernetes Model Gateway…

…Api to v0.6.0 (#4804) + Update `sigs.k8s.io/gateway-api` dependency to v0.6.0 + v1alpha2 ReferencePolicy struct removed from model in favor of ReferenceGrant Signed-off-by: Rohan Kumar <[email protected]>
fabric8io · Feb 6, 2023 · 5bef8d5 · 5bef8d5
1 parent 9a83ebd
commit 5bef8d5
Show file tree

Hide file tree

Showing 60 changed files with 3,032 additions and 5,373 deletions.
diff --git a/kubernetes-model-generator/go.mod b/kubernetes-model-generator/go.mod
@@ -36,6 +36,7 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/docker/docker v20.10.2+incompatible // indirect
 	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
+	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
@@ -87,14 +88,12 @@ require (
 	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
 	k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
 	sigs.k8s.io/controller-runtime v0.12.1 // indirect
-	sigs.k8s.io/gateway-api v0.5.0
+	sigs.k8s.io/gateway-api v0.6.0
 	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
-        github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 )
 
-
 replace (
 	bitbucket.org/ww/goautoneg => github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d
 	github.com/IBM-Cloud/terraform-provider-ibm => github.com/openshift/terraform-provider-ibm v1.26.2-openshift-2

diff --git a/kubernetes-model-generator/go.sum b/kubernetes-model-generator/go.sum
diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/cmd/generate/generate.go b/kubernetes-model-generator/kubernetes-model-gatewayapi/cmd/generate/generate.go
@@ -41,20 +41,22 @@ type Schema struct {
   HTTPRouteList                            v1alpha2gwapi.HTTPRouteList
   ReferenceGrant                           v1alpha2gwapi.ReferenceGrant
   ReferenceGrantList                       v1alpha2gwapi.ReferenceGrantList
-  ReferencePolicy                          v1alpha2gwapi.ReferencePolicy
-  ReferencePolicyList                      v1alpha2gwapi.ReferencePolicyList
   TCPRoute                                 v1alpha2gwapi.TCPRoute
   TCPRouteList                             v1alpha2gwapi.TCPRouteList
   TLSRoute                                 v1alpha2gwapi.TLSRoute
   TLSRouteList                             v1alpha2gwapi.TLSRouteList
   UDPRoute                                 v1alpha2gwapi.UDPRoute
   UDPRouteList                             v1alpha2gwapi.UDPRouteList
+  GRPCRoute                                v1alpha2gwapi.GRPCRoute
+  GRPCRouteList                            v1alpha2gwapi.GRPCRouteList
   V1Beta1Gateway                           v1beta1gwapi.Gateway
   V1Beta1GatewayList                       v1beta1gwapi.GatewayList
   V1Beta1GatewayClass                      v1beta1gwapi.GatewayClass
   V1Beta1GatewayClassList                  v1beta1gwapi.GatewayClassList
   V1Beta1HTTPRoute                         v1beta1gwapi.HTTPRoute
   V1Beta1HTTPRouteList                     v1beta1gwapi.HTTPRouteList
+  V1Beta1ReferenceGrant                    v1beta1gwapi.ReferenceGrant
+  V1Beta1ReferenceGrantList                v1beta1gwapi.ReferenceGrantList
 }
 
 func main() {

diff --git a/...netes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/...netes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java
@@ -19,10 +19,8 @@
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.fabric8.kubernetes.api.model.PodTemplateSpec;
 import io.fabric8.kubernetes.api.model.ResourceRequirements;
-import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrant;
-import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrantList;
-import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferencePolicy;
-import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferencePolicyList;
+import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GRPCRoute;
+import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GRPCRouteList;
 import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.TCPRoute;
 import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.TCPRouteList;
 import io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.TLSRoute;
@@ -42,6 +40,8 @@
     "apiVersion",
     "kind",
     "metadata",
+    "GRPCRoute",
+    "GRPCRouteList",
     "Gateway",
     "GatewayClass",
     "GatewayClassList",
@@ -50,8 +50,6 @@
     "HTTPRouteList",
     "ReferenceGrant",
     "ReferenceGrantList",
-    "ReferencePolicy",
-    "ReferencePolicyList",
     "TCPRoute",
     "TCPRouteList",
     "TLSRoute",
@@ -63,7 +61,9 @@
     "V1Beta1GatewayClassList",
     "V1Beta1GatewayList",
     "V1Beta1HTTPRoute",
-    "V1Beta1HTTPRouteList"
+    "V1Beta1HTTPRouteList",
+    "V1Beta1ReferenceGrant",
+    "V1Beta1ReferenceGrantList"
 })
 @ToString
 @EqualsAndHashCode
@@ -85,6 +85,10 @@
 })
 public class KubeSchema {
 
+    @JsonProperty("GRPCRoute")
+    private GRPCRoute gRPCRoute;
+    @JsonProperty("GRPCRouteList")
+    private GRPCRouteList gRPCRouteList;
     @JsonProperty("Gateway")
     private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.Gateway gateway;
     @JsonProperty("GatewayClass")
@@ -98,13 +102,9 @@ public class KubeSchema {
     @JsonProperty("HTTPRouteList")
     private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRouteList hTTPRouteList;
     @JsonProperty("ReferenceGrant")
-    private ReferenceGrant referenceGrant;
+    private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrant referenceGrant;
     @JsonProperty("ReferenceGrantList")
-    private ReferenceGrantList referenceGrantList;
-    @JsonProperty("ReferencePolicy")
-    private ReferencePolicy referencePolicy;
-    @JsonProperty("ReferencePolicyList")
-    private ReferencePolicyList referencePolicyList;
+    private io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrantList referenceGrantList;
     @JsonProperty("TCPRoute")
     private TCPRoute tCPRoute;
     @JsonProperty("TCPRouteList")
@@ -129,6 +129,10 @@ public class KubeSchema {
     private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRoute v1Beta1HTTPRoute;
     @JsonProperty("V1Beta1HTTPRouteList")
     private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRouteList v1Beta1HTTPRouteList;
+    @JsonProperty("V1Beta1ReferenceGrant")
+    private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrant v1Beta1ReferenceGrant;
+    @JsonProperty("V1Beta1ReferenceGrantList")
+    private io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrantList v1Beta1ReferenceGrantList;
     @JsonIgnore
     private Map<String, Object> additionalProperties = new HashMap<String, Object>();
 
@@ -143,29 +147,33 @@ public KubeSchema() {
      * 
      * @param gatewayClassList
      * @param v1Beta1HTTPRoute
+     * @param gRPCRoute
+     * @param v1Beta1ReferenceGrantList
      * @param uDPRoute
      * @param v1Beta1Gateway
-     * @param referencePolicy
      * @param v1Beta1GatewayClassList
      * @param gatewayList
      * @param tLSRouteList
      * @param tCPRoute
      * @param v1Beta1HTTPRouteList
      * @param hTTPRouteList
+     * @param v1Beta1ReferenceGrant
+     * @param gRPCRouteList
      * @param tLSRoute
      * @param v1Beta1GatewayClass
      * @param uDPRouteList
      * @param hTTPRoute
      * @param referenceGrantList
      * @param gatewayClass
-     * @param referencePolicyList
      * @param v1Beta1GatewayList
      * @param referenceGrant
      * @param gateway
      * @param tCPRouteList
      */
-    public KubeSchema(io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.Gateway gateway, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClass gatewayClass, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClassList gatewayClassList, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayList gatewayList, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRoute hTTPRoute, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRouteList hTTPRouteList, ReferenceGrant referenceGrant, ReferenceGrantList referenceGrantList, ReferencePolicy referencePolicy, ReferencePolicyList referencePolicyList, TCPRoute tCPRoute, TCPRouteList tCPRouteList, TLSRoute tLSRoute, TLSRouteList tLSRouteList, UDPRoute uDPRoute, UDPRouteList uDPRouteList, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.Gateway v1Beta1Gateway, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClass v1Beta1GatewayClass, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClassList v1Beta1GatewayClassList, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayList v1Beta1GatewayList, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRoute v1Beta1HTTPRoute, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRouteList v1Beta1HTTPRouteList) {
+    public KubeSchema(GRPCRoute gRPCRoute, GRPCRouteList gRPCRouteList, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.Gateway gateway, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClass gatewayClass, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClassList gatewayClassList, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayList gatewayList, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRoute hTTPRoute, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRouteList hTTPRouteList, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrant referenceGrant, io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrantList referenceGrantList, TCPRoute tCPRoute, TCPRouteList tCPRouteList, TLSRoute tLSRoute, TLSRouteList tLSRouteList, UDPRoute uDPRoute, UDPRouteList uDPRouteList, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.Gateway v1Beta1Gateway, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClass v1Beta1GatewayClass, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClassList v1Beta1GatewayClassList, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayList v1Beta1GatewayList, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRoute v1Beta1HTTPRoute, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRouteList v1Beta1HTTPRouteList, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrant v1Beta1ReferenceGrant, io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrantList v1Beta1ReferenceGrantList) {
         super();
+        this.gRPCRoute = gRPCRoute;
+        this.gRPCRouteList = gRPCRouteList;
         this.gateway = gateway;
         this.gatewayClass = gatewayClass;
         this.gatewayClassList = gatewayClassList;
@@ -174,8 +182,6 @@ public KubeSchema(io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.Gateway ga
         this.hTTPRouteList = hTTPRouteList;
         this.referenceGrant = referenceGrant;
         this.referenceGrantList = referenceGrantList;
-        this.referencePolicy = referencePolicy;
-        this.referencePolicyList = referencePolicyList;
         this.tCPRoute = tCPRoute;
         this.tCPRouteList = tCPRouteList;
         this.tLSRoute = tLSRoute;
@@ -188,6 +194,28 @@ public KubeSchema(io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.Gateway ga
         this.v1Beta1GatewayList = v1Beta1GatewayList;
         this.v1Beta1HTTPRoute = v1Beta1HTTPRoute;
         this.v1Beta1HTTPRouteList = v1Beta1HTTPRouteList;
+        this.v1Beta1ReferenceGrant = v1Beta1ReferenceGrant;
+        this.v1Beta1ReferenceGrantList = v1Beta1ReferenceGrantList;
+    }
+
+    @JsonProperty("GRPCRoute")
+    public GRPCRoute getGRPCRoute() {
+        return gRPCRoute;
+    }
+
+    @JsonProperty("GRPCRoute")
+    public void setGRPCRoute(GRPCRoute gRPCRoute) {
+        this.gRPCRoute = gRPCRoute;
+    }
+
+    @JsonProperty("GRPCRouteList")
+    public GRPCRouteList getGRPCRouteList() {
+        return gRPCRouteList;
+    }
+
+    @JsonProperty("GRPCRouteList")
+    public void setGRPCRouteList(GRPCRouteList gRPCRouteList) {
+        this.gRPCRouteList = gRPCRouteList;
     }
 
     @JsonProperty("Gateway")
@@ -251,45 +279,25 @@ public void setHTTPRouteList(io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2
     }
 
     @JsonProperty("ReferenceGrant")
-    public ReferenceGrant getReferenceGrant() {
+    public io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrant getReferenceGrant() {
         return referenceGrant;
     }
 
     @JsonProperty("ReferenceGrant")
-    public void setReferenceGrant(ReferenceGrant referenceGrant) {
+    public void setReferenceGrant(io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrant referenceGrant) {
         this.referenceGrant = referenceGrant;
     }
 
     @JsonProperty("ReferenceGrantList")
-    public ReferenceGrantList getReferenceGrantList() {
+    public io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrantList getReferenceGrantList() {
         return referenceGrantList;
     }
 
     @JsonProperty("ReferenceGrantList")
-    public void setReferenceGrantList(ReferenceGrantList referenceGrantList) {
+    public void setReferenceGrantList(io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrantList referenceGrantList) {
         this.referenceGrantList = referenceGrantList;
     }
 
-    @JsonProperty("ReferencePolicy")
-    public ReferencePolicy getReferencePolicy() {
-        return referencePolicy;
-    }
-
-    @JsonProperty("ReferencePolicy")
-    public void setReferencePolicy(ReferencePolicy referencePolicy) {
-        this.referencePolicy = referencePolicy;
-    }
-
-    @JsonProperty("ReferencePolicyList")
-    public ReferencePolicyList getReferencePolicyList() {
-        return referencePolicyList;
-    }
-
-    @JsonProperty("ReferencePolicyList")
-    public void setReferencePolicyList(ReferencePolicyList referencePolicyList) {
-        this.referencePolicyList = referencePolicyList;
-    }
-
     @JsonProperty("TCPRoute")
     public TCPRoute getTCPRoute() {
         return tCPRoute;
@@ -410,6 +418,26 @@ public void setV1Beta1HTTPRouteList(io.fabric8.kubernetes.api.model.gatewayapi.v
         this.v1Beta1HTTPRouteList = v1Beta1HTTPRouteList;
     }
 
+    @JsonProperty("V1Beta1ReferenceGrant")
+    public io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrant getV1Beta1ReferenceGrant() {
+        return v1Beta1ReferenceGrant;
+    }
+
+    @JsonProperty("V1Beta1ReferenceGrant")
+    public void setV1Beta1ReferenceGrant(io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrant v1Beta1ReferenceGrant) {
+        this.v1Beta1ReferenceGrant = v1Beta1ReferenceGrant;
+    }
+
+    @JsonProperty("V1Beta1ReferenceGrantList")
+    public io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrantList getV1Beta1ReferenceGrantList() {
+        return v1Beta1ReferenceGrantList;
+    }
+
+    @JsonProperty("V1Beta1ReferenceGrantList")
+    public void setV1Beta1ReferenceGrantList(io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrantList v1Beta1ReferenceGrantList) {
+        this.v1Beta1ReferenceGrantList = v1Beta1ReferenceGrantList;
+    }
+
     @JsonAnyGetter
     public Map<String, Object> getAdditionalProperties() {
         return this.additionalProperties;