Add GroupKind from Kubernetes Apimachinery metav1 to Kubernetes Model Core

Signed-off-by: Rohan Kumar <[email protected]>

Author: rohanKanojia

kubernetes-model-generator/kubernetes-model-core/cmd/generate/generate.go

@@ -55,6 +55,7 @@ type Schema struct {
 	Time                 metav1.Time
 	MicroTime            metav1.MicroTime
 	RootPaths            metav1.RootPaths
+	GroupKind            metav1.GroupKind
 	GroupVersionKind     metav1.GroupVersionKind
 	GroupVersionResource metav1.GroupVersionResource
 	Quantity             resource.Quantity

kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/GroupKind.java

@@ -0,0 +1,93 @@
+
+package io.fabric8.kubernetes.api.model;
+
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import io.sundr.builder.annotations.Buildable;
+import lombok.EqualsAndHashCode;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "apiVersion",
+    "kind",
+    "metadata",
+    "group"
+})
+@ToString
+@EqualsAndHashCode
+@Setter
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder")
+public class GroupKind implements KubernetesResource
+{
+
+    @JsonProperty("group")
+    private String group;
+    @JsonProperty("kind")
+    private String kind;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public GroupKind() {
+    }
+
+    /**
+     * 
+     * @param kind
+     * @param group
+     */
+    public GroupKind(String group, String kind) {
+        super();
+        this.group = group;
+        this.kind = kind;
+    }
+
+    @JsonProperty("group")
+    public String getGroup() {
+        return group;
+    }
+
+    @JsonProperty("group")
+    public void setGroup(String group) {
+        this.group = group;
+    }
+
+    @JsonProperty("kind")
+    public String getKind() {
+        return kind;
+    }
+
+    @JsonProperty("kind")
+    public void setKind(String kind) {
+        this.kind = kind;
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+}

kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java

@@ -49,6 +49,7 @@
     "EventSeries",
     "EventSource",
     "GetOptions",
+    "GroupKind",
     "GroupVersionKind",
     "GroupVersionResource",
     "Info",
@@ -149,6 +150,8 @@ public class KubeSchema {
     private EventSource eventSource;
     @JsonProperty("GetOptions")
     private GetOptions getOptions;
+    @JsonProperty("GroupKind")
+    private GroupKind groupKind;
     @JsonProperty("GroupVersionKind")
     private GroupVersionKind groupVersionKind;
     @JsonProperty("GroupVersionResource")
@@ -249,6 +252,7 @@ public KubeSchema() {
      * @param secretList
      * @param info
      * @param deleteOptions
+     * @param groupKind
      * @param groupVersionResource
      * @param limitRangeList
      * @param toleration
@@ -299,7 +303,7 @@ public KubeSchema() {
      * @param endpointPort
      * @param config
      */
-    public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIResource aPIResource, APIResourceList aPIResourceList, APIService aPIService, APIServiceList aPIServiceList, BaseKubernetesList baseKubernetesList, Binding binding, ComponentStatus componentStatus, ComponentStatusList componentStatusList, Condition condition, Config config, ConfigMap configMap, ConfigMapList configMapList, ContainerStatus containerStatus, CreateOptions createOptions, DeleteOptions deleteOptions, EndpointPort endpointPort, Endpoints endpoints, EndpointsList endpointsList, EnvVar envVar, Event event, EventList eventList, EventSeries eventSeries, EventSource eventSource, GetOptions getOptions, GroupVersionKind groupVersionKind, GroupVersionResource groupVersionResource, Info info, LimitRangeList limitRangeList, ListOptions listOptions, MicroTime microTime, Namespace namespace, NamespaceList namespaceList, Node node, NodeList nodeList, ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, PersistentVolume persistentVolume, PersistentVolumeClaim persistentVolumeClaim, PersistentVolumeClaimList persistentVolumeClaimList, PersistentVolumeList persistentVolumeList, PodExecOptions podExecOptions, PodList podList, PodTemplateList podTemplateList, Quantity quantity, ReplicationControllerList replicationControllerList, ResourceQuota resourceQuota, ResourceQuotaList resourceQuotaList, RootPaths rootPaths, Secret secret, SecretList secretList, ServiceAccount serviceAccount, ServiceAccountList serviceAccountList, ServiceList serviceList, Status status, String time, Toleration toleration, TopologySelectorTerm topologySelectorTerm, TypeMeta typeMeta, UpdateOptions updateOptions, WatchEvent watchEvent) {
+    public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIResource aPIResource, APIResourceList aPIResourceList, APIService aPIService, APIServiceList aPIServiceList, BaseKubernetesList baseKubernetesList, Binding binding, ComponentStatus componentStatus, ComponentStatusList componentStatusList, Condition condition, Config config, ConfigMap configMap, ConfigMapList configMapList, ContainerStatus containerStatus, CreateOptions createOptions, DeleteOptions deleteOptions, EndpointPort endpointPort, Endpoints endpoints, EndpointsList endpointsList, EnvVar envVar, Event event, EventList eventList, EventSeries eventSeries, EventSource eventSource, GetOptions getOptions, GroupKind groupKind, GroupVersionKind groupVersionKind, GroupVersionResource groupVersionResource, Info info, LimitRangeList limitRangeList, ListOptions listOptions, MicroTime microTime, Namespace namespace, NamespaceList namespaceList, Node node, NodeList nodeList, ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, PersistentVolume persistentVolume, PersistentVolumeClaim persistentVolumeClaim, PersistentVolumeClaimList persistentVolumeClaimList, PersistentVolumeList persistentVolumeList, PodExecOptions podExecOptions, PodList podList, PodTemplateList podTemplateList, Quantity quantity, ReplicationControllerList replicationControllerList, ResourceQuota resourceQuota, ResourceQuotaList resourceQuotaList, RootPaths rootPaths, Secret secret, SecretList secretList, ServiceAccount serviceAccount, ServiceAccountList serviceAccountList, ServiceList serviceList, Status status, String time, Toleration toleration, TopologySelectorTerm topologySelectorTerm, TypeMeta typeMeta, UpdateOptions updateOptions, WatchEvent watchEvent) {
         super();
         this.aPIGroup = aPIGroup;
         this.aPIGroupList = aPIGroupList;
@@ -327,6 +331,7 @@ public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIResource aPIR
         this.eventSeries = eventSeries;
         this.eventSource = eventSource;
         this.getOptions = getOptions;
+        this.groupKind = groupKind;
         this.groupVersionKind = groupVersionKind;
         this.groupVersionResource = groupVersionResource;
         this.info = info;
@@ -626,6 +631,16 @@ public void setGetOptions(GetOptions getOptions) {
         this.getOptions = getOptions;
     }
 
+    @JsonProperty("GroupKind")
+    public GroupKind getGroupKind() {
+        return groupKind;
+    }
+
+    @JsonProperty("GroupKind")
+    public void setGroupKind(GroupKind groupKind) {
+        this.groupKind = groupKind;
+    }
+
     @JsonProperty("GroupVersionKind")
     public GroupVersionKind getGroupVersionKind() {
         return groupVersionKind;

kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json

@@ -447,6 +447,22 @@
         "io.fabric8.kubernetes.api.model.KubernetesResource"
       ]
     },
+    "kubernetes_apimachinery_pkg_apis_GroupKind": {
+      "type": "object",
+      "properties": {
+        "group": {
+          "type": "string"
+        },
+        "kind": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": true,
+      "javaType": "io.fabric8.kubernetes.api.model.GroupKind",
+      "javaInterfaces": [
+        "io.fabric8.kubernetes.api.model.KubernetesResource"
+      ]
+    },
     "kubernetes_apimachinery_pkg_apis_GroupVersionForDiscovery": {
       "type": "object",
       "properties": {
@@ -7661,6 +7677,10 @@
       "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_GetOptions",
       "existingJavaType": "io.fabric8.kubernetes.api.model.GetOptions"
     },
+    "GroupKind": {
+      "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_GroupKind",
+      "existingJavaType": "io.fabric8.kubernetes.api.model.GroupKind"
+    },
     "GroupVersionKind": {
       "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_GroupVersionKind",
       "existingJavaType": "io.fabric8.kubernetes.api.model.GroupVersionKind"

kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json

@@ -447,6 +447,22 @@
         "io.fabric8.kubernetes.api.model.KubernetesResource"
       ]
     },
+    "kubernetes_apimachinery_pkg_apis_GroupKind": {
+      "type": "object",
+      "properties": {
+        "group": {
+          "type": "string"
+        },
+        "kind": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": true,
+      "javaType": "io.fabric8.kubernetes.api.model.GroupKind",
+      "javaInterfaces": [
+        "io.fabric8.kubernetes.api.model.KubernetesResource"
+      ]
+    },
     "kubernetes_apimachinery_pkg_apis_GroupVersionForDiscovery": {
       "type": "object",
       "properties": {
@@ -7661,6 +7677,10 @@
       "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_GetOptions",
       "existingJavaType": "io.fabric8.kubernetes.api.model.GetOptions"
     },
+    "GroupKind": {
+      "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_GroupKind",
+      "existingJavaType": "io.fabric8.kubernetes.api.model.GroupKind"
+    },
     "GroupVersionKind": {
       "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_GroupVersionKind",
       "existingJavaType": "io.fabric8.kubernetes.api.model.GroupVersionKind"
@@ -9917,6 +9937,17 @@
       },
       "additionalProperties": true
     },
+    "groupkind": {
+      "properties": {
+        "group": {
+          "type": "string"
+        },
+        "kind": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": true
+    },
     "groupversionfordiscovery": {
       "properties": {
         "groupVersion": {