refactor: openshift-model-miscellaneous generated from OpenAPI schemas

kubernetes-model-generator/kubernetes-model-core/pom.xml

@@ -142,15 +142,12 @@
               <settings combine.self="append">
                 <addBuildableReferences>false</addBuildableReferences>
                 <schemas>
+                  <schema>${project.basedir}/../openapi/schemas/cluster-api.json</schema>
                   <schema>${openapi.schema.kubernetes-latest}</schema>
+                  <schema>${project.basedir}/../openapi/schemas/admission-registration.json</schema>
                   <schema>${project.basedir}/../openapi/schemas/api-machinery-extra.json</schema>
                   <schema>${project.basedir}/../openapi/schemas/kubernetes-config.json</schema>
-                  <schema>${project.basedir}/../openapi/schemas/admission-registration.json</schema>
                 </schemas>
-                <packageMappings combine.self="append">
-                  <io.k8s.client-go.tools.clientcmd.api.v1>io.fabric8.kubernetes.api.model</io.k8s.client-go.tools.clientcmd.api.v1>
-                  <io.k8s.kube-aggregator.pkg.apis.apiregistration.v1>io.fabric8.kubernetes.api.model</io.k8s.kube-aggregator.pkg.apis.apiregistration.v1>
-                </packageMappings>
                 <skipGenerationRegexes>
                   <skipGenerationRegex>^io\.k8s\.apimachinery\.pkg\.runtime\.RawExtension$</skipGenerationRegex>
                 </skipGenerationRegexes>
@@ -159,6 +156,7 @@
                   <includeGenerationRegex>^io\.k8s\.apimachinery\..*$</includeGenerationRegex>
                   <includeGenerationRegex>^io\.k8s\.kube-aggregator\.pkg\.apis\.apiregistration\..*$</includeGenerationRegex>
                   <includeGenerationRegex>^io\.k8s\.client-go\.tools\.clientcmd\.api\.v1\..*$</includeGenerationRegex>
+                  <includeGenerationRegex>^io\.k8s\.sigs\.cluster-api\.api\..*$</includeGenerationRegex>
                 </includeGenerationRegexes>
               </settings>
             </configuration>

kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/clusterapi/v1beta1/Bootstrap.java

@@ -0,0 +1,103 @@
+
+package io.fabric8.kubernetes.api.model.clusterapi.v1beta1;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+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.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.ObjectReference;
+import io.sundr.builder.annotations.Buildable;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+    "configRef",
+    "dataSecretName"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder")
+@Generated("jsonschema2pojo")
+public class Bootstrap implements Editable<BootstrapBuilder> , KubernetesResource
+{
+
+    @JsonProperty("configRef")
+    private ObjectReference configRef;
+    @JsonProperty("dataSecretName")
+    private String dataSecretName;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public Bootstrap() {
+    }
+
+    public Bootstrap(ObjectReference configRef, String dataSecretName) {
+        super();
+        this.configRef = configRef;
+        this.dataSecretName = dataSecretName;
+    }
+
+    @JsonProperty("configRef")
+    public ObjectReference getConfigRef() {
+        return configRef;
+    }
+
+    @JsonProperty("configRef")
+    public void setConfigRef(ObjectReference configRef) {
+        this.configRef = configRef;
+    }
+
+    @JsonProperty("dataSecretName")
+    public String getDataSecretName() {
+        return dataSecretName;
+    }
+
+    @JsonProperty("dataSecretName")
+    public void setDataSecretName(String dataSecretName) {
+        this.dataSecretName = dataSecretName;
+    }
+
+    @JsonIgnore
+    public BootstrapBuilder edit() {
+        return new BootstrapBuilder(this);
+    }
+
+    @JsonIgnore
+    public BootstrapBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}

kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/ProvisioningStatusConditions.java → kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/clusterapi/v1beta1/Condition.java

@@ -1,5 +1,5 @@
 
-package io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1;
+package io.fabric8.kubernetes.api.model.clusterapi.v1beta1;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -12,18 +12,8 @@
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.fabric8.kubernetes.api.builder.Editable;
-import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.IntOrString;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
-import io.fabric8.kubernetes.api.model.LabelSelector;
-import io.fabric8.kubernetes.api.model.LocalObjectReference;
-import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.api.model.ObjectReference;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PodTemplateSpec;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
 import io.sundr.builder.annotations.Buildable;
-import io.sundr.builder.annotations.BuildableReference;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import lombok.experimental.Accessors;
@@ -34,6 +24,7 @@
     "lastTransitionTime",
     "message",
     "reason",
+    "severity",
     "status",
     "type"
 })
@@ -43,19 +34,9 @@
     "_",
     ""
 })
-@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
-    @BuildableReference(ObjectMeta.class),
-    @BuildableReference(LabelSelector.class),
-    @BuildableReference(Container.class),
-    @BuildableReference(PodTemplateSpec.class),
-    @BuildableReference(ResourceRequirements.class),
-    @BuildableReference(IntOrString.class),
-    @BuildableReference(ObjectReference.class),
-    @BuildableReference(LocalObjectReference.class),
-    @BuildableReference(PersistentVolumeClaim.class)
-})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder")
 @Generated("jsonschema2pojo")
