diff --git a/kubernetes-model-generator/openshift-model-config/pom.xml b/kubernetes-model-generator/openshift-model-config/pom.xml index 1dd2f8700dd..3d1a0515c5b 100644 --- a/kubernetes-model-generator/openshift-model-config/pom.xml +++ b/kubernetes-model-generator/openshift-model-config/pom.xml @@ -61,7 +61,7 @@ - ${openapi.schema.openshift-latest} + ${openapi.schema.openshift-generated} io.fabric8.openshift.api.model.config @@ -70,23 +70,8 @@ ^io\.openshift\.config\..*$ - ^io\.openshift\.config\.v1\.BuildSpecBDEnv$ - ^io\.openshift\.config\.v1\.BuildSpecBDEValueFrom$ - ^io\.openshift\.config\.v1\.BuildSpecBDResources$ + ^io\.openshift\.config\.v1alpha1\..*$ - - io.fabric8.kubernetes.api.model.Condition - io.fabric8.kubernetes.api.model.EnvVar - io.fabric8.kubernetes.api.model.ResourceRequirements - - - com.coreos.monitoring.v1.AlertmanagerSpecTolerations - io.fabric8.kubernetes.api.model.Toleration - - diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServer.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServer.java index 137d0edb216..5208bf3be46 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServer.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServer.java @@ -86,8 +86,7 @@ public class APIServer implements Editable , HasMetadata @JsonProperty("spec") private APIServerSpec spec; @JsonProperty("status") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object status; + private APIServerStatus status; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -98,7 +97,7 @@ public class APIServer implements Editable , HasMetadata public APIServer() { } - public APIServer(String apiVersion, String kind, ObjectMeta metadata, APIServerSpec spec, Object status) { + public APIServer(String apiVersion, String kind, ObjectMeta metadata, APIServerSpec spec, APIServerStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -168,13 +167,12 @@ public void setSpec(APIServerSpec spec) { } @JsonProperty("status") - public Object getStatus() { + public APIServerStatus getStatus() { return status; } @JsonProperty("status") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setStatus(Object status) { + public void setStatus(APIServerStatus status) { this.status = status; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerSpecEncryption.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerEncryption.java similarity index 89% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerSpecEncryption.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerEncryption.java index 9690ee3c3ca..f8db9ffbc56 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerSpecEncryption.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerEncryption.java @@ -51,7 +51,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class APIServerSpecEncryption implements Editable , KubernetesResource +public class APIServerEncryption implements Editable , KubernetesResource { @JsonProperty("type") @@ -63,10 +63,10 @@ public class APIServerSpecEncryption implements Editable , KubernetesResource +public class APIServerNamedServingCert implements Editable , KubernetesResource { @JsonProperty("names") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List names = new ArrayList<>(); @JsonProperty("servingCertificate") - private APIServerSpecSCNCServingCertificate servingCertificate; + private SecretNameReference servingCertificate; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,10 +69,10 @@ public class APIServerSpecSCNamedCertificates implements Editable names, APIServerSpecSCNCServingCertificate servingCertificate) { + public APIServerNamedServingCert(List names, SecretNameReference servingCertificate) { super(); this.names = names; this.servingCertificate = servingCertificate; @@ -90,22 +90,22 @@ public void setNames(List names) { } @JsonProperty("servingCertificate") - public APIServerSpecSCNCServingCertificate getServingCertificate() { + public SecretNameReference getServingCertificate() { return servingCertificate; } @JsonProperty("servingCertificate") - public void setServingCertificate(APIServerSpecSCNCServingCertificate servingCertificate) { + public void setServingCertificate(SecretNameReference servingCertificate) { this.servingCertificate = servingCertificate; } @JsonIgnore - public APIServerSpecSCNamedCertificatesBuilder edit() { - return new APIServerSpecSCNamedCertificatesBuilder(this); + public APIServerNamedServingCertBuilder edit() { + return new APIServerNamedServingCertBuilder(this); } @JsonIgnore - public APIServerSpecSCNamedCertificatesBuilder toBuilder() { + public APIServerNamedServingCertBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerSpecServingCerts.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerServingCerts.java similarity index 83% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerSpecServingCerts.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerServingCerts.java index c8aff0fda14..b8e065df685 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerSpecServingCerts.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerServingCerts.java @@ -53,12 +53,12 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class APIServerSpecServingCerts implements Editable , KubernetesResource +public class APIServerServingCerts implements Editable , KubernetesResource { @JsonProperty("namedCertificates") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List namedCertificates = new ArrayList<>(); + private List namedCertificates = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,32 +66,32 @@ public class APIServerSpecServingCerts implements Editable namedCertificates) { + public APIServerServingCerts(List namedCertificates) { super(); this.namedCertificates = namedCertificates; } @JsonProperty("namedCertificates") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getNamedCertificates() { + public List getNamedCertificates() { return namedCertificates; } @JsonProperty("namedCertificates") - public void setNamedCertificates(List namedCertificates) { + public void setNamedCertificates(List namedCertificates) { this.namedCertificates = namedCertificates; } @JsonIgnore - public APIServerSpecServingCertsBuilder edit() { - return new APIServerSpecServingCertsBuilder(this); + public APIServerServingCertsBuilder edit() { + return new APIServerServingCertsBuilder(this); } @JsonIgnore - public APIServerSpecServingCertsBuilder toBuilder() { + public APIServerServingCertsBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerSpec.java index 0776200c8c5..2dc54f6616a 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerSpec.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerSpec.java @@ -65,15 +65,15 @@ public class APIServerSpec implements Editable , Kubernete @JsonInclude(JsonInclude.Include.NON_EMPTY) private List additionalCORSAllowedOrigins = new ArrayList<>(); @JsonProperty("audit") - private APIServerSpecAudit audit; + private Audit audit; @JsonProperty("clientCA") - private APIServerSpecClientCA clientCA; + private ConfigMapNameReference clientCA; @JsonProperty("encryption") - private APIServerSpecEncryption encryption; + private APIServerEncryption encryption; @JsonProperty("servingCerts") - private APIServerSpecServingCerts servingCerts; + private APIServerServingCerts servingCerts; @JsonProperty("tlsSecurityProfile") - private APIServerSpecTlsSecurityProfile tlsSecurityProfile; + private TLSSecurityProfile tlsSecurityProfile; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -84,7 +84,7 @@ public class APIServerSpec implements Editable , Kubernete public APIServerSpec() { } - public APIServerSpec(List additionalCORSAllowedOrigins, APIServerSpecAudit audit, APIServerSpecClientCA clientCA, APIServerSpecEncryption encryption, APIServerSpecServingCerts servingCerts, APIServerSpecTlsSecurityProfile tlsSecurityProfile) { + public APIServerSpec(List additionalCORSAllowedOrigins, Audit audit, ConfigMapNameReference clientCA, APIServerEncryption encryption, APIServerServingCerts servingCerts, TLSSecurityProfile tlsSecurityProfile) { super(); this.additionalCORSAllowedOrigins = additionalCORSAllowedOrigins; this.audit = audit; @@ -106,52 +106,52 @@ public void setAdditionalCORSAllowedOrigins(List additionalCORSAllowedOr } @JsonProperty("audit") - public APIServerSpecAudit getAudit() { + public Audit getAudit() { return audit; } @JsonProperty("audit") - public void setAudit(APIServerSpecAudit audit) { + public void setAudit(Audit audit) { this.audit = audit; } @JsonProperty("clientCA") - public APIServerSpecClientCA getClientCA() { + public ConfigMapNameReference getClientCA() { return clientCA; } @JsonProperty("clientCA") - public void setClientCA(APIServerSpecClientCA clientCA) { + public void setClientCA(ConfigMapNameReference clientCA) { this.clientCA = clientCA; } @JsonProperty("encryption") - public APIServerSpecEncryption getEncryption() { + public APIServerEncryption getEncryption() { return encryption; } @JsonProperty("encryption") - public void setEncryption(APIServerSpecEncryption encryption) { + public void setEncryption(APIServerEncryption encryption) { this.encryption = encryption; } @JsonProperty("servingCerts") - public APIServerSpecServingCerts getServingCerts() { + public APIServerServingCerts getServingCerts() { return servingCerts; } @JsonProperty("servingCerts") - public void setServingCerts(APIServerSpecServingCerts servingCerts) { + public void setServingCerts(APIServerServingCerts servingCerts) { this.servingCerts = servingCerts; } @JsonProperty("tlsSecurityProfile") - public APIServerSpecTlsSecurityProfile getTlsSecurityProfile() { + public TLSSecurityProfile getTlsSecurityProfile() { return tlsSecurityProfile; } @JsonProperty("tlsSecurityProfile") - public void setTlsSecurityProfile(APIServerSpecTlsSecurityProfile tlsSecurityProfile) { + public void setTlsSecurityProfile(TLSSecurityProfile tlsSecurityProfile) { this.tlsSecurityProfile = tlsSecurityProfile; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerSpecSCNCServingCertificate.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerSpecSCNCServingCertificate.java deleted file mode 100644 index 3f9395ab213..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerSpecSCNCServingCertificate.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class APIServerSpecSCNCServingCertificate implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public APIServerSpecSCNCServingCertificate() { - } - - public APIServerSpecSCNCServingCertificate(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public APIServerSpecSCNCServingCertificateBuilder edit() { - return new APIServerSpecSCNCServingCertificateBuilder(this); - } - - @JsonIgnore - public APIServerSpecSCNCServingCertificateBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecTError.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerStatus.java similarity index 79% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecTError.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerStatus.java index b71a452a0a6..14ef355650f 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecTError.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerStatus.java @@ -8,7 +8,6 @@ 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; @@ -31,7 +30,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "name" + }) @ToString @EqualsAndHashCode @@ -51,43 +50,19 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class OAuthSpecTError implements Editable , KubernetesResource +public class APIServerStatus implements Editable , KubernetesResource { - @JsonProperty("name") - private String name; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); - /** - * No args constructor for use in serialization - * - */ - public OAuthSpecTError() { - } - - public OAuthSpecTError(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - @JsonIgnore - public OAuthSpecTErrorBuilder edit() { - return new OAuthSpecTErrorBuilder(this); + public APIServerStatusBuilder edit() { + return new APIServerStatusBuilder(this); } @JsonIgnore - public OAuthSpecTErrorBuilder toBuilder() { + public APIServerStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSSpecPAws.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSDNSSpec.java similarity index 92% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSSpecPAws.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSDNSSpec.java index 83a807373f3..5fc5247724f 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSSpecPAws.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSDNSSpec.java @@ -51,7 +51,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class DNSSpecPAws implements Editable , KubernetesResource +public class AWSDNSSpec implements Editable , KubernetesResource { @JsonProperty("privateZoneIAMRole") @@ -63,10 +63,10 @@ public class DNSSpecPAws implements Editable , KubernetesRes * No args constructor for use in serialization * */ - public DNSSpecPAws() { + public AWSDNSSpec() { } - public DNSSpecPAws(String privateZoneIAMRole) { + public AWSDNSSpec(String privateZoneIAMRole) { super(); this.privateZoneIAMRole = privateZoneIAMRole; } @@ -82,12 +82,12 @@ public void setPrivateZoneIAMRole(String privateZoneIAMRole) { } @JsonIgnore - public DNSSpecPAwsBuilder edit() { - return new DNSSpecPAwsBuilder(this); + public AWSDNSSpecBuilder edit() { + return new AWSDNSSpecBuilder(this); } @JsonIgnore - public DNSSpecPAwsBuilder toBuilder() { + public AWSDNSSpecBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressSpecLBPAws.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSIngressSpec.java similarity index 90% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressSpecLBPAws.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSIngressSpec.java index 5d9d659f139..cdf8d41dcc1 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressSpecLBPAws.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSIngressSpec.java @@ -51,7 +51,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressSpecLBPAws implements Editable , KubernetesResource +public class AWSIngressSpec implements Editable , KubernetesResource { @JsonProperty("type") @@ -63,10 +63,10 @@ public class IngressSpecLBPAws implements Editable , K * No args constructor for use in serialization * */ - public IngressSpecLBPAws() { + public AWSIngressSpec() { } - public IngressSpecLBPAws(String type) { + public AWSIngressSpec(String type) { super(); this.type = type; } @@ -82,12 +82,12 @@ public void setType(String type) { } @JsonIgnore - public IngressSpecLBPAwsBuilder edit() { - return new IngressSpecLBPAwsBuilder(this); + public AWSIngressSpecBuilder edit() { + return new AWSIngressSpecBuilder(this); } @JsonIgnore - public IngressSpecLBPAwsBuilder toBuilder() { + public AWSIngressSpecBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSAws.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSPlatformSpec.java similarity index 82% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSAws.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSPlatformSpec.java index 02ab5a7a8d5..0ed820a33de 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSAws.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSPlatformSpec.java @@ -53,12 +53,12 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureSpecPSAws implements Editable , KubernetesResource +public class AWSPlatformSpec implements Editable , KubernetesResource { @JsonProperty("serviceEndpoints") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List serviceEndpoints = new ArrayList<>(); + private List serviceEndpoints = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,32 +66,32 @@ public class InfrastructureSpecPSAws implements Editable serviceEndpoints) { + public AWSPlatformSpec(List serviceEndpoints) { super(); this.serviceEndpoints = serviceEndpoints; } @JsonProperty("serviceEndpoints") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getServiceEndpoints() { + public List getServiceEndpoints() { return serviceEndpoints; } @JsonProperty("serviceEndpoints") - public void setServiceEndpoints(List serviceEndpoints) { + public void setServiceEndpoints(List serviceEndpoints) { this.serviceEndpoints = serviceEndpoints; } @JsonIgnore - public InfrastructureSpecPSAwsBuilder edit() { - return new InfrastructureSpecPSAwsBuilder(this); + public AWSPlatformSpecBuilder edit() { + return new AWSPlatformSpecBuilder(this); } @JsonIgnore - public InfrastructureSpecPSAwsBuilder toBuilder() { + public AWSPlatformSpecBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSAws.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSPlatformStatus.java similarity index 79% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSAws.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSPlatformStatus.java index fb7ab23e857..65a6d16283e 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSAws.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSPlatformStatus.java @@ -55,17 +55,17 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureStatusPSAws implements Editable , KubernetesResource +public class AWSPlatformStatus implements Editable , KubernetesResource { @JsonProperty("region") private String region; @JsonProperty("resourceTags") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List resourceTags = new ArrayList<>(); + private List resourceTags = new ArrayList<>(); @JsonProperty("serviceEndpoints") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List serviceEndpoints = new ArrayList<>(); + private List serviceEndpoints = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -73,10 +73,10 @@ public class InfrastructureStatusPSAws implements Editable resourceTags, List serviceEndpoints) { + public AWSPlatformStatus(String region, List resourceTags, List serviceEndpoints) { super(); this.region = region; this.resourceTags = resourceTags; @@ -95,33 +95,33 @@ public void setRegion(String region) { @JsonProperty("resourceTags") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getResourceTags() { + public List getResourceTags() { return resourceTags; } @JsonProperty("resourceTags") - public void setResourceTags(List resourceTags) { + public void setResourceTags(List resourceTags) { this.resourceTags = resourceTags; } @JsonProperty("serviceEndpoints") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getServiceEndpoints() { + public List getServiceEndpoints() { return serviceEndpoints; } @JsonProperty("serviceEndpoints") - public void setServiceEndpoints(List serviceEndpoints) { + public void setServiceEndpoints(List serviceEndpoints) { this.serviceEndpoints = serviceEndpoints; } @JsonIgnore - public InfrastructureStatusPSAwsBuilder edit() { - return new InfrastructureStatusPSAwsBuilder(this); + public AWSPlatformStatusBuilder edit() { + return new AWSPlatformStatusBuilder(this); } @JsonIgnore - public InfrastructureStatusPSAwsBuilder toBuilder() { + public AWSPlatformStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSACResourceTags.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSResourceTag.java similarity index 88% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSACResourceTags.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSResourceTag.java index 2e68b33c1eb..153b37d9110 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSACResourceTags.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AWSResourceTag.java @@ -52,7 +52,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureStatusPSACResourceTags implements Editable , KubernetesResource +public class AWSResourceTag implements Editable , KubernetesResource { @JsonProperty("key") @@ -66,10 +66,10 @@ public class InfrastructureStatusPSACResourceTags implements Editable , KubernetesResource +public class AWSServiceEndpoint implements Editable , KubernetesResource { @JsonProperty("name") @@ -66,10 +66,10 @@ public class InfrastructureSpecPSAwsServiceEndpoints implements Editable , KubernetesResource +{ + + @JsonProperty("disabledPlugins") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List disabledPlugins = new ArrayList<>(); + @JsonProperty("enabledPlugins") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List enabledPlugins = new ArrayList<>(); + @JsonProperty("pluginConfig") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private Map pluginConfig = new LinkedHashMap<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public AdmissionConfig() { + } + + public AdmissionConfig(List disabledPlugins, List enabledPlugins, Map pluginConfig) { + super(); + this.disabledPlugins = disabledPlugins; + this.enabledPlugins = enabledPlugins; + this.pluginConfig = pluginConfig; + } + + @JsonProperty("disabledPlugins") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getDisabledPlugins() { + return disabledPlugins; + } + + @JsonProperty("disabledPlugins") + public void setDisabledPlugins(List disabledPlugins) { + this.disabledPlugins = disabledPlugins; + } + + @JsonProperty("enabledPlugins") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getEnabledPlugins() { + return enabledPlugins; + } + + @JsonProperty("enabledPlugins") + public void setEnabledPlugins(List enabledPlugins) { + this.enabledPlugins = enabledPlugins; + } + + @JsonProperty("pluginConfig") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public Map getPluginConfig() { + return pluginConfig; + } + + @JsonProperty("pluginConfig") + public void setPluginConfig(Map pluginConfig) { + this.pluginConfig = pluginConfig; + } + + @JsonIgnore + public AdmissionConfigBuilder edit() { + return new AdmissionConfigBuilder(this); + } + + @JsonIgnore + public AdmissionConfigBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AdmissionPluginConfig.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AdmissionPluginConfig.java new file mode 100644 index 00000000000..6dd144b390f --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AdmissionPluginConfig.java @@ -0,0 +1,124 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "configuration", + "location" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class AdmissionPluginConfig implements Editable , KubernetesResource +{ + + @JsonProperty("configuration") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object configuration; + @JsonProperty("location") + private String location; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public AdmissionPluginConfig() { + } + + public AdmissionPluginConfig(Object configuration, String location) { + super(); + this.configuration = configuration; + this.location = location; + } + + @JsonProperty("configuration") + public Object getConfiguration() { + return configuration; + } + + @JsonProperty("configuration") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setConfiguration(Object configuration) { + this.configuration = configuration; + } + + @JsonProperty("location") + public String getLocation() { + return location; + } + + @JsonProperty("location") + public void setLocation(String location) { + this.location = location; + } + + @JsonIgnore + public AdmissionPluginConfigBuilder edit() { + return new AdmissionPluginConfigBuilder(this); + } + + @JsonIgnore + public AdmissionPluginConfigBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AlibabaCloudPlatformSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AlibabaCloudPlatformSpec.java new file mode 100644 index 00000000000..2922272ee64 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AlibabaCloudPlatformSpec.java @@ -0,0 +1,83 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class AlibabaCloudPlatformSpec implements Editable , KubernetesResource +{ + + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + @JsonIgnore + public AlibabaCloudPlatformSpecBuilder edit() { + return new AlibabaCloudPlatformSpecBuilder(this); + } + + @JsonIgnore + public AlibabaCloudPlatformSpecBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSAlibabaCloud.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AlibabaCloudPlatformStatus.java similarity index 83% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSAlibabaCloud.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AlibabaCloudPlatformStatus.java index 976ca0138a9..7ca874819e1 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSAlibabaCloud.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AlibabaCloudPlatformStatus.java @@ -55,7 +55,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureStatusPSAlibabaCloud implements Editable , KubernetesResource +public class AlibabaCloudPlatformStatus implements Editable , KubernetesResource { @JsonProperty("region") @@ -64,7 +64,7 @@ public class InfrastructureStatusPSAlibabaCloud implements Editable resourceTags = new ArrayList<>(); + private List resourceTags = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -72,10 +72,10 @@ public class InfrastructureStatusPSAlibabaCloud implements Editable resourceTags) { + public AlibabaCloudPlatformStatus(String region, String resourceGroupID, List resourceTags) { super(); this.region = region; this.resourceGroupID = resourceGroupID; @@ -104,22 +104,22 @@ public void setResourceGroupID(String resourceGroupID) { @JsonProperty("resourceTags") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getResourceTags() { + public List getResourceTags() { return resourceTags; } @JsonProperty("resourceTags") - public void setResourceTags(List resourceTags) { + public void setResourceTags(List resourceTags) { this.resourceTags = resourceTags; } @JsonIgnore - public InfrastructureStatusPSAlibabaCloudBuilder edit() { - return new InfrastructureStatusPSAlibabaCloudBuilder(this); + public AlibabaCloudPlatformStatusBuilder edit() { + return new AlibabaCloudPlatformStatusBuilder(this); } @JsonIgnore - public InfrastructureStatusPSAlibabaCloudBuilder toBuilder() { + public AlibabaCloudPlatformStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSAwsResourceTags.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AlibabaCloudResourceTag.java similarity index 88% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSAwsResourceTags.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AlibabaCloudResourceTag.java index c146c95e6f9..588466a7999 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSAwsResourceTags.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AlibabaCloudResourceTag.java @@ -52,7 +52,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureStatusPSAwsResourceTags implements Editable , KubernetesResource +public class AlibabaCloudResourceTag implements Editable , KubernetesResource { @JsonProperty("key") @@ -66,10 +66,10 @@ public class InfrastructureStatusPSAwsResourceTags implements Editable , KubernetesResource +public class Audit implements Editable , KubernetesResource { @JsonProperty("customRules") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List customRules = new ArrayList<>(); + private List customRules = new ArrayList<>(); @JsonProperty("profile") private String profile; @JsonIgnore @@ -69,10 +69,10 @@ public class APIServerSpecAudit implements Editable , * No args constructor for use in serialization * */ - public APIServerSpecAudit() { + public Audit() { } - public APIServerSpecAudit(List customRules, String profile) { + public Audit(List customRules, String profile) { super(); this.customRules = customRules; this.profile = profile; @@ -80,12 +80,12 @@ public APIServerSpecAudit(List customRules, String pr @JsonProperty("customRules") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getCustomRules() { + public List getCustomRules() { return customRules; } @JsonProperty("customRules") - public void setCustomRules(List customRules) { + public void setCustomRules(List customRules) { this.customRules = customRules; } @@ -100,12 +100,12 @@ public void setProfile(String profile) { } @JsonIgnore - public APIServerSpecAuditBuilder edit() { - return new APIServerSpecAuditBuilder(this); + public AuditBuilder edit() { + return new AuditBuilder(this); } @JsonIgnore - public APIServerSpecAuditBuilder toBuilder() { + public AuditBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuditConfig.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuditConfig.java new file mode 100644 index 00000000000..05e8fb46e41 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuditConfig.java @@ -0,0 +1,236 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "auditFilePath", + "enabled", + "logFormat", + "maximumFileRetentionDays", + "maximumFileSizeMegabytes", + "maximumRetainedFiles", + "policyConfiguration", + "policyFile", + "webHookKubeConfig", + "webHookMode" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class AuditConfig implements Editable , KubernetesResource +{ + + @JsonProperty("auditFilePath") + private String auditFilePath; + @JsonProperty("enabled") + private Boolean enabled; + @JsonProperty("logFormat") + private String logFormat; + @JsonProperty("maximumFileRetentionDays") + private Integer maximumFileRetentionDays; + @JsonProperty("maximumFileSizeMegabytes") + private Integer maximumFileSizeMegabytes; + @JsonProperty("maximumRetainedFiles") + private Integer maximumRetainedFiles; + @JsonProperty("policyConfiguration") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + private Object policyConfiguration; + @JsonProperty("policyFile") + private String policyFile; + @JsonProperty("webHookKubeConfig") + private String webHookKubeConfig; + @JsonProperty("webHookMode") + private String webHookMode; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public AuditConfig() { + } + + public AuditConfig(String auditFilePath, Boolean enabled, String logFormat, Integer maximumFileRetentionDays, Integer maximumFileSizeMegabytes, Integer maximumRetainedFiles, Object policyConfiguration, String policyFile, String webHookKubeConfig, String webHookMode) { + super(); + this.auditFilePath = auditFilePath; + this.enabled = enabled; + this.logFormat = logFormat; + this.maximumFileRetentionDays = maximumFileRetentionDays; + this.maximumFileSizeMegabytes = maximumFileSizeMegabytes; + this.maximumRetainedFiles = maximumRetainedFiles; + this.policyConfiguration = policyConfiguration; + this.policyFile = policyFile; + this.webHookKubeConfig = webHookKubeConfig; + this.webHookMode = webHookMode; + } + + @JsonProperty("auditFilePath") + public String getAuditFilePath() { + return auditFilePath; + } + + @JsonProperty("auditFilePath") + public void setAuditFilePath(String auditFilePath) { + this.auditFilePath = auditFilePath; + } + + @JsonProperty("enabled") + public Boolean getEnabled() { + return enabled; + } + + @JsonProperty("enabled") + public void setEnabled(Boolean enabled) { + this.enabled = enabled; + } + + @JsonProperty("logFormat") + public String getLogFormat() { + return logFormat; + } + + @JsonProperty("logFormat") + public void setLogFormat(String logFormat) { + this.logFormat = logFormat; + } + + @JsonProperty("maximumFileRetentionDays") + public Integer getMaximumFileRetentionDays() { + return maximumFileRetentionDays; + } + + @JsonProperty("maximumFileRetentionDays") + public void setMaximumFileRetentionDays(Integer maximumFileRetentionDays) { + this.maximumFileRetentionDays = maximumFileRetentionDays; + } + + @JsonProperty("maximumFileSizeMegabytes") + public Integer getMaximumFileSizeMegabytes() { + return maximumFileSizeMegabytes; + } + + @JsonProperty("maximumFileSizeMegabytes") + public void setMaximumFileSizeMegabytes(Integer maximumFileSizeMegabytes) { + this.maximumFileSizeMegabytes = maximumFileSizeMegabytes; + } + + @JsonProperty("maximumRetainedFiles") + public Integer getMaximumRetainedFiles() { + return maximumRetainedFiles; + } + + @JsonProperty("maximumRetainedFiles") + public void setMaximumRetainedFiles(Integer maximumRetainedFiles) { + this.maximumRetainedFiles = maximumRetainedFiles; + } + + @JsonProperty("policyConfiguration") + public Object getPolicyConfiguration() { + return policyConfiguration; + } + + @JsonProperty("policyConfiguration") + @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) + public void setPolicyConfiguration(Object policyConfiguration) { + this.policyConfiguration = policyConfiguration; + } + + @JsonProperty("policyFile") + public String getPolicyFile() { + return policyFile; + } + + @JsonProperty("policyFile") + public void setPolicyFile(String policyFile) { + this.policyFile = policyFile; + } + + @JsonProperty("webHookKubeConfig") + public String getWebHookKubeConfig() { + return webHookKubeConfig; + } + + @JsonProperty("webHookKubeConfig") + public void setWebHookKubeConfig(String webHookKubeConfig) { + this.webHookKubeConfig = webHookKubeConfig; + } + + @JsonProperty("webHookMode") + public String getWebHookMode() { + return webHookMode; + } + + @JsonProperty("webHookMode") + public void setWebHookMode(String webHookMode) { + this.webHookMode = webHookMode; + } + + @JsonIgnore + public AuditConfigBuilder edit() { + return new AuditConfigBuilder(this); + } + + @JsonIgnore + public AuditConfigBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerSpecACustomRules.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuditCustomRule.java similarity index 89% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerSpecACustomRules.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuditCustomRule.java index dc5c0f11b29..e5d18419125 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerSpecACustomRules.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuditCustomRule.java @@ -52,7 +52,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class APIServerSpecACustomRules implements Editable , KubernetesResource +public class AuditCustomRule implements Editable , KubernetesResource { @JsonProperty("group") @@ -66,10 +66,10 @@ public class APIServerSpecACustomRules implements Editable , { @JsonProperty("oauthMetadata") - private AuthenticationSpecOauthMetadata oauthMetadata; + private ConfigMapNameReference oauthMetadata; + @JsonProperty("oidcProviders") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List oidcProviders = new ArrayList<>(); @JsonProperty("serviceAccountIssuer") private String serviceAccountIssuer; @JsonProperty("type") private String type; @JsonProperty("webhookTokenAuthenticator") - private AuthenticationSpecWebhookTokenAuthenticator webhookTokenAuthenticator; + private WebhookTokenAuthenticator webhookTokenAuthenticator; @JsonProperty("webhookTokenAuthenticators") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List webhookTokenAuthenticators = new ArrayList<>(); + private List webhookTokenAuthenticators = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -81,9 +85,10 @@ public class AuthenticationSpec implements Editable , public AuthenticationSpec() { } - public AuthenticationSpec(AuthenticationSpecOauthMetadata oauthMetadata, String serviceAccountIssuer, String type, AuthenticationSpecWebhookTokenAuthenticator webhookTokenAuthenticator, List webhookTokenAuthenticators) { + public AuthenticationSpec(ConfigMapNameReference oauthMetadata, List oidcProviders, String serviceAccountIssuer, String type, WebhookTokenAuthenticator webhookTokenAuthenticator, List webhookTokenAuthenticators) { super(); this.oauthMetadata = oauthMetadata; + this.oidcProviders = oidcProviders; this.serviceAccountIssuer = serviceAccountIssuer; this.type = type; this.webhookTokenAuthenticator = webhookTokenAuthenticator; @@ -91,15 +96,26 @@ public AuthenticationSpec(AuthenticationSpecOauthMetadata oauthMetadata, String } @JsonProperty("oauthMetadata") - public AuthenticationSpecOauthMetadata getOauthMetadata() { + public ConfigMapNameReference getOauthMetadata() { return oauthMetadata; } @JsonProperty("oauthMetadata") - public void setOauthMetadata(AuthenticationSpecOauthMetadata oauthMetadata) { + public void setOauthMetadata(ConfigMapNameReference oauthMetadata) { this.oauthMetadata = oauthMetadata; } + @JsonProperty("oidcProviders") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getOidcProviders() { + return oidcProviders; + } + + @JsonProperty("oidcProviders") + public void setOidcProviders(List oidcProviders) { + this.oidcProviders = oidcProviders; + } + @JsonProperty("serviceAccountIssuer") public String getServiceAccountIssuer() { return serviceAccountIssuer; @@ -121,23 +137,23 @@ public void setType(String type) { } @JsonProperty("webhookTokenAuthenticator") - public AuthenticationSpecWebhookTokenAuthenticator getWebhookTokenAuthenticator() { + public WebhookTokenAuthenticator getWebhookTokenAuthenticator() { return webhookTokenAuthenticator; } @JsonProperty("webhookTokenAuthenticator") - public void setWebhookTokenAuthenticator(AuthenticationSpecWebhookTokenAuthenticator webhookTokenAuthenticator) { + public void setWebhookTokenAuthenticator(WebhookTokenAuthenticator webhookTokenAuthenticator) { this.webhookTokenAuthenticator = webhookTokenAuthenticator; } @JsonProperty("webhookTokenAuthenticators") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getWebhookTokenAuthenticators() { + public List getWebhookTokenAuthenticators() { return webhookTokenAuthenticators; } @JsonProperty("webhookTokenAuthenticators") - public void setWebhookTokenAuthenticators(List webhookTokenAuthenticators) { + public void setWebhookTokenAuthenticators(List webhookTokenAuthenticators) { this.webhookTokenAuthenticators = webhookTokenAuthenticators; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuthenticationSpecWTAKubeConfig_1.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuthenticationSpecWTAKubeConfig_1.java deleted file mode 100644 index 758d287044a..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuthenticationSpecWTAKubeConfig_1.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class AuthenticationSpecWTAKubeConfig_1 implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public AuthenticationSpecWTAKubeConfig_1() { - } - - public AuthenticationSpecWTAKubeConfig_1(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public AuthenticationSpecWTAKubeConfig_1Builder edit() { - return new AuthenticationSpecWTAKubeConfig_1Builder(this); - } - - @JsonIgnore - public AuthenticationSpecWTAKubeConfig_1Builder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuthenticationStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuthenticationStatus.java index 0d8666d135a..bd9834a51d6 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuthenticationStatus.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuthenticationStatus.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.api.model.config.v1; +import java.util.ArrayList; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonAnyGetter; @@ -31,7 +33,8 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "integratedOAuthMetadata" + "integratedOAuthMetadata", + "oidcClients" }) @ToString @EqualsAndHashCode @@ -55,7 +58,10 @@ public class AuthenticationStatus implements Editable oidcClients = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,21 +72,33 @@ public class AuthenticationStatus implements Editable oidcClients) { super(); this.integratedOAuthMetadata = integratedOAuthMetadata; + this.oidcClients = oidcClients; } @JsonProperty("integratedOAuthMetadata") - public AuthenticationStatusIntegratedOAuthMetadata getIntegratedOAuthMetadata() { + public ConfigMapNameReference getIntegratedOAuthMetadata() { return integratedOAuthMetadata; } @JsonProperty("integratedOAuthMetadata") - public void setIntegratedOAuthMetadata(AuthenticationStatusIntegratedOAuthMetadata integratedOAuthMetadata) { + public void setIntegratedOAuthMetadata(ConfigMapNameReference integratedOAuthMetadata) { this.integratedOAuthMetadata = integratedOAuthMetadata; } + @JsonProperty("oidcClients") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getOidcClients() { + return oidcClients; + } + + @JsonProperty("oidcClients") + public void setOidcClients(List oidcClients) { + this.oidcClients = oidcClients; + } + @JsonIgnore public AuthenticationStatusBuilder edit() { return new AuthenticationStatusBuilder(this); diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuthenticationStatusIntegratedOAuthMetadata.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuthenticationStatusIntegratedOAuthMetadata.java deleted file mode 100644 index e9005347a73..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuthenticationStatusIntegratedOAuthMetadata.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class AuthenticationStatusIntegratedOAuthMetadata implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public AuthenticationStatusIntegratedOAuthMetadata() { - } - - public AuthenticationStatusIntegratedOAuthMetadata(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public AuthenticationStatusIntegratedOAuthMetadataBuilder edit() { - return new AuthenticationStatusIntegratedOAuthMetadataBuilder(this); - } - - @JsonIgnore - public AuthenticationStatusIntegratedOAuthMetadataBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AzurePlatformSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AzurePlatformSpec.java new file mode 100644 index 00000000000..9c2ec4dfa44 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AzurePlatformSpec.java @@ -0,0 +1,83 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class AzurePlatformSpec implements Editable , KubernetesResource +{ + + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + @JsonIgnore + public AzurePlatformSpecBuilder edit() { + return new AzurePlatformSpecBuilder(this); + } + + @JsonIgnore + public AzurePlatformSpecBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSAzure.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AzurePlatformStatus.java similarity index 86% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSAzure.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AzurePlatformStatus.java index 032ca52c38b..b86aed231d3 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSAzure.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AzurePlatformStatus.java @@ -57,7 +57,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureStatusPSAzure implements Editable , KubernetesResource +public class AzurePlatformStatus implements Editable , KubernetesResource { @JsonProperty("armEndpoint") @@ -70,7 +70,7 @@ public class InfrastructureStatusPSAzure implements Editable resourceTags = new ArrayList<>(); + private List resourceTags = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -78,10 +78,10 @@ public class InfrastructureStatusPSAzure implements Editable resourceTags) { + public AzurePlatformStatus(String armEndpoint, String cloudName, String networkResourceGroupName, String resourceGroupName, List resourceTags) { super(); this.armEndpoint = armEndpoint; this.cloudName = cloudName; @@ -132,22 +132,22 @@ public void setResourceGroupName(String resourceGroupName) { @JsonProperty("resourceTags") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getResourceTags() { + public List getResourceTags() { return resourceTags; } @JsonProperty("resourceTags") - public void setResourceTags(List resourceTags) { + public void setResourceTags(List resourceTags) { this.resourceTags = resourceTags; } @JsonIgnore - public InfrastructureStatusPSAzureBuilder edit() { - return new InfrastructureStatusPSAzureBuilder(this); + public AzurePlatformStatusBuilder edit() { + return new AzurePlatformStatusBuilder(this); } @JsonIgnore - public InfrastructureStatusPSAzureBuilder toBuilder() { + public AzurePlatformStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSAzureResourceTags.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AzureResourceTag.java similarity index 87% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSAzureResourceTags.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AzureResourceTag.java index e7ea6ec0256..2b4191630ca 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSAzureResourceTags.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AzureResourceTag.java @@ -52,7 +52,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureStatusPSAzureResourceTags implements Editable , KubernetesResource +public class AzureResourceTag implements Editable , KubernetesResource { @JsonProperty("key") @@ -66,10 +66,10 @@ public class InfrastructureStatusPSAzureResourceTags implements Editable , KubernetesResource +public class BareMetalPlatformLoadBalancer implements Editable , KubernetesResource { @JsonProperty("type") @@ -63,10 +63,10 @@ public class InfrastructureStatusPSOvirtLoadBalancer implements Editable , KubernetesResource +public class BareMetalPlatformSpec implements Editable , KubernetesResource { @JsonProperty("apiServerInternalIPs") @@ -74,10 +74,10 @@ public class InfrastructureSpecPSOpenstack implements Editable apiServerInternalIPs, List ingressIPs, List machineNetworks) { + public BareMetalPlatformSpec(List apiServerInternalIPs, List ingressIPs, List machineNetworks) { super(); this.apiServerInternalIPs = apiServerInternalIPs; this.ingressIPs = ingressIPs; @@ -118,12 +118,12 @@ public void setMachineNetworks(List machineNetworks) { } @JsonIgnore - public InfrastructureSpecPSOpenstackBuilder edit() { - return new InfrastructureSpecPSOpenstackBuilder(this); + public BareMetalPlatformSpecBuilder edit() { + return new BareMetalPlatformSpecBuilder(this); } @JsonIgnore - public InfrastructureSpecPSOpenstackBuilder toBuilder() { + public BareMetalPlatformSpecBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSVsphere.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BareMetalPlatformStatus.java similarity index 87% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSVsphere.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BareMetalPlatformStatus.java index 8474f280aba..8b403b81f1b 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSVsphere.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BareMetalPlatformStatus.java @@ -59,7 +59,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureStatusPSVsphere implements Editable , KubernetesResource +public class BareMetalPlatformStatus implements Editable , KubernetesResource { @JsonProperty("apiServerInternalIP") @@ -73,7 +73,7 @@ public class InfrastructureStatusPSVsphere implements Editable ingressIPs = new ArrayList<>(); @JsonProperty("loadBalancer") - private InfrastructureStatusPSVsphereLoadBalancer loadBalancer; + private BareMetalPlatformLoadBalancer loadBalancer; @JsonProperty("machineNetworks") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List machineNetworks = new ArrayList<>(); @@ -86,10 +86,10 @@ public class InfrastructureStatusPSVsphere implements Editable apiServerInternalIPs, String ingressIP, List ingressIPs, InfrastructureStatusPSVsphereLoadBalancer loadBalancer, List machineNetworks, String nodeDNSIP) { + public BareMetalPlatformStatus(String apiServerInternalIP, List apiServerInternalIPs, String ingressIP, List ingressIPs, BareMetalPlatformLoadBalancer loadBalancer, List machineNetworks, String nodeDNSIP) { super(); this.apiServerInternalIP = apiServerInternalIP; this.apiServerInternalIPs = apiServerInternalIPs; @@ -143,12 +143,12 @@ public void setIngressIPs(List ingressIPs) { } @JsonProperty("loadBalancer") - public InfrastructureStatusPSVsphereLoadBalancer getLoadBalancer() { + public BareMetalPlatformLoadBalancer getLoadBalancer() { return loadBalancer; } @JsonProperty("loadBalancer") - public void setLoadBalancer(InfrastructureStatusPSVsphereLoadBalancer loadBalancer) { + public void setLoadBalancer(BareMetalPlatformLoadBalancer loadBalancer) { this.loadBalancer = loadBalancer; } @@ -174,12 +174,12 @@ public void setNodeDNSIP(String nodeDNSIP) { } @JsonIgnore - public InfrastructureStatusPSVsphereBuilder edit() { - return new InfrastructureStatusPSVsphereBuilder(this); + public BareMetalPlatformStatusBuilder edit() { + return new BareMetalPlatformStatusBuilder(this); } @JsonIgnore - public InfrastructureStatusPSVsphereBuilder toBuilder() { + public BareMetalPlatformStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPBasicAuth.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BasicAuthIdentityProvider.java similarity index 79% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPBasicAuth.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BasicAuthIdentityProvider.java index 53b984efcf8..987968adcdf 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPBasicAuth.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BasicAuthIdentityProvider.java @@ -54,15 +54,15 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class OAuthSpecIPBasicAuth implements Editable , KubernetesResource +public class BasicAuthIdentityProvider implements Editable , KubernetesResource { @JsonProperty("ca") - private OAuthSpecIPBasicAuthCa ca; + private ConfigMapNameReference ca; @JsonProperty("tlsClientCert") - private OAuthSpecIPBasicAuthTlsClientCert tlsClientCert; + private SecretNameReference tlsClientCert; @JsonProperty("tlsClientKey") - private OAuthSpecIPBasicAuthTlsClientKey tlsClientKey; + private SecretNameReference tlsClientKey; @JsonProperty("url") private String url; @JsonIgnore @@ -72,10 +72,10 @@ public class OAuthSpecIPBasicAuth implements Editable , KubernetesResource +public class BuildDefaults implements Editable , KubernetesResource { @JsonProperty("defaultProxy") - private BuildSpecBDDefaultProxy defaultProxy; + private ProxySpec defaultProxy; @JsonProperty("env") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List env = new ArrayList<>(); @JsonProperty("gitProxy") - private BuildSpecBDGitProxy gitProxy; + private ProxySpec gitProxy; @JsonProperty("imageLabels") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List imageLabels = new ArrayList<>(); + private List imageLabels = new ArrayList<>(); @JsonProperty("resources") private ResourceRequirements resources; @JsonIgnore @@ -80,10 +80,10 @@ public class BuildSpecBuildDefaults implements Editable env, BuildSpecBDGitProxy gitProxy, List imageLabels, ResourceRequirements resources) { + public BuildDefaults(ProxySpec defaultProxy, List env, ProxySpec gitProxy, List imageLabels, ResourceRequirements resources) { super(); this.defaultProxy = defaultProxy; this.env = env; @@ -93,12 +93,12 @@ public BuildSpecBuildDefaults(BuildSpecBDDefaultProxy defaultProxy, List } @JsonProperty("defaultProxy") - public BuildSpecBDDefaultProxy getDefaultProxy() { + public ProxySpec getDefaultProxy() { return defaultProxy; } @JsonProperty("defaultProxy") - public void setDefaultProxy(BuildSpecBDDefaultProxy defaultProxy) { + public void setDefaultProxy(ProxySpec defaultProxy) { this.defaultProxy = defaultProxy; } @@ -114,23 +114,23 @@ public void setEnv(List env) { } @JsonProperty("gitProxy") - public BuildSpecBDGitProxy getGitProxy() { + public ProxySpec getGitProxy() { return gitProxy; } @JsonProperty("gitProxy") - public void setGitProxy(BuildSpecBDGitProxy gitProxy) { + public void setGitProxy(ProxySpec gitProxy) { this.gitProxy = gitProxy; } @JsonProperty("imageLabels") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getImageLabels() { + public List getImageLabels() { return imageLabels; } @JsonProperty("imageLabels") - public void setImageLabels(List imageLabels) { + public void setImageLabels(List imageLabels) { this.imageLabels = imageLabels; } @@ -145,12 +145,12 @@ public void setResources(ResourceRequirements resources) { } @JsonIgnore - public BuildSpecBuildDefaultsBuilder edit() { - return new BuildSpecBuildDefaultsBuilder(this); + public BuildDefaultsBuilder edit() { + return new BuildDefaultsBuilder(this); } @JsonIgnore - public BuildSpecBuildDefaultsBuilder toBuilder() { + public BuildDefaultsBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBuildOverrides.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildOverrides.java similarity index 83% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBuildOverrides.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildOverrides.java index cba88495d62..30a56e0ee2c 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBuildOverrides.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildOverrides.java @@ -24,6 +24,7 @@ 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.Toleration; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -56,20 +57,20 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class BuildSpecBuildOverrides implements Editable , KubernetesResource +public class BuildOverrides implements Editable , KubernetesResource { @JsonProperty("forcePull") private Boolean forcePull; @JsonProperty("imageLabels") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List imageLabels = new ArrayList<>(); + private List imageLabels = new ArrayList<>(); @JsonProperty("nodeSelector") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map nodeSelector = new LinkedHashMap<>(); @JsonProperty("tolerations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List tolerations = new ArrayList<>(); + private List tolerations = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -77,10 +78,10 @@ public class BuildSpecBuildOverrides implements Editable imageLabels, Map nodeSelector, List tolerations) { + public BuildOverrides(Boolean forcePull, List imageLabels, Map nodeSelector, List tolerations) { super(); this.forcePull = forcePull; this.imageLabels = imageLabels; @@ -100,12 +101,12 @@ public void setForcePull(Boolean forcePull) { @JsonProperty("imageLabels") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getImageLabels() { + public List getImageLabels() { return imageLabels; } @JsonProperty("imageLabels") - public void setImageLabels(List imageLabels) { + public void setImageLabels(List imageLabels) { this.imageLabels = imageLabels; } @@ -122,22 +123,22 @@ public void setNodeSelector(Map nodeSelector) { @JsonProperty("tolerations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getTolerations() { + public List getTolerations() { return tolerations; } @JsonProperty("tolerations") - public void setTolerations(List tolerations) { + public void setTolerations(List tolerations) { this.tolerations = tolerations; } @JsonIgnore - public BuildSpecBuildOverridesBuilder edit() { - return new BuildSpecBuildOverridesBuilder(this); + public BuildOverridesBuilder edit() { + return new BuildOverridesBuilder(this); } @JsonIgnore - public BuildSpecBuildOverridesBuilder toBuilder() { + public BuildOverridesBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpec.java index 5f2d419f2c9..08e42d4dde6 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpec.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpec.java @@ -57,11 +57,11 @@ public class BuildSpec implements Editable , KubernetesResourc { @JsonProperty("additionalTrustedCA") - private BuildSpecAdditionalTrustedCA additionalTrustedCA; + private ConfigMapNameReference additionalTrustedCA; @JsonProperty("buildDefaults") - private BuildSpecBuildDefaults buildDefaults; + private BuildDefaults buildDefaults; @JsonProperty("buildOverrides") - private BuildSpecBuildOverrides buildOverrides; + private BuildOverrides buildOverrides; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -72,7 +72,7 @@ public class BuildSpec implements Editable , KubernetesResourc public BuildSpec() { } - public BuildSpec(BuildSpecAdditionalTrustedCA additionalTrustedCA, BuildSpecBuildDefaults buildDefaults, BuildSpecBuildOverrides buildOverrides) { + public BuildSpec(ConfigMapNameReference additionalTrustedCA, BuildDefaults buildDefaults, BuildOverrides buildOverrides) { super(); this.additionalTrustedCA = additionalTrustedCA; this.buildDefaults = buildDefaults; @@ -80,32 +80,32 @@ public BuildSpec(BuildSpecAdditionalTrustedCA additionalTrustedCA, BuildSpecBuil } @JsonProperty("additionalTrustedCA") - public BuildSpecAdditionalTrustedCA getAdditionalTrustedCA() { + public ConfigMapNameReference getAdditionalTrustedCA() { return additionalTrustedCA; } @JsonProperty("additionalTrustedCA") - public void setAdditionalTrustedCA(BuildSpecAdditionalTrustedCA additionalTrustedCA) { + public void setAdditionalTrustedCA(ConfigMapNameReference additionalTrustedCA) { this.additionalTrustedCA = additionalTrustedCA; } @JsonProperty("buildDefaults") - public BuildSpecBuildDefaults getBuildDefaults() { + public BuildDefaults getBuildDefaults() { return buildDefaults; } @JsonProperty("buildDefaults") - public void setBuildDefaults(BuildSpecBuildDefaults buildDefaults) { + public void setBuildDefaults(BuildDefaults buildDefaults) { this.buildDefaults = buildDefaults; } @JsonProperty("buildOverrides") - public BuildSpecBuildOverrides getBuildOverrides() { + public BuildOverrides getBuildOverrides() { return buildOverrides; } @JsonProperty("buildOverrides") - public void setBuildOverrides(BuildSpecBuildOverrides buildOverrides) { + public void setBuildOverrides(BuildOverrides buildOverrides) { this.buildOverrides = buildOverrides; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecAdditionalTrustedCA.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecAdditionalTrustedCA.java deleted file mode 100644 index ec99ea9470a..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecAdditionalTrustedCA.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class BuildSpecAdditionalTrustedCA implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public BuildSpecAdditionalTrustedCA() { - } - - public BuildSpecAdditionalTrustedCA(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public BuildSpecAdditionalTrustedCABuilder edit() { - return new BuildSpecAdditionalTrustedCABuilder(this); - } - - @JsonIgnore - public BuildSpecAdditionalTrustedCABuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBDDefaultProxy.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBDDefaultProxy.java deleted file mode 100644 index 1cb6b77992e..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBDDefaultProxy.java +++ /dev/null @@ -1,168 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "httpProxy", - "httpsProxy", - "noProxy", - "readinessEndpoints", - "trustedCA" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class BuildSpecBDDefaultProxy implements Editable , KubernetesResource -{ - - @JsonProperty("httpProxy") - private String httpProxy; - @JsonProperty("httpsProxy") - private String httpsProxy; - @JsonProperty("noProxy") - private String noProxy; - @JsonProperty("readinessEndpoints") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List readinessEndpoints = new ArrayList<>(); - @JsonProperty("trustedCA") - private BuildSpecBDDPTrustedCA trustedCA; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public BuildSpecBDDefaultProxy() { - } - - public BuildSpecBDDefaultProxy(String httpProxy, String httpsProxy, String noProxy, List readinessEndpoints, BuildSpecBDDPTrustedCA trustedCA) { - super(); - this.httpProxy = httpProxy; - this.httpsProxy = httpsProxy; - this.noProxy = noProxy; - this.readinessEndpoints = readinessEndpoints; - this.trustedCA = trustedCA; - } - - @JsonProperty("httpProxy") - public String getHttpProxy() { - return httpProxy; - } - - @JsonProperty("httpProxy") - public void setHttpProxy(String httpProxy) { - this.httpProxy = httpProxy; - } - - @JsonProperty("httpsProxy") - public String getHttpsProxy() { - return httpsProxy; - } - - @JsonProperty("httpsProxy") - public void setHttpsProxy(String httpsProxy) { - this.httpsProxy = httpsProxy; - } - - @JsonProperty("noProxy") - public String getNoProxy() { - return noProxy; - } - - @JsonProperty("noProxy") - public void setNoProxy(String noProxy) { - this.noProxy = noProxy; - } - - @JsonProperty("readinessEndpoints") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getReadinessEndpoints() { - return readinessEndpoints; - } - - @JsonProperty("readinessEndpoints") - public void setReadinessEndpoints(List readinessEndpoints) { - this.readinessEndpoints = readinessEndpoints; - } - - @JsonProperty("trustedCA") - public BuildSpecBDDPTrustedCA getTrustedCA() { - return trustedCA; - } - - @JsonProperty("trustedCA") - public void setTrustedCA(BuildSpecBDDPTrustedCA trustedCA) { - this.trustedCA = trustedCA; - } - - @JsonIgnore - public BuildSpecBDDefaultProxyBuilder edit() { - return new BuildSpecBDDefaultProxyBuilder(this); - } - - @JsonIgnore - public BuildSpecBDDefaultProxyBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBDEVFResourceFieldRef.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBDEVFResourceFieldRef.java deleted file mode 100644 index a1396d1c953..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBDEVFResourceFieldRef.java +++ /dev/null @@ -1,138 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "containerName", - "divisor", - "resource" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class BuildSpecBDEVFResourceFieldRef implements Editable , KubernetesResource -{ - - @JsonProperty("containerName") - private String containerName; - @JsonProperty("divisor") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object divisor; - @JsonProperty("resource") - private String resource; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public BuildSpecBDEVFResourceFieldRef() { - } - - public BuildSpecBDEVFResourceFieldRef(String containerName, Object divisor, String resource) { - super(); - this.containerName = containerName; - this.divisor = divisor; - this.resource = resource; - } - - @JsonProperty("containerName") - public String getContainerName() { - return containerName; - } - - @JsonProperty("containerName") - public void setContainerName(String containerName) { - this.containerName = containerName; - } - - @JsonProperty("divisor") - public Object getDivisor() { - return divisor; - } - - @JsonProperty("divisor") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setDivisor(Object divisor) { - this.divisor = divisor; - } - - @JsonProperty("resource") - public String getResource() { - return resource; - } - - @JsonProperty("resource") - public void setResource(String resource) { - this.resource = resource; - } - - @JsonIgnore - public BuildSpecBDEVFResourceFieldRefBuilder edit() { - return new BuildSpecBDEVFResourceFieldRefBuilder(this); - } - - @JsonIgnore - public BuildSpecBDEVFResourceFieldRefBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBDGPTrustedCA.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBDGPTrustedCA.java deleted file mode 100644 index c317e259ccb..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBDGPTrustedCA.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class BuildSpecBDGPTrustedCA implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public BuildSpecBDGPTrustedCA() { - } - - public BuildSpecBDGPTrustedCA(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public BuildSpecBDGPTrustedCABuilder edit() { - return new BuildSpecBDGPTrustedCABuilder(this); - } - - @JsonIgnore - public BuildSpecBDGPTrustedCABuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBDGitProxy.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBDGitProxy.java deleted file mode 100644 index 842562ee646..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBDGitProxy.java +++ /dev/null @@ -1,168 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "httpProxy", - "httpsProxy", - "noProxy", - "readinessEndpoints", - "trustedCA" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class BuildSpecBDGitProxy implements Editable , KubernetesResource -{ - - @JsonProperty("httpProxy") - private String httpProxy; - @JsonProperty("httpsProxy") - private String httpsProxy; - @JsonProperty("noProxy") - private String noProxy; - @JsonProperty("readinessEndpoints") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List readinessEndpoints = new ArrayList<>(); - @JsonProperty("trustedCA") - private BuildSpecBDGPTrustedCA trustedCA; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public BuildSpecBDGitProxy() { - } - - public BuildSpecBDGitProxy(String httpProxy, String httpsProxy, String noProxy, List readinessEndpoints, BuildSpecBDGPTrustedCA trustedCA) { - super(); - this.httpProxy = httpProxy; - this.httpsProxy = httpsProxy; - this.noProxy = noProxy; - this.readinessEndpoints = readinessEndpoints; - this.trustedCA = trustedCA; - } - - @JsonProperty("httpProxy") - public String getHttpProxy() { - return httpProxy; - } - - @JsonProperty("httpProxy") - public void setHttpProxy(String httpProxy) { - this.httpProxy = httpProxy; - } - - @JsonProperty("httpsProxy") - public String getHttpsProxy() { - return httpsProxy; - } - - @JsonProperty("httpsProxy") - public void setHttpsProxy(String httpsProxy) { - this.httpsProxy = httpsProxy; - } - - @JsonProperty("noProxy") - public String getNoProxy() { - return noProxy; - } - - @JsonProperty("noProxy") - public void setNoProxy(String noProxy) { - this.noProxy = noProxy; - } - - @JsonProperty("readinessEndpoints") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getReadinessEndpoints() { - return readinessEndpoints; - } - - @JsonProperty("readinessEndpoints") - public void setReadinessEndpoints(List readinessEndpoints) { - this.readinessEndpoints = readinessEndpoints; - } - - @JsonProperty("trustedCA") - public BuildSpecBDGPTrustedCA getTrustedCA() { - return trustedCA; - } - - @JsonProperty("trustedCA") - public void setTrustedCA(BuildSpecBDGPTrustedCA trustedCA) { - this.trustedCA = trustedCA; - } - - @JsonIgnore - public BuildSpecBDGitProxyBuilder edit() { - return new BuildSpecBDGitProxyBuilder(this); - } - - @JsonIgnore - public BuildSpecBDGitProxyBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBOTolerations.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBOTolerations.java deleted file mode 100644 index 18a747844e3..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBOTolerations.java +++ /dev/null @@ -1,164 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "effect", - "key", - "operator", - "tolerationSeconds", - "value" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class BuildSpecBOTolerations implements Editable , KubernetesResource -{ - - @JsonProperty("effect") - private String effect; - @JsonProperty("key") - private String key; - @JsonProperty("operator") - private String operator; - @JsonProperty("tolerationSeconds") - private Long tolerationSeconds; - @JsonProperty("value") - private String value; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public BuildSpecBOTolerations() { - } - - public BuildSpecBOTolerations(String effect, String key, String operator, Long tolerationSeconds, String value) { - super(); - this.effect = effect; - this.key = key; - this.operator = operator; - this.tolerationSeconds = tolerationSeconds; - this.value = value; - } - - @JsonProperty("effect") - public String getEffect() { - return effect; - } - - @JsonProperty("effect") - public void setEffect(String effect) { - this.effect = effect; - } - - @JsonProperty("key") - public String getKey() { - return key; - } - - @JsonProperty("key") - public void setKey(String key) { - this.key = key; - } - - @JsonProperty("operator") - public String getOperator() { - return operator; - } - - @JsonProperty("operator") - public void setOperator(String operator) { - this.operator = operator; - } - - @JsonProperty("tolerationSeconds") - public Long getTolerationSeconds() { - return tolerationSeconds; - } - - @JsonProperty("tolerationSeconds") - public void setTolerationSeconds(Long tolerationSeconds) { - this.tolerationSeconds = tolerationSeconds; - } - - @JsonProperty("value") - public String getValue() { - return value; - } - - @JsonProperty("value") - public void setValue(String value) { - this.value = value; - } - - @JsonIgnore - public BuildSpecBOTolerationsBuilder edit() { - return new BuildSpecBOTolerationsBuilder(this); - } - - @JsonIgnore - public BuildSpecBOTolerationsBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkStatusMMNetwork.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/CertInfo.java similarity index 77% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkStatusMMNetwork.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/CertInfo.java index f63f74e0ceb..a04147f6ef6 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkStatusMMNetwork.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/CertInfo.java @@ -31,8 +31,8 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "from", - "to" + "certFile", + "keyFile" }) @ToString @EqualsAndHashCode @@ -52,13 +52,13 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NetworkStatusMMNetwork implements Editable , KubernetesResource +public class CertInfo implements Editable , KubernetesResource { - @JsonProperty("from") - private Integer from; - @JsonProperty("to") - private Integer to; + @JsonProperty("certFile") + private String certFile; + @JsonProperty("keyFile") + private String keyFile; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,42 +66,42 @@ public class NetworkStatusMMNetwork implements Editable , KubernetesResource +{ + + @JsonProperty("acceptContentTypes") + private String acceptContentTypes; + @JsonProperty("burst") + private Integer burst; + @JsonProperty("contentType") + private String contentType; + @JsonProperty("qps") + private Float qps; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ClientConnectionOverrides() { + } + + public ClientConnectionOverrides(String acceptContentTypes, Integer burst, String contentType, Float qps) { + super(); + this.acceptContentTypes = acceptContentTypes; + this.burst = burst; + this.contentType = contentType; + this.qps = qps; + } + + @JsonProperty("acceptContentTypes") + public String getAcceptContentTypes() { + return acceptContentTypes; + } + + @JsonProperty("acceptContentTypes") + public void setAcceptContentTypes(String acceptContentTypes) { + this.acceptContentTypes = acceptContentTypes; + } + + @JsonProperty("burst") + public Integer getBurst() { + return burst; + } + + @JsonProperty("burst") + public void setBurst(Integer burst) { + this.burst = burst; + } + + @JsonProperty("contentType") + public String getContentType() { + return contentType; + } + + @JsonProperty("contentType") + public void setContentType(String contentType) { + this.contentType = contentType; + } + + @JsonProperty("qps") + public Float getQps() { + return qps; + } + + @JsonProperty("qps") + public void setQps(Float qps) { + this.qps = qps; + } + + @JsonIgnore + public ClientConnectionOverridesBuilder edit() { + return new ClientConnectionOverridesBuilder(this); + } + + @JsonIgnore + public ClientConnectionOverridesBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSECloudControllerManager.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/CloudControllerManagerStatus.java similarity index 86% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSECloudControllerManager.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/CloudControllerManagerStatus.java index eb9348d200c..c611f340f59 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSECloudControllerManager.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/CloudControllerManagerStatus.java @@ -51,7 +51,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureStatusPSECloudControllerManager implements Editable , KubernetesResource +public class CloudControllerManagerStatus implements Editable , KubernetesResource { @JsonProperty("state") @@ -63,10 +63,10 @@ public class InfrastructureStatusPSECloudControllerManager implements Editable , KubernetesResource +{ + + @JsonProperty("clusterHosted") + private CloudLoadBalancerIPs clusterHosted; + @JsonProperty("dnsType") + private String dnsType; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public CloudLoadBalancerConfig() { + } + + public CloudLoadBalancerConfig(CloudLoadBalancerIPs clusterHosted, String dnsType) { + super(); + this.clusterHosted = clusterHosted; + this.dnsType = dnsType; + } + + @JsonProperty("clusterHosted") + public CloudLoadBalancerIPs getClusterHosted() { + return clusterHosted; + } + + @JsonProperty("clusterHosted") + public void setClusterHosted(CloudLoadBalancerIPs clusterHosted) { + this.clusterHosted = clusterHosted; + } + + @JsonProperty("dnsType") + public String getDnsType() { + return dnsType; + } + + @JsonProperty("dnsType") + public void setDnsType(String dnsType) { + this.dnsType = dnsType; + } + + @JsonIgnore + public CloudLoadBalancerConfigBuilder edit() { + return new CloudLoadBalancerConfigBuilder(this); + } + + @JsonIgnore + public CloudLoadBalancerConfigBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/CloudLoadBalancerIPs.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/CloudLoadBalancerIPs.java new file mode 100644 index 00000000000..130b1e4702e --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/CloudLoadBalancerIPs.java @@ -0,0 +1,144 @@ + +package io.fabric8.openshift.api.model.config.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "apiIntLoadBalancerIPs", + "apiLoadBalancerIPs", + "ingressLoadBalancerIPs" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class CloudLoadBalancerIPs implements Editable , KubernetesResource +{ + + @JsonProperty("apiIntLoadBalancerIPs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List apiIntLoadBalancerIPs = new ArrayList<>(); + @JsonProperty("apiLoadBalancerIPs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List apiLoadBalancerIPs = new ArrayList<>(); + @JsonProperty("ingressLoadBalancerIPs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List ingressLoadBalancerIPs = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public CloudLoadBalancerIPs() { + } + + public CloudLoadBalancerIPs(List apiIntLoadBalancerIPs, List apiLoadBalancerIPs, List ingressLoadBalancerIPs) { + super(); + this.apiIntLoadBalancerIPs = apiIntLoadBalancerIPs; + this.apiLoadBalancerIPs = apiLoadBalancerIPs; + this.ingressLoadBalancerIPs = ingressLoadBalancerIPs; + } + + @JsonProperty("apiIntLoadBalancerIPs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getApiIntLoadBalancerIPs() { + return apiIntLoadBalancerIPs; + } + + @JsonProperty("apiIntLoadBalancerIPs") + public void setApiIntLoadBalancerIPs(List apiIntLoadBalancerIPs) { + this.apiIntLoadBalancerIPs = apiIntLoadBalancerIPs; + } + + @JsonProperty("apiLoadBalancerIPs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getApiLoadBalancerIPs() { + return apiLoadBalancerIPs; + } + + @JsonProperty("apiLoadBalancerIPs") + public void setApiLoadBalancerIPs(List apiLoadBalancerIPs) { + this.apiLoadBalancerIPs = apiLoadBalancerIPs; + } + + @JsonProperty("ingressLoadBalancerIPs") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getIngressLoadBalancerIPs() { + return ingressLoadBalancerIPs; + } + + @JsonProperty("ingressLoadBalancerIPs") + public void setIngressLoadBalancerIPs(List ingressLoadBalancerIPs) { + this.ingressLoadBalancerIPs = ingressLoadBalancerIPs; + } + + @JsonIgnore + public CloudLoadBalancerIPsBuilder edit() { + return new CloudLoadBalancerIPsBuilder(this); + } + + @JsonIgnore + public CloudLoadBalancerIPsBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusCURMatchingRules.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterCondition.java similarity index 83% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusCURMatchingRules.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterCondition.java index 37484c86723..9ea86c56011 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusCURMatchingRules.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterCondition.java @@ -52,11 +52,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterVersionStatusCURMatchingRules implements Editable , KubernetesResource +public class ClusterCondition implements Editable , KubernetesResource { @JsonProperty("promql") - private ClusterVersionStatusCURMRPromql promql; + private PromQLClusterCondition promql; @JsonProperty("type") private String type; @JsonIgnore @@ -66,22 +66,22 @@ public class ClusterVersionStatusCURMatchingRules implements Editable , KubernetesResource +public class ClusterNetworkEntry implements Editable , KubernetesResource { @JsonProperty("cidr") private String cidr; @JsonProperty("hostPrefix") - private Integer hostPrefix; + private Long hostPrefix; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,10 +66,10 @@ public class NetworkSpecClusterNetwork implements Editable , HasMe @JsonProperty("metadata") private ObjectMeta metadata; @JsonProperty("spec") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object spec; + private ClusterOperatorSpec spec; @JsonProperty("status") private ClusterOperatorStatus status; @JsonIgnore @@ -98,7 +97,7 @@ public class ClusterOperator implements Editable , HasMe public ClusterOperator() { } - public ClusterOperator(String apiVersion, String kind, ObjectMeta metadata, Object spec, ClusterOperatorStatus status) { + public ClusterOperator(String apiVersion, String kind, ObjectMeta metadata, ClusterOperatorSpec spec, ClusterOperatorStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -158,13 +157,12 @@ public void setMetadata(ObjectMeta metadata) { } @JsonProperty("spec") - public Object getSpec() { + public ClusterOperatorSpec getSpec() { return spec; } @JsonProperty("spec") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setSpec(Object spec) { + public void setSpec(ClusterOperatorSpec spec) { this.spec = spec; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterOperatorSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterOperatorSpec.java new file mode 100644 index 00000000000..369ce611c27 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterOperatorSpec.java @@ -0,0 +1,83 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class ClusterOperatorSpec implements Editable , KubernetesResource +{ + + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + @JsonIgnore + public ClusterOperatorSpecBuilder edit() { + return new ClusterOperatorSpecBuilder(this); + } + + @JsonIgnore + public ClusterOperatorSpecBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterOperatorStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterOperatorStatus.java index 674e3a9f8cc..11eb061a12a 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterOperatorStatus.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterOperatorStatus.java @@ -61,16 +61,16 @@ public class ClusterOperatorStatus implements Editable conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("extension") @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) private Object extension; @JsonProperty("relatedObjects") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List relatedObjects = new ArrayList<>(); + private List relatedObjects = new ArrayList<>(); @JsonProperty("versions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List versions = new ArrayList<>(); + private List versions = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -81,7 +81,7 @@ public class ClusterOperatorStatus implements Editable conditions, Object extension, List relatedObjects, List versions) { + public ClusterOperatorStatus(List conditions, Object extension, List relatedObjects, List versions) { super(); this.conditions = conditions; this.extension = extension; @@ -91,12 +91,12 @@ public ClusterOperatorStatus(List conditions, O @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @@ -113,23 +113,23 @@ public void setExtension(Object extension) { @JsonProperty("relatedObjects") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getRelatedObjects() { + public List getRelatedObjects() { return relatedObjects; } @JsonProperty("relatedObjects") - public void setRelatedObjects(List relatedObjects) { + public void setRelatedObjects(List relatedObjects) { this.relatedObjects = relatedObjects; } @JsonProperty("versions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getVersions() { + public List getVersions() { return versions; } @JsonProperty("versions") - public void setVersions(List versions) { + public void setVersions(List versions) { this.versions = versions; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusConditions.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterOperatorStatusCondition.java similarity index 91% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusConditions.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterOperatorStatusCondition.java index c8ba5409b75..d1e24152d70 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusConditions.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterOperatorStatusCondition.java @@ -55,7 +55,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterVersionStatusConditions implements Editable , KubernetesResource +public class ClusterOperatorStatusCondition implements Editable , KubernetesResource { @JsonProperty("lastTransitionTime") @@ -75,10 +75,10 @@ public class ClusterVersionStatusConditions implements Editable , KubernetesResource +public class ClusterVersionCapabilitiesSpec implements Editable , KubernetesResource { @JsonProperty("additionalEnabledCapabilities") @@ -69,10 +69,10 @@ public class ClusterVersionSpecCapabilities implements Editable additionalEnabledCapabilities, String baselineCapabilitySet) { + public ClusterVersionCapabilitiesSpec(List additionalEnabledCapabilities, String baselineCapabilitySet) { super(); this.additionalEnabledCapabilities = additionalEnabledCapabilities; this.baselineCapabilitySet = baselineCapabilitySet; @@ -100,12 +100,12 @@ public void setBaselineCapabilitySet(String baselineCapabilitySet) { } @JsonIgnore - public ClusterVersionSpecCapabilitiesBuilder edit() { - return new ClusterVersionSpecCapabilitiesBuilder(this); + public ClusterVersionCapabilitiesSpecBuilder edit() { + return new ClusterVersionCapabilitiesSpecBuilder(this); } @JsonIgnore - public ClusterVersionSpecCapabilitiesBuilder toBuilder() { + public ClusterVersionCapabilitiesSpecBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusCapabilities.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionCapabilitiesStatus.java similarity index 90% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusCapabilities.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionCapabilitiesStatus.java index b7be7adab26..01fd9365b10 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusCapabilities.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionCapabilitiesStatus.java @@ -54,7 +54,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterVersionStatusCapabilities implements Editable , KubernetesResource +public class ClusterVersionCapabilitiesStatus implements Editable , KubernetesResource { @JsonProperty("enabledCapabilities") @@ -70,10 +70,10 @@ public class ClusterVersionStatusCapabilities implements Editable enabledCapabilities, List knownCapabilities) { + public ClusterVersionCapabilitiesStatus(List enabledCapabilities, List knownCapabilities) { super(); this.enabledCapabilities = enabledCapabilities; this.knownCapabilities = knownCapabilities; @@ -102,12 +102,12 @@ public void setKnownCapabilities(List knownCapabilities) { } @JsonIgnore - public ClusterVersionStatusCapabilitiesBuilder edit() { - return new ClusterVersionStatusCapabilitiesBuilder(this); + public ClusterVersionCapabilitiesStatusBuilder edit() { + return new ClusterVersionCapabilitiesStatusBuilder(this); } @JsonIgnore - public ClusterVersionStatusCapabilitiesBuilder toBuilder() { + public ClusterVersionCapabilitiesStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionSpec.java index d6987d985fb..0e5ae0ea498 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionSpec.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionSpec.java @@ -38,6 +38,7 @@ "clusterID", "desiredUpdate", "overrides", + "signatureStores", "upstream" }) @ToString @@ -62,16 +63,19 @@ public class ClusterVersionSpec implements Editable , { @JsonProperty("capabilities") - private ClusterVersionSpecCapabilities capabilities; + private ClusterVersionCapabilitiesSpec capabilities; @JsonProperty("channel") private String channel; @JsonProperty("clusterID") private String clusterID; @JsonProperty("desiredUpdate") - private ClusterVersionSpecDesiredUpdate desiredUpdate; + private Update desiredUpdate; @JsonProperty("overrides") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List overrides = new ArrayList<>(); + private List overrides = new ArrayList<>(); + @JsonProperty("signatureStores") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List signatureStores = new ArrayList<>(); @JsonProperty("upstream") private String upstream; @JsonIgnore @@ -84,23 +88,24 @@ public class ClusterVersionSpec implements Editable , public ClusterVersionSpec() { } - public ClusterVersionSpec(ClusterVersionSpecCapabilities capabilities, String channel, String clusterID, ClusterVersionSpecDesiredUpdate desiredUpdate, List overrides, String upstream) { + public ClusterVersionSpec(ClusterVersionCapabilitiesSpec capabilities, String channel, String clusterID, Update desiredUpdate, List overrides, List signatureStores, String upstream) { super(); this.capabilities = capabilities; this.channel = channel; this.clusterID = clusterID; this.desiredUpdate = desiredUpdate; this.overrides = overrides; + this.signatureStores = signatureStores; this.upstream = upstream; } @JsonProperty("capabilities") - public ClusterVersionSpecCapabilities getCapabilities() { + public ClusterVersionCapabilitiesSpec getCapabilities() { return capabilities; } @JsonProperty("capabilities") - public void setCapabilities(ClusterVersionSpecCapabilities capabilities) { + public void setCapabilities(ClusterVersionCapabilitiesSpec capabilities) { this.capabilities = capabilities; } @@ -125,26 +130,37 @@ public void setClusterID(String clusterID) { } @JsonProperty("desiredUpdate") - public ClusterVersionSpecDesiredUpdate getDesiredUpdate() { + public Update getDesiredUpdate() { return desiredUpdate; } @JsonProperty("desiredUpdate") - public void setDesiredUpdate(ClusterVersionSpecDesiredUpdate desiredUpdate) { + public void setDesiredUpdate(Update desiredUpdate) { this.desiredUpdate = desiredUpdate; } @JsonProperty("overrides") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getOverrides() { + public List getOverrides() { return overrides; } @JsonProperty("overrides") - public void setOverrides(List overrides) { + public void setOverrides(List overrides) { this.overrides = overrides; } + @JsonProperty("signatureStores") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getSignatureStores() { + return signatureStores; + } + + @JsonProperty("signatureStores") + public void setSignatureStores(List signatureStores) { + this.signatureStores = signatureStores; + } + @JsonProperty("upstream") public String getUpstream() { return upstream; diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatus.java index 188082389c9..b51c4e604e9 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatus.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatus.java @@ -64,21 +64,21 @@ public class ClusterVersionStatus implements Editable availableUpdates = new ArrayList<>(); @JsonProperty("capabilities") - private ClusterVersionStatusCapabilities capabilities; + private ClusterVersionCapabilitiesStatus capabilities; @JsonProperty("conditionalUpdates") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditionalUpdates = new ArrayList<>(); + private List conditionalUpdates = new ArrayList<>(); @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("desired") - private ClusterVersionStatusDesired desired; + private Release desired; @JsonProperty("history") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List history = new ArrayList<>(); + private List history = new ArrayList<>(); @JsonProperty("observedGeneration") private Long observedGeneration; @JsonProperty("versionHash") @@ -93,7 +93,7 @@ public class ClusterVersionStatus implements Editable conditionalUpdates, List conditions, ClusterVersionStatusDesired desired, List history, Long observedGeneration, String versionHash) { + public ClusterVersionStatus(List availableUpdates, ClusterVersionCapabilitiesStatus capabilities, List conditionalUpdates, List conditions, Release desired, List history, Long observedGeneration, String versionHash) { super(); this.availableUpdates = availableUpdates; this.capabilities = capabilities; @@ -106,66 +106,66 @@ public ClusterVersionStatus(Object availableUpdates, ClusterVersionStatusCapabil } @JsonProperty("availableUpdates") - public Object getAvailableUpdates() { + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getAvailableUpdates() { return availableUpdates; } @JsonProperty("availableUpdates") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setAvailableUpdates(Object availableUpdates) { + public void setAvailableUpdates(List availableUpdates) { this.availableUpdates = availableUpdates; } @JsonProperty("capabilities") - public ClusterVersionStatusCapabilities getCapabilities() { + public ClusterVersionCapabilitiesStatus getCapabilities() { return capabilities; } @JsonProperty("capabilities") - public void setCapabilities(ClusterVersionStatusCapabilities capabilities) { + public void setCapabilities(ClusterVersionCapabilitiesStatus capabilities) { this.capabilities = capabilities; } @JsonProperty("conditionalUpdates") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditionalUpdates() { + public List getConditionalUpdates() { return conditionalUpdates; } @JsonProperty("conditionalUpdates") - public void setConditionalUpdates(List conditionalUpdates) { + public void setConditionalUpdates(List conditionalUpdates) { this.conditionalUpdates = conditionalUpdates; } @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("desired") - public ClusterVersionStatusDesired getDesired() { + public Release getDesired() { return desired; } @JsonProperty("desired") - public void setDesired(ClusterVersionStatusDesired desired) { + public void setDesired(Release desired) { this.desired = desired; } @JsonProperty("history") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getHistory() { + public List getHistory() { return history; } @JsonProperty("history") - public void setHistory(List history) { + public void setHistory(List history) { this.history = history; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusCUConditions.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusCUConditions.java deleted file mode 100644 index f6ce243be52..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusCUConditions.java +++ /dev/null @@ -1,178 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "lastTransitionTime", - "message", - "observedGeneration", - "reason", - "status", - "type" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class ClusterVersionStatusCUConditions implements Editable , KubernetesResource -{ - - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("observedGeneration") - private Long observedGeneration; - @JsonProperty("reason") - private String reason; - @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ClusterVersionStatusCUConditions() { - } - - public ClusterVersionStatusCUConditions(String lastTransitionTime, String message, Long observedGeneration, String reason, String status, String type) { - super(); - this.lastTransitionTime = lastTransitionTime; - this.message = message; - this.observedGeneration = observedGeneration; - this.reason = reason; - this.status = status; - this.type = type; - } - - @JsonProperty("lastTransitionTime") - public String getLastTransitionTime() { - return lastTransitionTime; - } - - @JsonProperty("lastTransitionTime") - public void setLastTransitionTime(String lastTransitionTime) { - this.lastTransitionTime = lastTransitionTime; - } - - @JsonProperty("message") - public String getMessage() { - return message; - } - - @JsonProperty("message") - public void setMessage(String message) { - this.message = message; - } - - @JsonProperty("observedGeneration") - public Long getObservedGeneration() { - return observedGeneration; - } - - @JsonProperty("observedGeneration") - public void setObservedGeneration(Long observedGeneration) { - this.observedGeneration = observedGeneration; - } - - @JsonProperty("reason") - public String getReason() { - return reason; - } - - @JsonProperty("reason") - public void setReason(String reason) { - this.reason = reason; - } - - @JsonProperty("status") - public String getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(String status) { - this.status = status; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public ClusterVersionStatusCUConditionsBuilder edit() { - return new ClusterVersionStatusCUConditionsBuilder(this); - } - - @JsonIgnore - public ClusterVersionStatusCUConditionsBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionSpecOverrides.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ComponentOverride.java similarity index 90% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionSpecOverrides.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ComponentOverride.java index 1f130f54979..7bf20182ea3 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionSpecOverrides.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ComponentOverride.java @@ -55,7 +55,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterVersionSpecOverrides implements Editable , KubernetesResource +public class ComponentOverride implements Editable , KubernetesResource { @JsonProperty("group") @@ -75,10 +75,10 @@ public class ClusterVersionSpecOverrides implements Editable , KubernetesResource +public class ComponentRouteSpec implements Editable , KubernetesResource { @JsonProperty("hostname") @@ -64,7 +64,7 @@ public class IngressSpecComponentRoutes implements Editable additionalProperties = new LinkedHashMap(); @@ -72,10 +72,10 @@ public class IngressSpecComponentRoutes implements Editable , KubernetesResource +public class ComponentRouteStatus implements Editable , KubernetesResource { @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("consumingUsers") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List consumingUsers = new ArrayList<>(); @@ -79,7 +80,7 @@ public class IngressStatusComponentRoutes implements Editable relatedObjects = new ArrayList<>(); + private List relatedObjects = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -87,10 +88,10 @@ public class IngressStatusComponentRoutes implements Editable conditions, List consumingUsers, List currentHostnames, String defaultHostname, String name, String namespace, List relatedObjects) { + public ComponentRouteStatus(List conditions, List consumingUsers, List currentHostnames, String defaultHostname, String name, String namespace, List relatedObjects) { super(); this.conditions = conditions; this.consumingUsers = consumingUsers; @@ -103,12 +104,12 @@ public IngressStatusComponentRoutes(List conditions, @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @@ -166,22 +167,22 @@ public void setNamespace(String namespace) { @JsonProperty("relatedObjects") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getRelatedObjects() { + public List getRelatedObjects() { return relatedObjects; } @JsonProperty("relatedObjects") - public void setRelatedObjects(List relatedObjects) { + public void setRelatedObjects(List relatedObjects) { this.relatedObjects = relatedObjects; } @JsonIgnore - public IngressStatusComponentRoutesBuilder edit() { - return new IngressStatusComponentRoutesBuilder(this); + public ComponentRouteStatusBuilder edit() { + return new ComponentRouteStatusBuilder(this); } @JsonIgnore - public IngressStatusComponentRoutesBuilder toBuilder() { + public ComponentRouteStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusConditionalUpdates.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ConditionalUpdate.java similarity index 76% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusConditionalUpdates.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ConditionalUpdate.java index 1f845944b4f..1e9e12de2ef 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusConditionalUpdates.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ConditionalUpdate.java @@ -14,6 +14,7 @@ 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.Condition; import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; @@ -55,17 +56,17 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterVersionStatusConditionalUpdates implements Editable , KubernetesResource +public class ConditionalUpdate implements Editable , KubernetesResource { @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("release") - private ClusterVersionStatusCURelease release; + private Release release; @JsonProperty("risks") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List risks = new ArrayList<>(); + private List risks = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -73,10 +74,10 @@ public class ClusterVersionStatusConditionalUpdates implements Editable conditions, ClusterVersionStatusCURelease release, List risks) { + public ConditionalUpdate(List conditions, Release release, List risks) { super(); this.conditions = conditions; this.release = release; @@ -85,43 +86,43 @@ public ClusterVersionStatusConditionalUpdates(List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("release") - public ClusterVersionStatusCURelease getRelease() { + public Release getRelease() { return release; } @JsonProperty("release") - public void setRelease(ClusterVersionStatusCURelease release) { + public void setRelease(Release release) { this.release = release; } @JsonProperty("risks") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getRisks() { + public List getRisks() { return risks; } @JsonProperty("risks") - public void setRisks(List risks) { + public void setRisks(List risks) { this.risks = risks; } @JsonIgnore - public ClusterVersionStatusConditionalUpdatesBuilder edit() { - return new ClusterVersionStatusConditionalUpdatesBuilder(this); + public ConditionalUpdateBuilder edit() { + return new ConditionalUpdateBuilder(this); } @JsonIgnore - public ClusterVersionStatusConditionalUpdatesBuilder toBuilder() { + public ConditionalUpdateBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusCURisks.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ConditionalUpdateRisk.java similarity index 85% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusCURisks.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ConditionalUpdateRisk.java index cf1297a3681..5634e0b8c46 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusCURisks.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ConditionalUpdateRisk.java @@ -56,12 +56,12 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterVersionStatusCURisks implements Editable , KubernetesResource +public class ConditionalUpdateRisk implements Editable , KubernetesResource { @JsonProperty("matchingRules") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchingRules = new ArrayList<>(); + private List matchingRules = new ArrayList<>(); @JsonProperty("message") private String message; @JsonProperty("name") @@ -75,10 +75,10 @@ public class ClusterVersionStatusCURisks implements Editable matchingRules, String message, String name, String url) { + public ConditionalUpdateRisk(List matchingRules, String message, String name, String url) { super(); this.matchingRules = matchingRules; this.message = message; @@ -88,12 +88,12 @@ public ClusterVersionStatusCURisks(List ma @JsonProperty("matchingRules") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchingRules() { + public List getMatchingRules() { return matchingRules; } @JsonProperty("matchingRules") - public void setMatchingRules(List matchingRules) { + public void setMatchingRules(List matchingRules) { this.matchingRules = matchingRules; } @@ -128,12 +128,12 @@ public void setUrl(String url) { } @JsonIgnore - public ClusterVersionStatusCURisksBuilder edit() { - return new ClusterVersionStatusCURisksBuilder(this); + public ConditionalUpdateRiskBuilder edit() { + return new ConditionalUpdateRiskBuilder(this); } @JsonIgnore - public ClusterVersionStatusCURisksBuilder toBuilder() { + public ConditionalUpdateRiskBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecCloudConfig.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ConfigMapFileReference.java similarity index 89% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecCloudConfig.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ConfigMapFileReference.java index 375f0065653..e1a5399b6ef 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecCloudConfig.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ConfigMapFileReference.java @@ -52,7 +52,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureSpecCloudConfig implements Editable , KubernetesResource +public class ConfigMapFileReference implements Editable , KubernetesResource { @JsonProperty("key") @@ -66,10 +66,10 @@ public class InfrastructureSpecCloudConfig implements Editable , KubernetesResource +public class ConfigMapNameReference implements Editable , KubernetesResource { @JsonProperty("name") @@ -63,10 +63,10 @@ public class BuildSpecBDDPTrustedCA implements Editable , KubernetesResource +public class ConsoleAuthentication implements Editable , KubernetesResource { @JsonProperty("logoutRedirect") @@ -63,10 +63,10 @@ public class ConsoleSpecAuthentication implements Editable , KubernetesRes { @JsonProperty("authentication") - private ConsoleSpecAuthentication authentication; + private ConsoleAuthentication authentication; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,18 +66,18 @@ public class ConsoleSpec implements Editable , KubernetesRes public ConsoleSpec() { } - public ConsoleSpec(ConsoleSpecAuthentication authentication) { + public ConsoleSpec(ConsoleAuthentication authentication) { super(); this.authentication = authentication; } @JsonProperty("authentication") - public ConsoleSpecAuthentication getAuthentication() { + public ConsoleAuthentication getAuthentication() { return authentication; } @JsonProperty("authentication") - public void setAuthentication(ConsoleSpecAuthentication authentication) { + public void setAuthentication(ConsoleAuthentication authentication) { this.authentication = authentication; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/CustomFeatureGates.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/CustomFeatureGates.java new file mode 100644 index 00000000000..0cfeb23c0be --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/CustomFeatureGates.java @@ -0,0 +1,128 @@ + +package io.fabric8.openshift.api.model.config.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "disabled", + "enabled" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class CustomFeatureGates implements Editable , KubernetesResource +{ + + @JsonProperty("disabled") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List disabled = new ArrayList<>(); + @JsonProperty("enabled") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List enabled = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public CustomFeatureGates() { + } + + public CustomFeatureGates(List disabled, List enabled) { + super(); + this.disabled = disabled; + this.enabled = enabled; + } + + @JsonProperty("disabled") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getDisabled() { + return disabled; + } + + @JsonProperty("disabled") + public void setDisabled(List disabled) { + this.disabled = disabled; + } + + @JsonProperty("enabled") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getEnabled() { + return enabled; + } + + @JsonProperty("enabled") + public void setEnabled(List enabled) { + this.enabled = enabled; + } + + @JsonIgnore + public CustomFeatureGatesBuilder edit() { + return new CustomFeatureGatesBuilder(this); + } + + @JsonIgnore + public CustomFeatureGatesBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/CustomTLSProfile.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/CustomTLSProfile.java new file mode 100644 index 00000000000..98302a357e3 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/CustomTLSProfile.java @@ -0,0 +1,126 @@ + +package io.fabric8.openshift.api.model.config.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "ciphers", + "minTLSVersion" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class CustomTLSProfile implements Editable , KubernetesResource +{ + + @JsonProperty("ciphers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List ciphers = new ArrayList<>(); + @JsonProperty("minTLSVersion") + private String minTLSVersion; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public CustomTLSProfile() { + } + + public CustomTLSProfile(List ciphers, String minTLSVersion) { + super(); + this.ciphers = ciphers; + this.minTLSVersion = minTLSVersion; + } + + @JsonProperty("ciphers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getCiphers() { + return ciphers; + } + + @JsonProperty("ciphers") + public void setCiphers(List ciphers) { + this.ciphers = ciphers; + } + + @JsonProperty("minTLSVersion") + public String getMinTLSVersion() { + return minTLSVersion; + } + + @JsonProperty("minTLSVersion") + public void setMinTLSVersion(String minTLSVersion) { + this.minTLSVersion = minTLSVersion; + } + + @JsonIgnore + public CustomTLSProfileBuilder edit() { + return new CustomTLSProfileBuilder(this); + } + + @JsonIgnore + public CustomTLSProfileBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNS.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNS.java index 97934bf88ca..027386bb6ed 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNS.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNS.java @@ -86,8 +86,7 @@ public class DNS implements Editable , HasMetadata @JsonProperty("spec") private DNSSpec spec; @JsonProperty("status") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object status; + private DNSStatus status; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -98,7 +97,7 @@ public class DNS implements Editable , HasMetadata public DNS() { } - public DNS(String apiVersion, String kind, ObjectMeta metadata, DNSSpec spec, Object status) { + public DNS(String apiVersion, String kind, ObjectMeta metadata, DNSSpec spec, DNSStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -168,13 +167,12 @@ public void setSpec(DNSSpec spec) { } @JsonProperty("status") - public Object getStatus() { + public DNSStatus getStatus() { return status; } @JsonProperty("status") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setStatus(Object status) { + public void setStatus(DNSStatus status) { this.status = status; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSSpecPlatform.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSPlatformSpec.java similarity index 89% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSSpecPlatform.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSPlatformSpec.java index 01197d63727..e7bf9671fe7 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSSpecPlatform.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSPlatformSpec.java @@ -52,11 +52,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class DNSSpecPlatform implements Editable , KubernetesResource +public class DNSPlatformSpec implements Editable , KubernetesResource { @JsonProperty("aws") - private DNSSpecPAws aws; + private AWSDNSSpec aws; @JsonProperty("type") private String type; @JsonIgnore @@ -66,22 +66,22 @@ public class DNSSpecPlatform implements Editable , Kuber * No args constructor for use in serialization * */ - public DNSSpecPlatform() { + public DNSPlatformSpec() { } - public DNSSpecPlatform(DNSSpecPAws aws, String type) { + public DNSPlatformSpec(AWSDNSSpec aws, String type) { super(); this.aws = aws; this.type = type; } @JsonProperty("aws") - public DNSSpecPAws getAws() { + public AWSDNSSpec getAws() { return aws; } @JsonProperty("aws") - public void setAws(DNSSpecPAws aws) { + public void setAws(AWSDNSSpec aws) { this.aws = aws; } @@ -96,12 +96,12 @@ public void setType(String type) { } @JsonIgnore - public DNSSpecPlatformBuilder edit() { - return new DNSSpecPlatformBuilder(this); + public DNSPlatformSpecBuilder edit() { + return new DNSPlatformSpecBuilder(this); } @JsonIgnore - public DNSSpecPlatformBuilder toBuilder() { + public DNSPlatformSpecBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSSpec.java index b2166946e8c..6deda2402de 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSSpec.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSSpec.java @@ -60,11 +60,11 @@ public class DNSSpec implements Editable , KubernetesResource @JsonProperty("baseDomain") private String baseDomain; @JsonProperty("platform") - private DNSSpecPlatform platform; + private DNSPlatformSpec platform; @JsonProperty("privateZone") - private DNSSpecPrivateZone privateZone; + private DNSZone privateZone; @JsonProperty("publicZone") - private DNSSpecPublicZone publicZone; + private DNSZone publicZone; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -75,7 +75,7 @@ public class DNSSpec implements Editable , KubernetesResource public DNSSpec() { } - public DNSSpec(String baseDomain, DNSSpecPlatform platform, DNSSpecPrivateZone privateZone, DNSSpecPublicZone publicZone) { + public DNSSpec(String baseDomain, DNSPlatformSpec platform, DNSZone privateZone, DNSZone publicZone) { super(); this.baseDomain = baseDomain; this.platform = platform; @@ -94,32 +94,32 @@ public void setBaseDomain(String baseDomain) { } @JsonProperty("platform") - public DNSSpecPlatform getPlatform() { + public DNSPlatformSpec getPlatform() { return platform; } @JsonProperty("platform") - public void setPlatform(DNSSpecPlatform platform) { + public void setPlatform(DNSPlatformSpec platform) { this.platform = platform; } @JsonProperty("privateZone") - public DNSSpecPrivateZone getPrivateZone() { + public DNSZone getPrivateZone() { return privateZone; } @JsonProperty("privateZone") - public void setPrivateZone(DNSSpecPrivateZone privateZone) { + public void setPrivateZone(DNSZone privateZone) { this.privateZone = privateZone; } @JsonProperty("publicZone") - public DNSSpecPublicZone getPublicZone() { + public DNSZone getPublicZone() { return publicZone; } @JsonProperty("publicZone") - public void setPublicZone(DNSSpecPublicZone publicZone) { + public void setPublicZone(DNSZone publicZone) { this.publicZone = publicZone; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSStatus.java new file mode 100644 index 00000000000..783a0cfa411 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSStatus.java @@ -0,0 +1,83 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class DNSStatus implements Editable , KubernetesResource +{ + + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + @JsonIgnore + public DNSStatusBuilder edit() { + return new DNSStatusBuilder(this); + } + + @JsonIgnore + public DNSStatusBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSSpecPublicZone.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSZone.java similarity index 91% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSSpecPublicZone.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSZone.java index 79dc19475c8..463d814c68c 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSSpecPublicZone.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSZone.java @@ -52,7 +52,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class DNSSpecPublicZone implements Editable , KubernetesResource +public class DNSZone implements Editable , KubernetesResource { @JsonProperty("id") @@ -67,10 +67,10 @@ public class DNSSpecPublicZone implements Editable , K * No args constructor for use in serialization * */ - public DNSSpecPublicZone() { + public DNSZone() { } - public DNSSpecPublicZone(String id, Map tags) { + public DNSZone(String id, Map tags) { super(); this.id = id; this.tags = tags; @@ -98,12 +98,12 @@ public void setTags(Map tags) { } @JsonIgnore - public DNSSpecPublicZoneBuilder edit() { - return new DNSSpecPublicZoneBuilder(this); + public DNSZoneBuilder edit() { + return new DNSZoneBuilder(this); } @JsonIgnore - public DNSSpecPublicZoneBuilder toBuilder() { + public DNSZoneBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuthenticationSpecWTAKubeConfig.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DelegatedAuthentication.java similarity index 81% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuthenticationSpecWTAKubeConfig.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DelegatedAuthentication.java index b3083b9f599..b51f6383e12 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuthenticationSpecWTAKubeConfig.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DelegatedAuthentication.java @@ -31,7 +31,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "name" + "disabled" }) @ToString @EqualsAndHashCode @@ -51,11 +51,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class AuthenticationSpecWTAKubeConfig implements Editable , KubernetesResource +public class DelegatedAuthentication implements Editable , KubernetesResource { - @JsonProperty("name") - private String name; + @JsonProperty("disabled") + private Boolean disabled; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class AuthenticationSpecWTAKubeConfig implements Editable , KubernetesResource +{ + + @JsonProperty("disabled") + private Boolean disabled; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public DelegatedAuthorization() { + } + + public DelegatedAuthorization(Boolean disabled) { + super(); + this.disabled = disabled; + } + + @JsonProperty("disabled") + public Boolean getDisabled() { + return disabled; + } + + @JsonProperty("disabled") + public void setDisabled(Boolean disabled) { + this.disabled = disabled; + } + + @JsonIgnore + public DelegatedAuthorizationBuilder edit() { + return new DelegatedAuthorizationBuilder(this); + } + + @JsonIgnore + public DelegatedAuthorizationBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuthenticationSpecWebhookTokenAuthenticator.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DeprecatedWebhookTokenAuthenticator.java similarity index 81% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuthenticationSpecWebhookTokenAuthenticator.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DeprecatedWebhookTokenAuthenticator.java index 34e5c574726..2b47eb55e1d 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuthenticationSpecWebhookTokenAuthenticator.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DeprecatedWebhookTokenAuthenticator.java @@ -51,11 +51,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class AuthenticationSpecWebhookTokenAuthenticator implements Editable , KubernetesResource +public class DeprecatedWebhookTokenAuthenticator implements Editable , KubernetesResource { @JsonProperty("kubeConfig") - private AuthenticationSpecWTAKubeConfig kubeConfig; + private SecretNameReference kubeConfig; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class AuthenticationSpecWebhookTokenAuthenticator implements Editable , KubernetesResource +{ + + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + @JsonIgnore + public EquinixMetalPlatformSpecBuilder edit() { + return new EquinixMetalPlatformSpecBuilder(this); + } + + @JsonIgnore + public EquinixMetalPlatformSpecBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSKubevirt.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/EquinixMetalPlatformStatus.java similarity index 89% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSKubevirt.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/EquinixMetalPlatformStatus.java index 043d66b56f1..cb2db80d878 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSKubevirt.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/EquinixMetalPlatformStatus.java @@ -52,7 +52,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureStatusPSKubevirt implements Editable , KubernetesResource +public class EquinixMetalPlatformStatus implements Editable , KubernetesResource { @JsonProperty("apiServerInternalIP") @@ -66,10 +66,10 @@ public class InfrastructureStatusPSKubevirt implements Editable , KubernetesResource +{ + + @JsonProperty("ca") + private String ca; + @JsonProperty("certFile") + private String certFile; + @JsonProperty("keyFile") + private String keyFile; + @JsonProperty("urls") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List urls = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public EtcdConnectionInfo() { + } + + public EtcdConnectionInfo(String ca, String certFile, String keyFile, List urls) { + super(); + this.ca = ca; + this.certFile = certFile; + this.keyFile = keyFile; + this.urls = urls; + } + + @JsonProperty("ca") + public String getCa() { + return ca; + } + + @JsonProperty("ca") + public void setCa(String ca) { + this.ca = ca; + } + + @JsonProperty("certFile") + public String getCertFile() { + return certFile; + } + + @JsonProperty("certFile") + public void setCertFile(String certFile) { + this.certFile = certFile; + } + + @JsonProperty("keyFile") + public String getKeyFile() { + return keyFile; + } + + @JsonProperty("keyFile") + public void setKeyFile(String keyFile) { + this.keyFile = keyFile; + } + + @JsonProperty("urls") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getUrls() { + return urls; + } + + @JsonProperty("urls") + public void setUrls(List urls) { + this.urls = urls; + } + + @JsonIgnore + public EtcdConnectionInfoBuilder edit() { + return new EtcdConnectionInfoBuilder(this); + } + + @JsonIgnore + public EtcdConnectionInfoBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/EtcdStorageConfig.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/EtcdStorageConfig.java new file mode 100644 index 00000000000..f7121770848 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/EtcdStorageConfig.java @@ -0,0 +1,168 @@ + +package io.fabric8.openshift.api.model.config.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "ca", + "certFile", + "keyFile", + "storagePrefix", + "urls" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class EtcdStorageConfig implements Editable , KubernetesResource +{ + + @JsonProperty("ca") + private String ca; + @JsonProperty("certFile") + private String certFile; + @JsonProperty("keyFile") + private String keyFile; + @JsonProperty("storagePrefix") + private String storagePrefix; + @JsonProperty("urls") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List urls = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public EtcdStorageConfig() { + } + + public EtcdStorageConfig(String ca, String certFile, String keyFile, String storagePrefix, List urls) { + super(); + this.ca = ca; + this.certFile = certFile; + this.keyFile = keyFile; + this.storagePrefix = storagePrefix; + this.urls = urls; + } + + @JsonProperty("ca") + public String getCa() { + return ca; + } + + @JsonProperty("ca") + public void setCa(String ca) { + this.ca = ca; + } + + @JsonProperty("certFile") + public String getCertFile() { + return certFile; + } + + @JsonProperty("certFile") + public void setCertFile(String certFile) { + this.certFile = certFile; + } + + @JsonProperty("keyFile") + public String getKeyFile() { + return keyFile; + } + + @JsonProperty("keyFile") + public void setKeyFile(String keyFile) { + this.keyFile = keyFile; + } + + @JsonProperty("storagePrefix") + public String getStoragePrefix() { + return storagePrefix; + } + + @JsonProperty("storagePrefix") + public void setStoragePrefix(String storagePrefix) { + this.storagePrefix = storagePrefix; + } + + @JsonProperty("urls") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getUrls() { + return urls; + } + + @JsonProperty("urls") + public void setUrls(List urls) { + this.urls = urls; + } + + @JsonIgnore + public EtcdStorageConfigBuilder edit() { + return new EtcdStorageConfigBuilder(this); + } + + @JsonIgnore + public EtcdStorageConfigBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkSpecExternalIP.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ExternalIPConfig.java similarity index 87% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkSpecExternalIP.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ExternalIPConfig.java index 39404ec2e8c..05ade810442 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkSpecExternalIP.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ExternalIPConfig.java @@ -54,14 +54,14 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NetworkSpecExternalIP implements Editable , KubernetesResource +public class ExternalIPConfig implements Editable , KubernetesResource { @JsonProperty("autoAssignCIDRs") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List autoAssignCIDRs = new ArrayList<>(); @JsonProperty("policy") - private NetworkSpecEIPolicy policy; + private ExternalIPPolicy policy; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,10 +69,10 @@ public class NetworkSpecExternalIP implements Editable autoAssignCIDRs, NetworkSpecEIPolicy policy) { + public ExternalIPConfig(List autoAssignCIDRs, ExternalIPPolicy policy) { super(); this.autoAssignCIDRs = autoAssignCIDRs; this.policy = policy; @@ -90,22 +90,22 @@ public void setAutoAssignCIDRs(List autoAssignCIDRs) { } @JsonProperty("policy") - public NetworkSpecEIPolicy getPolicy() { + public ExternalIPPolicy getPolicy() { return policy; } @JsonProperty("policy") - public void setPolicy(NetworkSpecEIPolicy policy) { + public void setPolicy(ExternalIPPolicy policy) { this.policy = policy; } @JsonIgnore - public NetworkSpecExternalIPBuilder edit() { - return new NetworkSpecExternalIPBuilder(this); + public ExternalIPConfigBuilder edit() { + return new ExternalIPConfigBuilder(this); } @JsonIgnore - public NetworkSpecExternalIPBuilder toBuilder() { + public ExternalIPConfigBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkSpecEIPolicy.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ExternalIPPolicy.java similarity index 91% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkSpecEIPolicy.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ExternalIPPolicy.java index f3ef1d59345..2966303e48d 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkSpecEIPolicy.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ExternalIPPolicy.java @@ -54,7 +54,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NetworkSpecEIPolicy implements Editable , KubernetesResource +public class ExternalIPPolicy implements Editable , KubernetesResource { @JsonProperty("allowedCIDRs") @@ -70,10 +70,10 @@ public class NetworkSpecEIPolicy implements Editable * No args constructor for use in serialization * */ - public NetworkSpecEIPolicy() { + public ExternalIPPolicy() { } - public NetworkSpecEIPolicy(List allowedCIDRs, List rejectedCIDRs) { + public ExternalIPPolicy(List allowedCIDRs, List rejectedCIDRs) { super(); this.allowedCIDRs = allowedCIDRs; this.rejectedCIDRs = rejectedCIDRs; @@ -102,12 +102,12 @@ public void setRejectedCIDRs(List rejectedCIDRs) { } @JsonIgnore - public NetworkSpecEIPolicyBuilder edit() { - return new NetworkSpecEIPolicyBuilder(this); + public ExternalIPPolicyBuilder edit() { + return new ExternalIPPolicyBuilder(this); } @JsonIgnore - public NetworkSpecEIPolicyBuilder toBuilder() { + public ExternalIPPolicyBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSExternal.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ExternalPlatformSpec.java similarity index 89% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSExternal.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ExternalPlatformSpec.java index ce5f834d3af..06465f0c4b9 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSExternal.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ExternalPlatformSpec.java @@ -51,7 +51,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureSpecPSExternal implements Editable , KubernetesResource +public class ExternalPlatformSpec implements Editable , KubernetesResource { @JsonProperty("platformName") @@ -63,10 +63,10 @@ public class InfrastructureSpecPSExternal implements Editable , KubernetesResource +public class ExternalPlatformStatus implements Editable , KubernetesResource { @JsonProperty("cloudControllerManager") - private InfrastructureStatusPSECloudControllerManager cloudControllerManager; + private CloudControllerManagerStatus cloudControllerManager; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class InfrastructureStatusPSExternal implements Editable , KubernetesResource +public class FeatureGateAttributes implements Editable , KubernetesResource { @JsonProperty("name") @@ -63,10 +63,10 @@ public class APIServerSpecClientCA implements Editable , KubernetesResource +public class FeatureGateDetails implements Editable , KubernetesResource { @JsonProperty("disabled") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List disabled = new ArrayList<>(); + private List disabled = new ArrayList<>(); @JsonProperty("enabled") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List enabled = new ArrayList<>(); + private List enabled = new ArrayList<>(); @JsonProperty("version") private String version; @JsonIgnore @@ -73,10 +73,10 @@ public class FeatureGateStatusFeatureGates implements Editable disabled, List enabled, String version) { + public FeatureGateDetails(List disabled, List enabled, String version) { super(); this.disabled = disabled; this.enabled = enabled; @@ -85,23 +85,23 @@ public FeatureGateStatusFeatureGates(List disabled, @JsonProperty("disabled") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getDisabled() { + public List getDisabled() { return disabled; } @JsonProperty("disabled") - public void setDisabled(List disabled) { + public void setDisabled(List disabled) { this.disabled = disabled; } @JsonProperty("enabled") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getEnabled() { + public List getEnabled() { return enabled; } @JsonProperty("enabled") - public void setEnabled(List enabled) { + public void setEnabled(List enabled) { this.enabled = enabled; } @@ -116,12 +116,12 @@ public void setVersion(String version) { } @JsonIgnore - public FeatureGateStatusFeatureGatesBuilder edit() { - return new FeatureGateStatusFeatureGatesBuilder(this); + public FeatureGateDetailsBuilder edit() { + return new FeatureGateDetailsBuilder(this); } @JsonIgnore - public FeatureGateStatusFeatureGatesBuilder toBuilder() { + public FeatureGateDetailsBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateSelection.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateSelection.java new file mode 100644 index 00000000000..d77e8556d31 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateSelection.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "customNoUpgrade", + "featureSet" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class FeatureGateSelection implements Editable , KubernetesResource +{ + + @JsonProperty("customNoUpgrade") + private CustomFeatureGates customNoUpgrade; + @JsonProperty("featureSet") + private String featureSet; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public FeatureGateSelection() { + } + + public FeatureGateSelection(CustomFeatureGates customNoUpgrade, String featureSet) { + super(); + this.customNoUpgrade = customNoUpgrade; + this.featureSet = featureSet; + } + + @JsonProperty("customNoUpgrade") + public CustomFeatureGates getCustomNoUpgrade() { + return customNoUpgrade; + } + + @JsonProperty("customNoUpgrade") + public void setCustomNoUpgrade(CustomFeatureGates customNoUpgrade) { + this.customNoUpgrade = customNoUpgrade; + } + + @JsonProperty("featureSet") + public String getFeatureSet() { + return featureSet; + } + + @JsonProperty("featureSet") + public void setFeatureSet(String featureSet) { + this.featureSet = featureSet; + } + + @JsonIgnore + public FeatureGateSelectionBuilder edit() { + return new FeatureGateSelectionBuilder(this); + } + + @JsonIgnore + public FeatureGateSelectionBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateSpec.java index 6786cb3277d..03d01049abe 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateSpec.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateSpec.java @@ -56,8 +56,7 @@ public class FeatureGateSpec implements Editable , Kuber { @JsonProperty("customNoUpgrade") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object customNoUpgrade; + private CustomFeatureGates customNoUpgrade; @JsonProperty("featureSet") private String featureSet; @JsonIgnore @@ -70,20 +69,19 @@ public class FeatureGateSpec implements Editable , Kuber public FeatureGateSpec() { } - public FeatureGateSpec(Object customNoUpgrade, String featureSet) { + public FeatureGateSpec(CustomFeatureGates customNoUpgrade, String featureSet) { super(); this.customNoUpgrade = customNoUpgrade; this.featureSet = featureSet; } @JsonProperty("customNoUpgrade") - public Object getCustomNoUpgrade() { + public CustomFeatureGates getCustomNoUpgrade() { return customNoUpgrade; } @JsonProperty("customNoUpgrade") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setCustomNoUpgrade(Object customNoUpgrade) { + public void setCustomNoUpgrade(CustomFeatureGates customNoUpgrade) { this.customNoUpgrade = customNoUpgrade; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateStatus.java index bee398c0a22..d353087b7ad 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateStatus.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateStatus.java @@ -14,6 +14,7 @@ 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.Condition; import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; @@ -59,10 +60,10 @@ public class FeatureGateStatus implements Editable , K @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("featureGates") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List featureGates = new ArrayList<>(); + private List featureGates = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -73,7 +74,7 @@ public class FeatureGateStatus implements Editable , K public FeatureGateStatus() { } - public FeatureGateStatus(List conditions, List featureGates) { + public FeatureGateStatus(List conditions, List featureGates) { super(); this.conditions = conditions; this.featureGates = featureGates; @@ -81,23 +82,23 @@ public FeatureGateStatus(List conditions, List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("featureGates") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getFeatureGates() { + public List getFeatureGates() { return featureGates; } @JsonProperty("featureGates") - public void setFeatureGates(List featureGates) { + public void setFeatureGates(List featureGates) { this.featureGates = featureGates; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateStatusConditions.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateStatusConditions.java deleted file mode 100644 index 6d10e3b3b8e..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateStatusConditions.java +++ /dev/null @@ -1,178 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "lastTransitionTime", - "message", - "observedGeneration", - "reason", - "status", - "type" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class FeatureGateStatusConditions implements Editable , KubernetesResource -{ - - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("observedGeneration") - private Long observedGeneration; - @JsonProperty("reason") - private String reason; - @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public FeatureGateStatusConditions() { - } - - public FeatureGateStatusConditions(String lastTransitionTime, String message, Long observedGeneration, String reason, String status, String type) { - super(); - this.lastTransitionTime = lastTransitionTime; - this.message = message; - this.observedGeneration = observedGeneration; - this.reason = reason; - this.status = status; - this.type = type; - } - - @JsonProperty("lastTransitionTime") - public String getLastTransitionTime() { - return lastTransitionTime; - } - - @JsonProperty("lastTransitionTime") - public void setLastTransitionTime(String lastTransitionTime) { - this.lastTransitionTime = lastTransitionTime; - } - - @JsonProperty("message") - public String getMessage() { - return message; - } - - @JsonProperty("message") - public void setMessage(String message) { - this.message = message; - } - - @JsonProperty("observedGeneration") - public Long getObservedGeneration() { - return observedGeneration; - } - - @JsonProperty("observedGeneration") - public void setObservedGeneration(Long observedGeneration) { - this.observedGeneration = observedGeneration; - } - - @JsonProperty("reason") - public String getReason() { - return reason; - } - - @JsonProperty("reason") - public void setReason(String reason) { - this.reason = reason; - } - - @JsonProperty("status") - public String getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(String status) { - this.status = status; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public FeatureGateStatusConditionsBuilder edit() { - return new FeatureGateStatusConditionsBuilder(this); - } - - @JsonIgnore - public FeatureGateStatusConditionsBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateStatusFGDisabled.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateStatusFGDisabled.java deleted file mode 100644 index 026d4fda38c..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateStatusFGDisabled.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class FeatureGateStatusFGDisabled implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public FeatureGateStatusFGDisabled() { - } - - public FeatureGateStatusFGDisabled(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public FeatureGateStatusFGDisabledBuilder edit() { - return new FeatureGateStatusFGDisabledBuilder(this); - } - - @JsonIgnore - public FeatureGateStatusFGDisabledBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateStatusFGEnabled.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateStatusFGEnabled.java deleted file mode 100644 index b666e50e1dd..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateStatusFGEnabled.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class FeatureGateStatusFGEnabled implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public FeatureGateStatusFGEnabled() { - } - - public FeatureGateStatusFGEnabled(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public FeatureGateStatusFGEnabledBuilder edit() { - return new FeatureGateStatusFGEnabledBuilder(this); - } - - @JsonIgnore - public FeatureGateStatusFGEnabledBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateTests.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateTests.java new file mode 100644 index 00000000000..f5a09355c36 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/FeatureGateTests.java @@ -0,0 +1,126 @@ + +package io.fabric8.openshift.api.model.config.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "featureGate", + "tests" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class FeatureGateTests implements Editable , KubernetesResource +{ + + @JsonProperty("featureGate") + private String featureGate; + @JsonProperty("tests") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List tests = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public FeatureGateTests() { + } + + public FeatureGateTests(String featureGate, List tests) { + super(); + this.featureGate = featureGate; + this.tests = tests; + } + + @JsonProperty("featureGate") + public String getFeatureGate() { + return featureGate; + } + + @JsonProperty("featureGate") + public void setFeatureGate(String featureGate) { + this.featureGate = featureGate; + } + + @JsonProperty("tests") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getTests() { + return tests; + } + + @JsonProperty("tests") + public void setTests(List tests) { + this.tests = tests; + } + + @JsonIgnore + public FeatureGateTestsBuilder edit() { + return new FeatureGateTestsBuilder(this); + } + + @JsonIgnore + public FeatureGateTestsBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPRHCa.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/GCPPlatformSpec.java similarity index 79% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPRHCa.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/GCPPlatformSpec.java index 988686e8cb9..72139e84572 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPRHCa.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/GCPPlatformSpec.java @@ -8,7 +8,6 @@ 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; @@ -31,7 +30,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "name" + }) @ToString @EqualsAndHashCode @@ -51,43 +50,19 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class OAuthSpecIPRHCa implements Editable , KubernetesResource +public class GCPPlatformSpec implements Editable , KubernetesResource { - @JsonProperty("name") - private String name; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); - /** - * No args constructor for use in serialization - * - */ - public OAuthSpecIPRHCa() { - } - - public OAuthSpecIPRHCa(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - @JsonIgnore - public OAuthSpecIPRHCaBuilder edit() { - return new OAuthSpecIPRHCaBuilder(this); + public GCPPlatformSpecBuilder edit() { + return new GCPPlatformSpecBuilder(this); } @JsonIgnore - public OAuthSpecIPRHCaBuilder toBuilder() { + public GCPPlatformSpecBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSGcp.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/GCPPlatformStatus.java similarity index 61% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSGcp.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/GCPPlatformStatus.java index 8033842df9d..c799760acc6 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSGcp.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/GCPPlatformStatus.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.api.model.config.v1; +import java.util.ArrayList; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonAnyGetter; @@ -31,8 +33,11 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ + "cloudLoadBalancerConfig", "projectID", - "region" + "region", + "resourceLabels", + "resourceTags" }) @ToString @EqualsAndHashCode @@ -52,13 +57,21 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureStatusPSGcp implements Editable , KubernetesResource +public class GCPPlatformStatus implements Editable , KubernetesResource { + @JsonProperty("cloudLoadBalancerConfig") + private CloudLoadBalancerConfig cloudLoadBalancerConfig; @JsonProperty("projectID") private String projectID; @JsonProperty("region") private String region; + @JsonProperty("resourceLabels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List resourceLabels = new ArrayList<>(); + @JsonProperty("resourceTags") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List resourceTags = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,13 +79,26 @@ public class InfrastructureStatusPSGcp implements Editable resourceLabels, List resourceTags) { super(); + this.cloudLoadBalancerConfig = cloudLoadBalancerConfig; this.projectID = projectID; this.region = region; + this.resourceLabels = resourceLabels; + this.resourceTags = resourceTags; + } + + @JsonProperty("cloudLoadBalancerConfig") + public CloudLoadBalancerConfig getCloudLoadBalancerConfig() { + return cloudLoadBalancerConfig; + } + + @JsonProperty("cloudLoadBalancerConfig") + public void setCloudLoadBalancerConfig(CloudLoadBalancerConfig cloudLoadBalancerConfig) { + this.cloudLoadBalancerConfig = cloudLoadBalancerConfig; } @JsonProperty("projectID") @@ -95,13 +121,35 @@ public void setRegion(String region) { this.region = region; } + @JsonProperty("resourceLabels") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getResourceLabels() { + return resourceLabels; + } + + @JsonProperty("resourceLabels") + public void setResourceLabels(List resourceLabels) { + this.resourceLabels = resourceLabels; + } + + @JsonProperty("resourceTags") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getResourceTags() { + return resourceTags; + } + + @JsonProperty("resourceTags") + public void setResourceTags(List resourceTags) { + this.resourceTags = resourceTags; + } + @JsonIgnore - public InfrastructureStatusPSGcpBuilder edit() { - return new InfrastructureStatusPSGcpBuilder(this); + public GCPPlatformStatusBuilder edit() { + return new GCPPlatformStatusBuilder(this); } @JsonIgnore - public InfrastructureStatusPSGcpBuilder toBuilder() { + public GCPPlatformStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBOImageLabels.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/GCPResourceLabel.java similarity index 83% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBOImageLabels.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/GCPResourceLabel.java index 96326dd97e1..a19a3f01811 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBOImageLabels.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/GCPResourceLabel.java @@ -31,7 +31,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "name", + "key", "value" }) @ToString @@ -52,11 +52,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class BuildSpecBOImageLabels implements Editable , KubernetesResource +public class GCPResourceLabel implements Editable , KubernetesResource { - @JsonProperty("name") - private String name; + @JsonProperty("key") + private String key; @JsonProperty("value") private String value; @JsonIgnore @@ -66,23 +66,23 @@ public class BuildSpecBOImageLabels implements Editable , KubernetesResource +{ + + @JsonProperty("key") + private String key; + @JsonProperty("parentID") + private String parentID; + @JsonProperty("value") + private String value; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public GCPResourceTag() { + } + + public GCPResourceTag(String key, String parentID, String value) { + super(); + this.key = key; + this.parentID = parentID; + this.value = value; + } + + @JsonProperty("key") + public String getKey() { + return key; + } + + @JsonProperty("key") + public void setKey(String key) { + this.key = key; + } + + @JsonProperty("parentID") + public String getParentID() { + return parentID; + } + + @JsonProperty("parentID") + public void setParentID(String parentID) { + this.parentID = parentID; + } + + @JsonProperty("value") + public String getValue() { + return value; + } + + @JsonProperty("value") + public void setValue(String value) { + this.value = value; + } + + @JsonIgnore + public GCPResourceTagBuilder edit() { + return new GCPResourceTagBuilder(this); + } + + @JsonIgnore + public GCPResourceTagBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/GenericAPIServerConfig.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/GenericAPIServerConfig.java new file mode 100644 index 00000000000..337874e41e6 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/GenericAPIServerConfig.java @@ -0,0 +1,182 @@ + +package io.fabric8.openshift.api.model.config.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "admission", + "auditConfig", + "corsAllowedOrigins", + "kubeClientConfig", + "servingInfo", + "storageConfig" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class GenericAPIServerConfig implements Editable , KubernetesResource +{ + + @JsonProperty("admission") + private AdmissionConfig admission; + @JsonProperty("auditConfig") + private AuditConfig auditConfig; + @JsonProperty("corsAllowedOrigins") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List corsAllowedOrigins = new ArrayList<>(); + @JsonProperty("kubeClientConfig") + private KubeClientConfig kubeClientConfig; + @JsonProperty("servingInfo") + private HTTPServingInfo servingInfo; + @JsonProperty("storageConfig") + private EtcdStorageConfig storageConfig; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public GenericAPIServerConfig() { + } + + public GenericAPIServerConfig(AdmissionConfig admission, AuditConfig auditConfig, List corsAllowedOrigins, KubeClientConfig kubeClientConfig, HTTPServingInfo servingInfo, EtcdStorageConfig storageConfig) { + super(); + this.admission = admission; + this.auditConfig = auditConfig; + this.corsAllowedOrigins = corsAllowedOrigins; + this.kubeClientConfig = kubeClientConfig; + this.servingInfo = servingInfo; + this.storageConfig = storageConfig; + } + + @JsonProperty("admission") + public AdmissionConfig getAdmission() { + return admission; + } + + @JsonProperty("admission") + public void setAdmission(AdmissionConfig admission) { + this.admission = admission; + } + + @JsonProperty("auditConfig") + public AuditConfig getAuditConfig() { + return auditConfig; + } + + @JsonProperty("auditConfig") + public void setAuditConfig(AuditConfig auditConfig) { + this.auditConfig = auditConfig; + } + + @JsonProperty("corsAllowedOrigins") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getCorsAllowedOrigins() { + return corsAllowedOrigins; + } + + @JsonProperty("corsAllowedOrigins") + public void setCorsAllowedOrigins(List corsAllowedOrigins) { + this.corsAllowedOrigins = corsAllowedOrigins; + } + + @JsonProperty("kubeClientConfig") + public KubeClientConfig getKubeClientConfig() { + return kubeClientConfig; + } + + @JsonProperty("kubeClientConfig") + public void setKubeClientConfig(KubeClientConfig kubeClientConfig) { + this.kubeClientConfig = kubeClientConfig; + } + + @JsonProperty("servingInfo") + public HTTPServingInfo getServingInfo() { + return servingInfo; + } + + @JsonProperty("servingInfo") + public void setServingInfo(HTTPServingInfo servingInfo) { + this.servingInfo = servingInfo; + } + + @JsonProperty("storageConfig") + public EtcdStorageConfig getStorageConfig() { + return storageConfig; + } + + @JsonProperty("storageConfig") + public void setStorageConfig(EtcdStorageConfig storageConfig) { + this.storageConfig = storageConfig; + } + + @JsonIgnore + public GenericAPIServerConfigBuilder edit() { + return new GenericAPIServerConfigBuilder(this); + } + + @JsonIgnore + public GenericAPIServerConfigBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterOperatorStatusConditions.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/GenericControllerConfig.java similarity index 58% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterOperatorStatusConditions.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/GenericControllerConfig.java index d7a9048f856..dd6179853f8 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterOperatorStatusConditions.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/GenericControllerConfig.java @@ -31,11 +31,10 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "lastTransitionTime", - "message", - "reason", - "status", - "type" + "authentication", + "authorization", + "leaderElection", + "servingInfo" }) @ToString @EqualsAndHashCode @@ -55,19 +54,17 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterOperatorStatusConditions implements Editable , KubernetesResource +public class GenericControllerConfig implements Editable , KubernetesResource { - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("reason") - private String reason; - @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; + @JsonProperty("authentication") + private DelegatedAuthentication authentication; + @JsonProperty("authorization") + private DelegatedAuthorization authorization; + @JsonProperty("leaderElection") + private LeaderElection leaderElection; + @JsonProperty("servingInfo") + private HTTPServingInfo servingInfo; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -75,75 +72,64 @@ public class ClusterOperatorStatusConditions implements Editable , KubernetesResource +public class GitHubIdentityProvider implements Editable , KubernetesResource { @JsonProperty("ca") - private OAuthSpecIPGCa ca; + private ConfigMapNameReference ca; @JsonProperty("clientID") private String clientID; @JsonProperty("clientSecret") - private OAuthSpecIPGClientSecret clientSecret; + private SecretNameReference clientSecret; @JsonProperty("hostname") private String hostname; @JsonProperty("organizations") @@ -82,10 +82,10 @@ public class OAuthSpecIPGithub implements Editable , K * No args constructor for use in serialization * */ - public OAuthSpecIPGithub() { + public GitHubIdentityProvider() { } - public OAuthSpecIPGithub(OAuthSpecIPGCa ca, String clientID, OAuthSpecIPGClientSecret clientSecret, String hostname, List organizations, List teams) { + public GitHubIdentityProvider(ConfigMapNameReference ca, String clientID, SecretNameReference clientSecret, String hostname, List organizations, List teams) { super(); this.ca = ca; this.clientID = clientID; @@ -96,12 +96,12 @@ public OAuthSpecIPGithub(OAuthSpecIPGCa ca, String clientID, OAuthSpecIPGClientS } @JsonProperty("ca") - public OAuthSpecIPGCa getCa() { + public ConfigMapNameReference getCa() { return ca; } @JsonProperty("ca") - public void setCa(OAuthSpecIPGCa ca) { + public void setCa(ConfigMapNameReference ca) { this.ca = ca; } @@ -116,12 +116,12 @@ public void setClientID(String clientID) { } @JsonProperty("clientSecret") - public OAuthSpecIPGClientSecret getClientSecret() { + public SecretNameReference getClientSecret() { return clientSecret; } @JsonProperty("clientSecret") - public void setClientSecret(OAuthSpecIPGClientSecret clientSecret) { + public void setClientSecret(SecretNameReference clientSecret) { this.clientSecret = clientSecret; } @@ -158,12 +158,12 @@ public void setTeams(List teams) { } @JsonIgnore - public OAuthSpecIPGithubBuilder edit() { - return new OAuthSpecIPGithubBuilder(this); + public GitHubIdentityProviderBuilder edit() { + return new GitHubIdentityProviderBuilder(this); } @JsonIgnore - public OAuthSpecIPGithubBuilder toBuilder() { + public GitHubIdentityProviderBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPGitlab.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/GitLabIdentityProvider.java similarity index 84% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPGitlab.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/GitLabIdentityProvider.java index 6e5c898a9ec..f7b852840dc 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPGitlab.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/GitLabIdentityProvider.java @@ -54,15 +54,15 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class OAuthSpecIPGitlab implements Editable , KubernetesResource +public class GitLabIdentityProvider implements Editable , KubernetesResource { @JsonProperty("ca") - private OAuthSpecIPGCa_1 ca; + private ConfigMapNameReference ca; @JsonProperty("clientID") private String clientID; @JsonProperty("clientSecret") - private OAuthSpecIPGClientSecret_1 clientSecret; + private SecretNameReference clientSecret; @JsonProperty("url") private String url; @JsonIgnore @@ -72,10 +72,10 @@ public class OAuthSpecIPGitlab implements Editable , K * No args constructor for use in serialization * */ - public OAuthSpecIPGitlab() { + public GitLabIdentityProvider() { } - public OAuthSpecIPGitlab(OAuthSpecIPGCa_1 ca, String clientID, OAuthSpecIPGClientSecret_1 clientSecret, String url) { + public GitLabIdentityProvider(ConfigMapNameReference ca, String clientID, SecretNameReference clientSecret, String url) { super(); this.ca = ca; this.clientID = clientID; @@ -84,12 +84,12 @@ public OAuthSpecIPGitlab(OAuthSpecIPGCa_1 ca, String clientID, OAuthSpecIPGClien } @JsonProperty("ca") - public OAuthSpecIPGCa_1 getCa() { + public ConfigMapNameReference getCa() { return ca; } @JsonProperty("ca") - public void setCa(OAuthSpecIPGCa_1 ca) { + public void setCa(ConfigMapNameReference ca) { this.ca = ca; } @@ -104,12 +104,12 @@ public void setClientID(String clientID) { } @JsonProperty("clientSecret") - public OAuthSpecIPGClientSecret_1 getClientSecret() { + public SecretNameReference getClientSecret() { return clientSecret; } @JsonProperty("clientSecret") - public void setClientSecret(OAuthSpecIPGClientSecret_1 clientSecret) { + public void setClientSecret(SecretNameReference clientSecret) { this.clientSecret = clientSecret; } @@ -124,12 +124,12 @@ public void setUrl(String url) { } @JsonIgnore - public OAuthSpecIPGitlabBuilder edit() { - return new OAuthSpecIPGitlabBuilder(this); + public GitLabIdentityProviderBuilder edit() { + return new GitLabIdentityProviderBuilder(this); } @JsonIgnore - public OAuthSpecIPGitlabBuilder toBuilder() { + public GitLabIdentityProviderBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPGoogle.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/GoogleIdentityProvider.java similarity index 87% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPGoogle.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/GoogleIdentityProvider.java index 28a2ad1ac09..ac2fda84706 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPGoogle.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/GoogleIdentityProvider.java @@ -53,13 +53,13 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class OAuthSpecIPGoogle implements Editable , KubernetesResource +public class GoogleIdentityProvider implements Editable , KubernetesResource { @JsonProperty("clientID") private String clientID; @JsonProperty("clientSecret") - private OAuthSpecIPGClientSecret_2 clientSecret; + private SecretNameReference clientSecret; @JsonProperty("hostedDomain") private String hostedDomain; @JsonIgnore @@ -69,10 +69,10 @@ public class OAuthSpecIPGoogle implements Editable , K * No args constructor for use in serialization * */ - public OAuthSpecIPGoogle() { + public GoogleIdentityProvider() { } - public OAuthSpecIPGoogle(String clientID, OAuthSpecIPGClientSecret_2 clientSecret, String hostedDomain) { + public GoogleIdentityProvider(String clientID, SecretNameReference clientSecret, String hostedDomain) { super(); this.clientID = clientID; this.clientSecret = clientSecret; @@ -90,12 +90,12 @@ public void setClientID(String clientID) { } @JsonProperty("clientSecret") - public OAuthSpecIPGClientSecret_2 getClientSecret() { + public SecretNameReference getClientSecret() { return clientSecret; } @JsonProperty("clientSecret") - public void setClientSecret(OAuthSpecIPGClientSecret_2 clientSecret) { + public void setClientSecret(SecretNameReference clientSecret) { this.clientSecret = clientSecret; } @@ -110,12 +110,12 @@ public void setHostedDomain(String hostedDomain) { } @JsonIgnore - public OAuthSpecIPGoogleBuilder edit() { - return new OAuthSpecIPGoogleBuilder(this); + public GoogleIdentityProviderBuilder edit() { + return new GoogleIdentityProviderBuilder(this); } @JsonIgnore - public OAuthSpecIPGoogleBuilder toBuilder() { + public GoogleIdentityProviderBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPHtpasswd.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/HTPasswdIdentityProvider.java similarity index 85% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPHtpasswd.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/HTPasswdIdentityProvider.java index 1e2d1f0b74e..361130b3651 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPHtpasswd.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/HTPasswdIdentityProvider.java @@ -51,11 +51,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class OAuthSpecIPHtpasswd implements Editable , KubernetesResource +public class HTPasswdIdentityProvider implements Editable , KubernetesResource { @JsonProperty("fileData") - private OAuthSpecIPHFileData fileData; + private SecretNameReference fileData; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class OAuthSpecIPHtpasswd implements Editable * No args constructor for use in serialization * */ - public OAuthSpecIPHtpasswd() { + public HTPasswdIdentityProvider() { } - public OAuthSpecIPHtpasswd(OAuthSpecIPHFileData fileData) { + public HTPasswdIdentityProvider(SecretNameReference fileData) { super(); this.fileData = fileData; } @JsonProperty("fileData") - public OAuthSpecIPHFileData getFileData() { + public SecretNameReference getFileData() { return fileData; } @JsonProperty("fileData") - public void setFileData(OAuthSpecIPHFileData fileData) { + public void setFileData(SecretNameReference fileData) { this.fileData = fileData; } @JsonIgnore - public OAuthSpecIPHtpasswdBuilder edit() { - return new OAuthSpecIPHtpasswdBuilder(this); + public HTPasswdIdentityProviderBuilder edit() { + return new HTPasswdIdentityProviderBuilder(this); } @JsonIgnore - public OAuthSpecIPHtpasswdBuilder toBuilder() { + public HTPasswdIdentityProviderBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/HTTPServingInfo.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/HTTPServingInfo.java new file mode 100644 index 00000000000..fc8b2aee7ea --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/HTTPServingInfo.java @@ -0,0 +1,240 @@ + +package io.fabric8.openshift.api.model.config.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "bindAddress", + "bindNetwork", + "certFile", + "cipherSuites", + "clientCA", + "keyFile", + "maxRequestsInFlight", + "minTLSVersion", + "namedCertificates", + "requestTimeoutSeconds" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class HTTPServingInfo implements Editable , KubernetesResource +{ + + @JsonProperty("bindAddress") + private String bindAddress; + @JsonProperty("bindNetwork") + private String bindNetwork; + @JsonProperty("certFile") + private String certFile; + @JsonProperty("cipherSuites") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List cipherSuites = new ArrayList<>(); + @JsonProperty("clientCA") + private String clientCA; + @JsonProperty("keyFile") + private String keyFile; + @JsonProperty("maxRequestsInFlight") + private Long maxRequestsInFlight; + @JsonProperty("minTLSVersion") + private String minTLSVersion; + @JsonProperty("namedCertificates") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List namedCertificates = new ArrayList<>(); + @JsonProperty("requestTimeoutSeconds") + private Long requestTimeoutSeconds; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public HTTPServingInfo() { + } + + public HTTPServingInfo(String bindAddress, String bindNetwork, String certFile, List cipherSuites, String clientCA, String keyFile, Long maxRequestsInFlight, String minTLSVersion, List namedCertificates, Long requestTimeoutSeconds) { + super(); + this.bindAddress = bindAddress; + this.bindNetwork = bindNetwork; + this.certFile = certFile; + this.cipherSuites = cipherSuites; + this.clientCA = clientCA; + this.keyFile = keyFile; + this.maxRequestsInFlight = maxRequestsInFlight; + this.minTLSVersion = minTLSVersion; + this.namedCertificates = namedCertificates; + this.requestTimeoutSeconds = requestTimeoutSeconds; + } + + @JsonProperty("bindAddress") + public String getBindAddress() { + return bindAddress; + } + + @JsonProperty("bindAddress") + public void setBindAddress(String bindAddress) { + this.bindAddress = bindAddress; + } + + @JsonProperty("bindNetwork") + public String getBindNetwork() { + return bindNetwork; + } + + @JsonProperty("bindNetwork") + public void setBindNetwork(String bindNetwork) { + this.bindNetwork = bindNetwork; + } + + @JsonProperty("certFile") + public String getCertFile() { + return certFile; + } + + @JsonProperty("certFile") + public void setCertFile(String certFile) { + this.certFile = certFile; + } + + @JsonProperty("cipherSuites") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getCipherSuites() { + return cipherSuites; + } + + @JsonProperty("cipherSuites") + public void setCipherSuites(List cipherSuites) { + this.cipherSuites = cipherSuites; + } + + @JsonProperty("clientCA") + public String getClientCA() { + return clientCA; + } + + @JsonProperty("clientCA") + public void setClientCA(String clientCA) { + this.clientCA = clientCA; + } + + @JsonProperty("keyFile") + public String getKeyFile() { + return keyFile; + } + + @JsonProperty("keyFile") + public void setKeyFile(String keyFile) { + this.keyFile = keyFile; + } + + @JsonProperty("maxRequestsInFlight") + public Long getMaxRequestsInFlight() { + return maxRequestsInFlight; + } + + @JsonProperty("maxRequestsInFlight") + public void setMaxRequestsInFlight(Long maxRequestsInFlight) { + this.maxRequestsInFlight = maxRequestsInFlight; + } + + @JsonProperty("minTLSVersion") + public String getMinTLSVersion() { + return minTLSVersion; + } + + @JsonProperty("minTLSVersion") + public void setMinTLSVersion(String minTLSVersion) { + this.minTLSVersion = minTLSVersion; + } + + @JsonProperty("namedCertificates") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getNamedCertificates() { + return namedCertificates; + } + + @JsonProperty("namedCertificates") + public void setNamedCertificates(List namedCertificates) { + this.namedCertificates = namedCertificates; + } + + @JsonProperty("requestTimeoutSeconds") + public Long getRequestTimeoutSeconds() { + return requestTimeoutSeconds; + } + + @JsonProperty("requestTimeoutSeconds") + public void setRequestTimeoutSeconds(Long requestTimeoutSeconds) { + this.requestTimeoutSeconds = requestTimeoutSeconds; + } + + @JsonIgnore + public HTTPServingInfoBuilder edit() { + return new HTTPServingInfoBuilder(this); + } + + @JsonIgnore + public HTTPServingInfoBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OperatorHubSpecSources.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/HubSource.java similarity index 90% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OperatorHubSpecSources.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/HubSource.java index c0d068307b9..f914a64f980 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OperatorHubSpecSources.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/HubSource.java @@ -52,7 +52,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class OperatorHubSpecSources implements Editable , KubernetesResource +public class HubSource implements Editable , KubernetesResource { @JsonProperty("disabled") @@ -66,10 +66,10 @@ public class OperatorHubSpecSources implements Editable , KubernetesResource +public class HubSourceStatus implements Editable , KubernetesResource { - @JsonProperty("disabled") - private Boolean disabled; @JsonProperty("message") private String message; - @JsonProperty("name") - private String name; @JsonProperty("status") private String status; @JsonIgnore @@ -72,27 +66,15 @@ public class OperatorHubStatusSources implements Editable , KubernetesResource +{ + + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + @JsonIgnore + public IBMCloudPlatformSpecBuilder edit() { + return new IBMCloudPlatformSpecBuilder(this); + } + + @JsonIgnore + public IBMCloudPlatformSpecBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSIbmcloud.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IBMCloudPlatformStatus.java similarity index 85% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSIbmcloud.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IBMCloudPlatformStatus.java index 9eff15d7cba..943c218f09e 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSIbmcloud.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IBMCloudPlatformStatus.java @@ -58,7 +58,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureStatusPSIbmcloud implements Editable , KubernetesResource +public class IBMCloudPlatformStatus implements Editable , KubernetesResource { @JsonProperty("cisInstanceCRN") @@ -73,7 +73,7 @@ public class InfrastructureStatusPSIbmcloud implements Editable serviceEndpoints = new ArrayList<>(); + private List serviceEndpoints = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -81,10 +81,10 @@ public class InfrastructureStatusPSIbmcloud implements Editable serviceEndpoints) { + public IBMCloudPlatformStatus(String cisInstanceCRN, String dnsInstanceCRN, String location, String providerType, String resourceGroupName, List serviceEndpoints) { super(); this.cisInstanceCRN = cisInstanceCRN; this.dnsInstanceCRN = dnsInstanceCRN; @@ -146,22 +146,22 @@ public void setResourceGroupName(String resourceGroupName) { @JsonProperty("serviceEndpoints") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getServiceEndpoints() { + public List getServiceEndpoints() { return serviceEndpoints; } @JsonProperty("serviceEndpoints") - public void setServiceEndpoints(List serviceEndpoints) { + public void setServiceEndpoints(List serviceEndpoints) { this.serviceEndpoints = serviceEndpoints; } @JsonIgnore - public InfrastructureStatusPSIbmcloudBuilder edit() { - return new InfrastructureStatusPSIbmcloudBuilder(this); + public IBMCloudPlatformStatusBuilder edit() { + return new IBMCloudPlatformStatusBuilder(this); } @JsonIgnore - public InfrastructureStatusPSIbmcloudBuilder toBuilder() { + public IBMCloudPlatformStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSAwsServiceEndpoints.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IBMCloudServiceEndpoint.java similarity index 87% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSAwsServiceEndpoints.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IBMCloudServiceEndpoint.java index 13b69fdda12..497481b3bf9 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSAwsServiceEndpoints.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IBMCloudServiceEndpoint.java @@ -52,7 +52,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureStatusPSAwsServiceEndpoints implements Editable , KubernetesResource +public class IBMCloudServiceEndpoint implements Editable , KubernetesResource { @JsonProperty("name") @@ -66,10 +66,10 @@ public class InfrastructureStatusPSAwsServiceEndpoints implements Editable , KubernetesResource +public class IdentityProvider implements Editable , KubernetesResource { @JsonProperty("basicAuth") - private OAuthSpecIPBasicAuth basicAuth; + private BasicAuthIdentityProvider basicAuth; @JsonProperty("github") - private OAuthSpecIPGithub github; + private GitHubIdentityProvider github; @JsonProperty("gitlab") - private OAuthSpecIPGitlab gitlab; + private GitLabIdentityProvider gitlab; @JsonProperty("google") - private OAuthSpecIPGoogle google; + private GoogleIdentityProvider google; @JsonProperty("htpasswd") - private OAuthSpecIPHtpasswd htpasswd; + private HTPasswdIdentityProvider htpasswd; @JsonProperty("keystone") - private OAuthSpecIPKeystone keystone; + private KeystoneIdentityProvider keystone; @JsonProperty("ldap") - private OAuthSpecIPLdap ldap; + private LDAPIdentityProvider ldap; @JsonProperty("mappingMethod") private String mappingMethod; @JsonProperty("name") private String name; @JsonProperty("openID") - private OAuthSpecIPOpenID openID; + private OpenIDIdentityProvider openID; @JsonProperty("requestHeader") - private OAuthSpecIPRequestHeader requestHeader; + private RequestHeaderIdentityProvider requestHeader; @JsonProperty("type") private String type; @JsonIgnore @@ -96,10 +96,10 @@ public class OAuthSpecIdentityProviders implements Editable , KubernetesResource +{ + + @JsonProperty("basicAuth") + private BasicAuthIdentityProvider basicAuth; + @JsonProperty("github") + private GitHubIdentityProvider github; + @JsonProperty("gitlab") + private GitLabIdentityProvider gitlab; + @JsonProperty("google") + private GoogleIdentityProvider google; + @JsonProperty("htpasswd") + private HTPasswdIdentityProvider htpasswd; + @JsonProperty("keystone") + private KeystoneIdentityProvider keystone; + @JsonProperty("ldap") + private LDAPIdentityProvider ldap; + @JsonProperty("openID") + private OpenIDIdentityProvider openID; + @JsonProperty("requestHeader") + private RequestHeaderIdentityProvider requestHeader; + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public IdentityProviderConfig() { + } + + public IdentityProviderConfig(BasicAuthIdentityProvider basicAuth, GitHubIdentityProvider github, GitLabIdentityProvider gitlab, GoogleIdentityProvider google, HTPasswdIdentityProvider htpasswd, KeystoneIdentityProvider keystone, LDAPIdentityProvider ldap, OpenIDIdentityProvider openID, RequestHeaderIdentityProvider requestHeader, String type) { + super(); + this.basicAuth = basicAuth; + this.github = github; + this.gitlab = gitlab; + this.google = google; + this.htpasswd = htpasswd; + this.keystone = keystone; + this.ldap = ldap; + this.openID = openID; + this.requestHeader = requestHeader; + this.type = type; + } + + @JsonProperty("basicAuth") + public BasicAuthIdentityProvider getBasicAuth() { + return basicAuth; + } + + @JsonProperty("basicAuth") + public void setBasicAuth(BasicAuthIdentityProvider basicAuth) { + this.basicAuth = basicAuth; + } + + @JsonProperty("github") + public GitHubIdentityProvider getGithub() { + return github; + } + + @JsonProperty("github") + public void setGithub(GitHubIdentityProvider github) { + this.github = github; + } + + @JsonProperty("gitlab") + public GitLabIdentityProvider getGitlab() { + return gitlab; + } + + @JsonProperty("gitlab") + public void setGitlab(GitLabIdentityProvider gitlab) { + this.gitlab = gitlab; + } + + @JsonProperty("google") + public GoogleIdentityProvider getGoogle() { + return google; + } + + @JsonProperty("google") + public void setGoogle(GoogleIdentityProvider google) { + this.google = google; + } + + @JsonProperty("htpasswd") + public HTPasswdIdentityProvider getHtpasswd() { + return htpasswd; + } + + @JsonProperty("htpasswd") + public void setHtpasswd(HTPasswdIdentityProvider htpasswd) { + this.htpasswd = htpasswd; + } + + @JsonProperty("keystone") + public KeystoneIdentityProvider getKeystone() { + return keystone; + } + + @JsonProperty("keystone") + public void setKeystone(KeystoneIdentityProvider keystone) { + this.keystone = keystone; + } + + @JsonProperty("ldap") + public LDAPIdentityProvider getLdap() { + return ldap; + } + + @JsonProperty("ldap") + public void setLdap(LDAPIdentityProvider ldap) { + this.ldap = ldap; + } + + @JsonProperty("openID") + public OpenIDIdentityProvider getOpenID() { + return openID; + } + + @JsonProperty("openID") + public void setOpenID(OpenIDIdentityProvider openID) { + this.openID = openID; + } + + @JsonProperty("requestHeader") + public RequestHeaderIdentityProvider getRequestHeader() { + return requestHeader; + } + + @JsonProperty("requestHeader") + public void setRequestHeader(RequestHeaderIdentityProvider requestHeader) { + this.requestHeader = requestHeader; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonIgnore + public IdentityProviderConfigBuilder edit() { + return new IdentityProviderConfigBuilder(this); + } + + @JsonIgnore + public IdentityProviderConfigBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageContentPolicySpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageContentPolicySpec.java index 0e2ec0c054c..6142db71fda 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageContentPolicySpec.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageContentPolicySpec.java @@ -58,7 +58,7 @@ public class ImageContentPolicySpec implements Editable repositoryDigestMirrors = new ArrayList<>(); + private List repositoryDigestMirrors = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,19 +69,19 @@ public class ImageContentPolicySpec implements Editable repositoryDigestMirrors) { + public ImageContentPolicySpec(List repositoryDigestMirrors) { super(); this.repositoryDigestMirrors = repositoryDigestMirrors; } @JsonProperty("repositoryDigestMirrors") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getRepositoryDigestMirrors() { + public List getRepositoryDigestMirrors() { return repositoryDigestMirrors; } @JsonProperty("repositoryDigestMirrors") - public void setRepositoryDigestMirrors(List repositoryDigestMirrors) { + public void setRepositoryDigestMirrors(List repositoryDigestMirrors) { this.repositoryDigestMirrors = repositoryDigestMirrors; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageDigestMirrorSet.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageDigestMirrorSet.java index 45cba6169dd..725e50af86e 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageDigestMirrorSet.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageDigestMirrorSet.java @@ -86,8 +86,7 @@ public class ImageDigestMirrorSet implements Editable additionalProperties = new LinkedHashMap(); @@ -98,7 +97,7 @@ public class ImageDigestMirrorSet implements Editable imageDigestMirrors = new ArrayList<>(); + private List imageDigestMirrors = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,19 +69,19 @@ public class ImageDigestMirrorSetSpec implements Editable imageDigestMirrors) { + public ImageDigestMirrorSetSpec(List imageDigestMirrors) { super(); this.imageDigestMirrors = imageDigestMirrors; } @JsonProperty("imageDigestMirrors") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getImageDigestMirrors() { + public List getImageDigestMirrors() { return imageDigestMirrors; } @JsonProperty("imageDigestMirrors") - public void setImageDigestMirrors(List imageDigestMirrors) { + public void setImageDigestMirrors(List imageDigestMirrors) { this.imageDigestMirrors = imageDigestMirrors; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageDigestMirrorSetStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageDigestMirrorSetStatus.java new file mode 100644 index 00000000000..24f58a59661 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageDigestMirrorSetStatus.java @@ -0,0 +1,83 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class ImageDigestMirrorSetStatus implements Editable , KubernetesResource +{ + + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + @JsonIgnore + public ImageDigestMirrorSetStatusBuilder edit() { + return new ImageDigestMirrorSetStatusBuilder(this); + } + + @JsonIgnore + public ImageDigestMirrorSetStatusBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageTagMirrorSetSpecImageTagMirrors.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageDigestMirrors.java similarity index 89% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageTagMirrorSetSpecImageTagMirrors.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageDigestMirrors.java index b199d189c6f..f2d75cae91b 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageTagMirrorSetSpecImageTagMirrors.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageDigestMirrors.java @@ -55,7 +55,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ImageTagMirrorSetSpecImageTagMirrors implements Editable , KubernetesResource +public class ImageDigestMirrors implements Editable , KubernetesResource { @JsonProperty("mirrorSourcePolicy") @@ -72,10 +72,10 @@ public class ImageTagMirrorSetSpecImageTagMirrors implements Editable mirrors, String source) { + public ImageDigestMirrors(String mirrorSourcePolicy, List mirrors, String source) { super(); this.mirrorSourcePolicy = mirrorSourcePolicy; this.mirrors = mirrors; @@ -114,12 +114,12 @@ public void setSource(String source) { } @JsonIgnore - public ImageTagMirrorSetSpecImageTagMirrorsBuilder edit() { - return new ImageTagMirrorSetSpecImageTagMirrorsBuilder(this); + public ImageDigestMirrorsBuilder edit() { + return new ImageDigestMirrorsBuilder(this); } @JsonIgnore - public ImageTagMirrorSetSpecImageTagMirrorsBuilder toBuilder() { + public ImageDigestMirrorsBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBDImageLabels.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageLabel.java similarity index 90% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBDImageLabels.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageLabel.java index e20fc6af7ae..990daaec778 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBDImageLabels.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageLabel.java @@ -52,7 +52,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class BuildSpecBDImageLabels implements Editable , KubernetesResource +public class ImageLabel implements Editable , KubernetesResource { @JsonProperty("name") @@ -66,10 +66,10 @@ public class BuildSpecBDImageLabels implements Editable , KubernetesResourc { @JsonProperty("additionalTrustedCA") - private ImageSpecAdditionalTrustedCA additionalTrustedCA; + private ConfigMapNameReference additionalTrustedCA; @JsonProperty("allowedRegistriesForImport") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List allowedRegistriesForImport = new ArrayList<>(); + private List allowedRegistriesForImport = new ArrayList<>(); @JsonProperty("externalRegistryHostnames") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List externalRegistryHostnames = new ArrayList<>(); @JsonProperty("registrySources") - private ImageSpecRegistrySources registrySources; + private RegistrySources registrySources; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -79,7 +79,7 @@ public class ImageSpec implements Editable , KubernetesResourc public ImageSpec() { } - public ImageSpec(ImageSpecAdditionalTrustedCA additionalTrustedCA, List allowedRegistriesForImport, List externalRegistryHostnames, ImageSpecRegistrySources registrySources) { + public ImageSpec(ConfigMapNameReference additionalTrustedCA, List allowedRegistriesForImport, List externalRegistryHostnames, RegistrySources registrySources) { super(); this.additionalTrustedCA = additionalTrustedCA; this.allowedRegistriesForImport = allowedRegistriesForImport; @@ -88,23 +88,23 @@ public ImageSpec(ImageSpecAdditionalTrustedCA additionalTrustedCA, List getAllowedRegistriesForImport() { + public List getAllowedRegistriesForImport() { return allowedRegistriesForImport; } @JsonProperty("allowedRegistriesForImport") - public void setAllowedRegistriesForImport(List allowedRegistriesForImport) { + public void setAllowedRegistriesForImport(List allowedRegistriesForImport) { this.allowedRegistriesForImport = allowedRegistriesForImport; } @@ -120,12 +120,12 @@ public void setExternalRegistryHostnames(List externalRegistryHostnames) } @JsonProperty("registrySources") - public ImageSpecRegistrySources getRegistrySources() { + public RegistrySources getRegistrySources() { return registrySources; } @JsonProperty("registrySources") - public void setRegistrySources(ImageSpecRegistrySources registrySources) { + public void setRegistrySources(RegistrySources registrySources) { this.registrySources = registrySources; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageSpecAdditionalTrustedCA.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageSpecAdditionalTrustedCA.java deleted file mode 100644 index 67dea771410..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageSpecAdditionalTrustedCA.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class ImageSpecAdditionalTrustedCA implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ImageSpecAdditionalTrustedCA() { - } - - public ImageSpecAdditionalTrustedCA(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public ImageSpecAdditionalTrustedCABuilder edit() { - return new ImageSpecAdditionalTrustedCABuilder(this); - } - - @JsonIgnore - public ImageSpecAdditionalTrustedCABuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageTagMirrorSet.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageTagMirrorSet.java index abed885ebdc..8731ea1513d 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageTagMirrorSet.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageTagMirrorSet.java @@ -86,8 +86,7 @@ public class ImageTagMirrorSet implements Editable , H @JsonProperty("spec") private ImageTagMirrorSetSpec spec; @JsonProperty("status") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object status; + private ImageTagMirrorSetStatus status; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -98,7 +97,7 @@ public class ImageTagMirrorSet implements Editable , H public ImageTagMirrorSet() { } - public ImageTagMirrorSet(String apiVersion, String kind, ObjectMeta metadata, ImageTagMirrorSetSpec spec, Object status) { + public ImageTagMirrorSet(String apiVersion, String kind, ObjectMeta metadata, ImageTagMirrorSetSpec spec, ImageTagMirrorSetStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -168,13 +167,12 @@ public void setSpec(ImageTagMirrorSetSpec spec) { } @JsonProperty("status") - public Object getStatus() { + public ImageTagMirrorSetStatus getStatus() { return status; } @JsonProperty("status") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setStatus(Object status) { + public void setStatus(ImageTagMirrorSetStatus status) { this.status = status; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageTagMirrorSetSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageTagMirrorSetSpec.java index 279036419b7..e0077bbf1d6 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageTagMirrorSetSpec.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageTagMirrorSetSpec.java @@ -58,7 +58,7 @@ public class ImageTagMirrorSetSpec implements Editable imageTagMirrors = new ArrayList<>(); + private List imageTagMirrors = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,19 +69,19 @@ public class ImageTagMirrorSetSpec implements Editable imageTagMirrors) { + public ImageTagMirrorSetSpec(List imageTagMirrors) { super(); this.imageTagMirrors = imageTagMirrors; } @JsonProperty("imageTagMirrors") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getImageTagMirrors() { + public List getImageTagMirrors() { return imageTagMirrors; } @JsonProperty("imageTagMirrors") - public void setImageTagMirrors(List imageTagMirrors) { + public void setImageTagMirrors(List imageTagMirrors) { this.imageTagMirrors = imageTagMirrors; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageTagMirrorSetStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageTagMirrorSetStatus.java new file mode 100644 index 00000000000..32446e70ea4 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageTagMirrorSetStatus.java @@ -0,0 +1,83 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class ImageTagMirrorSetStatus implements Editable , KubernetesResource +{ + + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + @JsonIgnore + public ImageTagMirrorSetStatusBuilder edit() { + return new ImageTagMirrorSetStatusBuilder(this); + } + + @JsonIgnore + public ImageTagMirrorSetStatusBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageDigestMirrorSetSpecImageDigestMirrors.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageTagMirrors.java similarity index 88% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageDigestMirrorSetSpecImageDigestMirrors.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageTagMirrors.java index 97f3dcbc64f..32cea995b70 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageDigestMirrorSetSpecImageDigestMirrors.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageTagMirrors.java @@ -55,7 +55,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ImageDigestMirrorSetSpecImageDigestMirrors implements Editable , KubernetesResource +public class ImageTagMirrors implements Editable , KubernetesResource { @JsonProperty("mirrorSourcePolicy") @@ -72,10 +72,10 @@ public class ImageDigestMirrorSetSpecImageDigestMirrors implements Editable mirrors, String source) { + public ImageTagMirrors(String mirrorSourcePolicy, List mirrors, String source) { super(); this.mirrorSourcePolicy = mirrorSourcePolicy; this.mirrors = mirrors; @@ -114,12 +114,12 @@ public void setSource(String source) { } @JsonIgnore - public ImageDigestMirrorSetSpecImageDigestMirrorsBuilder edit() { - return new ImageDigestMirrorSetSpecImageDigestMirrorsBuilder(this); + public ImageTagMirrorsBuilder edit() { + return new ImageTagMirrorsBuilder(this); } @JsonIgnore - public ImageDigestMirrorSetSpecImageDigestMirrorsBuilder toBuilder() { + public ImageTagMirrorsBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpec.java index 0c689b80f97..6365f86c504 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpec.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpec.java @@ -56,9 +56,9 @@ public class InfrastructureSpec implements Editable , { @JsonProperty("cloudConfig") - private InfrastructureSpecCloudConfig cloudConfig; + private ConfigMapFileReference cloudConfig; @JsonProperty("platformSpec") - private InfrastructureSpecPlatformSpec platformSpec; + private PlatformSpec platformSpec; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,29 +69,29 @@ public class InfrastructureSpec implements Editable , public InfrastructureSpec() { } - public InfrastructureSpec(InfrastructureSpecCloudConfig cloudConfig, InfrastructureSpecPlatformSpec platformSpec) { + public InfrastructureSpec(ConfigMapFileReference cloudConfig, PlatformSpec platformSpec) { super(); this.cloudConfig = cloudConfig; this.platformSpec = platformSpec; } @JsonProperty("cloudConfig") - public InfrastructureSpecCloudConfig getCloudConfig() { + public ConfigMapFileReference getCloudConfig() { return cloudConfig; } @JsonProperty("cloudConfig") - public void setCloudConfig(InfrastructureSpecCloudConfig cloudConfig) { + public void setCloudConfig(ConfigMapFileReference cloudConfig) { this.cloudConfig = cloudConfig; } @JsonProperty("platformSpec") - public InfrastructureSpecPlatformSpec getPlatformSpec() { + public PlatformSpec getPlatformSpec() { return platformSpec; } @JsonProperty("platformSpec") - public void setPlatformSpec(InfrastructureSpecPlatformSpec platformSpec) { + public void setPlatformSpec(PlatformSpec platformSpec) { this.platformSpec = platformSpec; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSNutanixFDSubnets.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSNutanixFDSubnets.java deleted file mode 100644 index 7dddcefab8c..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSNutanixFDSubnets.java +++ /dev/null @@ -1,136 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name", - "type", - "uuid" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class InfrastructureSpecPSNutanixFDSubnets implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonProperty("type") - private String type; - @JsonProperty("uuid") - private String uuid; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public InfrastructureSpecPSNutanixFDSubnets() { - } - - public InfrastructureSpecPSNutanixFDSubnets(String name, String type, String uuid) { - super(); - this.name = name; - this.type = type; - this.uuid = uuid; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonProperty("uuid") - public String getUuid() { - return uuid; - } - - @JsonProperty("uuid") - public void setUuid(String uuid) { - this.uuid = uuid; - } - - @JsonIgnore - public InfrastructureSpecPSNutanixFDSubnetsBuilder edit() { - return new InfrastructureSpecPSNutanixFDSubnetsBuilder(this); - } - - @JsonIgnore - public InfrastructureSpecPSNutanixFDSubnetsBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSNutanixPrismCentral.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSNutanixPrismCentral.java deleted file mode 100644 index 1a873927159..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSNutanixPrismCentral.java +++ /dev/null @@ -1,122 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "address", - "port" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class InfrastructureSpecPSNutanixPrismCentral implements Editable , KubernetesResource -{ - - @JsonProperty("address") - private String address; - @JsonProperty("port") - private Integer port; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public InfrastructureSpecPSNutanixPrismCentral() { - } - - public InfrastructureSpecPSNutanixPrismCentral(String address, Integer port) { - super(); - this.address = address; - this.port = port; - } - - @JsonProperty("address") - public String getAddress() { - return address; - } - - @JsonProperty("address") - public void setAddress(String address) { - this.address = address; - } - - @JsonProperty("port") - public Integer getPort() { - return port; - } - - @JsonProperty("port") - public void setPort(Integer port) { - this.port = port; - } - - @JsonIgnore - public InfrastructureSpecPSNutanixPrismCentralBuilder edit() { - return new InfrastructureSpecPSNutanixPrismCentralBuilder(this); - } - - @JsonIgnore - public InfrastructureSpecPSNutanixPrismCentralBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSVsphereNNExternal.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSVsphereNNExternal.java deleted file mode 100644 index cf7796def2e..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSVsphereNNExternal.java +++ /dev/null @@ -1,142 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "excludeNetworkSubnetCidr", - "network", - "networkSubnetCidr" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class InfrastructureSpecPSVsphereNNExternal implements Editable , KubernetesResource -{ - - @JsonProperty("excludeNetworkSubnetCidr") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List excludeNetworkSubnetCidr = new ArrayList<>(); - @JsonProperty("network") - private String network; - @JsonProperty("networkSubnetCidr") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List networkSubnetCidr = new ArrayList<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public InfrastructureSpecPSVsphereNNExternal() { - } - - public InfrastructureSpecPSVsphereNNExternal(List excludeNetworkSubnetCidr, String network, List networkSubnetCidr) { - super(); - this.excludeNetworkSubnetCidr = excludeNetworkSubnetCidr; - this.network = network; - this.networkSubnetCidr = networkSubnetCidr; - } - - @JsonProperty("excludeNetworkSubnetCidr") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getExcludeNetworkSubnetCidr() { - return excludeNetworkSubnetCidr; - } - - @JsonProperty("excludeNetworkSubnetCidr") - public void setExcludeNetworkSubnetCidr(List excludeNetworkSubnetCidr) { - this.excludeNetworkSubnetCidr = excludeNetworkSubnetCidr; - } - - @JsonProperty("network") - public String getNetwork() { - return network; - } - - @JsonProperty("network") - public void setNetwork(String network) { - this.network = network; - } - - @JsonProperty("networkSubnetCidr") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getNetworkSubnetCidr() { - return networkSubnetCidr; - } - - @JsonProperty("networkSubnetCidr") - public void setNetworkSubnetCidr(List networkSubnetCidr) { - this.networkSubnetCidr = networkSubnetCidr; - } - - @JsonIgnore - public InfrastructureSpecPSVsphereNNExternalBuilder edit() { - return new InfrastructureSpecPSVsphereNNExternalBuilder(this); - } - - @JsonIgnore - public InfrastructureSpecPSVsphereNNExternalBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatus.java index df1ff740ce4..24d70460956 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatus.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatus.java @@ -79,7 +79,7 @@ public class InfrastructureStatus implements Editable additionalProperties = new LinkedHashMap(); @@ -90,7 +90,7 @@ public class InfrastructureStatus implements Editable , KubernetesResource -{ - - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public InfrastructureStatusPSOpenstackLoadBalancer() { - } - - public InfrastructureStatusPSOpenstackLoadBalancer(String type) { - super(); - this.type = type; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public InfrastructureStatusPSOpenstackLoadBalancerBuilder edit() { - return new InfrastructureStatusPSOpenstackLoadBalancerBuilder(this); - } - - @JsonIgnore - public InfrastructureStatusPSOpenstackLoadBalancerBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSPowervsServiceEndpoints.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSPowervsServiceEndpoints.java deleted file mode 100644 index a4b25ce6d87..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSPowervsServiceEndpoints.java +++ /dev/null @@ -1,122 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name", - "url" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class InfrastructureStatusPSPowervsServiceEndpoints implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonProperty("url") - private String url; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public InfrastructureStatusPSPowervsServiceEndpoints() { - } - - public InfrastructureStatusPSPowervsServiceEndpoints(String name, String url) { - super(); - this.name = name; - this.url = url; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonProperty("url") - public String getUrl() { - return url; - } - - @JsonProperty("url") - public void setUrl(String url) { - this.url = url; - } - - @JsonIgnore - public InfrastructureStatusPSPowervsServiceEndpointsBuilder edit() { - return new InfrastructureStatusPSPowervsServiceEndpointsBuilder(this); - } - - @JsonIgnore - public InfrastructureStatusPSPowervsServiceEndpointsBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSVsphereLoadBalancer.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSVsphereLoadBalancer.java deleted file mode 100644 index 7e6e0de411c..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSVsphereLoadBalancer.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "type" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class InfrastructureStatusPSVsphereLoadBalancer implements Editable , KubernetesResource -{ - - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public InfrastructureStatusPSVsphereLoadBalancer() { - } - - public InfrastructureStatusPSVsphereLoadBalancer(String type) { - super(); - this.type = type; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public InfrastructureStatusPSVsphereLoadBalancerBuilder edit() { - return new InfrastructureStatusPSVsphereLoadBalancerBuilder(this); - } - - @JsonIgnore - public InfrastructureStatusPSVsphereLoadBalancerBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressSpecLBPlatform.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressPlatformSpec.java similarity index 87% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressSpecLBPlatform.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressPlatformSpec.java index edfeea18090..f71ef86dd61 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressSpecLBPlatform.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressPlatformSpec.java @@ -52,11 +52,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressSpecLBPlatform implements Editable , KubernetesResource +public class IngressPlatformSpec implements Editable , KubernetesResource { @JsonProperty("aws") - private IngressSpecLBPAws aws; + private AWSIngressSpec aws; @JsonProperty("type") private String type; @JsonIgnore @@ -66,22 +66,22 @@ public class IngressSpecLBPlatform implements Editable , KubernetesRes private String appsDomain; @JsonProperty("componentRoutes") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List componentRoutes = new ArrayList<>(); + private List componentRoutes = new ArrayList<>(); @JsonProperty("domain") private String domain; @JsonProperty("loadBalancer") - private IngressSpecLoadBalancer loadBalancer; + private LoadBalancer loadBalancer; @JsonProperty("requiredHSTSPolicies") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List requiredHSTSPolicies = new ArrayList<>(); + private List requiredHSTSPolicies = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -82,7 +82,7 @@ public class IngressSpec implements Editable , KubernetesRes public IngressSpec() { } - public IngressSpec(String appsDomain, List componentRoutes, String domain, IngressSpecLoadBalancer loadBalancer, List requiredHSTSPolicies) { + public IngressSpec(String appsDomain, List componentRoutes, String domain, LoadBalancer loadBalancer, List requiredHSTSPolicies) { super(); this.appsDomain = appsDomain; this.componentRoutes = componentRoutes; @@ -103,12 +103,12 @@ public void setAppsDomain(String appsDomain) { @JsonProperty("componentRoutes") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getComponentRoutes() { + public List getComponentRoutes() { return componentRoutes; } @JsonProperty("componentRoutes") - public void setComponentRoutes(List componentRoutes) { + public void setComponentRoutes(List componentRoutes) { this.componentRoutes = componentRoutes; } @@ -123,23 +123,23 @@ public void setDomain(String domain) { } @JsonProperty("loadBalancer") - public IngressSpecLoadBalancer getLoadBalancer() { + public LoadBalancer getLoadBalancer() { return loadBalancer; } @JsonProperty("loadBalancer") - public void setLoadBalancer(IngressSpecLoadBalancer loadBalancer) { + public void setLoadBalancer(LoadBalancer loadBalancer) { this.loadBalancer = loadBalancer; } @JsonProperty("requiredHSTSPolicies") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getRequiredHSTSPolicies() { + public List getRequiredHSTSPolicies() { return requiredHSTSPolicies; } @JsonProperty("requiredHSTSPolicies") - public void setRequiredHSTSPolicies(List requiredHSTSPolicies) { + public void setRequiredHSTSPolicies(List requiredHSTSPolicies) { this.requiredHSTSPolicies = requiredHSTSPolicies; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressSpecCRServingCertKeyPairSecret.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressSpecCRServingCertKeyPairSecret.java deleted file mode 100644 index 76a39f1e6f7..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressSpecCRServingCertKeyPairSecret.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class IngressSpecCRServingCertKeyPairSecret implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public IngressSpecCRServingCertKeyPairSecret() { - } - - public IngressSpecCRServingCertKeyPairSecret(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public IngressSpecCRServingCertKeyPairSecretBuilder edit() { - return new IngressSpecCRServingCertKeyPairSecretBuilder(this); - } - - @JsonIgnore - public IngressSpecCRServingCertKeyPairSecretBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressSpecRHNamespaceSelector.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressSpecRHNamespaceSelector.java deleted file mode 100644 index c8a8d528342..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressSpecRHNamespaceSelector.java +++ /dev/null @@ -1,129 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -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.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.LabelSelectorRequirement; -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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "matchExpressions", - "matchLabels" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class IngressSpecRHNamespaceSelector implements Editable , KubernetesResource -{ - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List matchExpressions = new ArrayList<>(); - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map matchLabels = new LinkedHashMap<>(); - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public IngressSpecRHNamespaceSelector() { - } - - public IngressSpecRHNamespaceSelector(List matchExpressions, Map matchLabels) { - super(); - this.matchExpressions = matchExpressions; - this.matchLabels = matchLabels; - } - - @JsonProperty("matchExpressions") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMatchExpressions() { - return matchExpressions; - } - - @JsonProperty("matchExpressions") - public void setMatchExpressions(List matchExpressions) { - this.matchExpressions = matchExpressions; - } - - @JsonProperty("matchLabels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getMatchLabels() { - return matchLabels; - } - - @JsonProperty("matchLabels") - public void setMatchLabels(Map matchLabels) { - this.matchLabels = matchLabels; - } - - @JsonIgnore - public IngressSpecRHNamespaceSelectorBuilder edit() { - return new IngressSpecRHNamespaceSelectorBuilder(this); - } - - @JsonIgnore - public IngressSpecRHNamespaceSelectorBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressStatus.java index f79d760caa6..cbaa12c00db 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressStatus.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressStatus.java @@ -59,7 +59,7 @@ public class IngressStatus implements Editable , Kubernete @JsonProperty("componentRoutes") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List componentRoutes = new ArrayList<>(); + private List componentRoutes = new ArrayList<>(); @JsonProperty("defaultPlacement") private String defaultPlacement; @JsonIgnore @@ -72,7 +72,7 @@ public class IngressStatus implements Editable , Kubernete public IngressStatus() { } - public IngressStatus(List componentRoutes, String defaultPlacement) { + public IngressStatus(List componentRoutes, String defaultPlacement) { super(); this.componentRoutes = componentRoutes; this.defaultPlacement = defaultPlacement; @@ -80,12 +80,12 @@ public IngressStatus(List componentRoutes, String @JsonProperty("componentRoutes") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getComponentRoutes() { + public List getComponentRoutes() { return componentRoutes; } @JsonProperty("componentRoutes") - public void setComponentRoutes(List componentRoutes) { + public void setComponentRoutes(List componentRoutes) { this.componentRoutes = componentRoutes; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressStatusCRConditions.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressStatusCRConditions.java deleted file mode 100644 index fafd681fcb2..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressStatusCRConditions.java +++ /dev/null @@ -1,178 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "lastTransitionTime", - "message", - "observedGeneration", - "reason", - "status", - "type" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class IngressStatusCRConditions implements Editable , KubernetesResource -{ - - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("observedGeneration") - private Long observedGeneration; - @JsonProperty("reason") - private String reason; - @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public IngressStatusCRConditions() { - } - - public IngressStatusCRConditions(String lastTransitionTime, String message, Long observedGeneration, String reason, String status, String type) { - super(); - this.lastTransitionTime = lastTransitionTime; - this.message = message; - this.observedGeneration = observedGeneration; - this.reason = reason; - this.status = status; - this.type = type; - } - - @JsonProperty("lastTransitionTime") - public String getLastTransitionTime() { - return lastTransitionTime; - } - - @JsonProperty("lastTransitionTime") - public void setLastTransitionTime(String lastTransitionTime) { - this.lastTransitionTime = lastTransitionTime; - } - - @JsonProperty("message") - public String getMessage() { - return message; - } - - @JsonProperty("message") - public void setMessage(String message) { - this.message = message; - } - - @JsonProperty("observedGeneration") - public Long getObservedGeneration() { - return observedGeneration; - } - - @JsonProperty("observedGeneration") - public void setObservedGeneration(Long observedGeneration) { - this.observedGeneration = observedGeneration; - } - - @JsonProperty("reason") - public String getReason() { - return reason; - } - - @JsonProperty("reason") - public void setReason(String reason) { - this.reason = reason; - } - - @JsonProperty("status") - public String getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(String status) { - this.status = status; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public IngressStatusCRConditionsBuilder edit() { - return new IngressStatusCRConditionsBuilder(this); - } - - @JsonIgnore - public IngressStatusCRConditionsBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IntermediateTLSProfile.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IntermediateTLSProfile.java new file mode 100644 index 00000000000..146dd7ac362 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IntermediateTLSProfile.java @@ -0,0 +1,83 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class IntermediateTLSProfile implements Editable , KubernetesResource +{ + + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + @JsonIgnore + public IntermediateTLSProfileBuilder edit() { + return new IntermediateTLSProfileBuilder(this); + } + + @JsonIgnore + public IntermediateTLSProfileBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPKeystone.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/KeystoneIdentityProvider.java similarity index 81% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPKeystone.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/KeystoneIdentityProvider.java index cf1eadc4794..fa9ef901c97 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPKeystone.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/KeystoneIdentityProvider.java @@ -55,17 +55,17 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class OAuthSpecIPKeystone implements Editable , KubernetesResource +public class KeystoneIdentityProvider implements Editable , KubernetesResource { @JsonProperty("ca") - private OAuthSpecIPKCa ca; + private ConfigMapNameReference ca; @JsonProperty("domainName") private String domainName; @JsonProperty("tlsClientCert") - private OAuthSpecIPKTlsClientCert tlsClientCert; + private SecretNameReference tlsClientCert; @JsonProperty("tlsClientKey") - private OAuthSpecIPKTlsClientKey tlsClientKey; + private SecretNameReference tlsClientKey; @JsonProperty("url") private String url; @JsonIgnore @@ -75,10 +75,10 @@ public class OAuthSpecIPKeystone implements Editable * No args constructor for use in serialization * */ - public OAuthSpecIPKeystone() { + public KeystoneIdentityProvider() { } - public OAuthSpecIPKeystone(OAuthSpecIPKCa ca, String domainName, OAuthSpecIPKTlsClientCert tlsClientCert, OAuthSpecIPKTlsClientKey tlsClientKey, String url) { + public KeystoneIdentityProvider(ConfigMapNameReference ca, String domainName, SecretNameReference tlsClientCert, SecretNameReference tlsClientKey, String url) { super(); this.ca = ca; this.domainName = domainName; @@ -88,12 +88,12 @@ public OAuthSpecIPKeystone(OAuthSpecIPKCa ca, String domainName, OAuthSpecIPKTls } @JsonProperty("ca") - public OAuthSpecIPKCa getCa() { + public ConfigMapNameReference getCa() { return ca; } @JsonProperty("ca") - public void setCa(OAuthSpecIPKCa ca) { + public void setCa(ConfigMapNameReference ca) { this.ca = ca; } @@ -108,22 +108,22 @@ public void setDomainName(String domainName) { } @JsonProperty("tlsClientCert") - public OAuthSpecIPKTlsClientCert getTlsClientCert() { + public SecretNameReference getTlsClientCert() { return tlsClientCert; } @JsonProperty("tlsClientCert") - public void setTlsClientCert(OAuthSpecIPKTlsClientCert tlsClientCert) { + public void setTlsClientCert(SecretNameReference tlsClientCert) { this.tlsClientCert = tlsClientCert; } @JsonProperty("tlsClientKey") - public OAuthSpecIPKTlsClientKey getTlsClientKey() { + public SecretNameReference getTlsClientKey() { return tlsClientKey; } @JsonProperty("tlsClientKey") - public void setTlsClientKey(OAuthSpecIPKTlsClientKey tlsClientKey) { + public void setTlsClientKey(SecretNameReference tlsClientKey) { this.tlsClientKey = tlsClientKey; } @@ -138,12 +138,12 @@ public void setUrl(String url) { } @JsonIgnore - public OAuthSpecIPKeystoneBuilder edit() { - return new OAuthSpecIPKeystoneBuilder(this); + public KeystoneIdentityProviderBuilder edit() { + return new KeystoneIdentityProviderBuilder(this); } @JsonIgnore - public OAuthSpecIPKeystoneBuilder toBuilder() { + public KeystoneIdentityProviderBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/KubeClientConfig.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/KubeClientConfig.java new file mode 100644 index 00000000000..d868692067f --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/KubeClientConfig.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "connectionOverrides", + "kubeConfig" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class KubeClientConfig implements Editable , KubernetesResource +{ + + @JsonProperty("connectionOverrides") + private ClientConnectionOverrides connectionOverrides; + @JsonProperty("kubeConfig") + private String kubeConfig; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public KubeClientConfig() { + } + + public KubeClientConfig(ClientConnectionOverrides connectionOverrides, String kubeConfig) { + super(); + this.connectionOverrides = connectionOverrides; + this.kubeConfig = kubeConfig; + } + + @JsonProperty("connectionOverrides") + public ClientConnectionOverrides getConnectionOverrides() { + return connectionOverrides; + } + + @JsonProperty("connectionOverrides") + public void setConnectionOverrides(ClientConnectionOverrides connectionOverrides) { + this.connectionOverrides = connectionOverrides; + } + + @JsonProperty("kubeConfig") + public String getKubeConfig() { + return kubeConfig; + } + + @JsonProperty("kubeConfig") + public void setKubeConfig(String kubeConfig) { + this.kubeConfig = kubeConfig; + } + + @JsonIgnore + public KubeClientConfigBuilder edit() { + return new KubeClientConfigBuilder(this); + } + + @JsonIgnore + public KubeClientConfigBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/KubevirtPlatformSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/KubevirtPlatformSpec.java new file mode 100644 index 00000000000..7263ccba96a --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/KubevirtPlatformSpec.java @@ -0,0 +1,83 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class KubevirtPlatformSpec implements Editable , KubernetesResource +{ + + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + @JsonIgnore + public KubevirtPlatformSpecBuilder edit() { + return new KubevirtPlatformSpecBuilder(this); + } + + @JsonIgnore + public KubevirtPlatformSpecBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSEquinixMetal.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/KubevirtPlatformStatus.java similarity index 88% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSEquinixMetal.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/KubevirtPlatformStatus.java index 2958c9fb641..5438d82f241 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSEquinixMetal.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/KubevirtPlatformStatus.java @@ -52,7 +52,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureStatusPSEquinixMetal implements Editable , KubernetesResource +public class KubevirtPlatformStatus implements Editable , KubernetesResource { @JsonProperty("apiServerInternalIP") @@ -66,10 +66,10 @@ public class InfrastructureStatusPSEquinixMetal implements Editable , KubernetesResource +public class LDAPAttributeMapping implements Editable , KubernetesResource { @JsonProperty("email") @@ -78,10 +78,10 @@ public class OAuthSpecIPLAttributes implements Editable email, List id, List name, List preferredUsername) { + public LDAPAttributeMapping(List email, List id, List name, List preferredUsername) { super(); this.email = email; this.id = id; @@ -134,12 +134,12 @@ public void setPreferredUsername(List preferredUsername) { } @JsonIgnore - public OAuthSpecIPLAttributesBuilder edit() { - return new OAuthSpecIPLAttributesBuilder(this); + public LDAPAttributeMappingBuilder edit() { + return new LDAPAttributeMappingBuilder(this); } @JsonIgnore - public OAuthSpecIPLAttributesBuilder toBuilder() { + public LDAPAttributeMappingBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPLdap.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/LDAPIdentityProvider.java similarity index 82% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPLdap.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/LDAPIdentityProvider.java index aaed22e78bb..fcc268f1ce5 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPLdap.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/LDAPIdentityProvider.java @@ -56,17 +56,17 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class OAuthSpecIPLdap implements Editable , KubernetesResource +public class LDAPIdentityProvider implements Editable , KubernetesResource { @JsonProperty("attributes") - private OAuthSpecIPLAttributes attributes; + private LDAPAttributeMapping attributes; @JsonProperty("bindDN") private String bindDN; @JsonProperty("bindPassword") - private OAuthSpecIPLBindPassword bindPassword; + private SecretNameReference bindPassword; @JsonProperty("ca") - private OAuthSpecIPLCa ca; + private ConfigMapNameReference ca; @JsonProperty("insecure") private Boolean insecure; @JsonProperty("url") @@ -78,10 +78,10 @@ public class OAuthSpecIPLdap implements Editable , Kuber * No args constructor for use in serialization * */ - public OAuthSpecIPLdap() { + public LDAPIdentityProvider() { } - public OAuthSpecIPLdap(OAuthSpecIPLAttributes attributes, String bindDN, OAuthSpecIPLBindPassword bindPassword, OAuthSpecIPLCa ca, Boolean insecure, String url) { + public LDAPIdentityProvider(LDAPAttributeMapping attributes, String bindDN, SecretNameReference bindPassword, ConfigMapNameReference ca, Boolean insecure, String url) { super(); this.attributes = attributes; this.bindDN = bindDN; @@ -92,12 +92,12 @@ public OAuthSpecIPLdap(OAuthSpecIPLAttributes attributes, String bindDN, OAuthSp } @JsonProperty("attributes") - public OAuthSpecIPLAttributes getAttributes() { + public LDAPAttributeMapping getAttributes() { return attributes; } @JsonProperty("attributes") - public void setAttributes(OAuthSpecIPLAttributes attributes) { + public void setAttributes(LDAPAttributeMapping attributes) { this.attributes = attributes; } @@ -112,22 +112,22 @@ public void setBindDN(String bindDN) { } @JsonProperty("bindPassword") - public OAuthSpecIPLBindPassword getBindPassword() { + public SecretNameReference getBindPassword() { return bindPassword; } @JsonProperty("bindPassword") - public void setBindPassword(OAuthSpecIPLBindPassword bindPassword) { + public void setBindPassword(SecretNameReference bindPassword) { this.bindPassword = bindPassword; } @JsonProperty("ca") - public OAuthSpecIPLCa getCa() { + public ConfigMapNameReference getCa() { return ca; } @JsonProperty("ca") - public void setCa(OAuthSpecIPLCa ca) { + public void setCa(ConfigMapNameReference ca) { this.ca = ca; } @@ -152,12 +152,12 @@ public void setUrl(String url) { } @JsonIgnore - public OAuthSpecIPLdapBuilder edit() { - return new OAuthSpecIPLdapBuilder(this); + public LDAPIdentityProviderBuilder edit() { + return new LDAPIdentityProviderBuilder(this); } @JsonIgnore - public OAuthSpecIPLdapBuilder toBuilder() { + public LDAPIdentityProviderBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterOperatorStatusRelatedObjects.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/LeaderElection.java similarity index 66% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterOperatorStatusRelatedObjects.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/LeaderElection.java index 722cb511ce8..14592be8ab8 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterOperatorStatusRelatedObjects.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/LeaderElection.java @@ -31,10 +31,12 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "group", + "disable", + "leaseDuration", "name", "namespace", - "resource" + "renewDeadline", + "retryPeriod" }) @ToString @EqualsAndHashCode @@ -54,17 +56,21 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterOperatorStatusRelatedObjects implements Editable , KubernetesResource +public class LeaderElection implements Editable , KubernetesResource { - @JsonProperty("group") - private String group; + @JsonProperty("disable") + private Boolean disable; + @JsonProperty("leaseDuration") + private String leaseDuration; @JsonProperty("name") private String name; @JsonProperty("namespace") private String namespace; - @JsonProperty("resource") - private String resource; + @JsonProperty("renewDeadline") + private String renewDeadline; + @JsonProperty("retryPeriod") + private String retryPeriod; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -72,25 +78,37 @@ public class ClusterOperatorStatusRelatedObjects implements Editable , KubernetesResource +public class LoadBalancer implements Editable , KubernetesResource { @JsonProperty("platform") - private IngressSpecLBPlatform platform; + private IngressPlatformSpec platform; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class IngressSpecLoadBalancer implements Editable , KubernetesResource +public class MTUMigration implements Editable , KubernetesResource { @JsonProperty("machine") - private NetworkStatusMMMachine machine; + private MTUMigrationValues machine; @JsonProperty("network") - private NetworkStatusMMNetwork network; + private MTUMigrationValues network; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,42 +66,42 @@ public class NetworkStatusMMtu implements Editable , K * No args constructor for use in serialization * */ - public NetworkStatusMMtu() { + public MTUMigration() { } - public NetworkStatusMMtu(NetworkStatusMMMachine machine, NetworkStatusMMNetwork network) { + public MTUMigration(MTUMigrationValues machine, MTUMigrationValues network) { super(); this.machine = machine; this.network = network; } @JsonProperty("machine") - public NetworkStatusMMMachine getMachine() { + public MTUMigrationValues getMachine() { return machine; } @JsonProperty("machine") - public void setMachine(NetworkStatusMMMachine machine) { + public void setMachine(MTUMigrationValues machine) { this.machine = machine; } @JsonProperty("network") - public NetworkStatusMMNetwork getNetwork() { + public MTUMigrationValues getNetwork() { return network; } @JsonProperty("network") - public void setNetwork(NetworkStatusMMNetwork network) { + public void setNetwork(MTUMigrationValues network) { this.network = network; } @JsonIgnore - public NetworkStatusMMtuBuilder edit() { - return new NetworkStatusMMtuBuilder(this); + public MTUMigrationBuilder edit() { + return new MTUMigrationBuilder(this); } @JsonIgnore - public NetworkStatusMMtuBuilder toBuilder() { + public MTUMigrationBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkStatusMMMachine.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/MTUMigrationValues.java similarity index 85% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkStatusMMMachine.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/MTUMigrationValues.java index e1c9de485cd..10c61ccc9bd 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkStatusMMMachine.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/MTUMigrationValues.java @@ -52,13 +52,13 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NetworkStatusMMMachine implements Editable , KubernetesResource +public class MTUMigrationValues implements Editable , KubernetesResource { @JsonProperty("from") - private Integer from; + private Long from; @JsonProperty("to") - private Integer to; + private Long to; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,42 +66,42 @@ public class NetworkStatusMMMachine implements Editable , KubernetesResource +public class MaxAgePolicy implements Editable , KubernetesResource { @JsonProperty("largestMaxAge") @@ -66,10 +66,10 @@ public class IngressSpecRHMaxAge implements Editable * No args constructor for use in serialization * */ - public IngressSpecRHMaxAge() { + public MaxAgePolicy() { } - public IngressSpecRHMaxAge(Integer largestMaxAge, Integer smallestMaxAge) { + public MaxAgePolicy(Integer largestMaxAge, Integer smallestMaxAge) { super(); this.largestMaxAge = largestMaxAge; this.smallestMaxAge = smallestMaxAge; @@ -96,12 +96,12 @@ public void setSmallestMaxAge(Integer smallestMaxAge) { } @JsonIgnore - public IngressSpecRHMaxAgeBuilder edit() { - return new IngressSpecRHMaxAgeBuilder(this); + public MaxAgePolicyBuilder edit() { + return new MaxAgePolicyBuilder(this); } @JsonIgnore - public IngressSpecRHMaxAgeBuilder toBuilder() { + public MaxAgePolicyBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ModernTLSProfile.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ModernTLSProfile.java new file mode 100644 index 00000000000..e36b27b7fc1 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ModernTLSProfile.java @@ -0,0 +1,83 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class ModernTLSProfile implements Editable , KubernetesResource +{ + + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + @JsonIgnore + public ModernTLSProfileBuilder edit() { + return new ModernTLSProfileBuilder(this); + } + + @JsonIgnore + public ModernTLSProfileBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NamedCertificate.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NamedCertificate.java new file mode 100644 index 00000000000..caf9be63d9c --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NamedCertificate.java @@ -0,0 +1,140 @@ + +package io.fabric8.openshift.api.model.config.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "certFile", + "keyFile", + "names" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class NamedCertificate implements Editable , KubernetesResource +{ + + @JsonProperty("certFile") + private String certFile; + @JsonProperty("keyFile") + private String keyFile; + @JsonProperty("names") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List names = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public NamedCertificate() { + } + + public NamedCertificate(String certFile, String keyFile, List names) { + super(); + this.certFile = certFile; + this.keyFile = keyFile; + this.names = names; + } + + @JsonProperty("certFile") + public String getCertFile() { + return certFile; + } + + @JsonProperty("certFile") + public void setCertFile(String certFile) { + this.certFile = certFile; + } + + @JsonProperty("keyFile") + public String getKeyFile() { + return keyFile; + } + + @JsonProperty("keyFile") + public void setKeyFile(String keyFile) { + this.keyFile = keyFile; + } + + @JsonProperty("names") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getNames() { + return names; + } + + @JsonProperty("names") + public void setNames(List names) { + this.names = names; + } + + @JsonIgnore + public NamedCertificateBuilder edit() { + return new NamedCertificateBuilder(this); + } + + @JsonIgnore + public NamedCertificateBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkSpecNetworkDiagnostics.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkDiagnostics.java similarity index 80% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkSpecNetworkDiagnostics.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkDiagnostics.java index 356c63dfa24..c303b2fbd70 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkSpecNetworkDiagnostics.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkDiagnostics.java @@ -53,15 +53,15 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NetworkSpecNetworkDiagnostics implements Editable , KubernetesResource +public class NetworkDiagnostics implements Editable , KubernetesResource { @JsonProperty("mode") private String mode; @JsonProperty("sourcePlacement") - private NetworkSpecNDSourcePlacement sourcePlacement; + private NetworkDiagnosticsSourcePlacement sourcePlacement; @JsonProperty("targetPlacement") - private NetworkSpecNDTargetPlacement targetPlacement; + private NetworkDiagnosticsTargetPlacement targetPlacement; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,10 +69,10 @@ public class NetworkSpecNetworkDiagnostics implements Editable , KubernetesResource +public class NetworkDiagnosticsSourcePlacement implements Editable , KubernetesResource { @JsonProperty("nodeSelector") @@ -62,7 +63,7 @@ public class NetworkSpecNDTargetPlacement implements Editable nodeSelector = new LinkedHashMap<>(); @JsonProperty("tolerations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List tolerations = new ArrayList<>(); + private List tolerations = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -70,10 +71,10 @@ public class NetworkSpecNDTargetPlacement implements Editable nodeSelector, List tolerations) { + public NetworkDiagnosticsSourcePlacement(Map nodeSelector, List tolerations) { super(); this.nodeSelector = nodeSelector; this.tolerations = tolerations; @@ -92,22 +93,22 @@ public void setNodeSelector(Map nodeSelector) { @JsonProperty("tolerations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getTolerations() { + public List getTolerations() { return tolerations; } @JsonProperty("tolerations") - public void setTolerations(List tolerations) { + public void setTolerations(List tolerations) { this.tolerations = tolerations; } @JsonIgnore - public NetworkSpecNDTargetPlacementBuilder edit() { - return new NetworkSpecNDTargetPlacementBuilder(this); + public NetworkDiagnosticsSourcePlacementBuilder edit() { + return new NetworkDiagnosticsSourcePlacementBuilder(this); } @JsonIgnore - public NetworkSpecNDTargetPlacementBuilder toBuilder() { + public NetworkDiagnosticsSourcePlacementBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkSpecNDSourcePlacement.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkDiagnosticsTargetPlacement.java similarity index 84% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkSpecNDSourcePlacement.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkDiagnosticsTargetPlacement.java index 0f1c37b5043..39cb1a29742 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkSpecNDSourcePlacement.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkDiagnosticsTargetPlacement.java @@ -24,6 +24,7 @@ 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.Toleration; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -54,7 +55,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NetworkSpecNDSourcePlacement implements Editable , KubernetesResource +public class NetworkDiagnosticsTargetPlacement implements Editable , KubernetesResource { @JsonProperty("nodeSelector") @@ -62,7 +63,7 @@ public class NetworkSpecNDSourcePlacement implements Editable nodeSelector = new LinkedHashMap<>(); @JsonProperty("tolerations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List tolerations = new ArrayList<>(); + private List tolerations = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -70,10 +71,10 @@ public class NetworkSpecNDSourcePlacement implements Editable nodeSelector, List tolerations) { + public NetworkDiagnosticsTargetPlacement(Map nodeSelector, List tolerations) { super(); this.nodeSelector = nodeSelector; this.tolerations = tolerations; @@ -92,22 +93,22 @@ public void setNodeSelector(Map nodeSelector) { @JsonProperty("tolerations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getTolerations() { + public List getTolerations() { return tolerations; } @JsonProperty("tolerations") - public void setTolerations(List tolerations) { + public void setTolerations(List tolerations) { this.tolerations = tolerations; } @JsonIgnore - public NetworkSpecNDSourcePlacementBuilder edit() { - return new NetworkSpecNDSourcePlacementBuilder(this); + public NetworkDiagnosticsTargetPlacementBuilder edit() { + return new NetworkDiagnosticsTargetPlacementBuilder(this); } @JsonIgnore - public NetworkSpecNDSourcePlacementBuilder toBuilder() { + public NetworkDiagnosticsTargetPlacementBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkStatusMigration.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkMigration.java similarity index 87% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkStatusMigration.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkMigration.java index b1f6b07f56b..5b9fb55758c 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkStatusMigration.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkMigration.java @@ -52,11 +52,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class NetworkStatusMigration implements Editable , KubernetesResource +public class NetworkMigration implements Editable , KubernetesResource { @JsonProperty("mtu") - private NetworkStatusMMtu mtu; + private MTUMigration mtu; @JsonProperty("networkType") private String networkType; @JsonIgnore @@ -66,22 +66,22 @@ public class NetworkStatusMigration implements Editable , KubernetesRes @JsonProperty("clusterNetwork") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List clusterNetwork = new ArrayList<>(); + private List clusterNetwork = new ArrayList<>(); @JsonProperty("externalIP") - private NetworkSpecExternalIP externalIP; + private ExternalIPConfig externalIP; @JsonProperty("networkDiagnostics") - private NetworkSpecNetworkDiagnostics networkDiagnostics; + private NetworkDiagnostics networkDiagnostics; @JsonProperty("networkType") private String networkType; @JsonProperty("serviceNetwork") @@ -85,7 +85,7 @@ public class NetworkSpec implements Editable , KubernetesRes public NetworkSpec() { } - public NetworkSpec(List clusterNetwork, NetworkSpecExternalIP externalIP, NetworkSpecNetworkDiagnostics networkDiagnostics, String networkType, List serviceNetwork, String serviceNodePortRange) { + public NetworkSpec(List clusterNetwork, ExternalIPConfig externalIP, NetworkDiagnostics networkDiagnostics, String networkType, List serviceNetwork, String serviceNodePortRange) { super(); this.clusterNetwork = clusterNetwork; this.externalIP = externalIP; @@ -97,32 +97,32 @@ public NetworkSpec(List clusterNetwork, NetworkSpecEx @JsonProperty("clusterNetwork") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getClusterNetwork() { + public List getClusterNetwork() { return clusterNetwork; } @JsonProperty("clusterNetwork") - public void setClusterNetwork(List clusterNetwork) { + public void setClusterNetwork(List clusterNetwork) { this.clusterNetwork = clusterNetwork; } @JsonProperty("externalIP") - public NetworkSpecExternalIP getExternalIP() { + public ExternalIPConfig getExternalIP() { return externalIP; } @JsonProperty("externalIP") - public void setExternalIP(NetworkSpecExternalIP externalIP) { + public void setExternalIP(ExternalIPConfig externalIP) { this.externalIP = externalIP; } @JsonProperty("networkDiagnostics") - public NetworkSpecNetworkDiagnostics getNetworkDiagnostics() { + public NetworkDiagnostics getNetworkDiagnostics() { return networkDiagnostics; } @JsonProperty("networkDiagnostics") - public void setNetworkDiagnostics(NetworkSpecNetworkDiagnostics networkDiagnostics) { + public void setNetworkDiagnostics(NetworkDiagnostics networkDiagnostics) { this.networkDiagnostics = networkDiagnostics; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkSpecNDSPTolerations.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkSpecNDSPTolerations.java deleted file mode 100644 index 3a48a2e4d34..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkSpecNDSPTolerations.java +++ /dev/null @@ -1,164 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "effect", - "key", - "operator", - "tolerationSeconds", - "value" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class NetworkSpecNDSPTolerations implements Editable , KubernetesResource -{ - - @JsonProperty("effect") - private String effect; - @JsonProperty("key") - private String key; - @JsonProperty("operator") - private String operator; - @JsonProperty("tolerationSeconds") - private Long tolerationSeconds; - @JsonProperty("value") - private String value; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public NetworkSpecNDSPTolerations() { - } - - public NetworkSpecNDSPTolerations(String effect, String key, String operator, Long tolerationSeconds, String value) { - super(); - this.effect = effect; - this.key = key; - this.operator = operator; - this.tolerationSeconds = tolerationSeconds; - this.value = value; - } - - @JsonProperty("effect") - public String getEffect() { - return effect; - } - - @JsonProperty("effect") - public void setEffect(String effect) { - this.effect = effect; - } - - @JsonProperty("key") - public String getKey() { - return key; - } - - @JsonProperty("key") - public void setKey(String key) { - this.key = key; - } - - @JsonProperty("operator") - public String getOperator() { - return operator; - } - - @JsonProperty("operator") - public void setOperator(String operator) { - this.operator = operator; - } - - @JsonProperty("tolerationSeconds") - public Long getTolerationSeconds() { - return tolerationSeconds; - } - - @JsonProperty("tolerationSeconds") - public void setTolerationSeconds(Long tolerationSeconds) { - this.tolerationSeconds = tolerationSeconds; - } - - @JsonProperty("value") - public String getValue() { - return value; - } - - @JsonProperty("value") - public void setValue(String value) { - this.value = value; - } - - @JsonIgnore - public NetworkSpecNDSPTolerationsBuilder edit() { - return new NetworkSpecNDSPTolerationsBuilder(this); - } - - @JsonIgnore - public NetworkSpecNDSPTolerationsBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkSpecNDTPTolerations.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkSpecNDTPTolerations.java deleted file mode 100644 index 387705b1d4f..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkSpecNDTPTolerations.java +++ /dev/null @@ -1,164 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "effect", - "key", - "operator", - "tolerationSeconds", - "value" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class NetworkSpecNDTPTolerations implements Editable , KubernetesResource -{ - - @JsonProperty("effect") - private String effect; - @JsonProperty("key") - private String key; - @JsonProperty("operator") - private String operator; - @JsonProperty("tolerationSeconds") - private Long tolerationSeconds; - @JsonProperty("value") - private String value; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public NetworkSpecNDTPTolerations() { - } - - public NetworkSpecNDTPTolerations(String effect, String key, String operator, Long tolerationSeconds, String value) { - super(); - this.effect = effect; - this.key = key; - this.operator = operator; - this.tolerationSeconds = tolerationSeconds; - this.value = value; - } - - @JsonProperty("effect") - public String getEffect() { - return effect; - } - - @JsonProperty("effect") - public void setEffect(String effect) { - this.effect = effect; - } - - @JsonProperty("key") - public String getKey() { - return key; - } - - @JsonProperty("key") - public void setKey(String key) { - this.key = key; - } - - @JsonProperty("operator") - public String getOperator() { - return operator; - } - - @JsonProperty("operator") - public void setOperator(String operator) { - this.operator = operator; - } - - @JsonProperty("tolerationSeconds") - public Long getTolerationSeconds() { - return tolerationSeconds; - } - - @JsonProperty("tolerationSeconds") - public void setTolerationSeconds(Long tolerationSeconds) { - this.tolerationSeconds = tolerationSeconds; - } - - @JsonProperty("value") - public String getValue() { - return value; - } - - @JsonProperty("value") - public void setValue(String value) { - this.value = value; - } - - @JsonIgnore - public NetworkSpecNDTPTolerationsBuilder edit() { - return new NetworkSpecNDTPTolerationsBuilder(this); - } - - @JsonIgnore - public NetworkSpecNDTPTolerationsBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkStatus.java index e32a804feb9..40fbcd88f1f 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkStatus.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkStatus.java @@ -14,6 +14,7 @@ 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.Condition; import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.KubernetesResource; @@ -63,14 +64,14 @@ public class NetworkStatus implements Editable , Kubernete @JsonProperty("clusterNetwork") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List clusterNetwork = new ArrayList<>(); + private List clusterNetwork = new ArrayList<>(); @JsonProperty("clusterNetworkMTU") private Integer clusterNetworkMTU; @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("migration") - private NetworkStatusMigration migration; + private NetworkMigration migration; @JsonProperty("networkType") private String networkType; @JsonProperty("serviceNetwork") @@ -86,7 +87,7 @@ public class NetworkStatus implements Editable , Kubernete public NetworkStatus() { } - public NetworkStatus(List clusterNetwork, Integer clusterNetworkMTU, List conditions, NetworkStatusMigration migration, String networkType, List serviceNetwork) { + public NetworkStatus(List clusterNetwork, Integer clusterNetworkMTU, List conditions, NetworkMigration migration, String networkType, List serviceNetwork) { super(); this.clusterNetwork = clusterNetwork; this.clusterNetworkMTU = clusterNetworkMTU; @@ -98,12 +99,12 @@ public NetworkStatus(List clusterNetwork, Integer c @JsonProperty("clusterNetwork") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getClusterNetwork() { + public List getClusterNetwork() { return clusterNetwork; } @JsonProperty("clusterNetwork") - public void setClusterNetwork(List clusterNetwork) { + public void setClusterNetwork(List clusterNetwork) { this.clusterNetwork = clusterNetwork; } @@ -119,22 +120,22 @@ public void setClusterNetworkMTU(Integer clusterNetworkMTU) { @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } @JsonProperty("migration") - public NetworkStatusMigration getMigration() { + public NetworkMigration getMigration() { return migration; } @JsonProperty("migration") - public void setMigration(NetworkStatusMigration migration) { + public void setMigration(NetworkMigration migration) { this.migration = migration; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkStatusClusterNetwork.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkStatusClusterNetwork.java deleted file mode 100644 index 784327ca943..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkStatusClusterNetwork.java +++ /dev/null @@ -1,122 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "cidr", - "hostPrefix" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class NetworkStatusClusterNetwork implements Editable , KubernetesResource -{ - - @JsonProperty("cidr") - private String cidr; - @JsonProperty("hostPrefix") - private Integer hostPrefix; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public NetworkStatusClusterNetwork() { - } - - public NetworkStatusClusterNetwork(String cidr, Integer hostPrefix) { - super(); - this.cidr = cidr; - this.hostPrefix = hostPrefix; - } - - @JsonProperty("cidr") - public String getCidr() { - return cidr; - } - - @JsonProperty("cidr") - public void setCidr(String cidr) { - this.cidr = cidr; - } - - @JsonProperty("hostPrefix") - public Integer getHostPrefix() { - return hostPrefix; - } - - @JsonProperty("hostPrefix") - public void setHostPrefix(Integer hostPrefix) { - this.hostPrefix = hostPrefix; - } - - @JsonIgnore - public NetworkStatusClusterNetworkBuilder edit() { - return new NetworkStatusClusterNetworkBuilder(this); - } - - @JsonIgnore - public NetworkStatusClusterNetworkBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkStatusConditions.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkStatusConditions.java deleted file mode 100644 index 144e4816fbf..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NetworkStatusConditions.java +++ /dev/null @@ -1,178 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "lastTransitionTime", - "message", - "observedGeneration", - "reason", - "status", - "type" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class NetworkStatusConditions implements Editable , KubernetesResource -{ - - @JsonProperty("lastTransitionTime") - private String lastTransitionTime; - @JsonProperty("message") - private String message; - @JsonProperty("observedGeneration") - private Long observedGeneration; - @JsonProperty("reason") - private String reason; - @JsonProperty("status") - private String status; - @JsonProperty("type") - private String type; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public NetworkStatusConditions() { - } - - public NetworkStatusConditions(String lastTransitionTime, String message, Long observedGeneration, String reason, String status, String type) { - super(); - this.lastTransitionTime = lastTransitionTime; - this.message = message; - this.observedGeneration = observedGeneration; - this.reason = reason; - this.status = status; - this.type = type; - } - - @JsonProperty("lastTransitionTime") - public String getLastTransitionTime() { - return lastTransitionTime; - } - - @JsonProperty("lastTransitionTime") - public void setLastTransitionTime(String lastTransitionTime) { - this.lastTransitionTime = lastTransitionTime; - } - - @JsonProperty("message") - public String getMessage() { - return message; - } - - @JsonProperty("message") - public void setMessage(String message) { - this.message = message; - } - - @JsonProperty("observedGeneration") - public Long getObservedGeneration() { - return observedGeneration; - } - - @JsonProperty("observedGeneration") - public void setObservedGeneration(Long observedGeneration) { - this.observedGeneration = observedGeneration; - } - - @JsonProperty("reason") - public String getReason() { - return reason; - } - - @JsonProperty("reason") - public void setReason(String reason) { - this.reason = reason; - } - - @JsonProperty("status") - public String getStatus() { - return status; - } - - @JsonProperty("status") - public void setStatus(String status) { - this.status = status; - } - - @JsonProperty("type") - public String getType() { - return type; - } - - @JsonProperty("type") - public void setType(String type) { - this.type = type; - } - - @JsonIgnore - public NetworkStatusConditionsBuilder edit() { - return new NetworkStatusConditionsBuilder(this); - } - - @JsonIgnore - public NetworkStatusConditionsBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/Node.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/Node.java index 18ee7f1b281..cf79be55b24 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/Node.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/Node.java @@ -86,8 +86,7 @@ public class Node implements Editable , HasMetadata @JsonProperty("spec") private NodeSpec spec; @JsonProperty("status") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object status; + private NodeStatus status; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -98,7 +97,7 @@ public class Node implements Editable , HasMetadata public Node() { } - public Node(String apiVersion, String kind, ObjectMeta metadata, NodeSpec spec, Object status) { + public Node(String apiVersion, String kind, ObjectMeta metadata, NodeSpec spec, NodeStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -168,13 +167,12 @@ public void setSpec(NodeSpec spec) { } @JsonProperty("status") - public Object getStatus() { + public NodeStatus getStatus() { return status; } @JsonProperty("status") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setStatus(Object status) { + public void setStatus(NodeStatus status) { this.status = status; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NodeStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NodeStatus.java new file mode 100644 index 00000000000..74972119110 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NodeStatus.java @@ -0,0 +1,83 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class NodeStatus implements Editable , KubernetesResource +{ + + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + @JsonIgnore + public NodeStatusBuilder edit() { + return new NodeStatusBuilder(this); + } + + @JsonIgnore + public NodeStatusBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSNutanixFailureDomains.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixFailureDomain.java similarity index 78% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSNutanixFailureDomains.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixFailureDomain.java index 2c37a3cf9dd..f891c63205a 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSNutanixFailureDomains.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixFailureDomain.java @@ -55,16 +55,16 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureSpecPSNutanixFailureDomains implements Editable , KubernetesResource +public class NutanixFailureDomain implements Editable , KubernetesResource { @JsonProperty("cluster") - private InfrastructureSpecPSNutanixFDCluster cluster; + private NutanixResourceIdentifier cluster; @JsonProperty("name") private String name; @JsonProperty("subnets") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List subnets = new ArrayList<>(); + private List subnets = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -72,10 +72,10 @@ public class InfrastructureSpecPSNutanixFailureDomains implements Editable subnets) { + public NutanixFailureDomain(NutanixResourceIdentifier cluster, String name, List subnets) { super(); this.cluster = cluster; this.name = name; @@ -83,12 +83,12 @@ public InfrastructureSpecPSNutanixFailureDomains(InfrastructureSpecPSNutanixFDCl } @JsonProperty("cluster") - public InfrastructureSpecPSNutanixFDCluster getCluster() { + public NutanixResourceIdentifier getCluster() { return cluster; } @JsonProperty("cluster") - public void setCluster(InfrastructureSpecPSNutanixFDCluster cluster) { + public void setCluster(NutanixResourceIdentifier cluster) { this.cluster = cluster; } @@ -104,22 +104,22 @@ public void setName(String name) { @JsonProperty("subnets") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getSubnets() { + public List getSubnets() { return subnets; } @JsonProperty("subnets") - public void setSubnets(List subnets) { + public void setSubnets(List subnets) { this.subnets = subnets; } @JsonIgnore - public InfrastructureSpecPSNutanixFailureDomainsBuilder edit() { - return new InfrastructureSpecPSNutanixFailureDomainsBuilder(this); + public NutanixFailureDomainBuilder edit() { + return new NutanixFailureDomainBuilder(this); } @JsonIgnore - public InfrastructureSpecPSNutanixFailureDomainsBuilder toBuilder() { + public NutanixFailureDomainBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSNutanixLoadBalancer.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPlatformLoadBalancer.java similarity index 86% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSNutanixLoadBalancer.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPlatformLoadBalancer.java index 7e65f0ee7d5..71e5b311712 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSNutanixLoadBalancer.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPlatformLoadBalancer.java @@ -51,7 +51,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureStatusPSNutanixLoadBalancer implements Editable , KubernetesResource +public class NutanixPlatformLoadBalancer implements Editable , KubernetesResource { @JsonProperty("type") @@ -63,10 +63,10 @@ public class InfrastructureStatusPSNutanixLoadBalancer implements Editable , KubernetesResource +public class NutanixPlatformSpec implements Editable , KubernetesResource { @JsonProperty("failureDomains") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List failureDomains = new ArrayList<>(); + private List failureDomains = new ArrayList<>(); @JsonProperty("prismCentral") - private InfrastructureSpecPSNutanixPrismCentral prismCentral; + private NutanixPrismEndpoint prismCentral; @JsonProperty("prismElements") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List prismElements = new ArrayList<>(); + private List prismElements = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -73,10 +73,10 @@ public class InfrastructureSpecPSNutanix implements Editable failureDomains, InfrastructureSpecPSNutanixPrismCentral prismCentral, List prismElements) { + public NutanixPlatformSpec(List failureDomains, NutanixPrismEndpoint prismCentral, List prismElements) { super(); this.failureDomains = failureDomains; this.prismCentral = prismCentral; @@ -85,43 +85,43 @@ public InfrastructureSpecPSNutanix(List getFailureDomains() { + public List getFailureDomains() { return failureDomains; } @JsonProperty("failureDomains") - public void setFailureDomains(List failureDomains) { + public void setFailureDomains(List failureDomains) { this.failureDomains = failureDomains; } @JsonProperty("prismCentral") - public InfrastructureSpecPSNutanixPrismCentral getPrismCentral() { + public NutanixPrismEndpoint getPrismCentral() { return prismCentral; } @JsonProperty("prismCentral") - public void setPrismCentral(InfrastructureSpecPSNutanixPrismCentral prismCentral) { + public void setPrismCentral(NutanixPrismEndpoint prismCentral) { this.prismCentral = prismCentral; } @JsonProperty("prismElements") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getPrismElements() { + public List getPrismElements() { return prismElements; } @JsonProperty("prismElements") - public void setPrismElements(List prismElements) { + public void setPrismElements(List prismElements) { this.prismElements = prismElements; } @JsonIgnore - public InfrastructureSpecPSNutanixBuilder edit() { - return new InfrastructureSpecPSNutanixBuilder(this); + public NutanixPlatformSpecBuilder edit() { + return new NutanixPlatformSpecBuilder(this); } @JsonIgnore - public InfrastructureSpecPSNutanixBuilder toBuilder() { + public NutanixPlatformSpecBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSNutanix.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPlatformStatus.java similarity index 86% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSNutanix.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPlatformStatus.java index 298b1edffeb..0c6c1b1f2a1 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSNutanix.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPlatformStatus.java @@ -57,7 +57,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureStatusPSNutanix implements Editable , KubernetesResource +public class NutanixPlatformStatus implements Editable , KubernetesResource { @JsonProperty("apiServerInternalIP") @@ -71,7 +71,7 @@ public class InfrastructureStatusPSNutanix implements Editable ingressIPs = new ArrayList<>(); @JsonProperty("loadBalancer") - private InfrastructureStatusPSNutanixLoadBalancer loadBalancer; + private NutanixPlatformLoadBalancer loadBalancer; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -79,10 +79,10 @@ public class InfrastructureStatusPSNutanix implements Editable apiServerInternalIPs, String ingressIP, List ingressIPs, InfrastructureStatusPSNutanixLoadBalancer loadBalancer) { + public NutanixPlatformStatus(String apiServerInternalIP, List apiServerInternalIPs, String ingressIP, List ingressIPs, NutanixPlatformLoadBalancer loadBalancer) { super(); this.apiServerInternalIP = apiServerInternalIP; this.apiServerInternalIPs = apiServerInternalIPs; @@ -134,22 +134,22 @@ public void setIngressIPs(List ingressIPs) { } @JsonProperty("loadBalancer") - public InfrastructureStatusPSNutanixLoadBalancer getLoadBalancer() { + public NutanixPlatformLoadBalancer getLoadBalancer() { return loadBalancer; } @JsonProperty("loadBalancer") - public void setLoadBalancer(InfrastructureStatusPSNutanixLoadBalancer loadBalancer) { + public void setLoadBalancer(NutanixPlatformLoadBalancer loadBalancer) { this.loadBalancer = loadBalancer; } @JsonIgnore - public InfrastructureStatusPSNutanixBuilder edit() { - return new InfrastructureStatusPSNutanixBuilder(this); + public NutanixPlatformStatusBuilder edit() { + return new NutanixPlatformStatusBuilder(this); } @JsonIgnore - public InfrastructureStatusPSNutanixBuilder toBuilder() { + public NutanixPlatformStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSNutanixPrismElements.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPrismElementEndpoint.java similarity index 82% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSNutanixPrismElements.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPrismElementEndpoint.java index 2d1c5faf967..77236841adf 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSNutanixPrismElements.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/NutanixPrismElementEndpoint.java @@ -52,11 +52,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureSpecPSNutanixPrismElements implements Editable , KubernetesResource +public class NutanixPrismElementEndpoint implements Editable , KubernetesResource { @JsonProperty("endpoint") - private InfrastructureSpecPSNutanixPEEndpoint endpoint; + private NutanixPrismEndpoint endpoint; @JsonProperty("name") private String name; @JsonIgnore @@ -66,22 +66,22 @@ public class InfrastructureSpecPSNutanixPrismElements implements Editable , KubernetesResource +public class NutanixPrismEndpoint implements Editable , KubernetesResource { @JsonProperty("address") @@ -66,10 +66,10 @@ public class InfrastructureSpecPSNutanixPEEndpoint implements Editable , KubernetesResource +public class NutanixResourceIdentifier implements Editable , KubernetesResource { @JsonProperty("name") @@ -69,10 +69,10 @@ public class InfrastructureSpecPSNutanixFDCluster implements Editable , HasMetadata @JsonProperty("spec") private OAuthSpec spec; @JsonProperty("status") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object status; + private OAuthStatus status; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -98,7 +97,7 @@ public class OAuth implements Editable , HasMetadata public OAuth() { } - public OAuth(String apiVersion, String kind, ObjectMeta metadata, OAuthSpec spec, Object status) { + public OAuth(String apiVersion, String kind, ObjectMeta metadata, OAuthSpec spec, OAuthStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -168,13 +167,12 @@ public void setSpec(OAuthSpec spec) { } @JsonProperty("status") - public Object getStatus() { + public OAuthStatus getStatus() { return status; } @JsonProperty("status") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setStatus(Object status) { + public void setStatus(OAuthStatus status) { this.status = status; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusCURelease.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthRemoteConnectionInfo.java similarity index 67% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusCURelease.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthRemoteConnectionInfo.java index 1bbd31f5cf1..5caee224847 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusCURelease.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthRemoteConnectionInfo.java @@ -1,9 +1,7 @@ package io.fabric8.openshift.api.model.config.v1; -import java.util.ArrayList; import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonAnyGetter; @@ -33,10 +31,10 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "channels", - "image", - "url", - "version" + "ca", + "tlsClientCert", + "tlsClientKey", + "url" }) @ToString @EqualsAndHashCode @@ -56,18 +54,17 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterVersionStatusCURelease implements Editable , KubernetesResource +public class OAuthRemoteConnectionInfo implements Editable , KubernetesResource { - @JsonProperty("channels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List channels = new ArrayList<>(); - @JsonProperty("image") - private String image; + @JsonProperty("ca") + private ConfigMapNameReference ca; + @JsonProperty("tlsClientCert") + private SecretNameReference tlsClientCert; + @JsonProperty("tlsClientKey") + private SecretNameReference tlsClientKey; @JsonProperty("url") private String url; - @JsonProperty("version") - private String version; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -75,36 +72,45 @@ public class ClusterVersionStatusCURelease implements Editable channels, String image, String url, String version) { + public OAuthRemoteConnectionInfo(ConfigMapNameReference ca, SecretNameReference tlsClientCert, SecretNameReference tlsClientKey, String url) { super(); - this.channels = channels; - this.image = image; + this.ca = ca; + this.tlsClientCert = tlsClientCert; + this.tlsClientKey = tlsClientKey; this.url = url; - this.version = version; } - @JsonProperty("channels") - @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getChannels() { - return channels; + @JsonProperty("ca") + public ConfigMapNameReference getCa() { + return ca; } - @JsonProperty("channels") - public void setChannels(List channels) { - this.channels = channels; + @JsonProperty("ca") + public void setCa(ConfigMapNameReference ca) { + this.ca = ca; } - @JsonProperty("image") - public String getImage() { - return image; + @JsonProperty("tlsClientCert") + public SecretNameReference getTlsClientCert() { + return tlsClientCert; } - @JsonProperty("image") - public void setImage(String image) { - this.image = image; + @JsonProperty("tlsClientCert") + public void setTlsClientCert(SecretNameReference tlsClientCert) { + this.tlsClientCert = tlsClientCert; + } + + @JsonProperty("tlsClientKey") + public SecretNameReference getTlsClientKey() { + return tlsClientKey; + } + + @JsonProperty("tlsClientKey") + public void setTlsClientKey(SecretNameReference tlsClientKey) { + this.tlsClientKey = tlsClientKey; } @JsonProperty("url") @@ -117,23 +123,13 @@ public void setUrl(String url) { this.url = url; } - @JsonProperty("version") - public String getVersion() { - return version; - } - - @JsonProperty("version") - public void setVersion(String version) { - this.version = version; - } - @JsonIgnore - public ClusterVersionStatusCUReleaseBuilder edit() { - return new ClusterVersionStatusCUReleaseBuilder(this); + public OAuthRemoteConnectionInfoBuilder edit() { + return new OAuthRemoteConnectionInfoBuilder(this); } @JsonIgnore - public ClusterVersionStatusCUReleaseBuilder toBuilder() { + public OAuthRemoteConnectionInfoBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpec.java index 0fb7e8b5b3d..2b823dedfd1 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpec.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpec.java @@ -60,11 +60,11 @@ public class OAuthSpec implements Editable , KubernetesResourc @JsonProperty("identityProviders") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List identityProviders = new ArrayList<>(); + private List identityProviders = new ArrayList<>(); @JsonProperty("templates") - private OAuthSpecTemplates templates; + private OAuthTemplates templates; @JsonProperty("tokenConfig") - private OAuthSpecTokenConfig tokenConfig; + private TokenConfig tokenConfig; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -75,7 +75,7 @@ public class OAuthSpec implements Editable , KubernetesResourc public OAuthSpec() { } - public OAuthSpec(List identityProviders, OAuthSpecTemplates templates, OAuthSpecTokenConfig tokenConfig) { + public OAuthSpec(List identityProviders, OAuthTemplates templates, TokenConfig tokenConfig) { super(); this.identityProviders = identityProviders; this.templates = templates; @@ -84,32 +84,32 @@ public OAuthSpec(List identityProviders, OAuthSpecTe @JsonProperty("identityProviders") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getIdentityProviders() { + public List getIdentityProviders() { return identityProviders; } @JsonProperty("identityProviders") - public void setIdentityProviders(List identityProviders) { + public void setIdentityProviders(List identityProviders) { this.identityProviders = identityProviders; } @JsonProperty("templates") - public OAuthSpecTemplates getTemplates() { + public OAuthTemplates getTemplates() { return templates; } @JsonProperty("templates") - public void setTemplates(OAuthSpecTemplates templates) { + public void setTemplates(OAuthTemplates templates) { this.templates = templates; } @JsonProperty("tokenConfig") - public OAuthSpecTokenConfig getTokenConfig() { + public TokenConfig getTokenConfig() { return tokenConfig; } @JsonProperty("tokenConfig") - public void setTokenConfig(OAuthSpecTokenConfig tokenConfig) { + public void setTokenConfig(TokenConfig tokenConfig) { this.tokenConfig = tokenConfig; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPBasicAuthCa.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPBasicAuthCa.java deleted file mode 100644 index 1af9060436a..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPBasicAuthCa.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class OAuthSpecIPBasicAuthCa implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public OAuthSpecIPBasicAuthCa() { - } - - public OAuthSpecIPBasicAuthCa(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public OAuthSpecIPBasicAuthCaBuilder edit() { - return new OAuthSpecIPBasicAuthCaBuilder(this); - } - - @JsonIgnore - public OAuthSpecIPBasicAuthCaBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPBasicAuthTlsClientCert.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPBasicAuthTlsClientCert.java deleted file mode 100644 index ea2e6479774..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPBasicAuthTlsClientCert.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class OAuthSpecIPBasicAuthTlsClientCert implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public OAuthSpecIPBasicAuthTlsClientCert() { - } - - public OAuthSpecIPBasicAuthTlsClientCert(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public OAuthSpecIPBasicAuthTlsClientCertBuilder edit() { - return new OAuthSpecIPBasicAuthTlsClientCertBuilder(this); - } - - @JsonIgnore - public OAuthSpecIPBasicAuthTlsClientCertBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPBasicAuthTlsClientKey.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPBasicAuthTlsClientKey.java deleted file mode 100644 index 0e59fc784c8..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPBasicAuthTlsClientKey.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class OAuthSpecIPBasicAuthTlsClientKey implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public OAuthSpecIPBasicAuthTlsClientKey() { - } - - public OAuthSpecIPBasicAuthTlsClientKey(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public OAuthSpecIPBasicAuthTlsClientKeyBuilder edit() { - return new OAuthSpecIPBasicAuthTlsClientKeyBuilder(this); - } - - @JsonIgnore - public OAuthSpecIPBasicAuthTlsClientKeyBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPGClientSecret.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPGClientSecret.java deleted file mode 100644 index 403de8b863d..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPGClientSecret.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class OAuthSpecIPGClientSecret implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public OAuthSpecIPGClientSecret() { - } - - public OAuthSpecIPGClientSecret(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public OAuthSpecIPGClientSecretBuilder edit() { - return new OAuthSpecIPGClientSecretBuilder(this); - } - - @JsonIgnore - public OAuthSpecIPGClientSecretBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPGClientSecret_1.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPGClientSecret_1.java deleted file mode 100644 index 6b4b9c111b8..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPGClientSecret_1.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class OAuthSpecIPGClientSecret_1 implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public OAuthSpecIPGClientSecret_1() { - } - - public OAuthSpecIPGClientSecret_1(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public OAuthSpecIPGClientSecret_1Builder edit() { - return new OAuthSpecIPGClientSecret_1Builder(this); - } - - @JsonIgnore - public OAuthSpecIPGClientSecret_1Builder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPGClientSecret_2.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPGClientSecret_2.java deleted file mode 100644 index 717236b4d70..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPGClientSecret_2.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class OAuthSpecIPGClientSecret_2 implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public OAuthSpecIPGClientSecret_2() { - } - - public OAuthSpecIPGClientSecret_2(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public OAuthSpecIPGClientSecret_2Builder edit() { - return new OAuthSpecIPGClientSecret_2Builder(this); - } - - @JsonIgnore - public OAuthSpecIPGClientSecret_2Builder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPHFileData.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPHFileData.java deleted file mode 100644 index bb16eac31fc..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPHFileData.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class OAuthSpecIPHFileData implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public OAuthSpecIPHFileData() { - } - - public OAuthSpecIPHFileData(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public OAuthSpecIPHFileDataBuilder edit() { - return new OAuthSpecIPHFileDataBuilder(this); - } - - @JsonIgnore - public OAuthSpecIPHFileDataBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPKTlsClientCert.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPKTlsClientCert.java deleted file mode 100644 index 09b221d3ce0..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPKTlsClientCert.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class OAuthSpecIPKTlsClientCert implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public OAuthSpecIPKTlsClientCert() { - } - - public OAuthSpecIPKTlsClientCert(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public OAuthSpecIPKTlsClientCertBuilder edit() { - return new OAuthSpecIPKTlsClientCertBuilder(this); - } - - @JsonIgnore - public OAuthSpecIPKTlsClientCertBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPKTlsClientKey.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPKTlsClientKey.java deleted file mode 100644 index 10cc4d035b7..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPKTlsClientKey.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class OAuthSpecIPKTlsClientKey implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public OAuthSpecIPKTlsClientKey() { - } - - public OAuthSpecIPKTlsClientKey(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public OAuthSpecIPKTlsClientKeyBuilder edit() { - return new OAuthSpecIPKTlsClientKeyBuilder(this); - } - - @JsonIgnore - public OAuthSpecIPKTlsClientKeyBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPLBindPassword.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPLBindPassword.java deleted file mode 100644 index 656038c6f79..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPLBindPassword.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class OAuthSpecIPLBindPassword implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public OAuthSpecIPLBindPassword() { - } - - public OAuthSpecIPLBindPassword(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public OAuthSpecIPLBindPasswordBuilder edit() { - return new OAuthSpecIPLBindPasswordBuilder(this); - } - - @JsonIgnore - public OAuthSpecIPLBindPasswordBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPOpenIDCa.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPOpenIDCa.java deleted file mode 100644 index 3434ebb5d35..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPOpenIDCa.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class OAuthSpecIPOpenIDCa implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public OAuthSpecIPOpenIDCa() { - } - - public OAuthSpecIPOpenIDCa(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public OAuthSpecIPOpenIDCaBuilder edit() { - return new OAuthSpecIPOpenIDCaBuilder(this); - } - - @JsonIgnore - public OAuthSpecIPOpenIDCaBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPOpenIDClientSecret.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPOpenIDClientSecret.java deleted file mode 100644 index b26e83b3645..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPOpenIDClientSecret.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class OAuthSpecIPOpenIDClientSecret implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public OAuthSpecIPOpenIDClientSecret() { - } - - public OAuthSpecIPOpenIDClientSecret(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public OAuthSpecIPOpenIDClientSecretBuilder edit() { - return new OAuthSpecIPOpenIDClientSecretBuilder(this); - } - - @JsonIgnore - public OAuthSpecIPOpenIDClientSecretBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecTProviderSelection.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecTProviderSelection.java deleted file mode 100644 index 2014cd032f2..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecTProviderSelection.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class OAuthSpecTProviderSelection implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public OAuthSpecTProviderSelection() { - } - - public OAuthSpecTProviderSelection(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public OAuthSpecTProviderSelectionBuilder edit() { - return new OAuthSpecTProviderSelectionBuilder(this); - } - - @JsonIgnore - public OAuthSpecTProviderSelectionBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthStatus.java new file mode 100644 index 00000000000..d2ff69c328e --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthStatus.java @@ -0,0 +1,83 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class OAuthStatus implements Editable , KubernetesResource +{ + + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + @JsonIgnore + public OAuthStatusBuilder edit() { + return new OAuthStatusBuilder(this); + } + + @JsonIgnore + public OAuthStatusBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecTemplates.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthTemplates.java similarity index 80% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecTemplates.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthTemplates.java index 2926202d47b..76fd3b86911 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecTemplates.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthTemplates.java @@ -53,15 +53,15 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class OAuthSpecTemplates implements Editable , KubernetesResource +public class OAuthTemplates implements Editable , KubernetesResource { @JsonProperty("error") - private OAuthSpecTError error; + private SecretNameReference error; @JsonProperty("login") - private OAuthSpecTLogin login; + private SecretNameReference login; @JsonProperty("providerSelection") - private OAuthSpecTProviderSelection providerSelection; + private SecretNameReference providerSelection; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,10 +69,10 @@ public class OAuthSpecTemplates implements Editable , * No args constructor for use in serialization * */ - public OAuthSpecTemplates() { + public OAuthTemplates() { } - public OAuthSpecTemplates(OAuthSpecTError error, OAuthSpecTLogin login, OAuthSpecTProviderSelection providerSelection) { + public OAuthTemplates(SecretNameReference error, SecretNameReference login, SecretNameReference providerSelection) { super(); this.error = error; this.login = login; @@ -80,42 +80,42 @@ public OAuthSpecTemplates(OAuthSpecTError error, OAuthSpecTLogin login, OAuthSpe } @JsonProperty("error") - public OAuthSpecTError getError() { + public SecretNameReference getError() { return error; } @JsonProperty("error") - public void setError(OAuthSpecTError error) { + public void setError(SecretNameReference error) { this.error = error; } @JsonProperty("login") - public OAuthSpecTLogin getLogin() { + public SecretNameReference getLogin() { return login; } @JsonProperty("login") - public void setLogin(OAuthSpecTLogin login) { + public void setLogin(SecretNameReference login) { this.login = login; } @JsonProperty("providerSelection") - public OAuthSpecTProviderSelection getProviderSelection() { + public SecretNameReference getProviderSelection() { return providerSelection; } @JsonProperty("providerSelection") - public void setProviderSelection(OAuthSpecTProviderSelection providerSelection) { + public void setProviderSelection(SecretNameReference providerSelection) { this.providerSelection = providerSelection; } @JsonIgnore - public OAuthSpecTemplatesBuilder edit() { - return new OAuthSpecTemplatesBuilder(this); + public OAuthTemplatesBuilder edit() { + return new OAuthTemplatesBuilder(this); } @JsonIgnore - public OAuthSpecTemplatesBuilder toBuilder() { + public OAuthTemplatesBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OIDCClientConfig.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OIDCClientConfig.java new file mode 100644 index 00000000000..29e803c27cf --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OIDCClientConfig.java @@ -0,0 +1,168 @@ + +package io.fabric8.openshift.api.model.config.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "clientID", + "clientSecret", + "componentName", + "componentNamespace", + "extraScopes" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class OIDCClientConfig implements Editable , KubernetesResource +{ + + @JsonProperty("clientID") + private String clientID; + @JsonProperty("clientSecret") + private SecretNameReference clientSecret; + @JsonProperty("componentName") + private String componentName; + @JsonProperty("componentNamespace") + private String componentNamespace; + @JsonProperty("extraScopes") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List extraScopes = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public OIDCClientConfig() { + } + + public OIDCClientConfig(String clientID, SecretNameReference clientSecret, String componentName, String componentNamespace, List extraScopes) { + super(); + this.clientID = clientID; + this.clientSecret = clientSecret; + this.componentName = componentName; + this.componentNamespace = componentNamespace; + this.extraScopes = extraScopes; + } + + @JsonProperty("clientID") + public String getClientID() { + return clientID; + } + + @JsonProperty("clientID") + public void setClientID(String clientID) { + this.clientID = clientID; + } + + @JsonProperty("clientSecret") + public SecretNameReference getClientSecret() { + return clientSecret; + } + + @JsonProperty("clientSecret") + public void setClientSecret(SecretNameReference clientSecret) { + this.clientSecret = clientSecret; + } + + @JsonProperty("componentName") + public String getComponentName() { + return componentName; + } + + @JsonProperty("componentName") + public void setComponentName(String componentName) { + this.componentName = componentName; + } + + @JsonProperty("componentNamespace") + public String getComponentNamespace() { + return componentNamespace; + } + + @JsonProperty("componentNamespace") + public void setComponentNamespace(String componentNamespace) { + this.componentNamespace = componentNamespace; + } + + @JsonProperty("extraScopes") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getExtraScopes() { + return extraScopes; + } + + @JsonProperty("extraScopes") + public void setExtraScopes(List extraScopes) { + this.extraScopes = extraScopes; + } + + @JsonIgnore + public OIDCClientConfigBuilder edit() { + return new OIDCClientConfigBuilder(this); + } + + @JsonIgnore + public OIDCClientConfigBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBDEVFConfigMapKeyRef.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OIDCClientReference.java similarity index 67% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBDEVFConfigMapKeyRef.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OIDCClientReference.java index 288c7d256b4..6811810ef41 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBDEVFConfigMapKeyRef.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OIDCClientReference.java @@ -31,9 +31,9 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "key", - "name", - "optional" + "clientID", + "issuerURL", + "oidcProviderName" }) @ToString @EqualsAndHashCode @@ -53,15 +53,15 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class BuildSpecBDEVFConfigMapKeyRef implements Editable , KubernetesResource +public class OIDCClientReference implements Editable , KubernetesResource { - @JsonProperty("key") - private String key; - @JsonProperty("name") - private String name; - @JsonProperty("optional") - private Boolean optional; + @JsonProperty("clientID") + private String clientID; + @JsonProperty("issuerURL") + private String issuerURL; + @JsonProperty("oidcProviderName") + private String oidcProviderName; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,53 +69,53 @@ public class BuildSpecBDEVFConfigMapKeyRef implements Editable , KubernetesResource +{ + + @JsonProperty("componentName") + private String componentName; + @JsonProperty("componentNamespace") + private String componentNamespace; + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List conditions = new ArrayList<>(); + @JsonProperty("consumingUsers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List consumingUsers = new ArrayList<>(); + @JsonProperty("currentOIDCClients") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List currentOIDCClients = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public OIDCClientStatus() { + } + + public OIDCClientStatus(String componentName, String componentNamespace, List conditions, List consumingUsers, List currentOIDCClients) { + super(); + this.componentName = componentName; + this.componentNamespace = componentNamespace; + this.conditions = conditions; + this.consumingUsers = consumingUsers; + this.currentOIDCClients = currentOIDCClients; + } + + @JsonProperty("componentName") + public String getComponentName() { + return componentName; + } + + @JsonProperty("componentName") + public void setComponentName(String componentName) { + this.componentName = componentName; + } + + @JsonProperty("componentNamespace") + public String getComponentNamespace() { + return componentNamespace; + } + + @JsonProperty("componentNamespace") + public void setComponentNamespace(String componentNamespace) { + this.componentNamespace = componentNamespace; + } + + @JsonProperty("conditions") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getConditions() { + return conditions; + } + + @JsonProperty("conditions") + public void setConditions(List conditions) { + this.conditions = conditions; + } + + @JsonProperty("consumingUsers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getConsumingUsers() { + return consumingUsers; + } + + @JsonProperty("consumingUsers") + public void setConsumingUsers(List consumingUsers) { + this.consumingUsers = consumingUsers; + } + + @JsonProperty("currentOIDCClients") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getCurrentOIDCClients() { + return currentOIDCClients; + } + + @JsonProperty("currentOIDCClients") + public void setCurrentOIDCClients(List currentOIDCClients) { + this.currentOIDCClients = currentOIDCClients; + } + + @JsonIgnore + public OIDCClientStatusBuilder edit() { + return new OIDCClientStatusBuilder(this); + } + + @JsonIgnore + public OIDCClientStatusBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OIDCProvider.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OIDCProvider.java new file mode 100644 index 00000000000..07939e45a78 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OIDCProvider.java @@ -0,0 +1,170 @@ + +package io.fabric8.openshift.api.model.config.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "claimMappings", + "claimValidationRules", + "issuer", + "name", + "oidcClients" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class OIDCProvider implements Editable , KubernetesResource +{ + + @JsonProperty("claimMappings") + private TokenClaimMappings claimMappings; + @JsonProperty("claimValidationRules") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List claimValidationRules = new ArrayList<>(); + @JsonProperty("issuer") + private TokenIssuer issuer; + @JsonProperty("name") + private String name; + @JsonProperty("oidcClients") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List oidcClients = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public OIDCProvider() { + } + + public OIDCProvider(TokenClaimMappings claimMappings, List claimValidationRules, TokenIssuer issuer, String name, List oidcClients) { + super(); + this.claimMappings = claimMappings; + this.claimValidationRules = claimValidationRules; + this.issuer = issuer; + this.name = name; + this.oidcClients = oidcClients; + } + + @JsonProperty("claimMappings") + public TokenClaimMappings getClaimMappings() { + return claimMappings; + } + + @JsonProperty("claimMappings") + public void setClaimMappings(TokenClaimMappings claimMappings) { + this.claimMappings = claimMappings; + } + + @JsonProperty("claimValidationRules") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getClaimValidationRules() { + return claimValidationRules; + } + + @JsonProperty("claimValidationRules") + public void setClaimValidationRules(List claimValidationRules) { + this.claimValidationRules = claimValidationRules; + } + + @JsonProperty("issuer") + public TokenIssuer getIssuer() { + return issuer; + } + + @JsonProperty("issuer") + public void setIssuer(TokenIssuer issuer) { + this.issuer = issuer; + } + + @JsonProperty("name") + public String getName() { + return name; + } + + @JsonProperty("name") + public void setName(String name) { + this.name = name; + } + + @JsonProperty("oidcClients") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getOidcClients() { + return oidcClients; + } + + @JsonProperty("oidcClients") + public void setOidcClients(List oidcClients) { + this.oidcClients = oidcClients; + } + + @JsonIgnore + public OIDCProviderBuilder edit() { + return new OIDCProviderBuilder(this); + } + + @JsonIgnore + public OIDCProviderBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressStatusCRRelatedObjects.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ObjectReference.java similarity index 87% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressStatusCRRelatedObjects.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ObjectReference.java index 867e16e366f..4022388f5d7 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressStatusCRRelatedObjects.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ObjectReference.java @@ -18,7 +18,6 @@ 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; @@ -49,12 +48,12 @@ @BuildableReference(PodTemplateSpec.class), @BuildableReference(ResourceRequirements.class), @BuildableReference(IntOrString.class), - @BuildableReference(ObjectReference.class), + @BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class), @BuildableReference(LocalObjectReference.class), @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressStatusCRRelatedObjects implements Editable , KubernetesResource +public class ObjectReference implements Editable , KubernetesResource { @JsonProperty("group") @@ -72,10 +71,10 @@ public class IngressStatusCRRelatedObjects implements Editable , KubernetesResource +{ + + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + @JsonIgnore + public OldTLSProfileBuilder edit() { + return new OldTLSProfileBuilder(this); + } + + @JsonIgnore + public OldTLSProfileBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPOpenIDClaims.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OpenIDClaims.java similarity index 91% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPOpenIDClaims.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OpenIDClaims.java index 240f0be65fd..d7d99bf970d 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPOpenIDClaims.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OpenIDClaims.java @@ -56,7 +56,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class OAuthSpecIPOpenIDClaims implements Editable , KubernetesResource +public class OpenIDClaims implements Editable , KubernetesResource { @JsonProperty("email") @@ -78,10 +78,10 @@ public class OAuthSpecIPOpenIDClaims implements Editable email, List groups, List name, List preferredUsername) { + public OpenIDClaims(List email, List groups, List name, List preferredUsername) { super(); this.email = email; this.groups = groups; @@ -134,12 +134,12 @@ public void setPreferredUsername(List preferredUsername) { } @JsonIgnore - public OAuthSpecIPOpenIDClaimsBuilder edit() { - return new OAuthSpecIPOpenIDClaimsBuilder(this); + public OpenIDClaimsBuilder edit() { + return new OpenIDClaimsBuilder(this); } @JsonIgnore - public OAuthSpecIPOpenIDClaimsBuilder toBuilder() { + public OpenIDClaimsBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPOpenID.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OpenIDIdentityProvider.java similarity index 84% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPOpenID.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OpenIDIdentityProvider.java index 5f383089102..be7fd635974 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPOpenID.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OpenIDIdentityProvider.java @@ -59,17 +59,17 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class OAuthSpecIPOpenID implements Editable , KubernetesResource +public class OpenIDIdentityProvider implements Editable , KubernetesResource { @JsonProperty("ca") - private OAuthSpecIPOpenIDCa ca; + private ConfigMapNameReference ca; @JsonProperty("claims") - private OAuthSpecIPOpenIDClaims claims; + private OpenIDClaims claims; @JsonProperty("clientID") private String clientID; @JsonProperty("clientSecret") - private OAuthSpecIPOpenIDClientSecret clientSecret; + private SecretNameReference clientSecret; @JsonProperty("extraAuthorizeParameters") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map extraAuthorizeParameters = new LinkedHashMap<>(); @@ -85,10 +85,10 @@ public class OAuthSpecIPOpenID implements Editable , K * No args constructor for use in serialization * */ - public OAuthSpecIPOpenID() { + public OpenIDIdentityProvider() { } - public OAuthSpecIPOpenID(OAuthSpecIPOpenIDCa ca, OAuthSpecIPOpenIDClaims claims, String clientID, OAuthSpecIPOpenIDClientSecret clientSecret, Map extraAuthorizeParameters, List extraScopes, String issuer) { + public OpenIDIdentityProvider(ConfigMapNameReference ca, OpenIDClaims claims, String clientID, SecretNameReference clientSecret, Map extraAuthorizeParameters, List extraScopes, String issuer) { super(); this.ca = ca; this.claims = claims; @@ -100,22 +100,22 @@ public OAuthSpecIPOpenID(OAuthSpecIPOpenIDCa ca, OAuthSpecIPOpenIDClaims claims, } @JsonProperty("ca") - public OAuthSpecIPOpenIDCa getCa() { + public ConfigMapNameReference getCa() { return ca; } @JsonProperty("ca") - public void setCa(OAuthSpecIPOpenIDCa ca) { + public void setCa(ConfigMapNameReference ca) { this.ca = ca; } @JsonProperty("claims") - public OAuthSpecIPOpenIDClaims getClaims() { + public OpenIDClaims getClaims() { return claims; } @JsonProperty("claims") - public void setClaims(OAuthSpecIPOpenIDClaims claims) { + public void setClaims(OpenIDClaims claims) { this.claims = claims; } @@ -130,12 +130,12 @@ public void setClientID(String clientID) { } @JsonProperty("clientSecret") - public OAuthSpecIPOpenIDClientSecret getClientSecret() { + public SecretNameReference getClientSecret() { return clientSecret; } @JsonProperty("clientSecret") - public void setClientSecret(OAuthSpecIPOpenIDClientSecret clientSecret) { + public void setClientSecret(SecretNameReference clientSecret) { this.clientSecret = clientSecret; } @@ -172,12 +172,12 @@ public void setIssuer(String issuer) { } @JsonIgnore - public OAuthSpecIPOpenIDBuilder edit() { - return new OAuthSpecIPOpenIDBuilder(this); + public OpenIDIdentityProviderBuilder edit() { + return new OpenIDIdentityProviderBuilder(this); } @JsonIgnore - public OAuthSpecIPOpenIDBuilder toBuilder() { + public OpenIDIdentityProviderBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OpenStackPlatformLoadBalancer.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OpenStackPlatformLoadBalancer.java new file mode 100644 index 00000000000..5515a788967 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OpenStackPlatformLoadBalancer.java @@ -0,0 +1,108 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "type" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class OpenStackPlatformLoadBalancer implements Editable , KubernetesResource +{ + + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public OpenStackPlatformLoadBalancer() { + } + + public OpenStackPlatformLoadBalancer(String type) { + super(); + this.type = type; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonIgnore + public OpenStackPlatformLoadBalancerBuilder edit() { + return new OpenStackPlatformLoadBalancerBuilder(this); + } + + @JsonIgnore + public OpenStackPlatformLoadBalancerBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSBaremetal.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OpenStackPlatformSpec.java similarity index 90% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSBaremetal.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OpenStackPlatformSpec.java index 2ac8df683ad..587c0cb54c0 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSBaremetal.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OpenStackPlatformSpec.java @@ -55,7 +55,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureSpecPSBaremetal implements Editable , KubernetesResource +public class OpenStackPlatformSpec implements Editable , KubernetesResource { @JsonProperty("apiServerInternalIPs") @@ -74,10 +74,10 @@ public class InfrastructureSpecPSBaremetal implements Editable apiServerInternalIPs, List ingressIPs, List machineNetworks) { + public OpenStackPlatformSpec(List apiServerInternalIPs, List ingressIPs, List machineNetworks) { super(); this.apiServerInternalIPs = apiServerInternalIPs; this.ingressIPs = ingressIPs; @@ -118,12 +118,12 @@ public void setMachineNetworks(List machineNetworks) { } @JsonIgnore - public InfrastructureSpecPSBaremetalBuilder edit() { - return new InfrastructureSpecPSBaremetalBuilder(this); + public OpenStackPlatformSpecBuilder edit() { + return new OpenStackPlatformSpecBuilder(this); } @JsonIgnore - public InfrastructureSpecPSBaremetalBuilder toBuilder() { + public OpenStackPlatformSpecBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSOpenstack.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OpenStackPlatformStatus.java similarity index 87% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSOpenstack.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OpenStackPlatformStatus.java index 6ce6e9b34f4..9f5dfe4379d 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSOpenstack.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OpenStackPlatformStatus.java @@ -60,7 +60,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureStatusPSOpenstack implements Editable , KubernetesResource +public class OpenStackPlatformStatus implements Editable , KubernetesResource { @JsonProperty("apiServerInternalIP") @@ -76,7 +76,7 @@ public class InfrastructureStatusPSOpenstack implements Editable ingressIPs = new ArrayList<>(); @JsonProperty("loadBalancer") - private InfrastructureStatusPSOpenstackLoadBalancer loadBalancer; + private OpenStackPlatformLoadBalancer loadBalancer; @JsonProperty("machineNetworks") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List machineNetworks = new ArrayList<>(); @@ -89,10 +89,10 @@ public class InfrastructureStatusPSOpenstack implements Editable apiServerInternalIPs, String cloudName, String ingressIP, List ingressIPs, InfrastructureStatusPSOpenstackLoadBalancer loadBalancer, List machineNetworks, String nodeDNSIP) { + public OpenStackPlatformStatus(String apiServerInternalIP, List apiServerInternalIPs, String cloudName, String ingressIP, List ingressIPs, OpenStackPlatformLoadBalancer loadBalancer, List machineNetworks, String nodeDNSIP) { super(); this.apiServerInternalIP = apiServerInternalIP; this.apiServerInternalIPs = apiServerInternalIPs; @@ -157,12 +157,12 @@ public void setIngressIPs(List ingressIPs) { } @JsonProperty("loadBalancer") - public InfrastructureStatusPSOpenstackLoadBalancer getLoadBalancer() { + public OpenStackPlatformLoadBalancer getLoadBalancer() { return loadBalancer; } @JsonProperty("loadBalancer") - public void setLoadBalancer(InfrastructureStatusPSOpenstackLoadBalancer loadBalancer) { + public void setLoadBalancer(OpenStackPlatformLoadBalancer loadBalancer) { this.loadBalancer = loadBalancer; } @@ -188,12 +188,12 @@ public void setNodeDNSIP(String nodeDNSIP) { } @JsonIgnore - public InfrastructureStatusPSOpenstackBuilder edit() { - return new InfrastructureStatusPSOpenstackBuilder(this); + public OpenStackPlatformStatusBuilder edit() { + return new OpenStackPlatformStatusBuilder(this); } @JsonIgnore - public InfrastructureStatusPSOpenstackBuilder toBuilder() { + public OpenStackPlatformStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterOperatorStatusVersions.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OperandVersion.java similarity index 89% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterOperatorStatusVersions.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OperandVersion.java index 8e7819da87b..6a55a95827e 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterOperatorStatusVersions.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OperandVersion.java @@ -52,7 +52,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterOperatorStatusVersions implements Editable , KubernetesResource +public class OperandVersion implements Editable , KubernetesResource { @JsonProperty("name") @@ -66,10 +66,10 @@ public class ClusterOperatorStatusVersions implements Editable , Kuber private Boolean disableAllDefaultSources; @JsonProperty("sources") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List sources = new ArrayList<>(); + private List sources = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -72,7 +72,7 @@ public class OperatorHubSpec implements Editable , Kuber public OperatorHubSpec() { } - public OperatorHubSpec(Boolean disableAllDefaultSources, List sources) { + public OperatorHubSpec(Boolean disableAllDefaultSources, List sources) { super(); this.disableAllDefaultSources = disableAllDefaultSources; this.sources = sources; @@ -90,12 +90,12 @@ public void setDisableAllDefaultSources(Boolean disableAllDefaultSources) { @JsonProperty("sources") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getSources() { + public List getSources() { return sources; } @JsonProperty("sources") - public void setSources(List sources) { + public void setSources(List sources) { this.sources = sources; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OperatorHubStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OperatorHubStatus.java index 072c32b85f0..b269584f60d 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OperatorHubStatus.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OperatorHubStatus.java @@ -58,7 +58,7 @@ public class OperatorHubStatus implements Editable , K @JsonProperty("sources") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List sources = new ArrayList<>(); + private List sources = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,19 +69,19 @@ public class OperatorHubStatus implements Editable , K public OperatorHubStatus() { } - public OperatorHubStatus(List sources) { + public OperatorHubStatus(List sources) { super(); this.sources = sources; } @JsonProperty("sources") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getSources() { + public List getSources() { return sources; } @JsonProperty("sources") - public void setSources(List sources) { + public void setSources(List sources) { this.sources = sources; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OvirtPlatformLoadBalancer.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OvirtPlatformLoadBalancer.java new file mode 100644 index 00000000000..0f44420752d --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OvirtPlatformLoadBalancer.java @@ -0,0 +1,108 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "type" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class OvirtPlatformLoadBalancer implements Editable , KubernetesResource +{ + + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public OvirtPlatformLoadBalancer() { + } + + public OvirtPlatformLoadBalancer(String type) { + super(); + this.type = type; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonIgnore + public OvirtPlatformLoadBalancerBuilder edit() { + return new OvirtPlatformLoadBalancerBuilder(this); + } + + @JsonIgnore + public OvirtPlatformLoadBalancerBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OvirtPlatformSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OvirtPlatformSpec.java new file mode 100644 index 00000000000..fa25f54f0d7 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OvirtPlatformSpec.java @@ -0,0 +1,83 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class OvirtPlatformSpec implements Editable , KubernetesResource +{ + + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + @JsonIgnore + public OvirtPlatformSpecBuilder edit() { + return new OvirtPlatformSpecBuilder(this); + } + + @JsonIgnore + public OvirtPlatformSpecBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSOvirt.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OvirtPlatformStatus.java similarity index 87% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSOvirt.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OvirtPlatformStatus.java index 90a7e433cc4..dc49d67b860 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSOvirt.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OvirtPlatformStatus.java @@ -58,7 +58,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureStatusPSOvirt implements Editable , KubernetesResource +public class OvirtPlatformStatus implements Editable , KubernetesResource { @JsonProperty("apiServerInternalIP") @@ -72,7 +72,7 @@ public class InfrastructureStatusPSOvirt implements Editable ingressIPs = new ArrayList<>(); @JsonProperty("loadBalancer") - private InfrastructureStatusPSOvirtLoadBalancer loadBalancer; + private OvirtPlatformLoadBalancer loadBalancer; @JsonProperty("nodeDNSIP") private String nodeDNSIP; @JsonIgnore @@ -82,10 +82,10 @@ public class InfrastructureStatusPSOvirt implements Editable apiServerInternalIPs, String ingressIP, List ingressIPs, InfrastructureStatusPSOvirtLoadBalancer loadBalancer, String nodeDNSIP) { + public OvirtPlatformStatus(String apiServerInternalIP, List apiServerInternalIPs, String ingressIP, List ingressIPs, OvirtPlatformLoadBalancer loadBalancer, String nodeDNSIP) { super(); this.apiServerInternalIP = apiServerInternalIP; this.apiServerInternalIPs = apiServerInternalIPs; @@ -138,12 +138,12 @@ public void setIngressIPs(List ingressIPs) { } @JsonProperty("loadBalancer") - public InfrastructureStatusPSOvirtLoadBalancer getLoadBalancer() { + public OvirtPlatformLoadBalancer getLoadBalancer() { return loadBalancer; } @JsonProperty("loadBalancer") - public void setLoadBalancer(InfrastructureStatusPSOvirtLoadBalancer loadBalancer) { + public void setLoadBalancer(OvirtPlatformLoadBalancer loadBalancer) { this.loadBalancer = loadBalancer; } @@ -158,12 +158,12 @@ public void setNodeDNSIP(String nodeDNSIP) { } @JsonIgnore - public InfrastructureStatusPSOvirtBuilder edit() { - return new InfrastructureStatusPSOvirtBuilder(this); + public OvirtPlatformStatusBuilder edit() { + return new OvirtPlatformStatusBuilder(this); } @JsonIgnore - public InfrastructureStatusPSOvirtBuilder toBuilder() { + public OvirtPlatformStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPlatformSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PlatformSpec.java similarity index 60% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPlatformSpec.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PlatformSpec.java index d2303d2702f..5537cf9b2aa 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPlatformSpec.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PlatformSpec.java @@ -65,46 +65,39 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureSpecPlatformSpec implements Editable , KubernetesResource +public class PlatformSpec implements Editable , KubernetesResource { @JsonProperty("alibabaCloud") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object alibabaCloud; + private AlibabaCloudPlatformSpec alibabaCloud; @JsonProperty("aws") - private InfrastructureSpecPSAws aws; + private AWSPlatformSpec aws; @JsonProperty("azure") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object azure; + private AzurePlatformSpec azure; @JsonProperty("baremetal") - private InfrastructureSpecPSBaremetal baremetal; + private BareMetalPlatformSpec baremetal; @JsonProperty("equinixMetal") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object equinixMetal; + private EquinixMetalPlatformSpec equinixMetal; @JsonProperty("external") - private InfrastructureSpecPSExternal external; + private ExternalPlatformSpec external; @JsonProperty("gcp") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object gcp; + private GCPPlatformSpec gcp; @JsonProperty("ibmcloud") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object ibmcloud; + private IBMCloudPlatformSpec ibmcloud; @JsonProperty("kubevirt") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object kubevirt; + private KubevirtPlatformSpec kubevirt; @JsonProperty("nutanix") - private InfrastructureSpecPSNutanix nutanix; + private NutanixPlatformSpec nutanix; @JsonProperty("openstack") - private InfrastructureSpecPSOpenstack openstack; + private OpenStackPlatformSpec openstack; @JsonProperty("ovirt") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object ovirt; + private OvirtPlatformSpec ovirt; @JsonProperty("powervs") - private InfrastructureSpecPSPowervs powervs; + private PowerVSPlatformSpec powervs; @JsonProperty("type") private String type; @JsonProperty("vsphere") - private InfrastructureSpecPSVsphere vsphere; + private VSpherePlatformSpec vsphere; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -112,10 +105,10 @@ public class InfrastructureSpecPlatformSpec implements Editable , KubernetesResource +public class PlatformStatus implements Editable , KubernetesResource { @JsonProperty("alibabaCloud") - private InfrastructureStatusPSAlibabaCloud alibabaCloud; + private AlibabaCloudPlatformStatus alibabaCloud; @JsonProperty("aws") - private InfrastructureStatusPSAws aws; + private AWSPlatformStatus aws; @JsonProperty("azure") - private InfrastructureStatusPSAzure azure; + private AzurePlatformStatus azure; @JsonProperty("baremetal") - private InfrastructureStatusPSBaremetal baremetal; + private BareMetalPlatformStatus baremetal; @JsonProperty("equinixMetal") - private InfrastructureStatusPSEquinixMetal equinixMetal; + private EquinixMetalPlatformStatus equinixMetal; @JsonProperty("external") - private InfrastructureStatusPSExternal external; + private ExternalPlatformStatus external; @JsonProperty("gcp") - private InfrastructureStatusPSGcp gcp; + private GCPPlatformStatus gcp; @JsonProperty("ibmcloud") - private InfrastructureStatusPSIbmcloud ibmcloud; + private IBMCloudPlatformStatus ibmcloud; @JsonProperty("kubevirt") - private InfrastructureStatusPSKubevirt kubevirt; + private KubevirtPlatformStatus kubevirt; @JsonProperty("nutanix") - private InfrastructureStatusPSNutanix nutanix; + private NutanixPlatformStatus nutanix; @JsonProperty("openstack") - private InfrastructureStatusPSOpenstack openstack; + private OpenStackPlatformStatus openstack; @JsonProperty("ovirt") - private InfrastructureStatusPSOvirt ovirt; + private OvirtPlatformStatus ovirt; @JsonProperty("powervs") - private InfrastructureStatusPSPowervs powervs; + private PowerVSPlatformStatus powervs; @JsonProperty("type") private String type; @JsonProperty("vsphere") - private InfrastructureStatusPSVsphere vsphere; + private VSpherePlatformStatus vsphere; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -105,10 +105,10 @@ public class InfrastructureStatusPlatformStatus implements Editable , KubernetesResource +public class PowerVSPlatformSpec implements Editable , KubernetesResource { @JsonProperty("serviceEndpoints") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List serviceEndpoints = new ArrayList<>(); + private List serviceEndpoints = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,32 +66,32 @@ public class InfrastructureSpecPSPowervs implements Editable serviceEndpoints) { + public PowerVSPlatformSpec(List serviceEndpoints) { super(); this.serviceEndpoints = serviceEndpoints; } @JsonProperty("serviceEndpoints") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getServiceEndpoints() { + public List getServiceEndpoints() { return serviceEndpoints; } @JsonProperty("serviceEndpoints") - public void setServiceEndpoints(List serviceEndpoints) { + public void setServiceEndpoints(List serviceEndpoints) { this.serviceEndpoints = serviceEndpoints; } @JsonIgnore - public InfrastructureSpecPSPowervsBuilder edit() { - return new InfrastructureSpecPSPowervsBuilder(this); + public PowerVSPlatformSpecBuilder edit() { + return new PowerVSPlatformSpecBuilder(this); } @JsonIgnore - public InfrastructureSpecPSPowervsBuilder toBuilder() { + public PowerVSPlatformSpecBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSPowervs.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PowerVSPlatformStatus.java similarity index 85% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSPowervs.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PowerVSPlatformStatus.java index eee4a21a9e1..fa1d2286dc9 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSPowervs.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PowerVSPlatformStatus.java @@ -58,7 +58,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureStatusPSPowervs implements Editable , KubernetesResource +public class PowerVSPlatformStatus implements Editable , KubernetesResource { @JsonProperty("cisInstanceCRN") @@ -71,7 +71,7 @@ public class InfrastructureStatusPSPowervs implements Editable serviceEndpoints = new ArrayList<>(); + private List serviceEndpoints = new ArrayList<>(); @JsonProperty("zone") private String zone; @JsonIgnore @@ -81,10 +81,10 @@ public class InfrastructureStatusPSPowervs implements Editable serviceEndpoints, String zone) { + public PowerVSPlatformStatus(String cisInstanceCRN, String dnsInstanceCRN, String region, String resourceGroup, List serviceEndpoints, String zone) { super(); this.cisInstanceCRN = cisInstanceCRN; this.dnsInstanceCRN = dnsInstanceCRN; @@ -136,12 +136,12 @@ public void setResourceGroup(String resourceGroup) { @JsonProperty("serviceEndpoints") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getServiceEndpoints() { + public List getServiceEndpoints() { return serviceEndpoints; } @JsonProperty("serviceEndpoints") - public void setServiceEndpoints(List serviceEndpoints) { + public void setServiceEndpoints(List serviceEndpoints) { this.serviceEndpoints = serviceEndpoints; } @@ -156,12 +156,12 @@ public void setZone(String zone) { } @JsonIgnore - public InfrastructureStatusPSPowervsBuilder edit() { - return new InfrastructureStatusPSPowervsBuilder(this); + public PowerVSPlatformStatusBuilder edit() { + return new PowerVSPlatformStatusBuilder(this); } @JsonIgnore - public InfrastructureStatusPSPowervsBuilder toBuilder() { + public PowerVSPlatformStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSPowervsServiceEndpoints.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PowerVSServiceEndpoint.java similarity index 87% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSPowervsServiceEndpoints.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PowerVSServiceEndpoint.java index c069cbdbe98..20375d1dfac 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSPowervsServiceEndpoints.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PowerVSServiceEndpoint.java @@ -52,7 +52,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureSpecPSPowervsServiceEndpoints implements Editable , KubernetesResource +public class PowerVSServiceEndpoint implements Editable , KubernetesResource { @JsonProperty("name") @@ -66,10 +66,10 @@ public class InfrastructureSpecPSPowervsServiceEndpoints implements Editable , KubernetesResource +{ + + @JsonProperty("claim") + private String claim; + @JsonProperty("prefix") + private String prefix; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public PrefixedClaimMapping() { + } + + public PrefixedClaimMapping(String claim, String prefix) { + super(); + this.claim = claim; + this.prefix = prefix; + } + + @JsonProperty("claim") + public String getClaim() { + return claim; + } + + @JsonProperty("claim") + public void setClaim(String claim) { + this.claim = claim; + } + + @JsonProperty("prefix") + public String getPrefix() { + return prefix; + } + + @JsonProperty("prefix") + public void setPrefix(String prefix) { + this.prefix = prefix; + } + + @JsonIgnore + public PrefixedClaimMappingBuilder edit() { + return new PrefixedClaimMappingBuilder(this); + } + + @JsonIgnore + public PrefixedClaimMappingBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuthenticationSpecOauthMetadata.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ProfileCustomizations.java similarity index 76% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuthenticationSpecOauthMetadata.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ProfileCustomizations.java index 2384e288a27..8d5d2a61b84 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuthenticationSpecOauthMetadata.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ProfileCustomizations.java @@ -31,7 +31,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "name" + "dynamicResourceAllocation" }) @ToString @EqualsAndHashCode @@ -51,11 +51,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class AuthenticationSpecOauthMetadata implements Editable , KubernetesResource +public class ProfileCustomizations implements Editable , KubernetesResource { - @JsonProperty("name") - private String name; + @JsonProperty("dynamicResourceAllocation") + private String dynamicResourceAllocation; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class AuthenticationSpecOauthMetadata implements Editable , HasMetadata @JsonProperty("spec") private ProjectSpec spec; @JsonProperty("status") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object status; + private ProjectStatus status; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -98,7 +97,7 @@ public class Project implements Editable , HasMetadata public Project() { } - public Project(String apiVersion, String kind, ObjectMeta metadata, ProjectSpec spec, Object status) { + public Project(String apiVersion, String kind, ObjectMeta metadata, ProjectSpec spec, ProjectStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -168,13 +167,12 @@ public void setSpec(ProjectSpec spec) { } @JsonProperty("status") - public Object getStatus() { + public ProjectStatus getStatus() { return status; } @JsonProperty("status") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setStatus(Object status) { + public void setStatus(ProjectStatus status) { this.status = status; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ProjectSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ProjectSpec.java index f18bed09801..d82a9b719a2 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ProjectSpec.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ProjectSpec.java @@ -58,7 +58,7 @@ public class ProjectSpec implements Editable , KubernetesRes @JsonProperty("projectRequestMessage") private String projectRequestMessage; @JsonProperty("projectRequestTemplate") - private ProjectSpecProjectRequestTemplate projectRequestTemplate; + private TemplateReference projectRequestTemplate; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,7 +69,7 @@ public class ProjectSpec implements Editable , KubernetesRes public ProjectSpec() { } - public ProjectSpec(String projectRequestMessage, ProjectSpecProjectRequestTemplate projectRequestTemplate) { + public ProjectSpec(String projectRequestMessage, TemplateReference projectRequestTemplate) { super(); this.projectRequestMessage = projectRequestMessage; this.projectRequestTemplate = projectRequestTemplate; @@ -86,12 +86,12 @@ public void setProjectRequestMessage(String projectRequestMessage) { } @JsonProperty("projectRequestTemplate") - public ProjectSpecProjectRequestTemplate getProjectRequestTemplate() { + public TemplateReference getProjectRequestTemplate() { return projectRequestTemplate; } @JsonProperty("projectRequestTemplate") - public void setProjectRequestTemplate(ProjectSpecProjectRequestTemplate projectRequestTemplate) { + public void setProjectRequestTemplate(TemplateReference projectRequestTemplate) { this.projectRequestTemplate = projectRequestTemplate; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ProjectSpecProjectRequestTemplate.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ProjectSpecProjectRequestTemplate.java deleted file mode 100644 index 4bddfb46964..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ProjectSpecProjectRequestTemplate.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class ProjectSpecProjectRequestTemplate implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ProjectSpecProjectRequestTemplate() { - } - - public ProjectSpecProjectRequestTemplate(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public ProjectSpecProjectRequestTemplateBuilder edit() { - return new ProjectSpecProjectRequestTemplateBuilder(this); - } - - @JsonIgnore - public ProjectSpecProjectRequestTemplateBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ProjectStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ProjectStatus.java new file mode 100644 index 00000000000..dac0b819b0c --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ProjectStatus.java @@ -0,0 +1,83 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class ProjectStatus implements Editable , KubernetesResource +{ + + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + @JsonIgnore + public ProjectStatusBuilder edit() { + return new ProjectStatusBuilder(this); + } + + @JsonIgnore + public ProjectStatusBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusCURMRPromql.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PromQLClusterCondition.java similarity index 88% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusCURMRPromql.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PromQLClusterCondition.java index be5ef8c1f2c..2e35b11444a 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusCURMRPromql.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/PromQLClusterCondition.java @@ -51,7 +51,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterVersionStatusCURMRPromql implements Editable , KubernetesResource +public class PromQLClusterCondition implements Editable , KubernetesResource { @JsonProperty("promql") @@ -63,10 +63,10 @@ public class ClusterVersionStatusCURMRPromql implements Editable , KubernetesResourc @JsonInclude(JsonInclude.Include.NON_EMPTY) private List readinessEndpoints = new ArrayList<>(); @JsonProperty("trustedCA") - private ProxySpecTrustedCA trustedCA; + private ConfigMapNameReference trustedCA; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -81,7 +81,7 @@ public class ProxySpec implements Editable , KubernetesResourc public ProxySpec() { } - public ProxySpec(String httpProxy, String httpsProxy, String noProxy, List readinessEndpoints, ProxySpecTrustedCA trustedCA) { + public ProxySpec(String httpProxy, String httpsProxy, String noProxy, List readinessEndpoints, ConfigMapNameReference trustedCA) { super(); this.httpProxy = httpProxy; this.httpsProxy = httpsProxy; @@ -132,12 +132,12 @@ public void setReadinessEndpoints(List readinessEndpoints) { } @JsonProperty("trustedCA") - public ProxySpecTrustedCA getTrustedCA() { + public ConfigMapNameReference getTrustedCA() { return trustedCA; } @JsonProperty("trustedCA") - public void setTrustedCA(ProxySpecTrustedCA trustedCA) { + public void setTrustedCA(ConfigMapNameReference trustedCA) { this.trustedCA = trustedCA; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ProxySpecTrustedCA.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ProxySpecTrustedCA.java deleted file mode 100644 index 3b069124cae..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ProxySpecTrustedCA.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class ProxySpecTrustedCA implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public ProxySpecTrustedCA() { - } - - public ProxySpecTrustedCA(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public ProxySpecTrustedCABuilder edit() { - return new ProxySpecTrustedCABuilder(this); - } - - @JsonIgnore - public ProxySpecTrustedCABuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageSpecAllowedRegistriesForImport.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/RegistryLocation.java similarity index 88% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageSpecAllowedRegistriesForImport.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/RegistryLocation.java index fa8264c72d5..5bbfe19dd7f 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageSpecAllowedRegistriesForImport.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/RegistryLocation.java @@ -52,7 +52,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ImageSpecAllowedRegistriesForImport implements Editable , KubernetesResource +public class RegistryLocation implements Editable , KubernetesResource { @JsonProperty("domainName") @@ -66,10 +66,10 @@ public class ImageSpecAllowedRegistriesForImport implements Editable , KubernetesResource +public class RegistrySources implements Editable , KubernetesResource { @JsonProperty("allowedRegistries") @@ -78,10 +78,10 @@ public class ImageSpecRegistrySources implements Editable allowedRegistries, List blockedRegistries, List containerRuntimeSearchRegistries, List insecureRegistries) { + public RegistrySources(List allowedRegistries, List blockedRegistries, List containerRuntimeSearchRegistries, List insecureRegistries) { super(); this.allowedRegistries = allowedRegistries; this.blockedRegistries = blockedRegistries; @@ -134,12 +134,12 @@ public void setInsecureRegistries(List insecureRegistries) { } @JsonIgnore - public ImageSpecRegistrySourcesBuilder edit() { - return new ImageSpecRegistrySourcesBuilder(this); + public RegistrySourcesBuilder edit() { + return new RegistrySourcesBuilder(this); } @JsonIgnore - public ImageSpecRegistrySourcesBuilder toBuilder() { + public RegistrySourcesBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusDesired.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/Release.java similarity index 90% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusDesired.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/Release.java index 41600e8deed..0ae472c24e5 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionStatusDesired.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/Release.java @@ -56,7 +56,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterVersionStatusDesired implements Editable , KubernetesResource +public class Release implements Editable , KubernetesResource { @JsonProperty("channels") @@ -75,10 +75,10 @@ public class ClusterVersionStatusDesired implements Editable channels, String image, String url, String version) { + public Release(List channels, String image, String url, String version) { super(); this.channels = channels; this.image = image; @@ -128,12 +128,12 @@ public void setVersion(String version) { } @JsonIgnore - public ClusterVersionStatusDesiredBuilder edit() { - return new ClusterVersionStatusDesiredBuilder(this); + public ReleaseBuilder edit() { + return new ReleaseBuilder(this); } @JsonIgnore - public ClusterVersionStatusDesiredBuilder toBuilder() { + public ReleaseBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/RemoteConnectionInfo.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/RemoteConnectionInfo.java new file mode 100644 index 00000000000..ec3e9cb75c7 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/RemoteConnectionInfo.java @@ -0,0 +1,150 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "ca", + "certFile", + "keyFile", + "url" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class RemoteConnectionInfo implements Editable , KubernetesResource +{ + + @JsonProperty("ca") + private String ca; + @JsonProperty("certFile") + private String certFile; + @JsonProperty("keyFile") + private String keyFile; + @JsonProperty("url") + private String url; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public RemoteConnectionInfo() { + } + + public RemoteConnectionInfo(String ca, String certFile, String keyFile, String url) { + super(); + this.ca = ca; + this.certFile = certFile; + this.keyFile = keyFile; + this.url = url; + } + + @JsonProperty("ca") + public String getCa() { + return ca; + } + + @JsonProperty("ca") + public void setCa(String ca) { + this.ca = ca; + } + + @JsonProperty("certFile") + public String getCertFile() { + return certFile; + } + + @JsonProperty("certFile") + public void setCertFile(String certFile) { + this.certFile = certFile; + } + + @JsonProperty("keyFile") + public String getKeyFile() { + return keyFile; + } + + @JsonProperty("keyFile") + public void setKeyFile(String keyFile) { + this.keyFile = keyFile; + } + + @JsonProperty("url") + public String getUrl() { + return url; + } + + @JsonProperty("url") + public void setUrl(String url) { + this.url = url; + } + + @JsonIgnore + public RemoteConnectionInfoBuilder edit() { + return new RemoteConnectionInfoBuilder(this); + } + + @JsonIgnore + public RemoteConnectionInfoBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageContentPolicySpecRepositoryDigestMirrors.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/RepositoryDigestMirrors.java similarity index 88% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageContentPolicySpecRepositoryDigestMirrors.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/RepositoryDigestMirrors.java index 1718e8d1f49..e66c980f7e1 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ImageContentPolicySpecRepositoryDigestMirrors.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/RepositoryDigestMirrors.java @@ -55,7 +55,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ImageContentPolicySpecRepositoryDigestMirrors implements Editable , KubernetesResource +public class RepositoryDigestMirrors implements Editable , KubernetesResource { @JsonProperty("allowMirrorByTags") @@ -72,10 +72,10 @@ public class ImageContentPolicySpecRepositoryDigestMirrors implements Editable mirrors, String source) { + public RepositoryDigestMirrors(Boolean allowMirrorByTags, List mirrors, String source) { super(); this.allowMirrorByTags = allowMirrorByTags; this.mirrors = mirrors; @@ -114,12 +114,12 @@ public void setSource(String source) { } @JsonIgnore - public ImageContentPolicySpecRepositoryDigestMirrorsBuilder edit() { - return new ImageContentPolicySpecRepositoryDigestMirrorsBuilder(this); + public RepositoryDigestMirrorsBuilder edit() { + return new RepositoryDigestMirrorsBuilder(this); } @JsonIgnore - public ImageContentPolicySpecRepositoryDigestMirrorsBuilder toBuilder() { + public RepositoryDigestMirrorsBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPRequestHeader.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/RequestHeaderIdentityProvider.java similarity index 89% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPRequestHeader.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/RequestHeaderIdentityProvider.java index 40b49af2e30..6abf5e02954 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPRequestHeader.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/RequestHeaderIdentityProvider.java @@ -60,11 +60,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class OAuthSpecIPRequestHeader implements Editable , KubernetesResource +public class RequestHeaderIdentityProvider implements Editable , KubernetesResource { @JsonProperty("ca") - private OAuthSpecIPRHCa ca; + private ConfigMapNameReference ca; @JsonProperty("challengeURL") private String challengeURL; @JsonProperty("clientCommonNames") @@ -91,10 +91,10 @@ public class OAuthSpecIPRequestHeader implements Editable clientCommonNames, List emailHeaders, List headers, String loginURL, List nameHeaders, List preferredUsernameHeaders) { + public RequestHeaderIdentityProvider(ConfigMapNameReference ca, String challengeURL, List clientCommonNames, List emailHeaders, List headers, String loginURL, List nameHeaders, List preferredUsernameHeaders) { super(); this.ca = ca; this.challengeURL = challengeURL; @@ -107,12 +107,12 @@ public OAuthSpecIPRequestHeader(OAuthSpecIPRHCa ca, String challengeURL, List preferredUsernameHeaders) { } @JsonIgnore - public OAuthSpecIPRequestHeaderBuilder edit() { - return new OAuthSpecIPRequestHeaderBuilder(this); + public RequestHeaderIdentityProviderBuilder edit() { + return new RequestHeaderIdentityProviderBuilder(this); } @JsonIgnore - public OAuthSpecIPRequestHeaderBuilder toBuilder() { + public RequestHeaderIdentityProviderBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressSpecRequiredHSTSPolicies.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/RequiredHSTSPolicy.java similarity index 84% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressSpecRequiredHSTSPolicies.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/RequiredHSTSPolicy.java index 66b83d33f6f..0d0b4940d8e 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/IngressSpecRequiredHSTSPolicies.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/RequiredHSTSPolicy.java @@ -57,7 +57,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class IngressSpecRequiredHSTSPolicies implements Editable , KubernetesResource +public class RequiredHSTSPolicy implements Editable , KubernetesResource { @JsonProperty("domainPatterns") @@ -66,9 +66,9 @@ public class IngressSpecRequiredHSTSPolicies implements Editable domainPatterns, String includeSubDomainsPolicy, IngressSpecRHMaxAge maxAge, IngressSpecRHNamespaceSelector namespaceSelector, String preloadPolicy) { + public RequiredHSTSPolicy(List domainPatterns, String includeSubDomainsPolicy, MaxAgePolicy maxAge, LabelSelector namespaceSelector, String preloadPolicy) { super(); this.domainPatterns = domainPatterns; this.includeSubDomainsPolicy = includeSubDomainsPolicy; @@ -112,22 +112,22 @@ public void setIncludeSubDomainsPolicy(String includeSubDomainsPolicy) { } @JsonProperty("maxAge") - public IngressSpecRHMaxAge getMaxAge() { + public MaxAgePolicy getMaxAge() { return maxAge; } @JsonProperty("maxAge") - public void setMaxAge(IngressSpecRHMaxAge maxAge) { + public void setMaxAge(MaxAgePolicy maxAge) { this.maxAge = maxAge; } @JsonProperty("namespaceSelector") - public IngressSpecRHNamespaceSelector getNamespaceSelector() { + public LabelSelector getNamespaceSelector() { return namespaceSelector; } @JsonProperty("namespaceSelector") - public void setNamespaceSelector(IngressSpecRHNamespaceSelector namespaceSelector) { + public void setNamespaceSelector(LabelSelector namespaceSelector) { this.namespaceSelector = namespaceSelector; } @@ -142,12 +142,12 @@ public void setPreloadPolicy(String preloadPolicy) { } @JsonIgnore - public IngressSpecRequiredHSTSPoliciesBuilder edit() { - return new IngressSpecRequiredHSTSPoliciesBuilder(this); + public RequiredHSTSPolicyBuilder edit() { + return new RequiredHSTSPolicyBuilder(this); } @JsonIgnore - public IngressSpecRequiredHSTSPoliciesBuilder toBuilder() { + public RequiredHSTSPolicyBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/Scheduler.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/Scheduler.java index d6dabeecc88..eb22b3fd135 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/Scheduler.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/Scheduler.java @@ -86,8 +86,7 @@ public class Scheduler implements Editable , HasMetadata @JsonProperty("spec") private SchedulerSpec spec; @JsonProperty("status") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object status; + private SchedulerStatus status; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -98,7 +97,7 @@ public class Scheduler implements Editable , HasMetadata public Scheduler() { } - public Scheduler(String apiVersion, String kind, ObjectMeta metadata, SchedulerSpec spec, Object status) { + public Scheduler(String apiVersion, String kind, ObjectMeta metadata, SchedulerSpec spec, SchedulerStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -168,13 +167,12 @@ public void setSpec(SchedulerSpec spec) { } @JsonProperty("status") - public Object getStatus() { + public SchedulerStatus getStatus() { return status; } @JsonProperty("status") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - public void setStatus(Object status) { + public void setStatus(SchedulerStatus status) { this.status = status; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/SchedulerSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/SchedulerSpec.java index c037a514b1f..0e3ae1421e9 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/SchedulerSpec.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/SchedulerSpec.java @@ -34,7 +34,8 @@ "defaultNodeSelector", "mastersSchedulable", "policy", - "profile" + "profile", + "profileCustomizations" }) @ToString @EqualsAndHashCode @@ -62,9 +63,11 @@ public class SchedulerSpec implements Editable , Kubernete @JsonProperty("mastersSchedulable") private Boolean mastersSchedulable; @JsonProperty("policy") - private SchedulerSpecPolicy policy; + private ConfigMapNameReference policy; @JsonProperty("profile") private String profile; + @JsonProperty("profileCustomizations") + private ProfileCustomizations profileCustomizations; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -75,12 +78,13 @@ public class SchedulerSpec implements Editable , Kubernete public SchedulerSpec() { } - public SchedulerSpec(String defaultNodeSelector, Boolean mastersSchedulable, SchedulerSpecPolicy policy, String profile) { + public SchedulerSpec(String defaultNodeSelector, Boolean mastersSchedulable, ConfigMapNameReference policy, String profile, ProfileCustomizations profileCustomizations) { super(); this.defaultNodeSelector = defaultNodeSelector; this.mastersSchedulable = mastersSchedulable; this.policy = policy; this.profile = profile; + this.profileCustomizations = profileCustomizations; } @JsonProperty("defaultNodeSelector") @@ -104,12 +108,12 @@ public void setMastersSchedulable(Boolean mastersSchedulable) { } @JsonProperty("policy") - public SchedulerSpecPolicy getPolicy() { + public ConfigMapNameReference getPolicy() { return policy; } @JsonProperty("policy") - public void setPolicy(SchedulerSpecPolicy policy) { + public void setPolicy(ConfigMapNameReference policy) { this.policy = policy; } @@ -123,6 +127,16 @@ public void setProfile(String profile) { this.profile = profile; } + @JsonProperty("profileCustomizations") + public ProfileCustomizations getProfileCustomizations() { + return profileCustomizations; + } + + @JsonProperty("profileCustomizations") + public void setProfileCustomizations(ProfileCustomizations profileCustomizations) { + this.profileCustomizations = profileCustomizations; + } + @JsonIgnore public SchedulerSpecBuilder edit() { return new SchedulerSpecBuilder(this); diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/SchedulerSpecPolicy.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/SchedulerSpecPolicy.java deleted file mode 100644 index 5f106baf466..00000000000 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/SchedulerSpecPolicy.java +++ /dev/null @@ -1,108 +0,0 @@ - -package io.fabric8.openshift.api.model.config.v1; - -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.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; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "name" -}) -@ToString -@EqualsAndHashCode -@Accessors(prefix = { - "_", - "" -}) -@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) -}) -@Generated("jsonschema2pojo") -public class SchedulerSpecPolicy implements Editable , KubernetesResource -{ - - @JsonProperty("name") - private String name; - @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); - - /** - * No args constructor for use in serialization - * - */ - public SchedulerSpecPolicy() { - } - - public SchedulerSpecPolicy(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - - @JsonIgnore - public SchedulerSpecPolicyBuilder edit() { - return new SchedulerSpecPolicyBuilder(this); - } - - @JsonIgnore - public SchedulerSpecPolicyBuilder toBuilder() { - return edit(); - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - - public void setAdditionalProperties(Map additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecTLogin.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/SchedulerStatus.java similarity index 79% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecTLogin.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/SchedulerStatus.java index 8947b6b174d..bdf3150c644 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecTLogin.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/SchedulerStatus.java @@ -8,7 +8,6 @@ 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; @@ -31,7 +30,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "name" + }) @ToString @EqualsAndHashCode @@ -51,43 +50,19 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class OAuthSpecTLogin implements Editable , KubernetesResource +public class SchedulerStatus implements Editable , KubernetesResource { - @JsonProperty("name") - private String name; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); - /** - * No args constructor for use in serialization - * - */ - public OAuthSpecTLogin() { - } - - public OAuthSpecTLogin(String name) { - super(); - this.name = name; - } - - @JsonProperty("name") - public String getName() { - return name; - } - - @JsonProperty("name") - public void setName(String name) { - this.name = name; - } - @JsonIgnore - public OAuthSpecTLoginBuilder edit() { - return new OAuthSpecTLoginBuilder(this); + public SchedulerStatusBuilder edit() { + return new SchedulerStatusBuilder(this); } @JsonIgnore - public OAuthSpecTLoginBuilder toBuilder() { + public SchedulerStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPGCa_1.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/SecretNameReference.java similarity index 90% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPGCa_1.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/SecretNameReference.java index f550016256b..b1f6c9d8e00 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPGCa_1.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/SecretNameReference.java @@ -51,7 +51,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class OAuthSpecIPGCa_1 implements Editable , KubernetesResource +public class SecretNameReference implements Editable , KubernetesResource { @JsonProperty("name") @@ -63,10 +63,10 @@ public class OAuthSpecIPGCa_1 implements Editable , Kub * No args constructor for use in serialization * */ - public OAuthSpecIPGCa_1() { + public SecretNameReference() { } - public OAuthSpecIPGCa_1(String name) { + public SecretNameReference(String name) { super(); this.name = name; } @@ -82,12 +82,12 @@ public void setName(String name) { } @JsonIgnore - public OAuthSpecIPGCa_1Builder edit() { - return new OAuthSpecIPGCa_1Builder(this); + public SecretNameReferenceBuilder edit() { + return new SecretNameReferenceBuilder(this); } @JsonIgnore - public OAuthSpecIPGCa_1Builder toBuilder() { + public SecretNameReferenceBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ServingInfo.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ServingInfo.java new file mode 100644 index 00000000000..e1d34dcd8f0 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ServingInfo.java @@ -0,0 +1,212 @@ + +package io.fabric8.openshift.api.model.config.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "bindAddress", + "bindNetwork", + "certFile", + "cipherSuites", + "clientCA", + "keyFile", + "minTLSVersion", + "namedCertificates" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class ServingInfo implements Editable , KubernetesResource +{ + + @JsonProperty("bindAddress") + private String bindAddress; + @JsonProperty("bindNetwork") + private String bindNetwork; + @JsonProperty("certFile") + private String certFile; + @JsonProperty("cipherSuites") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List cipherSuites = new ArrayList<>(); + @JsonProperty("clientCA") + private String clientCA; + @JsonProperty("keyFile") + private String keyFile; + @JsonProperty("minTLSVersion") + private String minTLSVersion; + @JsonProperty("namedCertificates") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List namedCertificates = new ArrayList<>(); + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public ServingInfo() { + } + + public ServingInfo(String bindAddress, String bindNetwork, String certFile, List cipherSuites, String clientCA, String keyFile, String minTLSVersion, List namedCertificates) { + super(); + this.bindAddress = bindAddress; + this.bindNetwork = bindNetwork; + this.certFile = certFile; + this.cipherSuites = cipherSuites; + this.clientCA = clientCA; + this.keyFile = keyFile; + this.minTLSVersion = minTLSVersion; + this.namedCertificates = namedCertificates; + } + + @JsonProperty("bindAddress") + public String getBindAddress() { + return bindAddress; + } + + @JsonProperty("bindAddress") + public void setBindAddress(String bindAddress) { + this.bindAddress = bindAddress; + } + + @JsonProperty("bindNetwork") + public String getBindNetwork() { + return bindNetwork; + } + + @JsonProperty("bindNetwork") + public void setBindNetwork(String bindNetwork) { + this.bindNetwork = bindNetwork; + } + + @JsonProperty("certFile") + public String getCertFile() { + return certFile; + } + + @JsonProperty("certFile") + public void setCertFile(String certFile) { + this.certFile = certFile; + } + + @JsonProperty("cipherSuites") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getCipherSuites() { + return cipherSuites; + } + + @JsonProperty("cipherSuites") + public void setCipherSuites(List cipherSuites) { + this.cipherSuites = cipherSuites; + } + + @JsonProperty("clientCA") + public String getClientCA() { + return clientCA; + } + + @JsonProperty("clientCA") + public void setClientCA(String clientCA) { + this.clientCA = clientCA; + } + + @JsonProperty("keyFile") + public String getKeyFile() { + return keyFile; + } + + @JsonProperty("keyFile") + public void setKeyFile(String keyFile) { + this.keyFile = keyFile; + } + + @JsonProperty("minTLSVersion") + public String getMinTLSVersion() { + return minTLSVersion; + } + + @JsonProperty("minTLSVersion") + public void setMinTLSVersion(String minTLSVersion) { + this.minTLSVersion = minTLSVersion; + } + + @JsonProperty("namedCertificates") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getNamedCertificates() { + return namedCertificates; + } + + @JsonProperty("namedCertificates") + public void setNamedCertificates(List namedCertificates) { + this.namedCertificates = namedCertificates; + } + + @JsonIgnore + public ServingInfoBuilder edit() { + return new ServingInfoBuilder(this); + } + + @JsonIgnore + public ServingInfoBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSIbmcloudServiceEndpoints.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/SignatureStore.java similarity index 80% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSIbmcloudServiceEndpoints.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/SignatureStore.java index 84cf1e6ab19..deeec6d9c19 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSIbmcloudServiceEndpoints.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/SignatureStore.java @@ -31,7 +31,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "name", + "ca", "url" }) @ToString @@ -52,11 +52,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureStatusPSIbmcloudServiceEndpoints implements Editable , KubernetesResource +public class SignatureStore implements Editable , KubernetesResource { - @JsonProperty("name") - private String name; + @JsonProperty("ca") + private ConfigMapNameReference ca; @JsonProperty("url") private String url; @JsonIgnore @@ -66,23 +66,23 @@ public class InfrastructureStatusPSIbmcloudServiceEndpoints implements Editable< * No args constructor for use in serialization * */ - public InfrastructureStatusPSIbmcloudServiceEndpoints() { + public SignatureStore() { } - public InfrastructureStatusPSIbmcloudServiceEndpoints(String name, String url) { + public SignatureStore(ConfigMapNameReference ca, String url) { super(); - this.name = name; + this.ca = ca; this.url = url; } - @JsonProperty("name") - public String getName() { - return name; + @JsonProperty("ca") + public ConfigMapNameReference getCa() { + return ca; } - @JsonProperty("name") - public void setName(String name) { - this.name = name; + @JsonProperty("ca") + public void setCa(ConfigMapNameReference ca) { + this.ca = ca; } @JsonProperty("url") @@ -96,12 +96,12 @@ public void setUrl(String url) { } @JsonIgnore - public InfrastructureStatusPSIbmcloudServiceEndpointsBuilder edit() { - return new InfrastructureStatusPSIbmcloudServiceEndpointsBuilder(this); + public SignatureStoreBuilder edit() { + return new SignatureStoreBuilder(this); } @JsonIgnore - public InfrastructureStatusPSIbmcloudServiceEndpointsBuilder toBuilder() { + public SignatureStoreBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/StringSource.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/StringSource.java new file mode 100644 index 00000000000..4fef0d9e64a --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/StringSource.java @@ -0,0 +1,150 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "env", + "file", + "keyFile", + "value" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class StringSource implements Editable , KubernetesResource +{ + + @JsonProperty("env") + private String env; + @JsonProperty("file") + private String file; + @JsonProperty("keyFile") + private String keyFile; + @JsonProperty("value") + private String value; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public StringSource() { + } + + public StringSource(String env, String file, String keyFile, String value) { + super(); + this.env = env; + this.file = file; + this.keyFile = keyFile; + this.value = value; + } + + @JsonProperty("env") + public String getEnv() { + return env; + } + + @JsonProperty("env") + public void setEnv(String env) { + this.env = env; + } + + @JsonProperty("file") + public String getFile() { + return file; + } + + @JsonProperty("file") + public void setFile(String file) { + this.file = file; + } + + @JsonProperty("keyFile") + public String getKeyFile() { + return keyFile; + } + + @JsonProperty("keyFile") + public void setKeyFile(String keyFile) { + this.keyFile = keyFile; + } + + @JsonProperty("value") + public String getValue() { + return value; + } + + @JsonProperty("value") + public void setValue(String value) { + this.value = value; + } + + @JsonIgnore + public StringSourceBuilder edit() { + return new StringSourceBuilder(this); + } + + @JsonIgnore + public StringSourceBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/StringSourceSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/StringSourceSpec.java new file mode 100644 index 00000000000..ef10a4e5ada --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/StringSourceSpec.java @@ -0,0 +1,150 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "env", + "file", + "keyFile", + "value" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class StringSourceSpec implements Editable , KubernetesResource +{ + + @JsonProperty("env") + private String env; + @JsonProperty("file") + private String file; + @JsonProperty("keyFile") + private String keyFile; + @JsonProperty("value") + private String value; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public StringSourceSpec() { + } + + public StringSourceSpec(String env, String file, String keyFile, String value) { + super(); + this.env = env; + this.file = file; + this.keyFile = keyFile; + this.value = value; + } + + @JsonProperty("env") + public String getEnv() { + return env; + } + + @JsonProperty("env") + public void setEnv(String env) { + this.env = env; + } + + @JsonProperty("file") + public String getFile() { + return file; + } + + @JsonProperty("file") + public void setFile(String file) { + this.file = file; + } + + @JsonProperty("keyFile") + public String getKeyFile() { + return keyFile; + } + + @JsonProperty("keyFile") + public void setKeyFile(String keyFile) { + this.keyFile = keyFile; + } + + @JsonProperty("value") + public String getValue() { + return value; + } + + @JsonProperty("value") + public void setValue(String value) { + this.value = value; + } + + @JsonIgnore + public StringSourceSpecBuilder edit() { + return new StringSourceSpecBuilder(this); + } + + @JsonIgnore + public StringSourceSpecBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TLSProfileSpec.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TLSProfileSpec.java new file mode 100644 index 00000000000..d044d1e2448 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TLSProfileSpec.java @@ -0,0 +1,126 @@ + +package io.fabric8.openshift.api.model.config.v1; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "ciphers", + "minTLSVersion" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class TLSProfileSpec implements Editable , KubernetesResource +{ + + @JsonProperty("ciphers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List ciphers = new ArrayList<>(); + @JsonProperty("minTLSVersion") + private String minTLSVersion; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public TLSProfileSpec() { + } + + public TLSProfileSpec(List ciphers, String minTLSVersion) { + super(); + this.ciphers = ciphers; + this.minTLSVersion = minTLSVersion; + } + + @JsonProperty("ciphers") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getCiphers() { + return ciphers; + } + + @JsonProperty("ciphers") + public void setCiphers(List ciphers) { + this.ciphers = ciphers; + } + + @JsonProperty("minTLSVersion") + public String getMinTLSVersion() { + return minTLSVersion; + } + + @JsonProperty("minTLSVersion") + public void setMinTLSVersion(String minTLSVersion) { + this.minTLSVersion = minTLSVersion; + } + + @JsonIgnore + public TLSProfileSpecBuilder edit() { + return new TLSProfileSpecBuilder(this); + } + + @JsonIgnore + public TLSProfileSpecBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerSpecTlsSecurityProfile.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TLSSecurityProfile.java similarity index 72% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerSpecTlsSecurityProfile.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TLSSecurityProfile.java index c7911bf8359..b015522fdf2 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/APIServerSpecTlsSecurityProfile.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TLSSecurityProfile.java @@ -55,21 +55,17 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class APIServerSpecTlsSecurityProfile implements Editable , KubernetesResource +public class TLSSecurityProfile implements Editable , KubernetesResource { @JsonProperty("custom") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object custom; + private CustomTLSProfile custom; @JsonProperty("intermediate") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object intermediate; + private IntermediateTLSProfile intermediate; @JsonProperty("modern") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object modern; + private ModernTLSProfile modern; @JsonProperty("old") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object old; + private OldTLSProfile old; @JsonProperty("type") private String type; @JsonIgnore @@ -79,10 +75,10 @@ public class APIServerSpecTlsSecurityProfile implements Editable , KubernetesResource +public class TemplateReference implements Editable , KubernetesResource { @JsonProperty("name") @@ -63,10 +63,10 @@ public class OAuthSpecIPGCa implements Editable , Kuberne * No args constructor for use in serialization * */ - public OAuthSpecIPGCa() { + public TemplateReference() { } - public OAuthSpecIPGCa(String name) { + public TemplateReference(String name) { super(); this.name = name; } @@ -82,12 +82,12 @@ public void setName(String name) { } @JsonIgnore - public OAuthSpecIPGCaBuilder edit() { - return new OAuthSpecIPGCaBuilder(this); + public TemplateReferenceBuilder edit() { + return new TemplateReferenceBuilder(this); } @JsonIgnore - public OAuthSpecIPGCaBuilder toBuilder() { + public TemplateReferenceBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPKCa.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TestDetails.java similarity index 83% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPKCa.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TestDetails.java index 1db48b90682..de824fff09e 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/OAuthSpecIPKCa.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TestDetails.java @@ -31,7 +31,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "name" + "testName" }) @ToString @EqualsAndHashCode @@ -51,11 +51,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class OAuthSpecIPKCa implements Editable , KubernetesResource +public class TestDetails implements Editable , KubernetesResource { - @JsonProperty("name") - private String name; + @JsonProperty("testName") + private String testName; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class OAuthSpecIPKCa implements Editable , Kuberne * No args constructor for use in serialization * */ - public OAuthSpecIPKCa() { + public TestDetails() { } - public OAuthSpecIPKCa(String name) { + public TestDetails(String testName) { super(); - this.name = name; + this.testName = testName; } - @JsonProperty("name") - public String getName() { - return name; + @JsonProperty("testName") + public String getTestName() { + return testName; } - @JsonProperty("name") - public void setName(String name) { - this.name = name; + @JsonProperty("testName") + public void setTestName(String testName) { + this.testName = testName; } @JsonIgnore - public OAuthSpecIPKCaBuilder edit() { - return new OAuthSpecIPKCaBuilder(this); + public TestDetailsBuilder edit() { + return new TestDetailsBuilder(this); } @JsonIgnore - public OAuthSpecIPKCaBuilder toBuilder() { + public TestDetailsBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TestReporting.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TestReporting.java new file mode 100644 index 00000000000..62f4ec56de0 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TestReporting.java @@ -0,0 +1,164 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@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", 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) +}) +@Generated("jsonschema2pojo") +public class TestReporting implements Editable , KubernetesResource +{ + + @JsonProperty("apiVersion") + private String apiVersion; + @JsonProperty("kind") + private String kind; + @JsonProperty("metadata") + private ObjectMeta metadata; + @JsonProperty("spec") + private TestReportingSpec spec; + @JsonProperty("status") + private TestReportingStatus status; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public TestReporting() { + } + + public TestReporting(String apiVersion, String kind, ObjectMeta metadata, TestReportingSpec spec, TestReportingStatus 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 TestReportingSpec getSpec() { + return spec; + } + + @JsonProperty("spec") + public void setSpec(TestReportingSpec spec) { + this.spec = spec; + } + + @JsonProperty("status") + public TestReportingStatus getStatus() { + return status; + } + + @JsonProperty("status") + public void setStatus(TestReportingStatus status) { + this.status = status; + } + + @JsonIgnore + public TestReportingBuilder edit() { + return new TestReportingBuilder(this); + } + + @JsonIgnore + public TestReportingBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSSpecPrivateZone.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TestReportingSpec.java similarity index 76% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSSpecPrivateZone.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TestReportingSpec.java index 110d1bece94..29bc53342d7 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/DNSSpecPrivateZone.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TestReportingSpec.java @@ -1,7 +1,9 @@ package io.fabric8.openshift.api.model.config.v1; +import java.util.ArrayList; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonAnyGetter; @@ -31,8 +33,7 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "id", - "tags" + "testsForFeatureGates" }) @ToString @EqualsAndHashCode @@ -52,14 +53,12 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class DNSSpecPrivateZone implements Editable , KubernetesResource +public class TestReportingSpec implements Editable , KubernetesResource { - @JsonProperty("id") - private String id; - @JsonProperty("tags") + @JsonProperty("testsForFeatureGates") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map tags = new LinkedHashMap<>(); + private List testsForFeatureGates = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -67,43 +66,32 @@ public class DNSSpecPrivateZone implements Editable , * No args constructor for use in serialization * */ - public DNSSpecPrivateZone() { + public TestReportingSpec() { } - public DNSSpecPrivateZone(String id, Map tags) { + public TestReportingSpec(List testsForFeatureGates) { super(); - this.id = id; - this.tags = tags; + this.testsForFeatureGates = testsForFeatureGates; } - @JsonProperty("id") - public String getId() { - return id; - } - - @JsonProperty("id") - public void setId(String id) { - this.id = id; - } - - @JsonProperty("tags") + @JsonProperty("testsForFeatureGates") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getTags() { - return tags; + public List getTestsForFeatureGates() { + return testsForFeatureGates; } - @JsonProperty("tags") - public void setTags(Map tags) { - this.tags = tags; + @JsonProperty("testsForFeatureGates") + public void setTestsForFeatureGates(List testsForFeatureGates) { + this.testsForFeatureGates = testsForFeatureGates; } @JsonIgnore - public DNSSpecPrivateZoneBuilder edit() { - return new DNSSpecPrivateZoneBuilder(this); + public TestReportingSpecBuilder edit() { + return new TestReportingSpecBuilder(this); } @JsonIgnore - public DNSSpecPrivateZoneBuilder toBuilder() { + public TestReportingSpecBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TestReportingStatus.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TestReportingStatus.java new file mode 100644 index 00000000000..bf32b2e9109 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TestReportingStatus.java @@ -0,0 +1,83 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class TestReportingStatus implements Editable , KubernetesResource +{ + + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + @JsonIgnore + public TestReportingStatusBuilder edit() { + return new TestReportingStatusBuilder(this); + } + + @JsonIgnore + public TestReportingStatusBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TokenClaimMapping.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TokenClaimMapping.java new file mode 100644 index 00000000000..8a19e04ef71 --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TokenClaimMapping.java @@ -0,0 +1,108 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "claim" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class TokenClaimMapping implements Editable , KubernetesResource +{ + + @JsonProperty("claim") + private String claim; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public TokenClaimMapping() { + } + + public TokenClaimMapping(String claim) { + super(); + this.claim = claim; + } + + @JsonProperty("claim") + public String getClaim() { + return claim; + } + + @JsonProperty("claim") + public void setClaim(String claim) { + this.claim = claim; + } + + @JsonIgnore + public TokenClaimMappingBuilder edit() { + return new TokenClaimMappingBuilder(this); + } + + @JsonIgnore + public TokenClaimMappingBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBDEVFFieldRef.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TokenClaimMappings.java similarity index 73% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBDEVFFieldRef.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TokenClaimMappings.java index 4291cbf0177..dd87045018c 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/BuildSpecBDEVFFieldRef.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TokenClaimMappings.java @@ -31,8 +31,8 @@ @JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "apiVersion", - "fieldPath" + "groups", + "username" }) @ToString @EqualsAndHashCode @@ -52,13 +52,13 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class BuildSpecBDEVFFieldRef implements Editable , KubernetesResource +public class TokenClaimMappings implements Editable , KubernetesResource { - @JsonProperty("apiVersion") - private String apiVersion; - @JsonProperty("fieldPath") - private String fieldPath; + @JsonProperty("groups") + private PrefixedClaimMapping groups; + @JsonProperty("username") + private UsernameClaimMapping username; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,42 +66,42 @@ public class BuildSpecBDEVFFieldRef implements Editable , KubernetesResource +public class TokenClaimValidationRule implements Editable , KubernetesResource { + @JsonProperty("requiredClaim") + private TokenRequiredClaim requiredClaim; @JsonProperty("type") private String type; @JsonIgnore @@ -63,14 +66,25 @@ public class InfrastructureStatusPSBaremetalLoadBalancer implements Editable , KubernetesResource +public class TokenConfig implements Editable , KubernetesResource { @JsonProperty("accessTokenInactivityTimeout") @@ -69,10 +69,10 @@ public class OAuthSpecTokenConfig implements Editable , KubernetesResource +{ + + @JsonProperty("audiences") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + private List audiences = new ArrayList<>(); + @JsonProperty("issuerCertificateAuthority") + private ConfigMapNameReference issuerCertificateAuthority; + @JsonProperty("issuerURL") + private String issuerURL; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public TokenIssuer() { + } + + public TokenIssuer(List audiences, ConfigMapNameReference issuerCertificateAuthority, String issuerURL) { + super(); + this.audiences = audiences; + this.issuerCertificateAuthority = issuerCertificateAuthority; + this.issuerURL = issuerURL; + } + + @JsonProperty("audiences") + @JsonInclude(JsonInclude.Include.NON_EMPTY) + public List getAudiences() { + return audiences; + } + + @JsonProperty("audiences") + public void setAudiences(List audiences) { + this.audiences = audiences; + } + + @JsonProperty("issuerCertificateAuthority") + public ConfigMapNameReference getIssuerCertificateAuthority() { + return issuerCertificateAuthority; + } + + @JsonProperty("issuerCertificateAuthority") + public void setIssuerCertificateAuthority(ConfigMapNameReference issuerCertificateAuthority) { + this.issuerCertificateAuthority = issuerCertificateAuthority; + } + + @JsonProperty("issuerURL") + public String getIssuerURL() { + return issuerURL; + } + + @JsonProperty("issuerURL") + public void setIssuerURL(String issuerURL) { + this.issuerURL = issuerURL; + } + + @JsonIgnore + public TokenIssuerBuilder edit() { + return new TokenIssuerBuilder(this); + } + + @JsonIgnore + public TokenIssuerBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TokenRequiredClaim.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TokenRequiredClaim.java new file mode 100644 index 00000000000..3abe60a4e1f --- /dev/null +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/TokenRequiredClaim.java @@ -0,0 +1,122 @@ + +package io.fabric8.openshift.api.model.config.v1; + +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.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; + +@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "claim", + "requiredValue" +}) +@ToString +@EqualsAndHashCode +@Accessors(prefix = { + "_", + "" +}) +@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) +}) +@Generated("jsonschema2pojo") +public class TokenRequiredClaim implements Editable , KubernetesResource +{ + + @JsonProperty("claim") + private String claim; + @JsonProperty("requiredValue") + private String requiredValue; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public TokenRequiredClaim() { + } + + public TokenRequiredClaim(String claim, String requiredValue) { + super(); + this.claim = claim; + this.requiredValue = requiredValue; + } + + @JsonProperty("claim") + public String getClaim() { + return claim; + } + + @JsonProperty("claim") + public void setClaim(String claim) { + this.claim = claim; + } + + @JsonProperty("requiredValue") + public String getRequiredValue() { + return requiredValue; + } + + @JsonProperty("requiredValue") + public void setRequiredValue(String requiredValue) { + this.requiredValue = requiredValue; + } + + @JsonIgnore + public TokenRequiredClaimBuilder edit() { + return new TokenRequiredClaimBuilder(this); + } + + @JsonIgnore + public TokenRequiredClaimBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionSpecDesiredUpdate.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/Update.java similarity index 89% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionSpecDesiredUpdate.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/Update.java index 4c6765e2029..d8165b14884 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterVersionSpecDesiredUpdate.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/Update.java @@ -54,7 +54,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class ClusterVersionSpecDesiredUpdate implements Editable , KubernetesResource +public class Update implements Editable , KubernetesResource { @JsonProperty("architecture") @@ -72,10 +72,10 @@ public class ClusterVersionSpecDesiredUpdate implements Editable , KubernetesResource +public class UpdateHistory implements Editable , KubernetesResource { @JsonProperty("acceptedRisks") private String acceptedRisks; @JsonProperty("completionTime") - @JsonDeserialize(using = io.fabric8.kubernetes.internal.KubernetesDeserializer.class) - private Object completionTime; + private String completionTime; @JsonProperty("image") private String image; @JsonProperty("startedTime") @@ -82,10 +81,10 @@ public class ClusterVersionStatusHistory implements Editable , KubernetesResource +public class UsernameClaimMapping implements Editable , KubernetesResource { - @JsonProperty("key") - private String key; - @JsonProperty("name") - private String name; - @JsonProperty("optional") - private Boolean optional; + @JsonProperty("claim") + private String claim; + @JsonProperty("prefix") + private UsernamePrefix prefix; + @JsonProperty("prefixPolicy") + private String prefixPolicy; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -69,53 +69,53 @@ public class BuildSpecBDEVFSecretKeyRef implements Editable , KubernetesResource +public class UsernamePrefix implements Editable , KubernetesResource { - @JsonProperty("name") - private String name; + @JsonProperty("prefixString") + private String prefixString; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class OAuthSpecIPLCa implements Editable , Kuberne * No args constructor for use in serialization * */ - public OAuthSpecIPLCa() { + public UsernamePrefix() { } - public OAuthSpecIPLCa(String name) { + public UsernamePrefix(String prefixString) { super(); - this.name = name; + this.prefixString = prefixString; } - @JsonProperty("name") - public String getName() { - return name; + @JsonProperty("prefixString") + public String getPrefixString() { + return prefixString; } - @JsonProperty("name") - public void setName(String name) { - this.name = name; + @JsonProperty("prefixString") + public void setPrefixString(String prefixString) { + this.prefixString = prefixString; } @JsonIgnore - public OAuthSpecIPLCaBuilder edit() { - return new OAuthSpecIPLCaBuilder(this); + public UsernamePrefixBuilder edit() { + return new UsernamePrefixBuilder(this); } @JsonIgnore - public OAuthSpecIPLCaBuilder toBuilder() { + public UsernamePrefixBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSVsphereFailureDomains.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformFailureDomainSpec.java similarity index 84% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSVsphereFailureDomains.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformFailureDomainSpec.java index 344f31fbd67..e6c2b98962a 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSVsphereFailureDomains.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformFailureDomainSpec.java @@ -55,7 +55,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureSpecPSVsphereFailureDomains implements Editable , KubernetesResource +public class VSpherePlatformFailureDomainSpec implements Editable , KubernetesResource { @JsonProperty("name") @@ -65,7 +65,7 @@ public class InfrastructureSpecPSVsphereFailureDomains implements Editable , KubernetesResource +{ + + @JsonProperty("type") + private String type; + @JsonIgnore + private Map additionalProperties = new LinkedHashMap(); + + /** + * No args constructor for use in serialization + * + */ + public VSpherePlatformLoadBalancer() { + } + + public VSpherePlatformLoadBalancer(String type) { + super(); + this.type = type; + } + + @JsonProperty("type") + public String getType() { + return type; + } + + @JsonProperty("type") + public void setType(String type) { + this.type = type; + } + + @JsonIgnore + public VSpherePlatformLoadBalancerBuilder edit() { + return new VSpherePlatformLoadBalancerBuilder(this); + } + + @JsonIgnore + public VSpherePlatformLoadBalancerBuilder toBuilder() { + return edit(); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + public void setAdditionalProperties(Map additionalProperties) { + this.additionalProperties = additionalProperties; + } + +} diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSVsphereNodeNetworking.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformNodeNetworking.java similarity index 77% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSVsphereNodeNetworking.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformNodeNetworking.java index c69eaa8045e..0c5ab55f63d 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSVsphereNodeNetworking.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformNodeNetworking.java @@ -52,13 +52,13 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureSpecPSVsphereNodeNetworking implements Editable , KubernetesResource +public class VSpherePlatformNodeNetworking implements Editable , KubernetesResource { @JsonProperty("external") - private InfrastructureSpecPSVsphereNNExternal external; + private VSpherePlatformNodeNetworkingSpec external; @JsonProperty("internal") - private InfrastructureSpecPSVsphereNNInternal internal; + private VSpherePlatformNodeNetworkingSpec internal; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -66,42 +66,42 @@ public class InfrastructureSpecPSVsphereNodeNetworking implements Editable , KubernetesResource +public class VSpherePlatformNodeNetworkingSpec implements Editable , KubernetesResource { @JsonProperty("excludeNetworkSubnetCidr") @@ -73,10 +73,10 @@ public class InfrastructureSpecPSVsphereNNInternal implements Editable excludeNetworkSubnetCidr, String network, List networkSubnetCidr) { + public VSpherePlatformNodeNetworkingSpec(List excludeNetworkSubnetCidr, String network, List networkSubnetCidr) { super(); this.excludeNetworkSubnetCidr = excludeNetworkSubnetCidr; this.network = network; @@ -116,12 +116,12 @@ public void setNetworkSubnetCidr(List networkSubnetCidr) { } @JsonIgnore - public InfrastructureSpecPSVsphereNNInternalBuilder edit() { - return new InfrastructureSpecPSVsphereNNInternalBuilder(this); + public VSpherePlatformNodeNetworkingSpecBuilder edit() { + return new VSpherePlatformNodeNetworkingSpecBuilder(this); } @JsonIgnore - public InfrastructureSpecPSVsphereNNInternalBuilder toBuilder() { + public VSpherePlatformNodeNetworkingSpecBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSVsphere.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformSpec.java similarity index 79% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSVsphere.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformSpec.java index 77d08827819..55068d2dff4 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSVsphere.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformSpec.java @@ -58,7 +58,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureSpecPSVsphere implements Editable , KubernetesResource +public class VSpherePlatformSpec implements Editable , KubernetesResource { @JsonProperty("apiServerInternalIPs") @@ -66,7 +66,7 @@ public class InfrastructureSpecPSVsphere implements Editable apiServerInternalIPs = new ArrayList<>(); @JsonProperty("failureDomains") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List failureDomains = new ArrayList<>(); + private List failureDomains = new ArrayList<>(); @JsonProperty("ingressIPs") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List ingressIPs = new ArrayList<>(); @@ -74,10 +74,10 @@ public class InfrastructureSpecPSVsphere implements Editable machineNetworks = new ArrayList<>(); @JsonProperty("nodeNetworking") - private InfrastructureSpecPSVsphereNodeNetworking nodeNetworking; + private VSpherePlatformNodeNetworking nodeNetworking; @JsonProperty("vcenters") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List vcenters = new ArrayList<>(); + private List vcenters = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -85,10 +85,10 @@ public class InfrastructureSpecPSVsphere implements Editable apiServerInternalIPs, List failureDomains, List ingressIPs, List machineNetworks, InfrastructureSpecPSVsphereNodeNetworking nodeNetworking, List vcenters) { + public VSpherePlatformSpec(List apiServerInternalIPs, List failureDomains, List ingressIPs, List machineNetworks, VSpherePlatformNodeNetworking nodeNetworking, List vcenters) { super(); this.apiServerInternalIPs = apiServerInternalIPs; this.failureDomains = failureDomains; @@ -111,12 +111,12 @@ public void setApiServerInternalIPs(List apiServerInternalIPs) { @JsonProperty("failureDomains") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getFailureDomains() { + public List getFailureDomains() { return failureDomains; } @JsonProperty("failureDomains") - public void setFailureDomains(List failureDomains) { + public void setFailureDomains(List failureDomains) { this.failureDomains = failureDomains; } @@ -143,33 +143,33 @@ public void setMachineNetworks(List machineNetworks) { } @JsonProperty("nodeNetworking") - public InfrastructureSpecPSVsphereNodeNetworking getNodeNetworking() { + public VSpherePlatformNodeNetworking getNodeNetworking() { return nodeNetworking; } @JsonProperty("nodeNetworking") - public void setNodeNetworking(InfrastructureSpecPSVsphereNodeNetworking nodeNetworking) { + public void setNodeNetworking(VSpherePlatformNodeNetworking nodeNetworking) { this.nodeNetworking = nodeNetworking; } @JsonProperty("vcenters") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getVcenters() { + public List getVcenters() { return vcenters; } @JsonProperty("vcenters") - public void setVcenters(List vcenters) { + public void setVcenters(List vcenters) { this.vcenters = vcenters; } @JsonIgnore - public InfrastructureSpecPSVsphereBuilder edit() { - return new InfrastructureSpecPSVsphereBuilder(this); + public VSpherePlatformSpecBuilder edit() { + return new VSpherePlatformSpecBuilder(this); } @JsonIgnore - public InfrastructureSpecPSVsphereBuilder toBuilder() { + public VSpherePlatformSpecBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSBaremetal.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformStatus.java similarity index 87% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSBaremetal.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformStatus.java index 07bd675f347..4b6c5a676d1 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureStatusPSBaremetal.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformStatus.java @@ -59,7 +59,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureStatusPSBaremetal implements Editable , KubernetesResource +public class VSpherePlatformStatus implements Editable , KubernetesResource { @JsonProperty("apiServerInternalIP") @@ -73,7 +73,7 @@ public class InfrastructureStatusPSBaremetal implements Editable ingressIPs = new ArrayList<>(); @JsonProperty("loadBalancer") - private InfrastructureStatusPSBaremetalLoadBalancer loadBalancer; + private VSpherePlatformLoadBalancer loadBalancer; @JsonProperty("machineNetworks") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List machineNetworks = new ArrayList<>(); @@ -86,10 +86,10 @@ public class InfrastructureStatusPSBaremetal implements Editable apiServerInternalIPs, String ingressIP, List ingressIPs, InfrastructureStatusPSBaremetalLoadBalancer loadBalancer, List machineNetworks, String nodeDNSIP) { + public VSpherePlatformStatus(String apiServerInternalIP, List apiServerInternalIPs, String ingressIP, List ingressIPs, VSpherePlatformLoadBalancer loadBalancer, List machineNetworks, String nodeDNSIP) { super(); this.apiServerInternalIP = apiServerInternalIP; this.apiServerInternalIPs = apiServerInternalIPs; @@ -143,12 +143,12 @@ public void setIngressIPs(List ingressIPs) { } @JsonProperty("loadBalancer") - public InfrastructureStatusPSBaremetalLoadBalancer getLoadBalancer() { + public VSpherePlatformLoadBalancer getLoadBalancer() { return loadBalancer; } @JsonProperty("loadBalancer") - public void setLoadBalancer(InfrastructureStatusPSBaremetalLoadBalancer loadBalancer) { + public void setLoadBalancer(VSpherePlatformLoadBalancer loadBalancer) { this.loadBalancer = loadBalancer; } @@ -174,12 +174,12 @@ public void setNodeDNSIP(String nodeDNSIP) { } @JsonIgnore - public InfrastructureStatusPSBaremetalBuilder edit() { - return new InfrastructureStatusPSBaremetalBuilder(this); + public VSpherePlatformStatusBuilder edit() { + return new VSpherePlatformStatusBuilder(this); } @JsonIgnore - public InfrastructureStatusPSBaremetalBuilder toBuilder() { + public VSpherePlatformStatusBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSVsphereFDTopology.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformTopology.java similarity index 90% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSVsphereFDTopology.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformTopology.java index 5fd0aad8a81..7de3bff086c 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSVsphereFDTopology.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformTopology.java @@ -59,7 +59,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureSpecPSVsphereFDTopology implements Editable , KubernetesResource +public class VSpherePlatformTopology implements Editable , KubernetesResource { @JsonProperty("computeCluster") @@ -84,10 +84,10 @@ public class InfrastructureSpecPSVsphereFDTopology implements Editable networks, String resourcePool, String template) { + public VSpherePlatformTopology(String computeCluster, String datacenter, String datastore, String folder, List networks, String resourcePool, String template) { super(); this.computeCluster = computeCluster; this.datacenter = datacenter; @@ -170,12 +170,12 @@ public void setTemplate(String template) { } @JsonIgnore - public InfrastructureSpecPSVsphereFDTopologyBuilder edit() { - return new InfrastructureSpecPSVsphereFDTopologyBuilder(this); + public VSpherePlatformTopologyBuilder edit() { + return new VSpherePlatformTopologyBuilder(this); } @JsonIgnore - public InfrastructureSpecPSVsphereFDTopologyBuilder toBuilder() { + public VSpherePlatformTopologyBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSVsphereVcenters.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformVCenterSpec.java similarity index 89% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSVsphereVcenters.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformVCenterSpec.java index 598c6e7f64d..2377df83ecc 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/InfrastructureSpecPSVsphereVcenters.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/VSpherePlatformVCenterSpec.java @@ -55,7 +55,7 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class InfrastructureSpecPSVsphereVcenters implements Editable , KubernetesResource +public class VSpherePlatformVCenterSpec implements Editable , KubernetesResource { @JsonProperty("datacenters") @@ -72,10 +72,10 @@ public class InfrastructureSpecPSVsphereVcenters implements Editable datacenters, Integer port, String server) { + public VSpherePlatformVCenterSpec(List datacenters, Integer port, String server) { super(); this.datacenters = datacenters; this.port = port; @@ -114,12 +114,12 @@ public void setServer(String server) { } @JsonIgnore - public InfrastructureSpecPSVsphereVcentersBuilder edit() { - return new InfrastructureSpecPSVsphereVcentersBuilder(this); + public VSpherePlatformVCenterSpecBuilder edit() { + return new VSpherePlatformVCenterSpecBuilder(this); } @JsonIgnore - public InfrastructureSpecPSVsphereVcentersBuilder toBuilder() { + public VSpherePlatformVCenterSpecBuilder toBuilder() { return edit(); } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuthenticationSpecWebhookTokenAuthenticators.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/WebhookTokenAuthenticator.java similarity index 81% rename from kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuthenticationSpecWebhookTokenAuthenticators.java rename to kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/WebhookTokenAuthenticator.java index d6c8b2fb2cb..e2509d2fb29 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/AuthenticationSpecWebhookTokenAuthenticators.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/WebhookTokenAuthenticator.java @@ -51,11 +51,11 @@ @BuildableReference(PersistentVolumeClaim.class) }) @Generated("jsonschema2pojo") -public class AuthenticationSpecWebhookTokenAuthenticators implements Editable , KubernetesResource +public class WebhookTokenAuthenticator implements Editable , KubernetesResource { @JsonProperty("kubeConfig") - private AuthenticationSpecWTAKubeConfig_1 kubeConfig; + private SecretNameReference kubeConfig; @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -63,31 +63,31 @@ public class AuthenticationSpecWebhookTokenAuthenticators implements Editable", - reflect.TypeOf(openshiftconfigapi.ConfigMapNameReference{}): "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA", - reflect.TypeOf(openshiftconfigapi.ClusterOperatorStatusCondition{}): "io.fabric8.openshift.api.model.config.v1.ClusterOperatorStatusConditions", - reflect.TypeOf(openshiftconfigapi.IdentityProvider{}): "io.fabric8.openshift.api.model.config.v1.OAuthSpecIdentityProviders", } schema, err := schemagen.GenerateSchema(reflect.TypeOf(Schema{}), packages, typeMap, manualTypeMap, "hive") if err != nil { diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 1e51b5ff87f..83d14dc9716 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import io.fabric8.openshift.api.model.config.v1.ClusterOperatorStatusConditions; +import io.fabric8.openshift.api.model.config.v1.ClusterOperatorStatusCondition; import io.fabric8.openshift.api.model.hive.v1.Checkpoint; import io.fabric8.openshift.api.model.hive.v1.CheckpointList; import io.fabric8.openshift.api.model.hive.v1.ClusterClaim; @@ -61,7 +61,7 @@ public class KubeSchema { private ClusterDeprovisionList clusterDeprovisionList; private ClusterImageSet clusterImageSet; private ClusterImageSetList clusterImageSetList; - private ClusterOperatorStatusConditions clusterOperatorStatusCondition; + private ClusterOperatorStatusCondition clusterOperatorStatusCondition; private ClusterPool clusterPool; private ClusterPoolList clusterPoolList; private ClusterProvision clusterProvision; @@ -104,7 +104,7 @@ public class KubeSchema { public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, io.fabric8.openshift.api.model.hive.azure.v1.OSDisk azureOSDisk, KubernetesList baseKubernetesList, Checkpoint checkpoint, CheckpointList checkpointList, ClusterClaim clusterClaim, ClusterClaimList clusterClaimList, ClusterDeployment clusterDeployment, ClusterDeploymentList clusterDeploymentList, ClusterDeprovision clusterDeprovision, ClusterDeprovisionList clusterDeprovisionList, ClusterImageSet clusterImageSet, ClusterImageSetList clusterImageSetList, ClusterOperatorStatusConditions clusterOperatorStatusCondition, ClusterPool clusterPool, ClusterPoolList clusterPoolList, ClusterProvision clusterProvision, ClusterProvisionList clusterProvisionList, ClusterRelocate clusterRelocate, ClusterRelocateList clusterRelocateList, ClusterState clusterState, ClusterStateList clusterStateList, DNSZone dNSZone, DNSZoneList dNSZoneList, io.fabric8.openshift.api.model.hive.gcp.v1.OSDisk gcpOSDisk, HiveConfig hiveConfig, HiveConfigList hiveConfigList, LocalObjectReference localObjectReference, MachinePool machinePool, MachinePoolList machinePoolList, MachinePoolNameLease machinePoolNameLease, MachinePoolNameLeaseList machinePoolNameLeaseList, ObjectMeta objectMeta, Patch patch, SelectorSyncIdentityProvider selectorSyncIdentityProvider, SelectorSyncIdentityProviderList selectorSyncIdentityProviderList, SelectorSyncSet selectorSyncSet, SelectorSyncSetList selectorSyncSetList, Status status, SyncIdentityProvider syncIdentityProvider, SyncIdentityProviderList syncIdentityProviderList, SyncSet syncSet, SyncSetList syncSetList, String time, TypeMeta typeMeta, io.fabric8.openshift.api.model.hive.vsphere.v1.OSDisk vsphereOSDisk) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, io.fabric8.openshift.api.model.hive.azure.v1.OSDisk azureOSDisk, KubernetesList baseKubernetesList, Checkpoint checkpoint, CheckpointList checkpointList, ClusterClaim clusterClaim, ClusterClaimList clusterClaimList, ClusterDeployment clusterDeployment, ClusterDeploymentList clusterDeploymentList, ClusterDeprovision clusterDeprovision, ClusterDeprovisionList clusterDeprovisionList, ClusterImageSet clusterImageSet, ClusterImageSetList clusterImageSetList, ClusterOperatorStatusCondition clusterOperatorStatusCondition, ClusterPool clusterPool, ClusterPoolList clusterPoolList, ClusterProvision clusterProvision, ClusterProvisionList clusterProvisionList, ClusterRelocate clusterRelocate, ClusterRelocateList clusterRelocateList, ClusterState clusterState, ClusterStateList clusterStateList, DNSZone dNSZone, DNSZoneList dNSZoneList, io.fabric8.openshift.api.model.hive.gcp.v1.OSDisk gcpOSDisk, HiveConfig hiveConfig, HiveConfigList hiveConfigList, LocalObjectReference localObjectReference, MachinePool machinePool, MachinePoolList machinePoolList, MachinePoolNameLease machinePoolNameLease, MachinePoolNameLeaseList machinePoolNameLeaseList, ObjectMeta objectMeta, Patch patch, SelectorSyncIdentityProvider selectorSyncIdentityProvider, SelectorSyncIdentityProviderList selectorSyncIdentityProviderList, SelectorSyncSet selectorSyncSet, SelectorSyncSetList selectorSyncSetList, Status status, SyncIdentityProvider syncIdentityProvider, SyncIdentityProviderList syncIdentityProviderList, SyncSet syncSet, SyncSetList syncSetList, String time, TypeMeta typeMeta, io.fabric8.openshift.api.model.hive.vsphere.v1.OSDisk vsphereOSDisk) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -296,12 +296,12 @@ public void setClusterImageSetList(ClusterImageSetList clusterImageSetList) { } @JsonProperty("ClusterOperatorStatusCondition") - public ClusterOperatorStatusConditions getClusterOperatorStatusCondition() { + public ClusterOperatorStatusCondition getClusterOperatorStatusCondition() { return clusterOperatorStatusCondition; } @JsonProperty("ClusterOperatorStatusCondition") - public void setClusterOperatorStatusCondition(ClusterOperatorStatusConditions clusterOperatorStatusCondition) { + public void setClusterOperatorStatusCondition(ClusterOperatorStatusCondition clusterOperatorStatusCondition) { this.clusterOperatorStatusCondition = clusterOperatorStatusCondition; } diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 50962c1970e..7c9cc5c2075 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import io.fabric8.openshift.api.model.config.v1.ClusterOperatorStatusConditions; +import io.fabric8.openshift.api.model.config.v1.ClusterOperatorStatusCondition; import io.fabric8.openshift.api.model.hive.v1.Checkpoint; import io.fabric8.openshift.api.model.hive.v1.CheckpointList; import io.fabric8.openshift.api.model.hive.v1.ClusterClaim; @@ -61,7 +61,7 @@ public class ValidationSchema { private ClusterDeprovisionList clusterDeprovisionList; private ClusterImageSet clusterImageSet; private ClusterImageSetList clusterImageSetList; - private ClusterOperatorStatusConditions clusterOperatorStatusCondition; + private ClusterOperatorStatusCondition clusterOperatorStatusCondition; private ClusterPool clusterPool; private ClusterPoolList clusterPoolList; private ClusterProvision clusterProvision; @@ -104,7 +104,7 @@ public class ValidationSchema { public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, io.fabric8.openshift.api.model.hive.azure.v1.OSDisk azureOSDisk, KubernetesList baseKubernetesList, Checkpoint checkpoint, CheckpointList checkpointList, ClusterClaim clusterClaim, ClusterClaimList clusterClaimList, ClusterDeployment clusterDeployment, ClusterDeploymentList clusterDeploymentList, ClusterDeprovision clusterDeprovision, ClusterDeprovisionList clusterDeprovisionList, ClusterImageSet clusterImageSet, ClusterImageSetList clusterImageSetList, ClusterOperatorStatusConditions clusterOperatorStatusCondition, ClusterPool clusterPool, ClusterPoolList clusterPoolList, ClusterProvision clusterProvision, ClusterProvisionList clusterProvisionList, ClusterRelocate clusterRelocate, ClusterRelocateList clusterRelocateList, ClusterState clusterState, ClusterStateList clusterStateList, DNSZone dNSZone, DNSZoneList dNSZoneList, io.fabric8.openshift.api.model.hive.gcp.v1.OSDisk gcpOSDisk, HiveConfig hiveConfig, HiveConfigList hiveConfigList, LocalObjectReference localObjectReference, MachinePool machinePool, MachinePoolList machinePoolList, MachinePoolNameLease machinePoolNameLease, MachinePoolNameLeaseList machinePoolNameLeaseList, ObjectMeta objectMeta, Patch patch, SelectorSyncIdentityProvider selectorSyncIdentityProvider, SelectorSyncIdentityProviderList selectorSyncIdentityProviderList, SelectorSyncSet selectorSyncSet, SelectorSyncSetList selectorSyncSetList, Status status, SyncIdentityProvider syncIdentityProvider, SyncIdentityProviderList syncIdentityProviderList, SyncSet syncSet, SyncSetList syncSetList, String time, TypeMeta typeMeta, io.fabric8.openshift.api.model.hive.vsphere.v1.OSDisk vsphereOSDisk) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, io.fabric8.openshift.api.model.hive.azure.v1.OSDisk azureOSDisk, KubernetesList baseKubernetesList, Checkpoint checkpoint, CheckpointList checkpointList, ClusterClaim clusterClaim, ClusterClaimList clusterClaimList, ClusterDeployment clusterDeployment, ClusterDeploymentList clusterDeploymentList, ClusterDeprovision clusterDeprovision, ClusterDeprovisionList clusterDeprovisionList, ClusterImageSet clusterImageSet, ClusterImageSetList clusterImageSetList, ClusterOperatorStatusCondition clusterOperatorStatusCondition, ClusterPool clusterPool, ClusterPoolList clusterPoolList, ClusterProvision clusterProvision, ClusterProvisionList clusterProvisionList, ClusterRelocate clusterRelocate, ClusterRelocateList clusterRelocateList, ClusterState clusterState, ClusterStateList clusterStateList, DNSZone dNSZone, DNSZoneList dNSZoneList, io.fabric8.openshift.api.model.hive.gcp.v1.OSDisk gcpOSDisk, HiveConfig hiveConfig, HiveConfigList hiveConfigList, LocalObjectReference localObjectReference, MachinePool machinePool, MachinePoolList machinePoolList, MachinePoolNameLease machinePoolNameLease, MachinePoolNameLeaseList machinePoolNameLeaseList, ObjectMeta objectMeta, Patch patch, SelectorSyncIdentityProvider selectorSyncIdentityProvider, SelectorSyncIdentityProviderList selectorSyncIdentityProviderList, SelectorSyncSet selectorSyncSet, SelectorSyncSetList selectorSyncSetList, Status status, SyncIdentityProvider syncIdentityProvider, SyncIdentityProviderList syncIdentityProviderList, SyncSet syncSet, SyncSetList syncSetList, String time, TypeMeta typeMeta, io.fabric8.openshift.api.model.hive.vsphere.v1.OSDisk vsphereOSDisk) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -296,12 +296,12 @@ public void setClusterImageSetList(ClusterImageSetList clusterImageSetList) { } @JsonProperty("ClusterOperatorStatusCondition") - public ClusterOperatorStatusConditions getClusterOperatorStatusCondition() { + public ClusterOperatorStatusCondition getClusterOperatorStatusCondition() { return clusterOperatorStatusCondition; } @JsonProperty("ClusterOperatorStatusCondition") - public void setClusterOperatorStatusCondition(ClusterOperatorStatusConditions clusterOperatorStatusCondition) { + public void setClusterOperatorStatusCondition(ClusterOperatorStatusCondition clusterOperatorStatusCondition) { this.clusterOperatorStatusCondition = clusterOperatorStatusCondition; } diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterIngress.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterIngress.java index a0d76f832ce..f0b646a8266 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterIngress.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterIngress.java @@ -21,7 +21,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA; +import io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -62,7 +62,7 @@ public class ClusterIngress implements Editable , Kuberne @JsonProperty("domain") private String domain; @JsonProperty("httpErrorCodePages") - private BuildSpecBDDPTrustedCA httpErrorCodePages; + private ConfigMapNameReference httpErrorCodePages; @JsonProperty("name") private String name; @JsonProperty("namespaceSelector") @@ -81,7 +81,7 @@ public class ClusterIngress implements Editable , Kuberne public ClusterIngress() { } - public ClusterIngress(String domain, BuildSpecBDDPTrustedCA httpErrorCodePages, String name, io.fabric8.kubernetes.api.model.LabelSelector namespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector routeSelector, String servingCertificate) { + public ClusterIngress(String domain, ConfigMapNameReference httpErrorCodePages, String name, io.fabric8.kubernetes.api.model.LabelSelector namespaceSelector, io.fabric8.kubernetes.api.model.LabelSelector routeSelector, String servingCertificate) { super(); this.domain = domain; this.httpErrorCodePages = httpErrorCodePages; @@ -102,12 +102,12 @@ public void setDomain(String domain) { } @JsonProperty("httpErrorCodePages") - public BuildSpecBDDPTrustedCA getHttpErrorCodePages() { + public ConfigMapNameReference getHttpErrorCodePages() { return httpErrorCodePages; } @JsonProperty("httpErrorCodePages") - public void setHttpErrorCodePages(BuildSpecBDDPTrustedCA httpErrorCodePages) { + public void setHttpErrorCodePages(ConfigMapNameReference httpErrorCodePages) { this.httpErrorCodePages = httpErrorCodePages; } diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterOperatorState.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterOperatorState.java index fa4362a86c7..248883a5a11 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterOperatorState.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterOperatorState.java @@ -24,7 +24,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.openshift.api.model.config.v1.ClusterOperatorStatusConditions; +import io.fabric8.openshift.api.model.config.v1.ClusterOperatorStatusCondition; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -60,7 +60,7 @@ public class ClusterOperatorState implements Editable conditions = new ArrayList<>(); + private List conditions = new ArrayList<>(); @JsonProperty("name") private String name; @JsonIgnore @@ -73,7 +73,7 @@ public class ClusterOperatorState implements Editable conditions, String name) { + public ClusterOperatorState(List conditions, String name) { super(); this.conditions = conditions; this.name = name; @@ -81,12 +81,12 @@ public ClusterOperatorState(List conditions, St @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getConditions() { + public List getConditions() { return conditions; } @JsonProperty("conditions") - public void setConditions(List conditions) { + public void setConditions(List conditions) { this.conditions = conditions; } diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SelectorSyncIdentityProviderSpec.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SelectorSyncIdentityProviderSpec.java index 661f13bb27f..fb0c1ee33c4 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SelectorSyncIdentityProviderSpec.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SelectorSyncIdentityProviderSpec.java @@ -23,7 +23,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.openshift.api.model.config.v1.OAuthSpecIdentityProviders; +import io.fabric8.openshift.api.model.config.v1.IdentityProvider; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -61,7 +61,7 @@ public class SelectorSyncIdentityProviderSpec implements Editable identityProviders = new ArrayList<>(); + private List identityProviders = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -72,7 +72,7 @@ public class SelectorSyncIdentityProviderSpec implements Editable identityProviders) { + public SelectorSyncIdentityProviderSpec(io.fabric8.kubernetes.api.model.LabelSelector clusterDeploymentSelector, List identityProviders) { super(); this.clusterDeploymentSelector = clusterDeploymentSelector; this.identityProviders = identityProviders; @@ -90,12 +90,12 @@ public void setClusterDeploymentSelector(io.fabric8.kubernetes.api.model.LabelSe @JsonProperty("identityProviders") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getIdentityProviders() { + public List getIdentityProviders() { return identityProviders; } @JsonProperty("identityProviders") - public void setIdentityProviders(List identityProviders) { + public void setIdentityProviders(List identityProviders) { this.identityProviders = identityProviders; } diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SyncIdentityProviderSpec.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SyncIdentityProviderSpec.java index c5de3a60fcd..c31aa00078c 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SyncIdentityProviderSpec.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SyncIdentityProviderSpec.java @@ -23,7 +23,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.openshift.api.model.config.v1.OAuthSpecIdentityProviders; +import io.fabric8.openshift.api.model.config.v1.IdentityProvider; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -62,7 +62,7 @@ public class SyncIdentityProviderSpec implements Editable clusterDeploymentRefs = new ArrayList<>(); @JsonProperty("identityProviders") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List identityProviders = new ArrayList<>(); + private List identityProviders = new ArrayList<>(); @JsonIgnore private Map additionalProperties = new LinkedHashMap(); @@ -73,7 +73,7 @@ public class SyncIdentityProviderSpec implements Editable clusterDeploymentRefs, List identityProviders) { + public SyncIdentityProviderSpec(List clusterDeploymentRefs, List identityProviders) { super(); this.clusterDeploymentRefs = clusterDeploymentRefs; this.identityProviders = identityProviders; @@ -92,12 +92,12 @@ public void setClusterDeploymentRefs(List getIdentityProviders() { + public List getIdentityProviders() { return identityProviders; } @JsonProperty("identityProviders") - public void setIdentityProviders(List identityProviders) { + public void setIdentityProviders(List identityProviders) { this.identityProviders = identityProviders; } diff --git a/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/kube-schema.json index 8a9cef4697c..7f170a6a8b6 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/kube-schema.json @@ -3657,7 +3657,7 @@ "properties": { "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "tlsClientCert": { "$ref": "#/definitions/os_config_v1_SecretNameReference", @@ -3697,7 +3697,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ClusterOperatorStatusConditions", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ClusterOperatorStatusCondition", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -3710,7 +3710,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -3720,7 +3720,7 @@ "properties": { "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "clientID": { "type": "string" @@ -3758,7 +3758,7 @@ "properties": { "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "clientID": { "type": "string" @@ -3861,7 +3861,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OAuthSpecIdentityProviders", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.IdentityProvider", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -3920,7 +3920,7 @@ "properties": { "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "domainName": { "type": "string" @@ -3996,7 +3996,7 @@ }, "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "insecure": { "type": "boolean" @@ -4016,7 +4016,7 @@ "properties": { "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "tlsClientCert": { "$ref": "#/definitions/os_config_v1_SecretNameReference", @@ -4079,7 +4079,7 @@ "properties": { "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "claims": { "$ref": "#/definitions/os_config_v1_OpenIDClaims", @@ -4121,7 +4121,7 @@ "properties": { "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "challengeURL": { "type": "string" @@ -6108,7 +6108,7 @@ }, "httpErrorCodePages": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "name": { "type": "string" @@ -6189,7 +6189,7 @@ "javaOmitEmpty": true, "items": { "$ref": "#/definitions/os_config_v1_ClusterOperatorStatusCondition", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ClusterOperatorStatusConditions" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ClusterOperatorStatusCondition" } }, "name": { @@ -8251,7 +8251,7 @@ "type": "array", "items": { "$ref": "#/definitions/os_config_v1_IdentityProvider", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OAuthSpecIdentityProviders" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.IdentityProvider" } } }, @@ -8448,7 +8448,7 @@ "type": "array", "items": { "$ref": "#/definitions/os_config_v1_IdentityProvider", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OAuthSpecIdentityProviders" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.IdentityProvider" } } }, @@ -8504,7 +8504,7 @@ "type": "array", "items": { "$ref": "#/definitions/os_config_v1_IdentityProvider", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OAuthSpecIdentityProviders" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.IdentityProvider" } } }, @@ -8889,7 +8889,7 @@ }, "ClusterOperatorStatusCondition": { "$ref": "#/definitions/os_config_v1_ClusterOperatorStatusCondition", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ClusterOperatorStatusConditions" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ClusterOperatorStatusCondition" }, "ClusterPool": { "$ref": "#/definitions/os_hive_v1_ClusterPool", diff --git a/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/validation-schema.json index 1b3345371a8..b5d1d41f580 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/validation-schema.json @@ -3657,7 +3657,7 @@ "properties": { "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "tlsClientCert": { "$ref": "#/definitions/os_config_v1_SecretNameReference", @@ -3697,7 +3697,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ClusterOperatorStatusConditions", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ClusterOperatorStatusCondition", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -3710,7 +3710,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -3720,7 +3720,7 @@ "properties": { "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "clientID": { "type": "string" @@ -3758,7 +3758,7 @@ "properties": { "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "clientID": { "type": "string" @@ -3861,7 +3861,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OAuthSpecIdentityProviders", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.IdentityProvider", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -3920,7 +3920,7 @@ "properties": { "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "domainName": { "type": "string" @@ -3996,7 +3996,7 @@ }, "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "insecure": { "type": "boolean" @@ -4016,7 +4016,7 @@ "properties": { "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "tlsClientCert": { "$ref": "#/definitions/os_config_v1_SecretNameReference", @@ -4079,7 +4079,7 @@ "properties": { "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "claims": { "$ref": "#/definitions/os_config_v1_OpenIDClaims", @@ -4121,7 +4121,7 @@ "properties": { "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "challengeURL": { "type": "string" @@ -6108,7 +6108,7 @@ }, "httpErrorCodePages": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "name": { "type": "string" @@ -6189,7 +6189,7 @@ "javaOmitEmpty": true, "items": { "$ref": "#/definitions/os_config_v1_ClusterOperatorStatusCondition", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ClusterOperatorStatusConditions" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ClusterOperatorStatusCondition" } }, "name": { @@ -8251,7 +8251,7 @@ "type": "array", "items": { "$ref": "#/definitions/os_config_v1_IdentityProvider", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OAuthSpecIdentityProviders" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.IdentityProvider" } } }, @@ -8448,7 +8448,7 @@ "type": "array", "items": { "$ref": "#/definitions/os_config_v1_IdentityProvider", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OAuthSpecIdentityProviders" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.IdentityProvider" } } }, @@ -8504,7 +8504,7 @@ "type": "array", "items": { "$ref": "#/definitions/os_config_v1_IdentityProvider", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OAuthSpecIdentityProviders" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.IdentityProvider" } } }, @@ -8889,7 +8889,7 @@ }, "ClusterOperatorStatusCondition": { "$ref": "#/definitions/os_config_v1_ClusterOperatorStatusCondition", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ClusterOperatorStatusConditions" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ClusterOperatorStatusCondition" }, "ClusterPool": { "$ref": "#/definitions/os_hive_v1_ClusterPool", @@ -9422,7 +9422,7 @@ "properties": { "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "tlsClientCert": { "$ref": "#/definitions/os_config_v1_SecretNameReference", @@ -10173,7 +10173,7 @@ }, "httpErrorCodePages": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "name": { "type": "string" @@ -10239,7 +10239,7 @@ "javaOmitEmpty": true, "items": { "$ref": "#/definitions/os_config_v1_ClusterOperatorStatusCondition", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ClusterOperatorStatusConditions" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ClusterOperatorStatusCondition" } }, "name": { @@ -11934,7 +11934,7 @@ "properties": { "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "clientID": { "type": "string" @@ -11967,7 +11967,7 @@ "properties": { "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "clientID": { "type": "string" @@ -12509,7 +12509,7 @@ "properties": { "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "domainName": { "type": "string" @@ -12655,7 +12655,7 @@ }, "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "insecure": { "type": "boolean" @@ -12754,21 +12754,18 @@ }, "machinepool": { "properties": { - "bootVolume": { - "$ref": "#/definitions/os_hive_ibmcloud_v1_BootVolume", - "existingJavaType": "io.fabric8.openshift.api.model.hive.ibmcloud.v1.BootVolume" + "imageID": { + "type": "string" }, - "dedicatedHosts": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "$ref": "#/definitions/os_hive_ibmcloud_v1_DedicatedHost", - "existingJavaType": "io.fabric8.openshift.api.model.hive.ibmcloud.v1.DedicatedHost" - } + "instanceType": { + "type": "string" }, - "type": { + "systemDiskCategory": { "type": "string" }, + "systemDiskSize": { + "type": "integer" + }, "zones": { "type": "array", "javaOmitEmpty": true, @@ -13255,7 +13252,7 @@ "properties": { "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "tlsClientCert": { "$ref": "#/definitions/os_config_v1_SecretNameReference", @@ -13395,7 +13392,7 @@ "properties": { "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "claims": { "$ref": "#/definitions/os_config_v1_OpenIDClaims", @@ -13446,15 +13443,8 @@ }, "osdisk": { "properties": { - "diskEncryptionSet": { - "$ref": "#/definitions/os_hive_azure_v1_DiskEncryptionSet", - "existingJavaType": "io.fabric8.openshift.api.model.hive.azure.v1.DiskEncryptionSet" - }, "diskSizeGB": { "type": "integer" - }, - "diskType": { - "type": "string" } }, "additionalProperties": true @@ -14279,7 +14269,7 @@ "properties": { "ca": { "$ref": "#/definitions/os_config_v1_ConfigMapNameReference", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BuildSpecBDDPTrustedCA" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.ConfigMapNameReference" }, "challengeURL": { "type": "string" @@ -14640,7 +14630,7 @@ "type": "array", "items": { "$ref": "#/definitions/os_config_v1_IdentityProvider", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OAuthSpecIdentityProviders" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.IdentityProvider" } } }, @@ -14970,7 +14960,7 @@ "type": "array", "items": { "$ref": "#/definitions/os_config_v1_IdentityProvider", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OAuthSpecIdentityProviders" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.IdentityProvider" } } }, @@ -15015,7 +15005,7 @@ "type": "array", "items": { "$ref": "#/definitions/os_config_v1_IdentityProvider", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OAuthSpecIdentityProviders" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.IdentityProvider" } } }, diff --git a/kubernetes-model-generator/openshift-model-hive/src/test/java/io/fabric8/openshift/api/model/hive/v1/SelectorSyncIdentityProviderTest.java b/kubernetes-model-generator/openshift-model-hive/src/test/java/io/fabric8/openshift/api/model/hive/v1/SelectorSyncIdentityProviderTest.java index cbd8734a9ea..2e44f22a363 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/test/java/io/fabric8/openshift/api/model/hive/v1/SelectorSyncIdentityProviderTest.java +++ b/kubernetes-model-generator/openshift-model-hive/src/test/java/io/fabric8/openshift/api/model/hive/v1/SelectorSyncIdentityProviderTest.java @@ -16,8 +16,8 @@ package io.fabric8.openshift.api.model.hive.v1; import com.fasterxml.jackson.databind.ObjectMapper; -import io.fabric8.openshift.api.model.config.v1.OAuthSpecIPGithubBuilder; -import io.fabric8.openshift.api.model.config.v1.OAuthSpecIdentityProvidersBuilder; +import io.fabric8.openshift.api.model.config.v1.GitHubIdentityProviderBuilder; +import io.fabric8.openshift.api.model.config.v1.IdentityProviderBuilder; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -68,10 +68,10 @@ void builderShouldCreateObject() { .withName("allowall-identity-provider") .endMetadata() .withNewSpec() - .addToIdentityProviders(new OAuthSpecIdentityProvidersBuilder() + .addToIdentityProviders(new IdentityProviderBuilder() .withName("my_allow_provider") .withType("GitHubIdentityProvider") - .withGithub(new OAuthSpecIPGithubBuilder() + .withGithub(new GitHubIdentityProviderBuilder() .withClientID("sample-client-id") .withNewClientSecret() .withName("foo") diff --git a/kubernetes-model-generator/openshift-model-hive/src/test/java/io/fabric8/openshift/api/model/hive/v1/SyncIdentityProviderTest.java b/kubernetes-model-generator/openshift-model-hive/src/test/java/io/fabric8/openshift/api/model/hive/v1/SyncIdentityProviderTest.java index 0ce15fa0043..f23cfb8c528 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/test/java/io/fabric8/openshift/api/model/hive/v1/SyncIdentityProviderTest.java +++ b/kubernetes-model-generator/openshift-model-hive/src/test/java/io/fabric8/openshift/api/model/hive/v1/SyncIdentityProviderTest.java @@ -16,8 +16,8 @@ package io.fabric8.openshift.api.model.hive.v1; import com.fasterxml.jackson.databind.ObjectMapper; -import io.fabric8.openshift.api.model.config.v1.OAuthSpecIPGithubBuilder; -import io.fabric8.openshift.api.model.config.v1.OAuthSpecIdentityProvidersBuilder; +import io.fabric8.openshift.api.model.config.v1.GitHubIdentityProviderBuilder; +import io.fabric8.openshift.api.model.config.v1.IdentityProviderBuilder; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -69,10 +69,10 @@ void builderShouldCreateObject() { .endMetadata() .withNewSpec() .addNewClusterDeploymentRef("MyCluster") - .addToIdentityProviders(new OAuthSpecIdentityProvidersBuilder() + .addToIdentityProviders(new IdentityProviderBuilder() .withName("myprovider") .withType("GitHubIdentityProvider") - .withGithub(new OAuthSpecIPGithubBuilder() + .withGithub(new GitHubIdentityProviderBuilder() .withClientID("sample-client-id") .withNewClientSecret() .withName("foo") diff --git a/kubernetes-model-generator/openshift-model-installer/cmd/generate/generate.go b/kubernetes-model-generator/openshift-model-installer/cmd/generate/generate.go index 6cdf35ac63a..7d0255a9771 100644 --- a/kubernetes-model-generator/openshift-model-installer/cmd/generate/generate.go +++ b/kubernetes-model-generator/openshift-model-installer/cmd/generate/generate.go @@ -26,7 +26,6 @@ import ( "strings" "time" - config "github.com/openshift/api/config/v1" ipnet "github.com/openshift/installer/pkg/ipnet" installer "github.com/openshift/installer/pkg/types" alibabacloud "github.com/openshift/installer/pkg/types/alibabacloud" @@ -101,11 +100,6 @@ func main() { reflect.TypeOf(runtime.RawExtension{}): "java.util.Map", reflect.TypeOf(v1apiextensions.JSON{}): "com.fasterxml.jackson.databind.JsonNode", reflect.TypeOf(intstr.IntOrString{}): "io.fabric8.kubernetes.api.model.IntOrString", - reflect.TypeOf(config.BareMetalPlatformLoadBalancer{}): "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSBaremetalLoadBalancer", - reflect.TypeOf(config.NutanixPlatformLoadBalancer{}): "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSNutanixLoadBalancer", - reflect.TypeOf(config.OpenStackPlatformLoadBalancer{}): "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSOpenstackLoadBalancer", - reflect.TypeOf(config.OvirtPlatformLoadBalancer{}): "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSOvirtLoadBalancer", - reflect.TypeOf(config.VSpherePlatformLoadBalancer{}): "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSVsphereLoadBalancer", } schema, err := schemagen.GenerateSchema(reflect.TypeOf(Schema{}), packages, typeMap, manualTypeMap, "installer") if err != nil { diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/baremetal/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/baremetal/v1/Platform.java index e83a0105822..20afd19d0fc 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/baremetal/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/baremetal/v1/Platform.java @@ -24,7 +24,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSBaremetalLoadBalancer; +import io.fabric8.openshift.api.model.config.v1.BareMetalPlatformLoadBalancer; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -114,7 +114,7 @@ public class Platform implements Editable , KubernetesResource @JsonProperty("libvirtURI") private String libvirtURI; @JsonProperty("loadBalancer") - private InfrastructureStatusPSBaremetalLoadBalancer loadBalancer; + private BareMetalPlatformLoadBalancer loadBalancer; @JsonProperty("provisioningBridge") private String provisioningBridge; @JsonProperty("provisioningDHCPExternal") @@ -141,7 +141,7 @@ public class Platform implements Editable , KubernetesResource public Platform() { } - public Platform(String apiVIP, List apiVIPs, String bootstrapExternalStaticGateway, String bootstrapExternalStaticIP, String bootstrapOSImage, String bootstrapProvisioningIP, String clusterOSImage, String clusterProvisioningIP, MachinePool defaultMachinePlatform, String externalBridge, String externalMACAddress, List hosts, String ingressVIP, List ingressVIPs, String libvirtURI, InfrastructureStatusPSBaremetalLoadBalancer loadBalancer, String provisioningBridge, Boolean provisioningDHCPExternal, String provisioningDHCPRange, String provisioningHostIP, String provisioningMACAddress, String provisioningNetwork, String provisioningNetworkCIDR, String provisioningNetworkInterface) { + public Platform(String apiVIP, List apiVIPs, String bootstrapExternalStaticGateway, String bootstrapExternalStaticIP, String bootstrapOSImage, String bootstrapProvisioningIP, String clusterOSImage, String clusterProvisioningIP, MachinePool defaultMachinePlatform, String externalBridge, String externalMACAddress, List hosts, String ingressVIP, List ingressVIPs, String libvirtURI, BareMetalPlatformLoadBalancer loadBalancer, String provisioningBridge, Boolean provisioningDHCPExternal, String provisioningDHCPRange, String provisioningHostIP, String provisioningMACAddress, String provisioningNetwork, String provisioningNetworkCIDR, String provisioningNetworkInterface) { super(); this.apiVIP = apiVIP; this.apiVIPs = apiVIPs; @@ -323,12 +323,12 @@ public void setLibvirtURI(String libvirtURI) { } @JsonProperty("loadBalancer") - public InfrastructureStatusPSBaremetalLoadBalancer getLoadBalancer() { + public BareMetalPlatformLoadBalancer getLoadBalancer() { return loadBalancer; } @JsonProperty("loadBalancer") - public void setLoadBalancer(InfrastructureStatusPSBaremetalLoadBalancer loadBalancer) { + public void setLoadBalancer(BareMetalPlatformLoadBalancer loadBalancer) { this.loadBalancer = loadBalancer; } diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/Platform.java index 1acb52d0087..6948ec9f37f 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/nutanix/v1/Platform.java @@ -24,7 +24,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSNutanixLoadBalancer; +import io.fabric8.openshift.api.model.config.v1.NutanixPlatformLoadBalancer; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -81,7 +81,7 @@ public class Platform implements Editable , KubernetesResource @JsonInclude(JsonInclude.Include.NON_EMPTY) private List ingressVIPs = new ArrayList<>(); @JsonProperty("loadBalancer") - private InfrastructureStatusPSNutanixLoadBalancer loadBalancer; + private NutanixPlatformLoadBalancer loadBalancer; @JsonProperty("prismCentral") private PrismCentral prismCentral; @JsonProperty("prismElements") @@ -100,7 +100,7 @@ public class Platform implements Editable , KubernetesResource public Platform() { } - public Platform(String apiVIP, List apiVIPs, String clusterOSImage, MachinePool defaultMachinePlatform, String ingressVIP, List ingressVIPs, InfrastructureStatusPSNutanixLoadBalancer loadBalancer, PrismCentral prismCentral, List prismElements, List subnetUUIDs) { + public Platform(String apiVIP, List apiVIPs, String clusterOSImage, MachinePool defaultMachinePlatform, String ingressVIP, List ingressVIPs, NutanixPlatformLoadBalancer loadBalancer, PrismCentral prismCentral, List prismElements, List subnetUUIDs) { super(); this.apiVIP = apiVIP; this.apiVIPs = apiVIPs; @@ -177,12 +177,12 @@ public void setIngressVIPs(List ingressVIPs) { } @JsonProperty("loadBalancer") - public InfrastructureStatusPSNutanixLoadBalancer getLoadBalancer() { + public NutanixPlatformLoadBalancer getLoadBalancer() { return loadBalancer; } @JsonProperty("loadBalancer") - public void setLoadBalancer(InfrastructureStatusPSNutanixLoadBalancer loadBalancer) { + public void setLoadBalancer(NutanixPlatformLoadBalancer loadBalancer) { this.loadBalancer = loadBalancer; } diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/Platform.java index f4568495fe4..aa938d8f394 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/openstack/v1/Platform.java @@ -24,7 +24,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSOpenstackLoadBalancer; +import io.fabric8.openshift.api.model.config.v1.OpenStackPlatformLoadBalancer; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -108,7 +108,7 @@ public class Platform implements Editable , KubernetesResource @JsonProperty("lbFloatingIP") private String lbFloatingIP; @JsonProperty("loadBalancer") - private InfrastructureStatusPSOpenstackLoadBalancer loadBalancer; + private OpenStackPlatformLoadBalancer loadBalancer; @JsonProperty("machinesSubnet") private String machinesSubnet; @JsonProperty("octaviaSupport") @@ -127,7 +127,7 @@ public class Platform implements Editable , KubernetesResource public Platform() { } - public Platform(String apiFloatingIP, String apiVIP, List apiVIPs, String cloud, String clusterOSImage, Map clusterOSImageProperties, String computeFlavor, MachinePool defaultMachinePlatform, List externalDNS, String externalNetwork, String ingressFloatingIP, String ingressVIP, List ingressVIPs, String lbFloatingIP, InfrastructureStatusPSOpenstackLoadBalancer loadBalancer, String machinesSubnet, String octaviaSupport, String region, String trunkSupport) { + public Platform(String apiFloatingIP, String apiVIP, List apiVIPs, String cloud, String clusterOSImage, Map clusterOSImageProperties, String computeFlavor, MachinePool defaultMachinePlatform, List externalDNS, String externalNetwork, String ingressFloatingIP, String ingressVIP, List ingressVIPs, String lbFloatingIP, OpenStackPlatformLoadBalancer loadBalancer, String machinesSubnet, String octaviaSupport, String region, String trunkSupport) { super(); this.apiFloatingIP = apiFloatingIP; this.apiVIP = apiVIP; @@ -295,12 +295,12 @@ public void setLbFloatingIP(String lbFloatingIP) { } @JsonProperty("loadBalancer") - public InfrastructureStatusPSOpenstackLoadBalancer getLoadBalancer() { + public OpenStackPlatformLoadBalancer getLoadBalancer() { return loadBalancer; } @JsonProperty("loadBalancer") - public void setLoadBalancer(InfrastructureStatusPSOpenstackLoadBalancer loadBalancer) { + public void setLoadBalancer(OpenStackPlatformLoadBalancer loadBalancer) { this.loadBalancer = loadBalancer; } diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/Platform.java index 9be4ccb3d44..3793f6ce108 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/ovirt/v1/Platform.java @@ -24,7 +24,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSOvirtLoadBalancer; +import io.fabric8.openshift.api.model.config.v1.OvirtPlatformLoadBalancer; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -83,7 +83,7 @@ public class Platform implements Editable , KubernetesResource @JsonInclude(JsonInclude.Include.NON_EMPTY) private List ingressVips = new ArrayList<>(); @JsonProperty("loadBalancer") - private InfrastructureStatusPSOvirtLoadBalancer loadBalancer; + private OvirtPlatformLoadBalancer loadBalancer; @JsonProperty("ovirt_cluster_id") private String ovirtClusterId; @JsonProperty("ovirt_network_name") @@ -102,7 +102,7 @@ public class Platform implements Editable , KubernetesResource public Platform() { } - public Platform(List affinityGroups, String apiVip, List apiVips, MachinePool defaultMachinePlatform, String ingressVip, List ingressVips, InfrastructureStatusPSOvirtLoadBalancer loadBalancer, String ovirtClusterId, String ovirtNetworkName, String ovirtStorageDomainId, String vnicProfileID) { + public Platform(List affinityGroups, String apiVip, List apiVips, MachinePool defaultMachinePlatform, String ingressVip, List ingressVips, OvirtPlatformLoadBalancer loadBalancer, String ovirtClusterId, String ovirtNetworkName, String ovirtStorageDomainId, String vnicProfileID) { super(); this.affinityGroups = affinityGroups; this.apiVip = apiVip; @@ -181,12 +181,12 @@ public void setIngressVips(List ingressVips) { } @JsonProperty("loadBalancer") - public InfrastructureStatusPSOvirtLoadBalancer getLoadBalancer() { + public OvirtPlatformLoadBalancer getLoadBalancer() { return loadBalancer; } @JsonProperty("loadBalancer") - public void setLoadBalancer(InfrastructureStatusPSOvirtLoadBalancer loadBalancer) { + public void setLoadBalancer(OvirtPlatformLoadBalancer loadBalancer) { this.loadBalancer = loadBalancer; } diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Platform.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Platform.java index 57ed11d585c..135392e7e51 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Platform.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/vsphere/v1/Platform.java @@ -24,7 +24,7 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.ResourceRequirements; -import io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSVsphereLoadBalancer; +import io.fabric8.openshift.api.model.config.v1.VSpherePlatformLoadBalancer; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; import lombok.EqualsAndHashCode; @@ -103,7 +103,7 @@ public class Platform implements Editable , KubernetesResource @JsonInclude(JsonInclude.Include.NON_EMPTY) private List ingressVIPs = new ArrayList<>(); @JsonProperty("loadBalancer") - private InfrastructureStatusPSVsphereLoadBalancer loadBalancer; + private VSpherePlatformLoadBalancer loadBalancer; @JsonProperty("network") private String network; @JsonProperty("password") @@ -127,7 +127,7 @@ public class Platform implements Editable , KubernetesResource public Platform() { } - public Platform(String apiVIP, List apiVIPs, String cluster, String clusterOSImage, String datacenter, String defaultDatastore, MachinePool defaultMachinePlatform, String diskType, List failureDomains, String folder, String ingressVIP, List ingressVIPs, InfrastructureStatusPSVsphereLoadBalancer loadBalancer, String network, String password, String resourcePool, String username, String vCenter, List vcenters) { + public Platform(String apiVIP, List apiVIPs, String cluster, String clusterOSImage, String datacenter, String defaultDatastore, MachinePool defaultMachinePlatform, String diskType, List failureDomains, String folder, String ingressVIP, List ingressVIPs, VSpherePlatformLoadBalancer loadBalancer, String network, String password, String resourcePool, String username, String vCenter, List vcenters) { super(); this.apiVIP = apiVIP; this.apiVIPs = apiVIPs; @@ -274,12 +274,12 @@ public void setIngressVIPs(List ingressVIPs) { } @JsonProperty("loadBalancer") - public InfrastructureStatusPSVsphereLoadBalancer getLoadBalancer() { + public VSpherePlatformLoadBalancer getLoadBalancer() { return loadBalancer; } @JsonProperty("loadBalancer") - public void setLoadBalancer(InfrastructureStatusPSVsphereLoadBalancer loadBalancer) { + public void setLoadBalancer(VSpherePlatformLoadBalancer loadBalancer) { this.loadBalancer = loadBalancer; } diff --git a/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/kube-schema.json index ad8e17ab8e1..0a9805a8d25 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/kube-schema.json @@ -468,7 +468,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSBaremetalLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BareMetalPlatformLoadBalancer", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -481,7 +481,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSNutanixLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformLoadBalancer", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -494,7 +494,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSOpenstackLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformLoadBalancer", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -507,7 +507,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSOvirtLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OvirtPlatformLoadBalancer", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -520,7 +520,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSVsphereLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformLoadBalancer", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -1015,7 +1015,7 @@ }, "loadBalancer": { "$ref": "#/definitions/os_config_v1_BareMetalPlatformLoadBalancer", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSBaremetalLoadBalancer" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BareMetalPlatformLoadBalancer" }, "provisioningBridge": { "type": "string" @@ -1489,7 +1489,7 @@ }, "loadBalancer": { "$ref": "#/definitions/os_config_v1_NutanixPlatformLoadBalancer", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSNutanixLoadBalancer" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformLoadBalancer" }, "prismCentral": { "$ref": "#/definitions/os_installer_nutanix_v1_PrismCentral", @@ -1761,7 +1761,7 @@ }, "loadBalancer": { "$ref": "#/definitions/os_config_v1_OpenStackPlatformLoadBalancer", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSOpenstackLoadBalancer" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformLoadBalancer" }, "machinesSubnet": { "type": "string" @@ -1966,7 +1966,7 @@ }, "loadBalancer": { "$ref": "#/definitions/os_config_v1_OvirtPlatformLoadBalancer", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSOvirtLoadBalancer" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OvirtPlatformLoadBalancer" }, "ovirt_cluster_id": { "type": "string" @@ -2592,7 +2592,7 @@ }, "loadBalancer": { "$ref": "#/definitions/os_config_v1_VSpherePlatformLoadBalancer", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSVsphereLoadBalancer" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformLoadBalancer" }, "network": { "type": "string" diff --git a/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/validation-schema.json index f8d9f4ffc8a..d1dd94ce183 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/validation-schema.json @@ -468,7 +468,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSBaremetalLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BareMetalPlatformLoadBalancer", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -481,7 +481,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSNutanixLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformLoadBalancer", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -494,7 +494,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSOpenstackLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformLoadBalancer", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -507,7 +507,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSOvirtLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OvirtPlatformLoadBalancer", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -520,7 +520,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSVsphereLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformLoadBalancer", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource" ] @@ -1015,7 +1015,7 @@ }, "loadBalancer": { "$ref": "#/definitions/os_config_v1_BareMetalPlatformLoadBalancer", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSBaremetalLoadBalancer" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.BareMetalPlatformLoadBalancer" }, "provisioningBridge": { "type": "string" @@ -1489,7 +1489,7 @@ }, "loadBalancer": { "$ref": "#/definitions/os_config_v1_NutanixPlatformLoadBalancer", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSNutanixLoadBalancer" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.NutanixPlatformLoadBalancer" }, "prismCentral": { "$ref": "#/definitions/os_installer_nutanix_v1_PrismCentral", @@ -1761,7 +1761,7 @@ }, "loadBalancer": { "$ref": "#/definitions/os_config_v1_OpenStackPlatformLoadBalancer", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSOpenstackLoadBalancer" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OpenStackPlatformLoadBalancer" }, "machinesSubnet": { "type": "string" @@ -1966,7 +1966,7 @@ }, "loadBalancer": { "$ref": "#/definitions/os_config_v1_OvirtPlatformLoadBalancer", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSOvirtLoadBalancer" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.OvirtPlatformLoadBalancer" }, "ovirt_cluster_id": { "type": "string" @@ -2592,7 +2592,7 @@ }, "loadBalancer": { "$ref": "#/definitions/os_config_v1_VSpherePlatformLoadBalancer", - "existingJavaType": "io.fabric8.openshift.api.model.config.v1.InfrastructureStatusPSVsphereLoadBalancer" + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformLoadBalancer" }, "network": { "type": "string" @@ -3117,17 +3117,20 @@ }, "failuredomain": { "properties": { - "computeAvailabilityZone": { + "name": { "type": "string" }, - "portTargets": { - "type": "array", - "items": { - "$ref": "#/definitions/os_installer_openstack_v1_NamedPortTarget", - "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.NamedPortTarget" - } + "region": { + "type": "string" }, - "storageAvailabilityZone": { + "server": { + "type": "string" + }, + "topology": { + "$ref": "#/definitions/os_installer_vsphere_v1_Topology", + "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.Topology" + }, + "zone": { "type": "string" } }, @@ -3381,19 +3384,34 @@ }, "machinepool": { "properties": { - "amiID": { - "type": "string" + "additionalNetworkIDs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } }, - "iamRole": { - "type": "string" + "additionalSecurityGroupIDs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } }, - "metadataService": { - "$ref": "#/definitions/os_installer_aws_v1_EC2Metadata", - "existingJavaType": "io.fabric8.openshift.api.model.installer.aws.v1.EC2Metadata" + "failureDomains": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_installer_openstack_v1_FailureDomain", + "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.FailureDomain" + } }, "rootVolume": { - "$ref": "#/definitions/os_installer_aws_v1_EC2RootVolume", - "existingJavaType": "io.fabric8.openshift.api.model.installer.aws.v1.EC2RootVolume" + "$ref": "#/definitions/os_installer_openstack_v1_RootVolume", + "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.RootVolume" + }, + "serverGroupPolicy": { + "type": "string" }, "type": { "type": "string" @@ -3702,15 +3720,8 @@ }, "osdisk": { "properties": { - "diskEncryptionSet": { - "$ref": "#/definitions/os_installer_azure_v1_DiskEncryptionSet", - "existingJavaType": "io.fabric8.openshift.api.model.installer.azure.v1.DiskEncryptionSet" - }, "diskSizeGB": { "type": "integer" - }, - "diskType": { - "type": "string" } }, "additionalProperties": true @@ -3768,48 +3779,34 @@ }, "platform": { "properties": { - "armEndpoint": { - "type": "string" - }, - "baseDomainResourceGroupName": { - "type": "string" - }, - "cloudName": { - "type": "string" - }, - "clusterOSImage": { - "type": "string" - }, - "computeSubnet": { - "type": "string" + "computeSubnets": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } }, - "controlPlaneSubnet": { - "type": "string" + "controlPlaneSubnets": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } }, "defaultMachinePlatform": { - "$ref": "#/definitions/os_installer_azure_v1_MachinePool", - "existingJavaType": "io.fabric8.openshift.api.model.installer.azure.v1.MachinePool" + "$ref": "#/definitions/os_installer_ibmcloud_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool" }, "networkResourceGroupName": { "type": "string" }, - "outboundType": { - "type": "string" - }, "region": { "type": "string" }, "resourceGroupName": { "type": "string" }, - "userTags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" - }, - "virtualNetwork": { + "vpcName": { "type": "string" } }, diff --git a/kubernetes-model-generator/pom.xml b/kubernetes-model-generator/pom.xml index 11b4cc805ca..cfa38304811 100644 --- a/kubernetes-model-generator/pom.xml +++ b/kubernetes-model-generator/pom.xml @@ -79,7 +79,9 @@ false **/*KubernetesTest.java ${project.parent.basedir}/openapi/schemas/kubernetes-1.30.0.json + ${project.parent.basedir}/openapi/schemas/openshift-4.17.0.json + ${project.parent.basedir}/openapi/schemas/openshift-generated.json osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/NetworkTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/NetworkTest.java index 00963f94a2b..fd4e8e39641 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/NetworkTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/NetworkTest.java @@ -86,7 +86,7 @@ private Network createNewNetwork(String name) { .withNewSpec() .addNewClusterNetwork() .withCidr("10.217.0.0/22") - .withHostPrefix(23) + .withHostPrefix(23L) .endClusterNetwork() .withNewExternalIP().withNewPolicy().endPolicy().endExternalIP() .withNetworkType("OpenShiftSDN") diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SelectorSyncIdentityProviderTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SelectorSyncIdentityProviderTest.java index 9fa283d486d..74ce5ac865e 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SelectorSyncIdentityProviderTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SelectorSyncIdentityProviderTest.java @@ -15,8 +15,8 @@ */ package io.fabric8.openshift.client.server.mock.hive; -import io.fabric8.openshift.api.model.config.v1.OAuthSpecIPGithubBuilder; -import io.fabric8.openshift.api.model.config.v1.OAuthSpecIdentityProvidersBuilder; +import io.fabric8.openshift.api.model.config.v1.GitHubIdentityProviderBuilder; +import io.fabric8.openshift.api.model.config.v1.IdentityProviderBuilder; import io.fabric8.openshift.api.model.hive.v1.SelectorSyncIdentityProvider; import io.fabric8.openshift.api.model.hive.v1.SelectorSyncIdentityProviderBuilder; import io.fabric8.openshift.api.model.hive.v1.SelectorSyncIdentityProviderList; @@ -92,10 +92,10 @@ private SelectorSyncIdentityProvider createNewSelectorSyncIdentityProvider(Strin .withName(name) .endMetadata() .withNewSpec() - .addToIdentityProviders(new OAuthSpecIdentityProvidersBuilder() + .addToIdentityProviders(new IdentityProviderBuilder() .withName("my_allow_provider") .withType("GitHubIdentityProvider") - .withGithub(new OAuthSpecIPGithubBuilder() + .withGithub(new GitHubIdentityProviderBuilder() .withClientID("sample-client-id") .withNewClientSecret() .withName("foo") diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SyncIdentityProviderTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SyncIdentityProviderTest.java index bd1239e1f0f..a4571d96866 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SyncIdentityProviderTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SyncIdentityProviderTest.java @@ -15,8 +15,8 @@ */ package io.fabric8.openshift.client.server.mock.hive; -import io.fabric8.openshift.api.model.config.v1.OAuthSpecIPGithubBuilder; -import io.fabric8.openshift.api.model.config.v1.OAuthSpecIdentityProvidersBuilder; +import io.fabric8.openshift.api.model.config.v1.GitHubIdentityProviderBuilder; +import io.fabric8.openshift.api.model.config.v1.IdentityProviderBuilder; import io.fabric8.openshift.api.model.hive.v1.SyncIdentityProvider; import io.fabric8.openshift.api.model.hive.v1.SyncIdentityProviderBuilder; import io.fabric8.openshift.api.model.hive.v1.SyncIdentityProviderList; @@ -93,10 +93,10 @@ private SyncIdentityProvider createNewSyncIdentityProvider(String name) { .endMetadata() .withNewSpec() .addNewClusterDeploymentRef("MyCluster") - .addToIdentityProviders(new OAuthSpecIdentityProvidersBuilder() + .addToIdentityProviders(new IdentityProviderBuilder() .withName("myprovider") .withType("GitHubIdentityProvider") - .withGithub(new OAuthSpecIPGithubBuilder() + .withGithub(new GitHubIdentityProviderBuilder() .withClientID("sample-client-id") .withNewClientSecret() .withName("foo")