-public class ProvisioningStatusConditions implements Editable<ProvisioningStatusConditionsBuilder> , KubernetesResource
+public class Condition implements Editable<ConditionBuilder> , KubernetesResource
 {
 
     @JsonProperty("lastTransitionTime")
@@ -64,6 +45,8 @@ public class ProvisioningStatusConditions implements Editable<ProvisioningStatus
     private String message;
     @JsonProperty("reason")
     private String reason;
+    @JsonProperty("severity")
+    private String severity;
     @JsonProperty("status")
     private String status;
     @JsonProperty("type")
@@ -75,14 +58,15 @@ public class ProvisioningStatusConditions implements Editable<ProvisioningStatus
      * No args constructor for use in serialization
      * 
      */
-    public ProvisioningStatusConditions() {
+    public Condition() {
     }
 
-    public ProvisioningStatusConditions(String lastTransitionTime, String message, String reason, String status, String type) {
+    public Condition(String lastTransitionTime, String message, String reason, String severity, String status, String type) {
         super();
         this.lastTransitionTime = lastTransitionTime;
         this.message = message;
         this.reason = reason;
+        this.severity = severity;
         this.status = status;
         this.type = type;
     }
@@ -117,6 +101,16 @@ public void setReason(String reason) {
         this.reason = reason;
     }
 
+    @JsonProperty("severity")
+    public String getSeverity() {
+        return severity;
+    }
+
+    @JsonProperty("severity")
+    public void setSeverity(String severity) {
+        this.severity = severity;
+    }
+
     @JsonProperty("status")
     public String getStatus() {
         return status;
@@ -138,12 +132,12 @@ public void setType(String type) {
     }
 
     @JsonIgnore
-    public ProvisioningStatusConditionsBuilder edit() {
-        return new ProvisioningStatusConditionsBuilder(this);
+    public ConditionBuilder edit() {
+        return new ConditionBuilder(this);
     }
 
     @JsonIgnore
-    public ProvisioningStatusConditionsBuilder toBuilder() {
+    public ConditionBuilder toBuilder() {
         return edit();
     }
 

kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/clusterapi/v1beta1/Machine.java

@@ -0,0 +1,145 @@
+
+package io.fabric8.kubernetes.api.model.clusterapi.v1beta1;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.annotation.Generated;
+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.fabric8.kubernetes.api.builder.Editable;
+import io.fabric8.kubernetes.api.model.KubernetesResource;
+import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.sundr.builder.annotations.Buildable;
+import lombok.EqualsAndHashCode;
+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",
+    "spec",
+    "status"
+})
+@ToString
+@EqualsAndHashCode
+@Accessors(prefix = {
+    "_",
+    ""
+})
+@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder")
+@Generated("jsonschema2pojo")
+public class Machine implements Editable<MachineBuilder> , KubernetesResource
+{
+
+    @JsonProperty("apiVersion")
+    private String apiVersion;
+    @JsonProperty("kind")
+    private String kind;
+    @JsonProperty("metadata")
+    private ObjectMeta metadata;
+    @JsonProperty("spec")
+    private MachineSpec spec;
+    @JsonProperty("status")
+    private MachineStatus status;
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new LinkedHashMap<String, Object>();
+
+    /**
+     * No args constructor for use in serialization
+     * 
+     */
+    public Machine() {
+    }
+
+    public Machine(String apiVersion, String kind, ObjectMeta metadata, MachineSpec spec, MachineStatus status) {
+        super();
+        this.apiVersion = apiVersion;
+        this.kind = kind;
+        this.metadata = metadata;
+        this.spec = spec;
+        this.status = status;
+    }
+
+    @JsonProperty("apiVersion")
+    public String getApiVersion() {
+        return apiVersion;
+    }
+
+    @JsonProperty("apiVersion")
+    public void setApiVersion(String apiVersion) {
+        this.apiVersion = apiVersion;
+    }
+
+    @JsonProperty("kind")
+    public String getKind() {
+        return kind;
+    }
+
+    @JsonProperty("kind")
+    public void setKind(String kind) {
+        this.kind = kind;
+    }
+
+    @JsonProperty("metadata")
+    public ObjectMeta getMetadata() {
+        return metadata;
+    }
+
+    @JsonProperty("metadata")
+    public void setMetadata(ObjectMeta metadata) {
+        this.metadata = metadata;
+    }
+
+    @JsonProperty("spec")
+    public MachineSpec getSpec() {
+        return spec;
+    }
+
+    @JsonProperty("spec")
+    public void setSpec(MachineSpec spec) {
+        this.spec = spec;
+    }
+
+    @JsonProperty("status")
+    public MachineStatus getStatus() {
+        return status;
+    }
+
+    @JsonProperty("status")
+    public void setStatus(MachineStatus status) {
+        this.status = status;
+    }
+
+    @JsonIgnore
+    public MachineBuilder edit() {
+        return new MachineBuilder(this);
+    }
+
+    @JsonIgnore
+    public MachineBuilder toBuilder() {
+        return edit();
+    }
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+    public void setAdditionalProperties(Map<String, Object> additionalProperties) {
+        this.additionalProperties = additionalProperties;
+    }
+
+}