From ea029944019835c6cec241a397cc17715e7646b3 Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Mon, 1 Jul 2024 17:44:09 +0200 Subject: [PATCH] fix: generated classes handle java.lang.String type consistently (6094) fix: generated classes handle java.lang.String type consistently Generated Java classes all reference the java.lang.String type using a simplified String reference. Signed-off-by: Marc Nuri --- fix: generated classes handle java.lang.String type consistently (generated code) Signed-off-by: Marc Nuri --- .../model/admission/v1/AdmissionResponse.java | 32 ++-- .../admission/v1beta1/AdmissionResponse.java | 32 ++-- .../api/model/authentication/UserInfo.java | 26 +-- .../v1/SubjectAccessReviewSpec.java | 26 +-- .../v1beta1/SubjectAccessReviewSpec.java | 26 +-- .../main/resources/schema/kube-schema.json | 16 +- .../resources/schema/validation-schema.json | 176 +++++++++--------- .../apiextensions/v1/JSONSchemaProps.java | 74 ++++---- .../v1beta1/JSONSchemaProps.java | 74 ++++---- .../main/resources/schema/kube-schema.json | 20 +- .../resources/schema/validation-schema.json | 168 +++++++---------- .../main/resources/schema/kube-schema.json | 68 +++---- .../resources/schema/validation-schema.json | 136 +++++++------- .../main/resources/schema/kube-schema.json | 6 +- .../resources/schema/validation-schema.json | 132 +++++++------ .../main/resources/schema/kube-schema.json | 22 +-- .../resources/schema/validation-schema.json | 44 ++--- .../v1/CertificateSigningRequestSpec.java | 44 ++--- .../CertificateSigningRequestSpec.java | 44 ++--- .../main/resources/schema/kube-schema.json | 8 +- .../resources/schema/validation-schema.json | 24 +-- .../main/resources/schema/kube-schema.json | 4 +- .../resources/schema/validation-schema.json | 8 +- .../kubernetes/api/model/AuthInfo.java | 74 ++++---- .../api/model/AuthProviderConfig.java | 14 +- .../api/model/CSIPersistentVolumeSource.java | 26 +-- .../kubernetes/api/model/CSIVolumeSource.java | 20 +- .../kubernetes/api/model/ConfigMap.java | 20 +- .../kubernetes/api/model/ContainerStatus.java | 32 ++-- .../api/model/FlexPersistentVolumeSource.java | 20 +- .../api/model/FlexVolumeSource.java | 20 +- .../kubernetes/api/model/LabelSelector.java | 6 +- .../kubernetes/api/model/LimitRangeItem.java | 14 +- .../kubernetes/api/model/NodeStatus.java | 20 +- .../kubernetes/api/model/ObjectMeta.java | 14 +- .../model/PersistentVolumeClaimStatus.java | 26 +-- .../api/model/PersistentVolumeSpec.java | 44 ++--- .../fabric8/kubernetes/api/model/PodSpec.java | 74 ++++---- .../api/model/ReplicationControllerSpec.java | 6 +- .../api/model/ResourceQuotaSpec.java | 14 +- .../api/model/ResourceQuotaStatus.java | 6 +- .../api/model/ResourceRequirements.java | 6 +- .../fabric8/kubernetes/api/model/Secret.java | 26 +-- .../kubernetes/api/model/ServiceSpec.java | 92 ++++----- .../api/model/VolumeResourceRequirements.java | 6 +- .../main/resources/schema/kube-schema.json | 72 +++---- .../resources/schema/validation-schema.json | 144 +++++++------- .../api/model/discovery/v1/Endpoint.java | 32 ++-- .../api/model/discovery/v1beta1/Endpoint.java | 26 +-- .../main/resources/schema/kube-schema.json | 8 +- .../resources/schema/validation-schema.json | 20 +- .../main/resources/schema/kube-schema.json | 4 +- .../resources/schema/validation-schema.json | 14 +- .../model/extensions/DeploymentRollback.java | 26 +-- .../main/resources/schema/kube-schema.json | 24 +-- .../resources/schema/validation-schema.json | 48 ++--- .../main/resources/schema/kube-schema.json | 4 +- .../resources/schema/validation-schema.json | 84 ++++----- .../gatewayapi/v1/GatewayInfrastructure.java | 6 +- .../model/gatewayapi/v1/GatewayTLSConfig.java | 14 +- .../main/resources/schema/kube-schema.json | 12 +- .../resources/schema/validation-schema.json | 52 +++--- .../kustomize/v1beta1/GeneratorOptions.java | 6 +- .../model/kustomize/v1beta1/HelmChart.java | 68 +++---- .../kustomize/v1beta1/HelmChartArgs.java | 80 ++++---- .../kustomize/v1beta1/Kustomization.java | 98 +++++----- .../api/model/kustomize/v1beta1/Label.java | 6 +- .../model/kustomize/v1beta1/ObjectMeta.java | 20 +- .../api/model/kustomize/v1beta1/Patch.java | 20 +- .../main/resources/schema/kube-schema.json | 22 +-- .../resources/schema/validation-schema.json | 44 ++--- .../metrics/v1beta1/ContainerMetrics.java | 14 +- .../model/metrics/v1beta1/NodeMetrics.java | 8 +- .../main/resources/schema/kube-schema.json | 8 +- .../resources/schema/validation-schema.json | 16 +- .../main/resources/schema/kube-schema.json | 6 +- .../resources/schema/validation-schema.json | 59 +++--- .../api/model/node/v1/Overhead.java | 6 +- .../api/model/node/v1/Scheduling.java | 6 +- .../api/model/node/v1alpha1/Overhead.java | 6 +- .../api/model/node/v1alpha1/Scheduling.java | 6 +- .../api/model/node/v1beta1/Overhead.java | 6 +- .../api/model/node/v1beta1/Scheduling.java | 6 +- .../main/resources/schema/kube-schema.json | 16 +- .../resources/schema/validation-schema.json | 34 ++-- .../policy/v1/PodDisruptionBudgetStatus.java | 6 +- .../v1beta1/PodDisruptionBudgetStatus.java | 6 +- .../main/resources/schema/kube-schema.json | 10 +- .../resources/schema/validation-schema.json | 24 +-- .../main/resources/schema/kube-schema.json | 6 +- .../resources/schema/validation-schema.json | 12 +- .../main/resources/schema/kube-schema.json | 4 +- .../resources/schema/validation-schema.json | 8 +- .../main/resources/schema/kube-schema.json | 4 +- .../resources/schema/validation-schema.json | 8 +- .../api/model/storage/StorageClass.java | 44 ++--- .../model/storage/VolumeAttachmentStatus.java | 6 +- .../v1alpha1/VolumeAttributesClass.java | 26 +-- .../main/resources/schema/kube-schema.json | 18 +- .../resources/schema/validation-schema.json | 56 +++--- .../main/resources/schema/kube-schema.json | 4 +- .../resources/schema/validation-schema.json | 8 +- .../api/model/config/v1/BuildOverrides.java | 6 +- .../api/model/config/v1/DNSZone.java | 14 +- .../config/v1/OpenIDIdentityProvider.java | 26 +-- .../main/resources/schema/kube-schema.json | 16 +- .../resources/schema/validation-schema.json | 32 ++-- .../main/resources/schema/kube-schema.json | 6 +- .../resources/schema/validation-schema.json | 12 +- .../api/model/hive/aws/v1/AwsPlatform.java | 14 +- .../hive/metricsconfig/v1/MetricsConfig.java | 6 +- .../api/model/hive/v1/ClusterPoolSpec.java | 14 +- .../api/model/hive/v1/MachinePoolSpec.java | 14 +- .../main/resources/schema/kube-schema.json | 34 ++-- .../resources/schema/validation-schema.json | 95 +++++----- .../installer/alibabacloud/v1/Platform.java | 38 ++-- .../api/model/installer/aws/v1/Platform.java | 38 ++-- .../model/installer/azure/v1/Platform.java | 74 ++++---- .../installer/openstack/v1/Platform.java | 104 +++++------ .../main/resources/schema/kube-schema.json | 12 +- .../resources/schema/validation-schema.json | 88 ++++----- ...trolPlaneMachineSetTemplateObjectMeta.java | 6 +- .../model/machine/v1alpha1/NetworkParam.java | 32 ++-- .../v1alpha1/OpenstackProviderSpec.java | 86 ++++----- .../api/model/machine/v1alpha1/PortOpts.java | 68 +++---- .../api/model/machine/v1beta1/ObjectMeta.java | 26 +-- .../main/resources/schema/kube-schema.json | 20 +- .../resources/schema/validation-schema.json | 43 +++-- .../v1/ControllerConfigSpec.java | 92 ++++----- .../main/resources/schema/kube-schema.json | 10 +- .../resources/schema/validation-schema.json | 20 +- .../operator/v1/ImageRegistrySpec.java | 8 +- .../main/resources/schema/kube-schema.json | 12 +- .../resources/schema/validation-schema.json | 24 +-- .../model/monitoring/v1/AlertmanagerSpec.java | 140 +++++++------- .../monitoring/v1/EmbeddedObjectMetadata.java | 14 +- .../api/model/monitoring/v1/Endpoint.java | 50 ++--- .../api/model/monitoring/v1/OAuth2.java | 20 +- .../monitoring/v1/PodMetricsEndpoint.java | 44 ++--- .../v1/ProbeTargetStaticConfig.java | 14 +- .../model/monitoring/v1/PrometheusSpec.java | 176 +++++++++--------- .../v1/PrometheusTracingConfig.java | 32 ++-- .../model/monitoring/v1/RemoteReadSpec.java | 44 ++--- .../model/monitoring/v1/RemoteWriteSpec.java | 44 ++--- .../api/model/monitoring/v1/Rule.java | 32 ++-- .../model/monitoring/v1/ThanosRulerSpec.java | 128 ++++++------- .../model/monitoring/v1alpha1/SNSConfig.java | 44 ++--- .../main/resources/schema/kube-schema.json | 64 +++---- .../resources/schema/validation-schema.json | 128 ++++++------- .../model/operator/v1/DNSNodePlacement.java | 6 +- .../model/operator/v1/ImagePrunerSpec.java | 20 +- .../api/model/operator/v1/ProxyConfig.java | 20 +- .../main/resources/schema/kube-schema.json | 18 +- .../resources/schema/validation-schema.json | 36 ++-- .../lifecyclemanager/v1/CSVDescription.java | 50 ++--- .../v1alpha1/ClusterServiceVersionSpec.java | 56 +++--- .../operatorhub/v1alpha1/GrpcPodConfig.java | 20 +- .../v1alpha1/StrategyDeploymentSpec.java | 14 +- .../v1alpha1/SubscriptionConfig.java | 6 +- .../main/resources/schema/kube-schema.json | 34 ++-- .../resources/schema/validation-schema.json | 68 +++---- .../main/resources/schema/kube-schema.json | 4 +- .../resources/schema/validation-schema.json | 8 +- .../api/model/tuned/v1/TunedRecommend.java | 14 +- .../main/resources/schema/kube-schema.json | 6 +- .../resources/schema/validation-schema.json | 12 +- .../whereabouts/v1alpha1/IPPoolSpec.java | 14 +- .../main/resources/schema/kube-schema.json | 6 +- .../resources/schema/validation-schema.json | 12 +- .../openshift/api/model/BuildConfigSpec.java | 20 +- .../openshift/api/model/BuildSpec.java | 14 +- .../model/ClusterResourceQuotaSelector.java | 6 +- .../api/model/DeploymentConfigRollback.java | 26 +-- .../api/model/DeploymentConfigSpec.java | 6 +- .../api/model/DeploymentStrategy.java | 14 +- .../fabric8/openshift/api/model/Identity.java | 32 ++-- .../openshift/api/model/ImageSignature.java | 8 +- .../openshift/api/model/TagReference.java | 14 +- .../fabric8/openshift/api/model/Template.java | 26 +-- .../api/model/TemplateInstanceRequester.java | 26 +-- .../main/resources/schema/kube-schema.json | 60 +++--- .../resources/schema/validation-schema.json | 120 ++++++------ .../pkg/schemagen/generate.go | 14 +- 183 files changed, 3011 insertions(+), 3054 deletions(-) diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admission/v1/AdmissionResponse.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admission/v1/AdmissionResponse.java index cb9a5dae1b2..700520607eb 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admission/v1/AdmissionResponse.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admission/v1/AdmissionResponse.java @@ -71,18 +71,18 @@ public class AdmissionResponse implements Editable , K @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map auditAnnotations = new LinkedHashMap(); @JsonProperty("patch") - private java.lang.String patch; + private String patch; @JsonProperty("patchType") - private java.lang.String patchType; + private String patchType; @JsonProperty("status") private Status status; @JsonProperty("uid") - private java.lang.String uid; + private String uid; @JsonProperty("warnings") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List warnings = new ArrayList(); + private List warnings = new ArrayList(); @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -91,7 +91,7 @@ public class AdmissionResponse implements Editable , K public AdmissionResponse() { } - public AdmissionResponse(Boolean allowed, Map auditAnnotations, java.lang.String patch, java.lang.String patchType, Status status, java.lang.String uid, List warnings) { + public AdmissionResponse(Boolean allowed, Map auditAnnotations, String patch, String patchType, Status status, String uid, List warnings) { super(); this.allowed = allowed; this.auditAnnotations = auditAnnotations; @@ -123,22 +123,22 @@ public void setAuditAnnotations(Map auditAnnotations) { } @JsonProperty("patch") - public java.lang.String getPatch() { + public String getPatch() { return patch; } @JsonProperty("patch") - public void setPatch(java.lang.String patch) { + public void setPatch(String patch) { this.patch = patch; } @JsonProperty("patchType") - public java.lang.String getPatchType() { + public String getPatchType() { return patchType; } @JsonProperty("patchType") - public void setPatchType(java.lang.String patchType) { + public void setPatchType(String patchType) { this.patchType = patchType; } @@ -153,23 +153,23 @@ public void setStatus(Status status) { } @JsonProperty("uid") - public java.lang.String getUid() { + public String getUid() { return uid; } @JsonProperty("uid") - public void setUid(java.lang.String uid) { + public void setUid(String uid) { this.uid = uid; } @JsonProperty("warnings") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getWarnings() { + public List getWarnings() { return warnings; } @JsonProperty("warnings") - public void setWarnings(List warnings) { + public void setWarnings(List warnings) { this.warnings = warnings; } @@ -184,12 +184,12 @@ public AdmissionResponseBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admission/v1beta1/AdmissionResponse.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admission/v1beta1/AdmissionResponse.java index e82f87a6ed7..7ec08c0302f 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admission/v1beta1/AdmissionResponse.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admission/v1beta1/AdmissionResponse.java @@ -71,18 +71,18 @@ public class AdmissionResponse implements Editable , K @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map auditAnnotations = new LinkedHashMap(); @JsonProperty("patch") - private java.lang.String patch; + private String patch; @JsonProperty("patchType") - private java.lang.String patchType; + private String patchType; @JsonProperty("status") private Status status; @JsonProperty("uid") - private java.lang.String uid; + private String uid; @JsonProperty("warnings") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List warnings = new ArrayList(); + private List warnings = new ArrayList(); @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -91,7 +91,7 @@ public class AdmissionResponse implements Editable , K public AdmissionResponse() { } - public AdmissionResponse(Boolean allowed, Map auditAnnotations, java.lang.String patch, java.lang.String patchType, Status status, java.lang.String uid, List warnings) { + public AdmissionResponse(Boolean allowed, Map auditAnnotations, String patch, String patchType, Status status, String uid, List warnings) { super(); this.allowed = allowed; this.auditAnnotations = auditAnnotations; @@ -123,22 +123,22 @@ public void setAuditAnnotations(Map auditAnnotations) { } @JsonProperty("patch") - public java.lang.String getPatch() { + public String getPatch() { return patch; } @JsonProperty("patch") - public void setPatch(java.lang.String patch) { + public void setPatch(String patch) { this.patch = patch; } @JsonProperty("patchType") - public java.lang.String getPatchType() { + public String getPatchType() { return patchType; } @JsonProperty("patchType") - public void setPatchType(java.lang.String patchType) { + public void setPatchType(String patchType) { this.patchType = patchType; } @@ -153,23 +153,23 @@ public void setStatus(Status status) { } @JsonProperty("uid") - public java.lang.String getUid() { + public String getUid() { return uid; } @JsonProperty("uid") - public void setUid(java.lang.String uid) { + public void setUid(String uid) { this.uid = uid; } @JsonProperty("warnings") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getWarnings() { + public List getWarnings() { return warnings; } @JsonProperty("warnings") - public void setWarnings(List warnings) { + public void setWarnings(List warnings) { this.warnings = warnings; } @@ -184,12 +184,12 @@ public AdmissionResponseBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/UserInfo.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/UserInfo.java index 6ba009555ab..a6fc5cb0b6a 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/UserInfo.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/UserInfo.java @@ -66,13 +66,13 @@ public class UserInfo implements Editable , KubernetesResource private Map> extra = new LinkedHashMap>(); @JsonProperty("groups") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List groups = new ArrayList(); + private List groups = new ArrayList(); @JsonProperty("uid") - private java.lang.String uid; + private String uid; @JsonProperty("username") - private java.lang.String username; + private String username; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -81,7 +81,7 @@ public class UserInfo implements Editable , KubernetesResource public UserInfo() { } - public UserInfo(Map> extra, List groups, java.lang.String uid, java.lang.String username) { + public UserInfo(Map> extra, List groups, String uid, String username) { super(); this.extra = extra; this.groups = groups; @@ -101,32 +101,32 @@ public void setExtra(Map> extra) { @JsonProperty("groups") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGroups() { + public List getGroups() { return groups; } @JsonProperty("groups") - public void setGroups(List groups) { + public void setGroups(List groups) { this.groups = groups; } @JsonProperty("uid") - public java.lang.String getUid() { + public String getUid() { return uid; } @JsonProperty("uid") - public void setUid(java.lang.String uid) { + public void setUid(String uid) { this.uid = uid; } @JsonProperty("username") - public java.lang.String getUsername() { + public String getUsername() { return username; } @JsonProperty("username") - public void setUsername(java.lang.String username) { + public void setUsername(String username) { this.username = username; } @@ -141,12 +141,12 @@ public UserInfoBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/SubjectAccessReviewSpec.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/SubjectAccessReviewSpec.java index 27046af9b7c..bda9dbbabf6 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/SubjectAccessReviewSpec.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/SubjectAccessReviewSpec.java @@ -68,17 +68,17 @@ public class SubjectAccessReviewSpec implements Editable> extra = new LinkedHashMap>(); @JsonProperty("groups") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List groups = new ArrayList(); + private List groups = new ArrayList(); @JsonProperty("nonResourceAttributes") private NonResourceAttributes nonResourceAttributes; @JsonProperty("resourceAttributes") private ResourceAttributes resourceAttributes; @JsonProperty("uid") - private java.lang.String uid; + private String uid; @JsonProperty("user") - private java.lang.String user; + private String user; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -87,7 +87,7 @@ public class SubjectAccessReviewSpec implements Editable> extra, List groups, NonResourceAttributes nonResourceAttributes, ResourceAttributes resourceAttributes, java.lang.String uid, java.lang.String user) { + public SubjectAccessReviewSpec(Map> extra, List groups, NonResourceAttributes nonResourceAttributes, ResourceAttributes resourceAttributes, String uid, String user) { super(); this.extra = extra; this.groups = groups; @@ -109,12 +109,12 @@ public void setExtra(Map> extra) { @JsonProperty("groups") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGroups() { + public List getGroups() { return groups; } @JsonProperty("groups") - public void setGroups(List groups) { + public void setGroups(List groups) { this.groups = groups; } @@ -139,22 +139,22 @@ public void setResourceAttributes(ResourceAttributes resourceAttributes) { } @JsonProperty("uid") - public java.lang.String getUid() { + public String getUid() { return uid; } @JsonProperty("uid") - public void setUid(java.lang.String uid) { + public void setUid(String uid) { this.uid = uid; } @JsonProperty("user") - public java.lang.String getUser() { + public String getUser() { return user; } @JsonProperty("user") - public void setUser(java.lang.String user) { + public void setUser(String user) { this.user = user; } @@ -169,12 +169,12 @@ public SubjectAccessReviewSpecBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SubjectAccessReviewSpec.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SubjectAccessReviewSpec.java index 632828d47c4..39c1307206b 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SubjectAccessReviewSpec.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SubjectAccessReviewSpec.java @@ -68,17 +68,17 @@ public class SubjectAccessReviewSpec implements Editable> extra = new LinkedHashMap>(); @JsonProperty("group") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List group = new ArrayList(); + private List group = new ArrayList(); @JsonProperty("nonResourceAttributes") private NonResourceAttributes nonResourceAttributes; @JsonProperty("resourceAttributes") private ResourceAttributes resourceAttributes; @JsonProperty("uid") - private java.lang.String uid; + private String uid; @JsonProperty("user") - private java.lang.String user; + private String user; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -87,7 +87,7 @@ public class SubjectAccessReviewSpec implements Editable> extra, List group, NonResourceAttributes nonResourceAttributes, ResourceAttributes resourceAttributes, java.lang.String uid, java.lang.String user) { + public SubjectAccessReviewSpec(Map> extra, List group, NonResourceAttributes nonResourceAttributes, ResourceAttributes resourceAttributes, String uid, String user) { super(); this.extra = extra; this.group = group; @@ -109,12 +109,12 @@ public void setExtra(Map> extra) { @JsonProperty("group") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGroup() { + public List getGroup() { return group; } @JsonProperty("group") - public void setGroup(List group) { + public void setGroup(List group) { this.group = group; } @@ -139,22 +139,22 @@ public void setResourceAttributes(ResourceAttributes resourceAttributes) { } @JsonProperty("uid") - public java.lang.String getUid() { + public String getUid() { return uid; } @JsonProperty("uid") - public void setUid(java.lang.String uid) { + public void setUid(String uid) { this.uid = uid; } @JsonProperty("user") - public java.lang.String getUser() { + public String getUser() { return user; } @JsonProperty("user") - public void setUser(java.lang.String user) { + public void setUser(String user) { this.user = user; } @@ -169,12 +169,12 @@ public SubjectAccessReviewSpecBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/kube-schema.json index b3e91713ae2..284c02d75ae 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/kube-schema.json @@ -90,7 +90,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "patch": { "type": "string" @@ -221,7 +221,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "patch": { "type": "string" @@ -2594,7 +2594,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -2774,7 +2774,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -2807,7 +2807,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -3396,7 +3396,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", @@ -3780,7 +3780,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", @@ -4140,7 +4140,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" }, "group": { "type": "array", diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/validation-schema.json index e11fbc16234..b48bdae7379 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/main/resources/schema/validation-schema.json @@ -90,7 +90,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "patch": { "type": "string" @@ -221,7 +221,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "patch": { "type": "string" @@ -2594,7 +2594,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -2774,7 +2774,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -2807,7 +2807,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -3396,7 +3396,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", @@ -3780,7 +3780,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", @@ -4140,7 +4140,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" }, "group": { "type": "array", @@ -4556,7 +4556,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "patch": { "type": "string" @@ -4585,7 +4585,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admission.k8s.io/v1beta1", + "default": "admission.k8s.io/v1", "required": true }, "kind": { @@ -4594,12 +4594,12 @@ "required": true }, "request": { - "$ref": "#/definitions/kubernetes_admission_v1beta1_AdmissionRequest", - "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest" + "$ref": "#/definitions/kubernetes_admission_v1_AdmissionRequest", + "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest" }, "response": { - "$ref": "#/definitions/kubernetes_admission_v1beta1_AdmissionResponse", - "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse" + "$ref": "#/definitions/kubernetes_admission_v1_AdmissionResponse", + "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse" } }, "additionalProperties": true @@ -4898,7 +4898,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true @@ -5114,14 +5114,13 @@ "properties": { "admissionReviewVersions": { "type": "array", - "javaOmitEmpty": true, "items": { "type": "string" } }, "clientConfig": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_WebhookClientConfig", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.WebhookClientConfig" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_WebhookClientConfig", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.WebhookClientConfig" }, "failurePolicy": { "type": "string" @@ -5130,8 +5129,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchCondition" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MatchCondition" } }, "matchPolicy": { @@ -5172,7 +5171,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1beta1", + "default": "admissionregistration.k8s.io/v1", "required": true }, "kind": { @@ -5188,8 +5187,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MutatingWebhook", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhook" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_MutatingWebhook", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhook" } } }, @@ -5199,14 +5198,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1", + "default": "admissionregistration.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_MutatingWebhookConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MutatingWebhookConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration" } }, "kind": { @@ -5300,7 +5299,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -5333,7 +5332,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -5617,7 +5616,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1", + "default": "authorization.k8s.io/v1beta1", "required": true }, "kind": { @@ -5630,12 +5629,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_authorization_v1_SelfSubjectAccessReviewSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReviewSpec" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_SelfSubjectAccessReviewSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReviewSpec" }, "status": { - "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewStatus" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewStatus" } }, "additionalProperties": true @@ -5689,7 +5688,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1beta1", + "default": "authorization.k8s.io/v1", "required": true }, "kind": { @@ -5702,12 +5701,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SelfSubjectRulesReviewSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReviewSpec" + "$ref": "#/definitions/kubernetes_authorization_v1_SelfSubjectRulesReviewSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReviewSpec" }, "status": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectRulesReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectRulesReviewStatus" + "$ref": "#/definitions/kubernetes_authorization_v1_SubjectRulesReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectRulesReviewStatus" } }, "additionalProperties": true @@ -5829,7 +5828,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1", + "default": "authorization.k8s.io/v1beta1", "required": true }, "kind": { @@ -5842,12 +5841,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewSpec" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewSpec" }, "status": { - "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewStatus" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewStatus" } }, "additionalProperties": true @@ -5862,9 +5861,9 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" }, - "groups": { + "group": { "type": "array", "javaOmitEmpty": true, "items": { @@ -5872,12 +5871,12 @@ } }, "nonResourceAttributes": { - "$ref": "#/definitions/kubernetes_authorization_v1_NonResourceAttributes", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.NonResourceAttributes" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_NonResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.NonResourceAttributes" }, "resourceAttributes": { - "$ref": "#/definitions/kubernetes_authorization_v1_ResourceAttributes", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_ResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.ResourceAttributes" }, "uid": { "type": "string" @@ -6122,7 +6121,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", @@ -6144,7 +6143,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1alpha1", + "default": "admissionregistration.k8s.io/v1beta1", "required": true }, "kind": { @@ -6157,12 +6156,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicySpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicySpec" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicySpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicySpec" }, "status": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicyStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyStatus" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyStatus" } }, "additionalProperties": true @@ -6171,7 +6170,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1", + "default": "admissionregistration.k8s.io/v1beta1", "required": true }, "kind": { @@ -6184,8 +6183,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_ValidatingAdmissionPolicyBindingSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingAdmissionPolicyBindingSpec" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBindingSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingSpec" } }, "additionalProperties": true @@ -6220,12 +6219,12 @@ "validatingadmissionpolicybindingspec": { "properties": { "matchResources": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_MatchResources", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.MatchResources" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchResources", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchResources" }, "paramRef": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ParamRef", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ParamRef" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ParamRef", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ParamRef" }, "policyName": { "type": "string" @@ -6244,15 +6243,15 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1beta1", + "default": "admissionregistration.k8s.io/v1", "required": true }, "items": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicy", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_ValidatingAdmissionPolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingAdmissionPolicy" } }, "kind": { @@ -6273,8 +6272,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_AuditAnnotation", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.AuditAnnotation" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_AuditAnnotation", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.AuditAnnotation" } }, "failurePolicy": { @@ -6284,32 +6283,32 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchCondition" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MatchCondition" } }, "matchConstraints": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchResources", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchResources" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_MatchResources", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MatchResources" }, "paramKind": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ParamKind", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ParamKind" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_ParamKind", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ParamKind" }, "validations": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_Validation", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.Validation" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_Validation", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.Validation" } }, "variables": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_Variable", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.Variable" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_Variable", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.Variable" } } }, @@ -6330,8 +6329,8 @@ "existingJavaType": "Long" }, "typeChecking": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_TypeChecking", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.TypeChecking" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_TypeChecking", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.TypeChecking" } }, "additionalProperties": true @@ -6340,14 +6339,13 @@ "properties": { "admissionReviewVersions": { "type": "array", - "javaOmitEmpty": true, "items": { "type": "string" } }, "clientConfig": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_WebhookClientConfig", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.WebhookClientConfig" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_WebhookClientConfig", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.WebhookClientConfig" }, "failurePolicy": { "type": "string" @@ -6356,8 +6354,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchCondition" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MatchCondition" } }, "matchPolicy": { @@ -6422,14 +6420,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1", + "default": "admissionregistration.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_ValidatingWebhookConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingWebhookConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration" } }, "kind": { @@ -6478,8 +6476,8 @@ "type": "string" }, "service": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ServiceReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_ServiceReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference" }, "url": { "type": "string" diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/JSONSchemaProps.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/JSONSchemaProps.java index 5b05e8bfe31..13d3258a0d2 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/JSONSchemaProps.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/JSONSchemaProps.java @@ -101,9 +101,9 @@ public class JSONSchemaProps implements Editable , Kuber { @JsonProperty("$ref") - private java.lang.String $ref; + private String $ref; @JsonProperty("$schema") - private java.lang.String $schema; + private String $schema; @JsonProperty("additionalItems") private JSONSchemaPropsOrBool additionalItems; @JsonProperty("additionalProperties") @@ -123,7 +123,7 @@ public class JSONSchemaProps implements Editable , Kuber @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map dependencies = new LinkedHashMap(); @JsonProperty("description") - private java.lang.String description; + private String description; @JsonProperty("enum") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List _enum = new ArrayList(); @@ -136,9 +136,9 @@ public class JSONSchemaProps implements Editable , Kuber @JsonProperty("externalDocs") private ExternalDocumentation externalDocs; @JsonProperty("format") - private java.lang.String format; + private String format; @JsonProperty("id") - private java.lang.String id; + private String id; @JsonProperty("items") private JSONSchemaPropsOrArray items; @JsonProperty("maxItems") @@ -167,7 +167,7 @@ public class JSONSchemaProps implements Editable , Kuber @JsonInclude(JsonInclude.Include.NON_EMPTY) private List oneOf = new ArrayList(); @JsonProperty("pattern") - private java.lang.String pattern; + private String pattern; @JsonProperty("patternProperties") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map patternProperties = new LinkedHashMap(); @@ -176,11 +176,11 @@ public class JSONSchemaProps implements Editable , Kuber private Map properties = new LinkedHashMap(); @JsonProperty("required") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List required = new ArrayList(); + private List required = new ArrayList(); @JsonProperty("title") - private java.lang.String title; + private String title; @JsonProperty("type") - private java.lang.String type; + private String type; @JsonProperty("uniqueItems") private Boolean uniqueItems; @JsonProperty("x-kubernetes-embedded-resource") @@ -189,11 +189,11 @@ public class JSONSchemaProps implements Editable , Kuber private Boolean xKubernetesIntOrString; @JsonProperty("x-kubernetes-list-map-keys") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List xKubernetesListMapKeys = new ArrayList(); + private List xKubernetesListMapKeys = new ArrayList(); @JsonProperty("x-kubernetes-list-type") - private java.lang.String xKubernetesListType; + private String xKubernetesListType; @JsonProperty("x-kubernetes-map-type") - private java.lang.String xKubernetesMapType; + private String xKubernetesMapType; @JsonProperty("x-kubernetes-preserve-unknown-fields") private Boolean xKubernetesPreserveUnknownFields; @JsonProperty("x-kubernetes-validations") @@ -207,7 +207,7 @@ public class JSONSchemaProps implements Editable , Kuber public JSONSchemaProps() { } - public JSONSchemaProps(java.lang.String $ref, java.lang.String $schema, JSONSchemaPropsOrBool additionalItems, JSONSchemaPropsOrBool additionalProperties, List allOf, List anyOf, JsonNode _default, Map definitions, Map dependencies, java.lang.String description, List _enum, JsonNode example, Boolean exclusiveMaximum, Boolean exclusiveMinimum, ExternalDocumentation externalDocs, java.lang.String format, java.lang.String id, JSONSchemaPropsOrArray items, Long maxItems, Long maxLength, Long maxProperties, Double maximum, Long minItems, Long minLength, Long minProperties, Double minimum, Double multipleOf, JSONSchemaProps not, Boolean nullable, List oneOf, java.lang.String pattern, Map patternProperties, Map properties, List required, java.lang.String title, java.lang.String type, Boolean uniqueItems, Boolean xKubernetesEmbeddedResource, Boolean xKubernetesIntOrString, List xKubernetesListMapKeys, java.lang.String xKubernetesListType, java.lang.String xKubernetesMapType, Boolean xKubernetesPreserveUnknownFields, List xKubernetesValidations) { + public JSONSchemaProps(String $ref, String $schema, JSONSchemaPropsOrBool additionalItems, JSONSchemaPropsOrBool additionalProperties, List allOf, List anyOf, JsonNode _default, Map definitions, Map dependencies, String description, List _enum, JsonNode example, Boolean exclusiveMaximum, Boolean exclusiveMinimum, ExternalDocumentation externalDocs, String format, String id, JSONSchemaPropsOrArray items, Long maxItems, Long maxLength, Long maxProperties, Double maximum, Long minItems, Long minLength, Long minProperties, Double minimum, Double multipleOf, JSONSchemaProps not, Boolean nullable, List oneOf, String pattern, Map patternProperties, Map properties, List required, String title, String type, Boolean uniqueItems, Boolean xKubernetesEmbeddedResource, Boolean xKubernetesIntOrString, List xKubernetesListMapKeys, String xKubernetesListType, String xKubernetesMapType, Boolean xKubernetesPreserveUnknownFields, List xKubernetesValidations) { super(); this.$ref = $ref; this.$schema = $schema; @@ -256,22 +256,22 @@ public JSONSchemaProps(java.lang.String $ref, java.lang.String $schema, JSONSche } @JsonProperty("$ref") - public java.lang.String get$ref() { + public String get$ref() { return $ref; } @JsonProperty("$ref") - public void set$ref(java.lang.String $ref) { + public void set$ref(String $ref) { this.$ref = $ref; } @JsonProperty("$schema") - public java.lang.String get$schema() { + public String get$schema() { return $schema; } @JsonProperty("$schema") - public void set$schema(java.lang.String $schema) { + public void set$schema(String $schema) { this.$schema = $schema; } @@ -348,12 +348,12 @@ public void setDependencies(Map dependenci } @JsonProperty("description") - public java.lang.String getDescription() { + public String getDescription() { return description; } @JsonProperty("description") - public void setDescription(java.lang.String description) { + public void setDescription(String description) { this.description = description; } @@ -408,22 +408,22 @@ public void setExternalDocs(ExternalDocumentation externalDocs) { } @JsonProperty("format") - public java.lang.String getFormat() { + public String getFormat() { return format; } @JsonProperty("format") - public void setFormat(java.lang.String format) { + public void setFormat(String format) { this.format = format; } @JsonProperty("id") - public java.lang.String getId() { + public String getId() { return id; } @JsonProperty("id") - public void setId(java.lang.String id) { + public void setId(String id) { this.id = id; } @@ -559,12 +559,12 @@ public void setOneOf(List oneOf) { } @JsonProperty("pattern") - public java.lang.String getPattern() { + public String getPattern() { return pattern; } @JsonProperty("pattern") - public void setPattern(java.lang.String pattern) { + public void setPattern(String pattern) { this.pattern = pattern; } @@ -590,32 +590,32 @@ public void setProperties(Map getRequired() { + public List getRequired() { return required; } @JsonProperty("required") - public void setRequired(List required) { + public void setRequired(List required) { this.required = required; } @JsonProperty("title") - public java.lang.String getTitle() { + public String getTitle() { return title; } @JsonProperty("title") - public void setTitle(java.lang.String title) { + public void setTitle(String title) { this.title = title; } @JsonProperty("type") - public java.lang.String getType() { + public String getType() { return type; } @JsonProperty("type") - public void setType(java.lang.String type) { + public void setType(String type) { this.type = type; } @@ -650,32 +650,32 @@ public void setXKubernetesIntOrString(Boolean xKubernetesIntOrString) { } @JsonProperty("x-kubernetes-list-map-keys") - public List getXKubernetesListMapKeys() { + public List getXKubernetesListMapKeys() { return xKubernetesListMapKeys; } @JsonProperty("x-kubernetes-list-map-keys") - public void setXKubernetesListMapKeys(List xKubernetesListMapKeys) { + public void setXKubernetesListMapKeys(List xKubernetesListMapKeys) { this.xKubernetesListMapKeys = xKubernetesListMapKeys; } @JsonProperty("x-kubernetes-list-type") - public java.lang.String getXKubernetesListType() { + public String getXKubernetesListType() { return xKubernetesListType; } @JsonProperty("x-kubernetes-list-type") - public void setXKubernetesListType(java.lang.String xKubernetesListType) { + public void setXKubernetesListType(String xKubernetesListType) { this.xKubernetesListType = xKubernetesListType; } @JsonProperty("x-kubernetes-map-type") - public java.lang.String getXKubernetesMapType() { + public String getXKubernetesMapType() { return xKubernetesMapType; } @JsonProperty("x-kubernetes-map-type") - public void setXKubernetesMapType(java.lang.String xKubernetesMapType) { + public void setXKubernetesMapType(String xKubernetesMapType) { this.xKubernetesMapType = xKubernetesMapType; } diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/JSONSchemaProps.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/JSONSchemaProps.java index b3ae2fd672f..0e0418e8c92 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/JSONSchemaProps.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/JSONSchemaProps.java @@ -101,9 +101,9 @@ public class JSONSchemaProps implements Editable , Kuber { @JsonProperty("$ref") - private java.lang.String $ref; + private String $ref; @JsonProperty("$schema") - private java.lang.String $schema; + private String $schema; @JsonProperty("additionalItems") private JSONSchemaPropsOrBool additionalItems; @JsonProperty("additionalProperties") @@ -123,7 +123,7 @@ public class JSONSchemaProps implements Editable , Kuber @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map dependencies = new LinkedHashMap(); @JsonProperty("description") - private java.lang.String description; + private String description; @JsonProperty("enum") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List _enum = new ArrayList(); @@ -136,9 +136,9 @@ public class JSONSchemaProps implements Editable , Kuber @JsonProperty("externalDocs") private ExternalDocumentation externalDocs; @JsonProperty("format") - private java.lang.String format; + private String format; @JsonProperty("id") - private java.lang.String id; + private String id; @JsonProperty("items") private JSONSchemaPropsOrArray items; @JsonProperty("maxItems") @@ -167,7 +167,7 @@ public class JSONSchemaProps implements Editable , Kuber @JsonInclude(JsonInclude.Include.NON_EMPTY) private List oneOf = new ArrayList(); @JsonProperty("pattern") - private java.lang.String pattern; + private String pattern; @JsonProperty("patternProperties") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map patternProperties = new LinkedHashMap(); @@ -176,11 +176,11 @@ public class JSONSchemaProps implements Editable , Kuber private Map properties = new LinkedHashMap(); @JsonProperty("required") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List required = new ArrayList(); + private List required = new ArrayList(); @JsonProperty("title") - private java.lang.String title; + private String title; @JsonProperty("type") - private java.lang.String type; + private String type; @JsonProperty("uniqueItems") private Boolean uniqueItems; @JsonProperty("x-kubernetes-embedded-resource") @@ -189,11 +189,11 @@ public class JSONSchemaProps implements Editable , Kuber private Boolean xKubernetesIntOrString; @JsonProperty("x-kubernetes-list-map-keys") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List xKubernetesListMapKeys = new ArrayList(); + private List xKubernetesListMapKeys = new ArrayList(); @JsonProperty("x-kubernetes-list-type") - private java.lang.String xKubernetesListType; + private String xKubernetesListType; @JsonProperty("x-kubernetes-map-type") - private java.lang.String xKubernetesMapType; + private String xKubernetesMapType; @JsonProperty("x-kubernetes-preserve-unknown-fields") private Boolean xKubernetesPreserveUnknownFields; @JsonProperty("x-kubernetes-validations") @@ -207,7 +207,7 @@ public class JSONSchemaProps implements Editable , Kuber public JSONSchemaProps() { } - public JSONSchemaProps(java.lang.String $ref, java.lang.String $schema, JSONSchemaPropsOrBool additionalItems, JSONSchemaPropsOrBool additionalProperties, List allOf, List anyOf, JsonNode _default, Map definitions, Map dependencies, java.lang.String description, List _enum, JsonNode example, Boolean exclusiveMaximum, Boolean exclusiveMinimum, ExternalDocumentation externalDocs, java.lang.String format, java.lang.String id, JSONSchemaPropsOrArray items, Long maxItems, Long maxLength, Long maxProperties, Double maximum, Long minItems, Long minLength, Long minProperties, Double minimum, Double multipleOf, JSONSchemaProps not, Boolean nullable, List oneOf, java.lang.String pattern, Map patternProperties, Map properties, List required, java.lang.String title, java.lang.String type, Boolean uniqueItems, Boolean xKubernetesEmbeddedResource, Boolean xKubernetesIntOrString, List xKubernetesListMapKeys, java.lang.String xKubernetesListType, java.lang.String xKubernetesMapType, Boolean xKubernetesPreserveUnknownFields, List xKubernetesValidations) { + public JSONSchemaProps(String $ref, String $schema, JSONSchemaPropsOrBool additionalItems, JSONSchemaPropsOrBool additionalProperties, List allOf, List anyOf, JsonNode _default, Map definitions, Map dependencies, String description, List _enum, JsonNode example, Boolean exclusiveMaximum, Boolean exclusiveMinimum, ExternalDocumentation externalDocs, String format, String id, JSONSchemaPropsOrArray items, Long maxItems, Long maxLength, Long maxProperties, Double maximum, Long minItems, Long minLength, Long minProperties, Double minimum, Double multipleOf, JSONSchemaProps not, Boolean nullable, List oneOf, String pattern, Map patternProperties, Map properties, List required, String title, String type, Boolean uniqueItems, Boolean xKubernetesEmbeddedResource, Boolean xKubernetesIntOrString, List xKubernetesListMapKeys, String xKubernetesListType, String xKubernetesMapType, Boolean xKubernetesPreserveUnknownFields, List xKubernetesValidations) { super(); this.$ref = $ref; this.$schema = $schema; @@ -256,22 +256,22 @@ public JSONSchemaProps(java.lang.String $ref, java.lang.String $schema, JSONSche } @JsonProperty("$ref") - public java.lang.String get$ref() { + public String get$ref() { return $ref; } @JsonProperty("$ref") - public void set$ref(java.lang.String $ref) { + public void set$ref(String $ref) { this.$ref = $ref; } @JsonProperty("$schema") - public java.lang.String get$schema() { + public String get$schema() { return $schema; } @JsonProperty("$schema") - public void set$schema(java.lang.String $schema) { + public void set$schema(String $schema) { this.$schema = $schema; } @@ -348,12 +348,12 @@ public void setDependencies(Map dependenci } @JsonProperty("description") - public java.lang.String getDescription() { + public String getDescription() { return description; } @JsonProperty("description") - public void setDescription(java.lang.String description) { + public void setDescription(String description) { this.description = description; } @@ -408,22 +408,22 @@ public void setExternalDocs(ExternalDocumentation externalDocs) { } @JsonProperty("format") - public java.lang.String getFormat() { + public String getFormat() { return format; } @JsonProperty("format") - public void setFormat(java.lang.String format) { + public void setFormat(String format) { this.format = format; } @JsonProperty("id") - public java.lang.String getId() { + public String getId() { return id; } @JsonProperty("id") - public void setId(java.lang.String id) { + public void setId(String id) { this.id = id; } @@ -559,12 +559,12 @@ public void setOneOf(List oneOf) { } @JsonProperty("pattern") - public java.lang.String getPattern() { + public String getPattern() { return pattern; } @JsonProperty("pattern") - public void setPattern(java.lang.String pattern) { + public void setPattern(String pattern) { this.pattern = pattern; } @@ -590,32 +590,32 @@ public void setProperties(Map getRequired() { + public List getRequired() { return required; } @JsonProperty("required") - public void setRequired(List required) { + public void setRequired(List required) { this.required = required; } @JsonProperty("title") - public java.lang.String getTitle() { + public String getTitle() { return title; } @JsonProperty("title") - public void setTitle(java.lang.String title) { + public void setTitle(String title) { this.title = title; } @JsonProperty("type") - public java.lang.String getType() { + public String getType() { return type; } @JsonProperty("type") - public void setType(java.lang.String type) { + public void setType(String type) { this.type = type; } @@ -650,32 +650,32 @@ public void setXKubernetesIntOrString(Boolean xKubernetesIntOrString) { } @JsonProperty("x-kubernetes-list-map-keys") - public List getXKubernetesListMapKeys() { + public List getXKubernetesListMapKeys() { return xKubernetesListMapKeys; } @JsonProperty("x-kubernetes-list-map-keys") - public void setXKubernetesListMapKeys(List xKubernetesListMapKeys) { + public void setXKubernetesListMapKeys(List xKubernetesListMapKeys) { this.xKubernetesListMapKeys = xKubernetesListMapKeys; } @JsonProperty("x-kubernetes-list-type") - public java.lang.String getXKubernetesListType() { + public String getXKubernetesListType() { return xKubernetesListType; } @JsonProperty("x-kubernetes-list-type") - public void setXKubernetesListType(java.lang.String xKubernetesListType) { + public void setXKubernetesListType(String xKubernetesListType) { this.xKubernetesListType = xKubernetesListType; } @JsonProperty("x-kubernetes-map-type") - public java.lang.String getXKubernetesMapType() { + public String getXKubernetesMapType() { return xKubernetesMapType; } @JsonProperty("x-kubernetes-map-type") - public void setXKubernetesMapType(java.lang.String xKubernetesMapType) { + public void setXKubernetesMapType(String xKubernetesMapType) { this.xKubernetesMapType = xKubernetesMapType; } diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/kube-schema.json index 9552519c906..5a6138b0b68 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/kube-schema.json @@ -498,7 +498,7 @@ "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" }, "dependencies": { "type": "object", @@ -506,7 +506,7 @@ "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrStringArray", "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray\u003e" }, "description": { "type": "string" @@ -600,7 +600,7 @@ "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" }, "properties": { "type": "object", @@ -608,7 +608,7 @@ "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" }, "required": { "type": "array", @@ -1272,7 +1272,7 @@ "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" }, "dependencies": { "type": "object", @@ -1280,7 +1280,7 @@ "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrStringArray", "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray\u003e" }, "description": { "type": "string" @@ -1374,7 +1374,7 @@ "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" }, "properties": { "type": "object", @@ -1382,7 +1382,7 @@ "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" }, "required": { "type": "array", @@ -1922,7 +1922,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -1955,7 +1955,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json index 856d2122169..a22a0bdf311 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json @@ -498,7 +498,7 @@ "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" }, "dependencies": { "type": "object", @@ -506,7 +506,7 @@ "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrStringArray", "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray\u003e" }, "description": { "type": "string" @@ -600,7 +600,7 @@ "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" }, "properties": { "type": "object", @@ -608,7 +608,7 @@ "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" }, "required": { "type": "array", @@ -1272,7 +1272,7 @@ "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" }, "dependencies": { "type": "object", @@ -1280,7 +1280,7 @@ "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrStringArray", "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray\u003e" }, "description": { "type": "string" @@ -1374,7 +1374,7 @@ "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" }, "properties": { "type": "object", @@ -1382,7 +1382,7 @@ "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" }, "required": { "type": "array", @@ -1922,7 +1922,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -1955,7 +1955,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -2634,13 +2634,13 @@ }, "customresourcecolumndefinition": { "properties": { - "description": { + "JSONPath": { "type": "string" }, - "format": { + "description": { "type": "string" }, - "jsonPath": { + "format": { "type": "string" }, "name": { @@ -2781,24 +2781,16 @@ }, "customresourcedefinitionspec": { "properties": { - "additionalPrinterColumns": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceColumnDefinition", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceColumnDefinition" - } - }, "conversion": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceConversion", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceConversion" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceConversion", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceConversion" }, "group": { "type": "string" }, "names": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionNames", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionNames" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionNames", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionNames" }, "preserveUnknownFields": { "type": "boolean" @@ -2806,31 +2798,11 @@ "scope": { "type": "string" }, - "selectableFields": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_SelectableField", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.SelectableField" - } - }, - "subresources": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresources", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresources" - }, - "validation": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceValidation", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceValidation" - }, - "version": { - "type": "string" - }, "versions": { "type": "array", - "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionVersion", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionVersion" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionVersion", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionVersion" } } }, @@ -2864,8 +2836,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceColumnDefinition", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceColumnDefinition" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceColumnDefinition", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceColumnDefinition" } }, "deprecated": { @@ -2878,15 +2850,15 @@ "type": "string" }, "schema": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceValidation", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceValidation" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceValidation", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceValidation" }, "selectableFields": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_SelectableField", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.SelectableField" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_SelectableField", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.SelectableField" } }, "served": { @@ -2896,8 +2868,8 @@ "type": "boolean" }, "subresources": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceSubresources", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceSubresources" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresources", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresources" } }, "additionalProperties": true @@ -2905,12 +2877,12 @@ "customresourcesubresources": { "properties": { "scale": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceSubresourceScale", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceSubresourceScale" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresourceScale", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresourceScale" }, "status": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceSubresourceStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceSubresourceStatus" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresourceStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresourceStatus" } }, "additionalProperties": true @@ -3064,48 +3036,48 @@ "type": "string" }, "additionalItems": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrBool", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrBool" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrBool", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrBool" }, "additionalProperties": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrBool", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrBool" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrBool", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrBool" }, "allOf": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" } }, "anyOf": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" } }, "default": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSON", + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSON", "existingJavaType": "com.fasterxml.jackson.databind.JsonNode" }, "definitions": { "type": "object", "additionalProperties": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" }, "dependencies": { "type": "object", "additionalProperties": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrStringArray", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrStringArray", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray\u003e" }, "description": { "type": "string" @@ -3114,12 +3086,12 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSON", + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSON", "existingJavaType": "com.fasterxml.jackson.databind.JsonNode" } }, "example": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSON", + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSON", "existingJavaType": "com.fasterxml.jackson.databind.JsonNode" }, "exclusiveMaximum": { @@ -3129,8 +3101,8 @@ "type": "boolean" }, "externalDocs": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_ExternalDocumentation", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.ExternalDocumentation" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_ExternalDocumentation", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.ExternalDocumentation" }, "format": { "type": "string" @@ -3139,8 +3111,8 @@ "type": "string" }, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrArray", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrArray" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrArray", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrArray" }, "maxItems": { "type": "integer", @@ -3176,8 +3148,8 @@ "type": "number" }, "not": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" }, "nullable": { "type": "boolean" @@ -3186,8 +3158,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" } }, "pattern": { @@ -3196,18 +3168,18 @@ "patternProperties": { "type": "object", "additionalProperties": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" }, "properties": { "type": "object", "additionalProperties": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" }, "required": { "type": "array", @@ -3251,8 +3223,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_ValidationRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.ValidationRule" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_ValidationRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.ValidationRule" } } }, @@ -3263,13 +3235,13 @@ "JSONSchemas": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" } }, "Schema": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" } }, "additionalProperties": true @@ -3427,7 +3399,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -3460,7 +3432,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/kube-schema.json index e109257fa1f..c870a2b83b8 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/kube-schema.json @@ -252,7 +252,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -432,7 +432,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -465,7 +465,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -1931,7 +1931,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "volumeHandle": { "type": "string" @@ -1964,7 +1964,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -2261,14 +2261,14 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "data": { "type": "object", "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "immutable": { "type": "boolean" @@ -2718,7 +2718,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "containerID": { "type": "string" @@ -3410,7 +3410,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "readOnly": { "type": "boolean" @@ -3440,7 +3440,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "readOnly": { "type": "boolean" @@ -3863,7 +3863,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "defaultRequest": { "type": "object", @@ -3871,7 +3871,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "max": { "type": "object", @@ -3879,7 +3879,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "maxLimitRequestRatio": { "type": "object", @@ -3887,7 +3887,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "min": { "type": "object", @@ -3895,7 +3895,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "type": { "type": "string" @@ -4532,7 +4532,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "capacity": { "type": "object", @@ -4540,7 +4540,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "conditions": { "type": "array", @@ -4877,7 +4877,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "allocatedResources": { "type": "object", @@ -4885,7 +4885,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "capacity": { "type": "object", @@ -4893,7 +4893,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "conditions": { "type": "array", @@ -5112,7 +5112,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "cephfs": { "$ref": "#/definitions/kubernetes_core_CephFSPersistentVolumeSource", @@ -5731,7 +5731,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "os": { "$ref": "#/definitions/kubernetes_core_PodOS", @@ -5743,7 +5743,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "preemptionPolicy": { "type": "string" @@ -6369,7 +6369,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "template": { "$ref": "#/definitions/kubernetes_core_PodTemplateSpec", @@ -6523,7 +6523,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "scopeSelector": { "$ref": "#/definitions/kubernetes_core_ScopeSelector", @@ -6552,7 +6552,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "used": { "type": "object", @@ -6560,7 +6560,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" } }, "additionalProperties": true, @@ -6586,7 +6586,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "requests": { "type": "object", @@ -6594,7 +6594,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" } }, "additionalProperties": true, @@ -6777,7 +6777,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "immutable": { "type": "boolean" @@ -6796,7 +6796,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "type": { "type": "string" @@ -7262,7 +7262,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "sessionAffinity": { "type": "string" @@ -7801,7 +7801,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "requests": { "type": "object", @@ -7809,7 +7809,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" } }, "additionalProperties": true, diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/validation-schema.json index 3365006b343..0a0c980f583 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-apps/src/main/resources/schema/validation-schema.json @@ -252,7 +252,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -432,7 +432,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -465,7 +465,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -1931,7 +1931,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "volumeHandle": { "type": "string" @@ -1964,7 +1964,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -2261,14 +2261,14 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "data": { "type": "object", "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "immutable": { "type": "boolean" @@ -2718,7 +2718,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "containerID": { "type": "string" @@ -3410,7 +3410,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "readOnly": { "type": "boolean" @@ -3440,7 +3440,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "readOnly": { "type": "boolean" @@ -3863,7 +3863,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "defaultRequest": { "type": "object", @@ -3871,7 +3871,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "max": { "type": "object", @@ -3879,7 +3879,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "maxLimitRequestRatio": { "type": "object", @@ -3887,7 +3887,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "min": { "type": "object", @@ -3895,7 +3895,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "type": { "type": "string" @@ -4532,7 +4532,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "capacity": { "type": "object", @@ -4540,7 +4540,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "conditions": { "type": "array", @@ -4877,7 +4877,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "allocatedResources": { "type": "object", @@ -4885,7 +4885,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "capacity": { "type": "object", @@ -4893,7 +4893,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "conditions": { "type": "array", @@ -5112,7 +5112,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "cephfs": { "$ref": "#/definitions/kubernetes_core_CephFSPersistentVolumeSource", @@ -5731,7 +5731,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "os": { "$ref": "#/definitions/kubernetes_core_PodOS", @@ -5743,7 +5743,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "preemptionPolicy": { "type": "string" @@ -6369,7 +6369,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "template": { "$ref": "#/definitions/kubernetes_core_PodTemplateSpec", @@ -6523,7 +6523,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "scopeSelector": { "$ref": "#/definitions/kubernetes_core_ScopeSelector", @@ -6552,7 +6552,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "used": { "type": "object", @@ -6560,7 +6560,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" } }, "additionalProperties": true, @@ -6586,7 +6586,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "requests": { "type": "object", @@ -6594,7 +6594,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" } }, "additionalProperties": true, @@ -6777,7 +6777,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "immutable": { "type": "boolean" @@ -6796,7 +6796,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "type": { "type": "string" @@ -7262,7 +7262,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "sessionAffinity": { "type": "string" @@ -7801,7 +7801,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "requests": { "type": "object", @@ -7809,7 +7809,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" } }, "additionalProperties": true, @@ -8683,14 +8683,14 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "data": { "type": "object", "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "immutable": { "type": "boolean" @@ -9063,7 +9063,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "containerID": { "type": "string" @@ -9228,7 +9228,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "volumeHandle": { "type": "string" @@ -9256,7 +9256,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true @@ -10154,7 +10154,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "readOnly": { "type": "boolean" @@ -10179,7 +10179,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "readOnly": { "type": "boolean" @@ -10537,7 +10537,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true @@ -10625,7 +10625,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "defaultRequest": { "type": "object", @@ -10633,7 +10633,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "max": { "type": "object", @@ -10641,7 +10641,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "maxLimitRequestRatio": { "type": "object", @@ -10649,7 +10649,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "min": { "type": "object", @@ -10657,7 +10657,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "type": { "type": "string" @@ -11270,7 +11270,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "capacity": { "type": "object", @@ -11278,7 +11278,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "conditions": { "type": "array", @@ -11390,7 +11390,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -11423,7 +11423,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -11703,7 +11703,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "allocatedResources": { "type": "object", @@ -11711,7 +11711,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "capacity": { "type": "object", @@ -11719,7 +11719,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "conditions": { "type": "array", @@ -11912,7 +11912,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "cephfs": { "$ref": "#/definitions/kubernetes_core_CephFSPersistentVolumeSource", @@ -12439,7 +12439,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "os": { "$ref": "#/definitions/kubernetes_core_PodOS", @@ -12451,7 +12451,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "preemptionPolicy": { "type": "string" @@ -13132,7 +13132,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "template": { "$ref": "#/definitions/kubernetes_core_PodTemplateSpec", @@ -13254,7 +13254,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "scopeSelector": { "$ref": "#/definitions/kubernetes_core_ScopeSelector", @@ -13278,7 +13278,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "used": { "type": "object", @@ -13286,7 +13286,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" } }, "additionalProperties": true @@ -13307,7 +13307,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "requests": { "type": "object", @@ -13315,7 +13315,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" } }, "additionalProperties": true @@ -13495,7 +13495,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "immutable": { "type": "boolean" @@ -13514,7 +13514,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "type": { "type": "string" @@ -13932,7 +13932,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "sessionAffinity": { "type": "string" @@ -14694,7 +14694,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "requests": { "type": "object", @@ -14702,7 +14702,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/kube-schema.json index 039fd164bbf..8f02b96d28a 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/kube-schema.json @@ -209,7 +209,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -389,7 +389,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -422,7 +422,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/validation-schema.json index b36dbfcf67f..44f9405803d 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/validation-schema.json @@ -209,7 +209,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -389,7 +389,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -422,7 +422,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -2767,8 +2767,8 @@ "type": "string" }, "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricTarget", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricTarget" + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" } }, "additionalProperties": true @@ -2872,12 +2872,12 @@ "externalmetricsource": { "properties": { "metric": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricIdentifier", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricIdentifier" + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" }, "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricTarget", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricTarget" + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" } }, "additionalProperties": true @@ -2992,14 +2992,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "autoscaling/v2beta2", + "default": "autoscaling/v2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HorizontalPodAutoscaler", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler" + "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscaler", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler" } }, "kind": { @@ -3017,8 +3017,8 @@ "horizontalpodautoscalerspec": { "properties": { "behavior": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscalerBehavior", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerBehavior" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HorizontalPodAutoscalerBehavior", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerBehavior" }, "maxReplicas": { "type": "integer" @@ -3027,16 +3027,16 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricSpec" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricSpec" } }, "minReplicas": { "type": "integer" }, "scaleTargetRef": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_CrossVersionObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.CrossVersionObjectReference" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.CrossVersionObjectReference" } }, "additionalProperties": true @@ -3046,15 +3046,15 @@ "conditions": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_HorizontalPodAutoscalerCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerCondition" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HorizontalPodAutoscalerCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerCondition" } }, "currentMetrics": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_MetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.MetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricStatus" } }, "currentReplicas": { @@ -3154,7 +3154,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true @@ -3311,24 +3311,24 @@ "metricspec": { "properties": { "containerResource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ContainerResourceMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ContainerResourceMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ContainerResourceMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ContainerResourceMetricSource" }, "external": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ExternalMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ExternalMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ExternalMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ExternalMetricSource" }, "object": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ObjectMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ObjectMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ObjectMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ObjectMetricSource" }, "pods": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_PodsMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.PodsMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_PodsMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.PodsMetricSource" }, "resource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ResourceMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ResourceMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ResourceMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ResourceMetricSource" }, "type": { "type": "string" @@ -3406,7 +3406,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -3439,7 +3439,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -3479,17 +3479,24 @@ }, "objectmetricsource": { "properties": { - "describedObject": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_CrossVersionObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.CrossVersionObjectReference" + "averageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "metric": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricIdentifier", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricIdentifier" + "metricName": { + "type": "string" + }, + "selector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" }, "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricTarget", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricTarget" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.CrossVersionObjectReference" + }, + "targetValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" } }, "additionalProperties": true @@ -3570,29 +3577,29 @@ }, "podsmetricsource": { "properties": { - "metric": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" + "metricName": { + "type": "string" }, - "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" + "selector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "targetAverageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" } }, "additionalProperties": true }, "podsmetricstatus": { "properties": { - "currentAverageValue": { - "$ref": "#/definitions/kubernetes_resource_Quantity", - "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" - }, - "metricName": { - "type": "string" + "current": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" }, - "selector": { - "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", - "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + "metric": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" } }, "additionalProperties": true @@ -3624,9 +3631,12 @@ "name": { "type": "string" }, - "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricTarget", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricTarget" + "targetAverageUtilization": { + "type": "integer" + }, + "targetAverageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/kube-schema.json index f64b2bcee09..4323c12c773 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/kube-schema.json @@ -222,7 +222,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -402,7 +402,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -435,7 +435,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -1579,7 +1579,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -2447,7 +2447,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "readOnly": { "type": "boolean" @@ -3355,7 +3355,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "os": { "$ref": "#/definitions/kubernetes_core_PodOS", @@ -3367,7 +3367,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "preemptionPolicy": { "type": "string" @@ -3755,7 +3755,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "requests": { "type": "object", @@ -3763,7 +3763,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" } }, "additionalProperties": true, @@ -4406,7 +4406,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "requests": { "type": "object", @@ -4414,7 +4414,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" } }, "additionalProperties": true, diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/validation-schema.json index 9922fe0f942..72670889189 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-batch/src/main/resources/schema/validation-schema.json @@ -222,7 +222,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -402,7 +402,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -435,7 +435,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -1579,7 +1579,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -2447,7 +2447,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "readOnly": { "type": "boolean" @@ -3355,7 +3355,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "os": { "$ref": "#/definitions/kubernetes_core_PodOS", @@ -3367,7 +3367,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "preemptionPolicy": { "type": "string" @@ -3755,7 +3755,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "requests": { "type": "object", @@ -3763,7 +3763,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" } }, "additionalProperties": true, @@ -4406,7 +4406,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "requests": { "type": "object", @@ -4414,7 +4414,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" } }, "additionalProperties": true, @@ -5324,7 +5324,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true @@ -5788,7 +5788,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "readOnly": { "type": "boolean" @@ -6273,7 +6273,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true @@ -6557,7 +6557,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -6590,7 +6590,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -7138,7 +7138,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "os": { "$ref": "#/definitions/kubernetes_core_PodOS", @@ -7150,7 +7150,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "preemptionPolicy": { "type": "string" @@ -7499,7 +7499,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "requests": { "type": "object", @@ -7507,7 +7507,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" } }, "additionalProperties": true @@ -8228,7 +8228,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "requests": { "type": "object", @@ -8236,7 +8236,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1/CertificateSigningRequestSpec.java b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1/CertificateSigningRequestSpec.java index 6cfede99043..3d52bdd31d1 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1/CertificateSigningRequestSpec.java +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1/CertificateSigningRequestSpec.java @@ -72,20 +72,20 @@ public class CertificateSigningRequestSpec implements Editable> extra = new LinkedHashMap>(); @JsonProperty("groups") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List groups = new ArrayList(); + private List groups = new ArrayList(); @JsonProperty("request") - private java.lang.String request; + private String request; @JsonProperty("signerName") - private java.lang.String signerName; + private String signerName; @JsonProperty("uid") - private java.lang.String uid; + private String uid; @JsonProperty("usages") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List usages = new ArrayList(); + private List usages = new ArrayList(); @JsonProperty("username") - private java.lang.String username; + private String username; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -94,7 +94,7 @@ public class CertificateSigningRequestSpec implements Editable> extra, List groups, java.lang.String request, java.lang.String signerName, java.lang.String uid, List usages, java.lang.String username) { + public CertificateSigningRequestSpec(Integer expirationSeconds, Map> extra, List groups, String request, String signerName, String uid, List usages, String username) { super(); this.expirationSeconds = expirationSeconds; this.extra = extra; @@ -128,63 +128,63 @@ public void setExtra(Map> extra) { @JsonProperty("groups") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGroups() { + public List getGroups() { return groups; } @JsonProperty("groups") - public void setGroups(List groups) { + public void setGroups(List groups) { this.groups = groups; } @JsonProperty("request") - public java.lang.String getRequest() { + public String getRequest() { return request; } @JsonProperty("request") - public void setRequest(java.lang.String request) { + public void setRequest(String request) { this.request = request; } @JsonProperty("signerName") - public java.lang.String getSignerName() { + public String getSignerName() { return signerName; } @JsonProperty("signerName") - public void setSignerName(java.lang.String signerName) { + public void setSignerName(String signerName) { this.signerName = signerName; } @JsonProperty("uid") - public java.lang.String getUid() { + public String getUid() { return uid; } @JsonProperty("uid") - public void setUid(java.lang.String uid) { + public void setUid(String uid) { this.uid = uid; } @JsonProperty("usages") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getUsages() { + public List getUsages() { return usages; } @JsonProperty("usages") - public void setUsages(List usages) { + public void setUsages(List usages) { this.usages = usages; } @JsonProperty("username") - public java.lang.String getUsername() { + public String getUsername() { return username; } @JsonProperty("username") - public void setUsername(java.lang.String username) { + public void setUsername(String username) { this.username = username; } @@ -199,12 +199,12 @@ public CertificateSigningRequestSpecBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1beta1/CertificateSigningRequestSpec.java b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1beta1/CertificateSigningRequestSpec.java index 8132572a445..679a8f67425 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1beta1/CertificateSigningRequestSpec.java +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1beta1/CertificateSigningRequestSpec.java @@ -72,20 +72,20 @@ public class CertificateSigningRequestSpec implements Editable> extra = new LinkedHashMap>(); @JsonProperty("groups") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List groups = new ArrayList(); + private List groups = new ArrayList(); @JsonProperty("request") - private java.lang.String request; + private String request; @JsonProperty("signerName") - private java.lang.String signerName; + private String signerName; @JsonProperty("uid") - private java.lang.String uid; + private String uid; @JsonProperty("usages") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List usages = new ArrayList(); + private List usages = new ArrayList(); @JsonProperty("username") - private java.lang.String username; + private String username; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -94,7 +94,7 @@ public class CertificateSigningRequestSpec implements Editable> extra, List groups, java.lang.String request, java.lang.String signerName, java.lang.String uid, List usages, java.lang.String username) { + public CertificateSigningRequestSpec(Integer expirationSeconds, Map> extra, List groups, String request, String signerName, String uid, List usages, String username) { super(); this.expirationSeconds = expirationSeconds; this.extra = extra; @@ -128,63 +128,63 @@ public void setExtra(Map> extra) { @JsonProperty("groups") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getGroups() { + public List getGroups() { return groups; } @JsonProperty("groups") - public void setGroups(List groups) { + public void setGroups(List groups) { this.groups = groups; } @JsonProperty("request") - public java.lang.String getRequest() { + public String getRequest() { return request; } @JsonProperty("request") - public void setRequest(java.lang.String request) { + public void setRequest(String request) { this.request = request; } @JsonProperty("signerName") - public java.lang.String getSignerName() { + public String getSignerName() { return signerName; } @JsonProperty("signerName") - public void setSignerName(java.lang.String signerName) { + public void setSignerName(String signerName) { this.signerName = signerName; } @JsonProperty("uid") - public java.lang.String getUid() { + public String getUid() { return uid; } @JsonProperty("uid") - public void setUid(java.lang.String uid) { + public void setUid(String uid) { this.uid = uid; } @JsonProperty("usages") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getUsages() { + public List getUsages() { return usages; } @JsonProperty("usages") - public void setUsages(List usages) { + public void setUsages(List usages) { this.usages = usages; } @JsonProperty("username") - public java.lang.String getUsername() { + public String getUsername() { return username; } @JsonProperty("username") - public void setUsername(java.lang.String username) { + public void setUsername(String username) { this.username = username; } @@ -199,12 +199,12 @@ public CertificateSigningRequestSpecBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/kube-schema.json index f33b88f0f76..6d115d250b5 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/kube-schema.json @@ -354,7 +354,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -387,7 +387,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -856,7 +856,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", @@ -1096,7 +1096,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/validation-schema.json index 59756ea9748..0f382365a8a 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/main/resources/schema/validation-schema.json @@ -354,7 +354,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -387,7 +387,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -856,7 +856,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", @@ -1096,7 +1096,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", @@ -1337,7 +1337,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "certificates.k8s.io/v1beta1", + "default": "certificates.k8s.io/v1", "required": true }, "kind": { @@ -1350,12 +1350,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_certificates_v1beta1_CertificateSigningRequestSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestSpec" + "$ref": "#/definitions/kubernetes_certificates_v1_CertificateSigningRequestSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestSpec" }, "status": { - "$ref": "#/definitions/kubernetes_certificates_v1beta1_CertificateSigningRequestStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatus" + "$ref": "#/definitions/kubernetes_certificates_v1_CertificateSigningRequestStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestStatus" } }, "additionalProperties": true @@ -1424,7 +1424,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" }, "groups": { "type": "array", @@ -1785,7 +1785,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -1818,7 +1818,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", diff --git a/kubernetes-model-generator/kubernetes-model-coordination/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-coordination/src/main/resources/schema/kube-schema.json index 4d938459dcd..adfda5ceac8 100644 --- a/kubernetes-model-generator/kubernetes-model-coordination/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-coordination/src/main/resources/schema/kube-schema.json @@ -367,7 +367,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -400,7 +400,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", diff --git a/kubernetes-model-generator/kubernetes-model-coordination/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-coordination/src/main/resources/schema/validation-schema.json index a3d8a745f1e..2a23a2df598 100644 --- a/kubernetes-model-generator/kubernetes-model-coordination/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-coordination/src/main/resources/schema/validation-schema.json @@ -367,7 +367,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -400,7 +400,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -1323,7 +1323,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -1356,7 +1356,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/AuthInfo.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/AuthInfo.java index 5073d8b5601..7b4395607a0 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/AuthInfo.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/AuthInfo.java @@ -52,40 +52,40 @@ public class AuthInfo implements Editable , KubernetesResource { @JsonProperty("as") - private java.lang.String as; + private String as; @JsonProperty("as-groups") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List asGroups = new ArrayList(); + private List asGroups = new ArrayList(); @JsonProperty("as-uid") - private java.lang.String asUid; + private String asUid; @JsonProperty("as-user-extra") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map> asUserExtra = new LinkedHashMap>(); @JsonProperty("auth-provider") private AuthProviderConfig authProvider; @JsonProperty("client-certificate") - private java.lang.String clientCertificate; + private String clientCertificate; @JsonProperty("client-certificate-data") - private java.lang.String clientCertificateData; + private String clientCertificateData; @JsonProperty("client-key") - private java.lang.String clientKey; + private String clientKey; @JsonProperty("client-key-data") - private java.lang.String clientKeyData; + private String clientKeyData; @JsonProperty("exec") private ExecConfig exec; @JsonProperty("extensions") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List extensions = new ArrayList(); @JsonProperty("password") - private java.lang.String password; + private String password; @JsonProperty("token") - private java.lang.String token; + private String token; @JsonProperty("tokenFile") - private java.lang.String tokenFile; + private String tokenFile; @JsonProperty("username") - private java.lang.String username; + private String username; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -94,7 +94,7 @@ public class AuthInfo implements Editable , KubernetesResource public AuthInfo() { } - public AuthInfo(java.lang.String as, List asGroups, java.lang.String asUid, Map> asUserExtra, AuthProviderConfig authProvider, java.lang.String clientCertificate, java.lang.String clientCertificateData, java.lang.String clientKey, java.lang.String clientKeyData, ExecConfig exec, List extensions, java.lang.String password, java.lang.String token, java.lang.String tokenFile, java.lang.String username) { + public AuthInfo(String as, List asGroups, String asUid, Map> asUserExtra, AuthProviderConfig authProvider, String clientCertificate, String clientCertificateData, String clientKey, String clientKeyData, ExecConfig exec, List extensions, String password, String token, String tokenFile, String username) { super(); this.as = as; this.asGroups = asGroups; @@ -114,32 +114,32 @@ public AuthInfo(java.lang.String as, List asGroups, java.lang. } @JsonProperty("as") - public java.lang.String getAs() { + public String getAs() { return as; } @JsonProperty("as") - public void setAs(java.lang.String as) { + public void setAs(String as) { this.as = as; } @JsonProperty("as-groups") - public List getAsGroups() { + public List getAsGroups() { return asGroups; } @JsonProperty("as-groups") - public void setAsGroups(List asGroups) { + public void setAsGroups(List asGroups) { this.asGroups = asGroups; } @JsonProperty("as-uid") - public java.lang.String getAsUid() { + public String getAsUid() { return asUid; } @JsonProperty("as-uid") - public void setAsUid(java.lang.String asUid) { + public void setAsUid(String asUid) { this.asUid = asUid; } @@ -164,42 +164,42 @@ public void setAuthProvider(AuthProviderConfig authProvider) { } @JsonProperty("client-certificate") - public java.lang.String getClientCertificate() { + public String getClientCertificate() { return clientCertificate; } @JsonProperty("client-certificate") - public void setClientCertificate(java.lang.String clientCertificate) { + public void setClientCertificate(String clientCertificate) { this.clientCertificate = clientCertificate; } @JsonProperty("client-certificate-data") - public java.lang.String getClientCertificateData() { + public String getClientCertificateData() { return clientCertificateData; } @JsonProperty("client-certificate-data") - public void setClientCertificateData(java.lang.String clientCertificateData) { + public void setClientCertificateData(String clientCertificateData) { this.clientCertificateData = clientCertificateData; } @JsonProperty("client-key") - public java.lang.String getClientKey() { + public String getClientKey() { return clientKey; } @JsonProperty("client-key") - public void setClientKey(java.lang.String clientKey) { + public void setClientKey(String clientKey) { this.clientKey = clientKey; } @JsonProperty("client-key-data") - public java.lang.String getClientKeyData() { + public String getClientKeyData() { return clientKeyData; } @JsonProperty("client-key-data") - public void setClientKeyData(java.lang.String clientKeyData) { + public void setClientKeyData(String clientKeyData) { this.clientKeyData = clientKeyData; } @@ -225,42 +225,42 @@ public void setExtensions(List extensions) { } @JsonProperty("password") - public java.lang.String getPassword() { + public String getPassword() { return password; } @JsonProperty("password") - public void setPassword(java.lang.String password) { + public void setPassword(String password) { this.password = password; } @JsonProperty("token") - public java.lang.String getToken() { + public String getToken() { return token; } @JsonProperty("token") - public void setToken(java.lang.String token) { + public void setToken(String token) { this.token = token; } @JsonProperty("tokenFile") - public java.lang.String getTokenFile() { + public String getTokenFile() { return tokenFile; } @JsonProperty("tokenFile") - public void setTokenFile(java.lang.String tokenFile) { + public void setTokenFile(String tokenFile) { this.tokenFile = tokenFile; } @JsonProperty("username") - public java.lang.String getUsername() { + public String getUsername() { return username; } @JsonProperty("username") - public void setUsername(java.lang.String username) { + public void setUsername(String username) { this.username = username; } @@ -275,12 +275,12 @@ public AuthInfoBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/AuthProviderConfig.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/AuthProviderConfig.java index 95cf26c9ec5..f80128eeb9a 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/AuthProviderConfig.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/AuthProviderConfig.java @@ -40,9 +40,9 @@ public class AuthProviderConfig implements Editable , @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map config = new LinkedHashMap(); @JsonProperty("name") - private java.lang.String name; + private String name; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -51,7 +51,7 @@ public class AuthProviderConfig implements Editable , public AuthProviderConfig() { } - public AuthProviderConfig(Map config, java.lang.String name) { + public AuthProviderConfig(Map config, String name) { super(); this.config = config; this.name = name; @@ -68,12 +68,12 @@ public void setConfig(Map config) { } @JsonProperty("name") - public java.lang.String getName() { + public String getName() { return name; } @JsonProperty("name") - public void setName(java.lang.String name) { + public void setName(String name) { this.name = name; } @@ -88,12 +88,12 @@ public AuthProviderConfigBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/CSIPersistentVolumeSource.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/CSIPersistentVolumeSource.java index c0587b3c2c1..011d5237972 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/CSIPersistentVolumeSource.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/CSIPersistentVolumeSource.java @@ -49,9 +49,9 @@ public class CSIPersistentVolumeSource implements Editable volumeAttributes = new LinkedHashMap(); @JsonProperty("volumeHandle") - private java.lang.String volumeHandle; + private String volumeHandle; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -75,7 +75,7 @@ public class CSIPersistentVolumeSource implements Editable volumeAttributes, java.lang.String volumeHandle) { + public CSIPersistentVolumeSource(SecretReference controllerExpandSecretRef, SecretReference controllerPublishSecretRef, String driver, String fsType, SecretReference nodeExpandSecretRef, SecretReference nodePublishSecretRef, SecretReference nodeStageSecretRef, Boolean readOnly, Map volumeAttributes, String volumeHandle) { super(); this.controllerExpandSecretRef = controllerExpandSecretRef; this.controllerPublishSecretRef = controllerPublishSecretRef; @@ -110,22 +110,22 @@ public void setControllerPublishSecretRef(SecretReference controllerPublishSecre } @JsonProperty("driver") - public java.lang.String getDriver() { + public String getDriver() { return driver; } @JsonProperty("driver") - public void setDriver(java.lang.String driver) { + public void setDriver(String driver) { this.driver = driver; } @JsonProperty("fsType") - public java.lang.String getFsType() { + public String getFsType() { return fsType; } @JsonProperty("fsType") - public void setFsType(java.lang.String fsType) { + public void setFsType(String fsType) { this.fsType = fsType; } @@ -180,12 +180,12 @@ public void setVolumeAttributes(Map volumeAttributes) { } @JsonProperty("volumeHandle") - public java.lang.String getVolumeHandle() { + public String getVolumeHandle() { return volumeHandle; } @JsonProperty("volumeHandle") - public void setVolumeHandle(java.lang.String volumeHandle) { + public void setVolumeHandle(String volumeHandle) { this.volumeHandle = volumeHandle; } @@ -200,12 +200,12 @@ public CSIPersistentVolumeSourceBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/CSIVolumeSource.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/CSIVolumeSource.java index 42fe763d5a5..bd0c9ead9fc 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/CSIVolumeSource.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/CSIVolumeSource.java @@ -40,9 +40,9 @@ public class CSIVolumeSource implements Editable , Kuber { @JsonProperty("driver") - private java.lang.String driver; + private String driver; @JsonProperty("fsType") - private java.lang.String fsType; + private String fsType; @JsonProperty("nodePublishSecretRef") private LocalObjectReference nodePublishSecretRef; @JsonProperty("readOnly") @@ -51,7 +51,7 @@ public class CSIVolumeSource implements Editable , Kuber @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map volumeAttributes = new LinkedHashMap(); @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -60,7 +60,7 @@ public class CSIVolumeSource implements Editable , Kuber public CSIVolumeSource() { } - public CSIVolumeSource(java.lang.String driver, java.lang.String fsType, LocalObjectReference nodePublishSecretRef, Boolean readOnly, Map volumeAttributes) { + public CSIVolumeSource(String driver, String fsType, LocalObjectReference nodePublishSecretRef, Boolean readOnly, Map volumeAttributes) { super(); this.driver = driver; this.fsType = fsType; @@ -70,22 +70,22 @@ public CSIVolumeSource(java.lang.String driver, java.lang.String fsType, LocalOb } @JsonProperty("driver") - public java.lang.String getDriver() { + public String getDriver() { return driver; } @JsonProperty("driver") - public void setDriver(java.lang.String driver) { + public void setDriver(String driver) { this.driver = driver; } @JsonProperty("fsType") - public java.lang.String getFsType() { + public String getFsType() { return fsType; } @JsonProperty("fsType") - public void setFsType(java.lang.String fsType) { + public void setFsType(String fsType) { this.fsType = fsType; } @@ -130,12 +130,12 @@ public CSIVolumeSourceBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ConfigMap.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ConfigMap.java index fd5ef41d7c0..70eb34494a2 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ConfigMap.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ConfigMap.java @@ -55,7 +55,7 @@ public class ConfigMap implements Editable , HasMetadata, Name * */ @JsonProperty("apiVersion") - private java.lang.String apiVersion = "v1"; + private String apiVersion = "v1"; @JsonProperty("binaryData") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map binaryData = new LinkedHashMap(); @@ -70,11 +70,11 @@ public class ConfigMap implements Editable , HasMetadata, Name * */ @JsonProperty("kind") - private java.lang.String kind = "ConfigMap"; + private String kind = "ConfigMap"; @JsonProperty("metadata") private ObjectMeta metadata; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -83,7 +83,7 @@ public class ConfigMap implements Editable , HasMetadata, Name public ConfigMap() { } - public ConfigMap(java.lang.String apiVersion, Map binaryData, Map data, Boolean immutable, java.lang.String kind, ObjectMeta metadata) { + public ConfigMap(String apiVersion, Map binaryData, Map data, Boolean immutable, String kind, ObjectMeta metadata) { super(); this.apiVersion = apiVersion; this.binaryData = binaryData; @@ -99,7 +99,7 @@ public ConfigMap(java.lang.String apiVersion, Map binaryData, Ma * */ @JsonProperty("apiVersion") - public java.lang.String getApiVersion() { + public String getApiVersion() { return apiVersion; } @@ -109,7 +109,7 @@ public java.lang.String getApiVersion() { * */ @JsonProperty("apiVersion") - public void setApiVersion(java.lang.String apiVersion) { + public void setApiVersion(String apiVersion) { this.apiVersion = apiVersion; } @@ -149,7 +149,7 @@ public void setImmutable(Boolean immutable) { * */ @JsonProperty("kind") - public java.lang.String getKind() { + public String getKind() { return kind; } @@ -159,7 +159,7 @@ public java.lang.String getKind() { * */ @JsonProperty("kind") - public void setKind(java.lang.String kind) { + public void setKind(String kind) { this.kind = kind; } @@ -184,12 +184,12 @@ public ConfigMapBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ContainerStatus.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ContainerStatus.java index eedf5829463..11e32a650fd 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ContainerStatus.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ContainerStatus.java @@ -52,15 +52,15 @@ public class ContainerStatus implements Editable , Kuber @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map allocatedResources = new LinkedHashMap(); @JsonProperty("containerID") - private java.lang.String containerID; + private String containerID; @JsonProperty("image") - private java.lang.String image; + private String image; @JsonProperty("imageID") - private java.lang.String imageID; + private String imageID; @JsonProperty("lastState") private ContainerState lastState; @JsonProperty("name") - private java.lang.String name; + private String name; @JsonProperty("ready") private Boolean ready; @JsonProperty("resources") @@ -75,7 +75,7 @@ public class ContainerStatus implements Editable , Kuber @JsonInclude(JsonInclude.Include.NON_EMPTY) private List volumeMounts = new ArrayList(); @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -84,7 +84,7 @@ public class ContainerStatus implements Editable , Kuber public ContainerStatus() { } - public ContainerStatus(Map allocatedResources, java.lang.String containerID, java.lang.String image, java.lang.String imageID, ContainerState lastState, java.lang.String name, Boolean ready, ResourceRequirements resources, Integer restartCount, Boolean started, ContainerState state, List volumeMounts) { + public ContainerStatus(Map allocatedResources, String containerID, String image, String imageID, ContainerState lastState, String name, Boolean ready, ResourceRequirements resources, Integer restartCount, Boolean started, ContainerState state, List volumeMounts) { super(); this.allocatedResources = allocatedResources; this.containerID = containerID; @@ -111,32 +111,32 @@ public void setAllocatedResources(Map allocatedResources) { } @JsonProperty("containerID") - public java.lang.String getContainerID() { + public String getContainerID() { return containerID; } @JsonProperty("containerID") - public void setContainerID(java.lang.String containerID) { + public void setContainerID(String containerID) { this.containerID = containerID; } @JsonProperty("image") - public java.lang.String getImage() { + public String getImage() { return image; } @JsonProperty("image") - public void setImage(java.lang.String image) { + public void setImage(String image) { this.image = image; } @JsonProperty("imageID") - public java.lang.String getImageID() { + public String getImageID() { return imageID; } @JsonProperty("imageID") - public void setImageID(java.lang.String imageID) { + public void setImageID(String imageID) { this.imageID = imageID; } @@ -151,12 +151,12 @@ public void setLastState(ContainerState lastState) { } @JsonProperty("name") - public java.lang.String getName() { + public String getName() { return name; } @JsonProperty("name") - public void setName(java.lang.String name) { + public void setName(String name) { this.name = name; } @@ -232,12 +232,12 @@ public ContainerStatusBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/FlexPersistentVolumeSource.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/FlexPersistentVolumeSource.java index cd0e966e5de..90246e3cf55 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/FlexPersistentVolumeSource.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/FlexPersistentVolumeSource.java @@ -40,9 +40,9 @@ public class FlexPersistentVolumeSource implements Editable options = new LinkedHashMap(); @@ -51,7 +51,7 @@ public class FlexPersistentVolumeSource implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -60,7 +60,7 @@ public class FlexPersistentVolumeSource implements Editable options, Boolean readOnly, SecretReference secretRef) { + public FlexPersistentVolumeSource(String driver, String fsType, Map options, Boolean readOnly, SecretReference secretRef) { super(); this.driver = driver; this.fsType = fsType; @@ -70,22 +70,22 @@ public FlexPersistentVolumeSource(java.lang.String driver, java.lang.String fsTy } @JsonProperty("driver") - public java.lang.String getDriver() { + public String getDriver() { return driver; } @JsonProperty("driver") - public void setDriver(java.lang.String driver) { + public void setDriver(String driver) { this.driver = driver; } @JsonProperty("fsType") - public java.lang.String getFsType() { + public String getFsType() { return fsType; } @JsonProperty("fsType") - public void setFsType(java.lang.String fsType) { + public void setFsType(String fsType) { this.fsType = fsType; } @@ -130,12 +130,12 @@ public FlexPersistentVolumeSourceBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/FlexVolumeSource.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/FlexVolumeSource.java index 0cf14d10389..f7e631dfd59 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/FlexVolumeSource.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/FlexVolumeSource.java @@ -40,9 +40,9 @@ public class FlexVolumeSource implements Editable , Kub { @JsonProperty("driver") - private java.lang.String driver; + private String driver; @JsonProperty("fsType") - private java.lang.String fsType; + private String fsType; @JsonProperty("options") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map options = new LinkedHashMap(); @@ -51,7 +51,7 @@ public class FlexVolumeSource implements Editable , Kub @JsonProperty("secretRef") private LocalObjectReference secretRef; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -60,7 +60,7 @@ public class FlexVolumeSource implements Editable , Kub public FlexVolumeSource() { } - public FlexVolumeSource(java.lang.String driver, java.lang.String fsType, Map options, Boolean readOnly, LocalObjectReference secretRef) { + public FlexVolumeSource(String driver, String fsType, Map options, Boolean readOnly, LocalObjectReference secretRef) { super(); this.driver = driver; this.fsType = fsType; @@ -70,22 +70,22 @@ public FlexVolumeSource(java.lang.String driver, java.lang.String fsType, Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/LabelSelector.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/LabelSelector.java index d6ae3feac5f..1cccb90b22a 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/LabelSelector.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/LabelSelector.java @@ -45,7 +45,7 @@ public class LabelSelector implements Editable , Kubernete @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map matchLabels = new LinkedHashMap(); @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -92,12 +92,12 @@ public LabelSelectorBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/LimitRangeItem.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/LimitRangeItem.java index 2f867528ce3..2a05d2fd03f 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/LimitRangeItem.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/LimitRangeItem.java @@ -56,9 +56,9 @@ public class LimitRangeItem implements Editable , Kuberne @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map min = new LinkedHashMap(); @JsonProperty("type") - private java.lang.String type; + private String type; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -67,7 +67,7 @@ public class LimitRangeItem implements Editable , Kuberne public LimitRangeItem() { } - public LimitRangeItem(Map _default, Map defaultRequest, Map max, Map maxLimitRequestRatio, Map min, java.lang.String type) { + public LimitRangeItem(Map _default, Map defaultRequest, Map max, Map maxLimitRequestRatio, Map min, String type) { super(); this._default = _default; this.defaultRequest = defaultRequest; @@ -128,12 +128,12 @@ public void setMin(Map min) { } @JsonProperty("type") - public java.lang.String getType() { + public String getType() { return type; } @JsonProperty("type") - public void setType(java.lang.String type) { + public void setType(String type) { this.type = type; } @@ -148,12 +148,12 @@ public LimitRangeItemBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/NodeStatus.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/NodeStatus.java index 32e26e6e1f8..3f82c7733be 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/NodeStatus.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/NodeStatus.java @@ -70,7 +70,7 @@ public class NodeStatus implements Editable , KubernetesResou @JsonProperty("nodeInfo") private NodeSystemInfo nodeInfo; @JsonProperty("phase") - private java.lang.String phase; + private String phase; @JsonProperty("runtimeHandlers") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List runtimeHandlers = new ArrayList(); @@ -79,9 +79,9 @@ public class NodeStatus implements Editable , KubernetesResou private List volumesAttached = new ArrayList(); @JsonProperty("volumesInUse") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List volumesInUse = new ArrayList(); + private List volumesInUse = new ArrayList(); @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -90,7 +90,7 @@ public class NodeStatus implements Editable , KubernetesResou public NodeStatus() { } - public NodeStatus(List addresses, Map allocatable, Map capacity, List conditions, NodeConfigStatus config, NodeDaemonEndpoints daemonEndpoints, List images, NodeSystemInfo nodeInfo, java.lang.String phase, List runtimeHandlers, List volumesAttached, List volumesInUse) { + public NodeStatus(List addresses, Map allocatable, Map capacity, List conditions, NodeConfigStatus config, NodeDaemonEndpoints daemonEndpoints, List images, NodeSystemInfo nodeInfo, String phase, List runtimeHandlers, List volumesAttached, List volumesInUse) { super(); this.addresses = addresses; this.allocatable = allocatable; @@ -190,12 +190,12 @@ public void setNodeInfo(NodeSystemInfo nodeInfo) { } @JsonProperty("phase") - public java.lang.String getPhase() { + public String getPhase() { return phase; } @JsonProperty("phase") - public void setPhase(java.lang.String phase) { + public void setPhase(String phase) { this.phase = phase; } @@ -223,12 +223,12 @@ public void setVolumesAttached(List volumesAttached) { @JsonProperty("volumesInUse") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getVolumesInUse() { + public List getVolumesInUse() { return volumesInUse; } @JsonProperty("volumesInUse") - public void setVolumesInUse(List volumesInUse) { + public void setVolumesInUse(List volumesInUse) { this.volumesInUse = volumesInUse; } @@ -243,12 +243,12 @@ public NodeStatusBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ObjectMeta.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ObjectMeta.java index 2d8ee7edacb..1c2eef73d95 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ObjectMeta.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ObjectMeta.java @@ -53,7 +53,7 @@ public class ObjectMeta implements Editable , KubernetesResou @JsonProperty("annotations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map annotations = new LinkedHashMap(); + private Map annotations = new LinkedHashMap(); @JsonProperty("creationTimestamp") private String creationTimestamp; @JsonProperty("deletionGracePeriodSeconds") @@ -69,7 +69,7 @@ public class ObjectMeta implements Editable , KubernetesResou private Long generation; @JsonProperty("labels") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map labels = new LinkedHashMap(); + private Map labels = new LinkedHashMap(); @JsonProperty("managedFields") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List managedFields = new ArrayList(); @@ -96,7 +96,7 @@ public class ObjectMeta implements Editable , KubernetesResou public ObjectMeta() { } - public ObjectMeta(Map annotations, String creationTimestamp, Long deletionGracePeriodSeconds, String deletionTimestamp, List finalizers, java.lang.String generateName, Long generation, Map labels, List managedFields, java.lang.String name, java.lang.String namespace, List ownerReferences, java.lang.String resourceVersion, java.lang.String selfLink, java.lang.String uid) { + public ObjectMeta(Map annotations, String creationTimestamp, Long deletionGracePeriodSeconds, String deletionTimestamp, List finalizers, java.lang.String generateName, Long generation, Map labels, List managedFields, java.lang.String name, java.lang.String namespace, List ownerReferences, java.lang.String resourceVersion, java.lang.String selfLink, java.lang.String uid) { super(); this.annotations = annotations; this.creationTimestamp = creationTimestamp; @@ -116,12 +116,12 @@ public ObjectMeta(Map annotations, String creationTimestamp, Lon } @JsonProperty("annotations") - public Map getAnnotations() { + public Map getAnnotations() { return annotations; } @JsonProperty("annotations") - public void setAnnotations(Map annotations) { + public void setAnnotations(Map annotations) { this.annotations = annotations; } @@ -187,12 +187,12 @@ public void setGeneration(Long generation) { } @JsonProperty("labels") - public Map getLabels() { + public Map getLabels() { return labels; } @JsonProperty("labels") - public void setLabels(Map labels) { + public void setLabels(Map labels) { this.labels = labels; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaimStatus.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaimStatus.java index 059be41aea6..2a8c4c84df1 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaimStatus.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaimStatus.java @@ -46,7 +46,7 @@ public class PersistentVolumeClaimStatus implements Editable accessModes = new ArrayList(); + private List accessModes = new ArrayList(); @JsonProperty("allocatedResourceStatuses") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map allocatedResourceStatuses = new LinkedHashMap(); @@ -60,13 +60,13 @@ public class PersistentVolumeClaimStatus implements Editable conditions = new ArrayList(); @JsonProperty("currentVolumeAttributesClassName") - private java.lang.String currentVolumeAttributesClassName; + private String currentVolumeAttributesClassName; @JsonProperty("modifyVolumeStatus") private ModifyVolumeStatus modifyVolumeStatus; @JsonProperty("phase") - private java.lang.String phase; + private String phase; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -75,7 +75,7 @@ public class PersistentVolumeClaimStatus implements Editable accessModes, Map allocatedResourceStatuses, Map allocatedResources, Map capacity, List conditions, java.lang.String currentVolumeAttributesClassName, ModifyVolumeStatus modifyVolumeStatus, java.lang.String phase) { + public PersistentVolumeClaimStatus(List accessModes, Map allocatedResourceStatuses, Map allocatedResources, Map capacity, List conditions, String currentVolumeAttributesClassName, ModifyVolumeStatus modifyVolumeStatus, String phase) { super(); this.accessModes = accessModes; this.allocatedResourceStatuses = allocatedResourceStatuses; @@ -89,12 +89,12 @@ public PersistentVolumeClaimStatus(List accessModes, Map getAccessModes() { + public List getAccessModes() { return accessModes; } @JsonProperty("accessModes") - public void setAccessModes(List accessModes) { + public void setAccessModes(List accessModes) { this.accessModes = accessModes; } @@ -140,12 +140,12 @@ public void setConditions(List conditions) { } @JsonProperty("currentVolumeAttributesClassName") - public java.lang.String getCurrentVolumeAttributesClassName() { + public String getCurrentVolumeAttributesClassName() { return currentVolumeAttributesClassName; } @JsonProperty("currentVolumeAttributesClassName") - public void setCurrentVolumeAttributesClassName(java.lang.String currentVolumeAttributesClassName) { + public void setCurrentVolumeAttributesClassName(String currentVolumeAttributesClassName) { this.currentVolumeAttributesClassName = currentVolumeAttributesClassName; } @@ -160,12 +160,12 @@ public void setModifyVolumeStatus(ModifyVolumeStatus modifyVolumeStatus) { } @JsonProperty("phase") - public java.lang.String getPhase() { + public String getPhase() { return phase; } @JsonProperty("phase") - public void setPhase(java.lang.String phase) { + public void setPhase(String phase) { this.phase = phase; } @@ -180,12 +180,12 @@ public PersistentVolumeClaimStatusBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeSpec.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeSpec.java index 30a4e1ec51e..f26205145f5 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeSpec.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeSpec.java @@ -69,7 +69,7 @@ public class PersistentVolumeSpec implements Editable accessModes = new ArrayList(); + private List accessModes = new ArrayList(); @JsonProperty("awsElasticBlockStore") private AWSElasticBlockStoreVolumeSource awsElasticBlockStore; @JsonProperty("azureDisk") @@ -105,13 +105,13 @@ public class PersistentVolumeSpec implements Editable mountOptions = new ArrayList(); + private List mountOptions = new ArrayList(); @JsonProperty("nfs") private NFSVolumeSource nfs; @JsonProperty("nodeAffinity") private VolumeNodeAffinity nodeAffinity; @JsonProperty("persistentVolumeReclaimPolicy") - private java.lang.String persistentVolumeReclaimPolicy; + private String persistentVolumeReclaimPolicy; @JsonProperty("photonPersistentDisk") private PhotonPersistentDiskVolumeSource photonPersistentDisk; @JsonProperty("portworxVolume") @@ -123,17 +123,17 @@ public class PersistentVolumeSpec implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -142,7 +142,7 @@ public class PersistentVolumeSpec implements Editable accessModes, AWSElasticBlockStoreVolumeSource awsElasticBlockStore, AzureDiskVolumeSource azureDisk, AzureFilePersistentVolumeSource azureFile, Map capacity, CephFSPersistentVolumeSource cephfs, CinderPersistentVolumeSource cinder, ObjectReference claimRef, CSIPersistentVolumeSource csi, FCVolumeSource fc, FlexPersistentVolumeSource flexVolume, FlockerVolumeSource flocker, GCEPersistentDiskVolumeSource gcePersistentDisk, GlusterfsPersistentVolumeSource glusterfs, HostPathVolumeSource hostPath, ISCSIPersistentVolumeSource iscsi, LocalVolumeSource local, List mountOptions, NFSVolumeSource nfs, VolumeNodeAffinity nodeAffinity, java.lang.String persistentVolumeReclaimPolicy, PhotonPersistentDiskVolumeSource photonPersistentDisk, PortworxVolumeSource portworxVolume, QuobyteVolumeSource quobyte, RBDPersistentVolumeSource rbd, ScaleIOPersistentVolumeSource scaleIO, java.lang.String storageClassName, StorageOSPersistentVolumeSource storageos, java.lang.String volumeAttributesClassName, java.lang.String volumeMode, VsphereVirtualDiskVolumeSource vsphereVolume) { + public PersistentVolumeSpec(List accessModes, AWSElasticBlockStoreVolumeSource awsElasticBlockStore, AzureDiskVolumeSource azureDisk, AzureFilePersistentVolumeSource azureFile, Map capacity, CephFSPersistentVolumeSource cephfs, CinderPersistentVolumeSource cinder, ObjectReference claimRef, CSIPersistentVolumeSource csi, FCVolumeSource fc, FlexPersistentVolumeSource flexVolume, FlockerVolumeSource flocker, GCEPersistentDiskVolumeSource gcePersistentDisk, GlusterfsPersistentVolumeSource glusterfs, HostPathVolumeSource hostPath, ISCSIPersistentVolumeSource iscsi, LocalVolumeSource local, List mountOptions, NFSVolumeSource nfs, VolumeNodeAffinity nodeAffinity, String persistentVolumeReclaimPolicy, PhotonPersistentDiskVolumeSource photonPersistentDisk, PortworxVolumeSource portworxVolume, QuobyteVolumeSource quobyte, RBDPersistentVolumeSource rbd, ScaleIOPersistentVolumeSource scaleIO, String storageClassName, StorageOSPersistentVolumeSource storageos, String volumeAttributesClassName, String volumeMode, VsphereVirtualDiskVolumeSource vsphereVolume) { super(); this.accessModes = accessModes; this.awsElasticBlockStore = awsElasticBlockStore; @@ -179,12 +179,12 @@ public PersistentVolumeSpec(List accessModes, AWSElasticBlockS @JsonProperty("accessModes") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getAccessModes() { + public List getAccessModes() { return accessModes; } @JsonProperty("accessModes") - public void setAccessModes(List accessModes) { + public void setAccessModes(List accessModes) { this.accessModes = accessModes; } @@ -350,12 +350,12 @@ public void setLocal(LocalVolumeSource local) { @JsonProperty("mountOptions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getMountOptions() { + public List getMountOptions() { return mountOptions; } @JsonProperty("mountOptions") - public void setMountOptions(List mountOptions) { + public void setMountOptions(List mountOptions) { this.mountOptions = mountOptions; } @@ -380,12 +380,12 @@ public void setNodeAffinity(VolumeNodeAffinity nodeAffinity) { } @JsonProperty("persistentVolumeReclaimPolicy") - public java.lang.String getPersistentVolumeReclaimPolicy() { + public String getPersistentVolumeReclaimPolicy() { return persistentVolumeReclaimPolicy; } @JsonProperty("persistentVolumeReclaimPolicy") - public void setPersistentVolumeReclaimPolicy(java.lang.String persistentVolumeReclaimPolicy) { + public void setPersistentVolumeReclaimPolicy(String persistentVolumeReclaimPolicy) { this.persistentVolumeReclaimPolicy = persistentVolumeReclaimPolicy; } @@ -440,12 +440,12 @@ public void setScaleIO(ScaleIOPersistentVolumeSource scaleIO) { } @JsonProperty("storageClassName") - public java.lang.String getStorageClassName() { + public String getStorageClassName() { return storageClassName; } @JsonProperty("storageClassName") - public void setStorageClassName(java.lang.String storageClassName) { + public void setStorageClassName(String storageClassName) { this.storageClassName = storageClassName; } @@ -460,22 +460,22 @@ public void setStorageos(StorageOSPersistentVolumeSource storageos) { } @JsonProperty("volumeAttributesClassName") - public java.lang.String getVolumeAttributesClassName() { + public String getVolumeAttributesClassName() { return volumeAttributesClassName; } @JsonProperty("volumeAttributesClassName") - public void setVolumeAttributesClassName(java.lang.String volumeAttributesClassName) { + public void setVolumeAttributesClassName(String volumeAttributesClassName) { this.volumeAttributesClassName = volumeAttributesClassName; } @JsonProperty("volumeMode") - public java.lang.String getVolumeMode() { + public String getVolumeMode() { return volumeMode; } @JsonProperty("volumeMode") - public void setVolumeMode(java.lang.String volumeMode) { + public void setVolumeMode(String volumeMode) { this.volumeMode = volumeMode; } @@ -500,12 +500,12 @@ public PersistentVolumeSpecBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodSpec.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodSpec.java index 8bc894e07f6..a2725df9839 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodSpec.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodSpec.java @@ -87,7 +87,7 @@ public class PodSpec implements Editable , KubernetesResource @JsonProperty("dnsConfig") private PodDNSConfig dnsConfig; @JsonProperty("dnsPolicy") - private java.lang.String dnsPolicy; + private String dnsPolicy; @JsonProperty("enableServiceLinks") private Boolean enableServiceLinks; @JsonProperty("ephemeralContainers") @@ -105,7 +105,7 @@ public class PodSpec implements Editable , KubernetesResource @JsonProperty("hostUsers") private Boolean hostUsers; @JsonProperty("hostname") - private java.lang.String hostname; + private String hostname; @JsonProperty("imagePullSecrets") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List imagePullSecrets = new ArrayList(); @@ -113,7 +113,7 @@ public class PodSpec implements Editable , KubernetesResource @JsonInclude(JsonInclude.Include.NON_EMPTY) private List initContainers = new ArrayList(); @JsonProperty("nodeName") - private java.lang.String nodeName; + private String nodeName; @JsonProperty("nodeSelector") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map nodeSelector = new LinkedHashMap(); @@ -123,11 +123,11 @@ public class PodSpec implements Editable , KubernetesResource @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map overhead = new LinkedHashMap(); @JsonProperty("preemptionPolicy") - private java.lang.String preemptionPolicy; + private String preemptionPolicy; @JsonProperty("priority") private Integer priority; @JsonProperty("priorityClassName") - private java.lang.String priorityClassName; + private String priorityClassName; @JsonProperty("readinessGates") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List readinessGates = new ArrayList(); @@ -135,26 +135,26 @@ public class PodSpec implements Editable , KubernetesResource @JsonInclude(JsonInclude.Include.NON_EMPTY) private List resourceClaims = new ArrayList(); @JsonProperty("restartPolicy") - private java.lang.String restartPolicy; + private String restartPolicy; @JsonProperty("runtimeClassName") - private java.lang.String runtimeClassName; + private String runtimeClassName; @JsonProperty("schedulerName") - private java.lang.String schedulerName; + private String schedulerName; @JsonProperty("schedulingGates") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List schedulingGates = new ArrayList(); @JsonProperty("securityContext") private PodSecurityContext securityContext; @JsonProperty("serviceAccount") - private java.lang.String serviceAccount; + private String serviceAccount; @JsonProperty("serviceAccountName") - private java.lang.String serviceAccountName; + private String serviceAccountName; @JsonProperty("setHostnameAsFQDN") private Boolean setHostnameAsFQDN; @JsonProperty("shareProcessNamespace") private Boolean shareProcessNamespace; @JsonProperty("subdomain") - private java.lang.String subdomain; + private String subdomain; @JsonProperty("terminationGracePeriodSeconds") private Long terminationGracePeriodSeconds; @JsonProperty("tolerations") @@ -167,7 +167,7 @@ public class PodSpec implements Editable , KubernetesResource @JsonInclude(JsonInclude.Include.NON_EMPTY) private List volumes = new ArrayList(); @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -176,7 +176,7 @@ public class PodSpec implements Editable , KubernetesResource public PodSpec() { } - public PodSpec(Long activeDeadlineSeconds, Affinity affinity, Boolean automountServiceAccountToken, List containers, PodDNSConfig dnsConfig, java.lang.String dnsPolicy, Boolean enableServiceLinks, List ephemeralContainers, List hostAliases, Boolean hostIPC, Boolean hostNetwork, Boolean hostPID, Boolean hostUsers, java.lang.String hostname, List imagePullSecrets, List initContainers, java.lang.String nodeName, Map nodeSelector, PodOS os, Map overhead, java.lang.String preemptionPolicy, Integer priority, java.lang.String priorityClassName, List readinessGates, List resourceClaims, java.lang.String restartPolicy, java.lang.String runtimeClassName, java.lang.String schedulerName, List schedulingGates, PodSecurityContext securityContext, java.lang.String serviceAccount, java.lang.String serviceAccountName, Boolean setHostnameAsFQDN, Boolean shareProcessNamespace, java.lang.String subdomain, Long terminationGracePeriodSeconds, List tolerations, List topologySpreadConstraints, List volumes) { + public PodSpec(Long activeDeadlineSeconds, Affinity affinity, Boolean automountServiceAccountToken, List containers, PodDNSConfig dnsConfig, String dnsPolicy, Boolean enableServiceLinks, List ephemeralContainers, List hostAliases, Boolean hostIPC, Boolean hostNetwork, Boolean hostPID, Boolean hostUsers, String hostname, List imagePullSecrets, List initContainers, String nodeName, Map nodeSelector, PodOS os, Map overhead, String preemptionPolicy, Integer priority, String priorityClassName, List readinessGates, List resourceClaims, String restartPolicy, String runtimeClassName, String schedulerName, List schedulingGates, PodSecurityContext securityContext, String serviceAccount, String serviceAccountName, Boolean setHostnameAsFQDN, Boolean shareProcessNamespace, String subdomain, Long terminationGracePeriodSeconds, List tolerations, List topologySpreadConstraints, List volumes) { super(); this.activeDeadlineSeconds = activeDeadlineSeconds; this.affinity = affinity; @@ -270,12 +270,12 @@ public void setDnsConfig(PodDNSConfig dnsConfig) { } @JsonProperty("dnsPolicy") - public java.lang.String getDnsPolicy() { + public String getDnsPolicy() { return dnsPolicy; } @JsonProperty("dnsPolicy") - public void setDnsPolicy(java.lang.String dnsPolicy) { + public void setDnsPolicy(String dnsPolicy) { this.dnsPolicy = dnsPolicy; } @@ -352,12 +352,12 @@ public void setHostUsers(Boolean hostUsers) { } @JsonProperty("hostname") - public java.lang.String getHostname() { + public String getHostname() { return hostname; } @JsonProperty("hostname") - public void setHostname(java.lang.String hostname) { + public void setHostname(String hostname) { this.hostname = hostname; } @@ -384,12 +384,12 @@ public void setInitContainers(List initContainers) { } @JsonProperty("nodeName") - public java.lang.String getNodeName() { + public String getNodeName() { return nodeName; } @JsonProperty("nodeName") - public void setNodeName(java.lang.String nodeName) { + public void setNodeName(String nodeName) { this.nodeName = nodeName; } @@ -424,12 +424,12 @@ public void setOverhead(Map overhead) { } @JsonProperty("preemptionPolicy") - public java.lang.String getPreemptionPolicy() { + public String getPreemptionPolicy() { return preemptionPolicy; } @JsonProperty("preemptionPolicy") - public void setPreemptionPolicy(java.lang.String preemptionPolicy) { + public void setPreemptionPolicy(String preemptionPolicy) { this.preemptionPolicy = preemptionPolicy; } @@ -444,12 +444,12 @@ public void setPriority(Integer priority) { } @JsonProperty("priorityClassName") - public java.lang.String getPriorityClassName() { + public String getPriorityClassName() { return priorityClassName; } @JsonProperty("priorityClassName") - public void setPriorityClassName(java.lang.String priorityClassName) { + public void setPriorityClassName(String priorityClassName) { this.priorityClassName = priorityClassName; } @@ -476,32 +476,32 @@ public void setResourceClaims(List resourceClaims) { } @JsonProperty("restartPolicy") - public java.lang.String getRestartPolicy() { + public String getRestartPolicy() { return restartPolicy; } @JsonProperty("restartPolicy") - public void setRestartPolicy(java.lang.String restartPolicy) { + public void setRestartPolicy(String restartPolicy) { this.restartPolicy = restartPolicy; } @JsonProperty("runtimeClassName") - public java.lang.String getRuntimeClassName() { + public String getRuntimeClassName() { return runtimeClassName; } @JsonProperty("runtimeClassName") - public void setRuntimeClassName(java.lang.String runtimeClassName) { + public void setRuntimeClassName(String runtimeClassName) { this.runtimeClassName = runtimeClassName; } @JsonProperty("schedulerName") - public java.lang.String getSchedulerName() { + public String getSchedulerName() { return schedulerName; } @JsonProperty("schedulerName") - public void setSchedulerName(java.lang.String schedulerName) { + public void setSchedulerName(String schedulerName) { this.schedulerName = schedulerName; } @@ -527,22 +527,22 @@ public void setSecurityContext(PodSecurityContext securityContext) { } @JsonProperty("serviceAccount") - public java.lang.String getServiceAccount() { + public String getServiceAccount() { return serviceAccount; } @JsonProperty("serviceAccount") - public void setServiceAccount(java.lang.String serviceAccount) { + public void setServiceAccount(String serviceAccount) { this.serviceAccount = serviceAccount; } @JsonProperty("serviceAccountName") - public java.lang.String getServiceAccountName() { + public String getServiceAccountName() { return serviceAccountName; } @JsonProperty("serviceAccountName") - public void setServiceAccountName(java.lang.String serviceAccountName) { + public void setServiceAccountName(String serviceAccountName) { this.serviceAccountName = serviceAccountName; } @@ -567,12 +567,12 @@ public void setShareProcessNamespace(Boolean shareProcessNamespace) { } @JsonProperty("subdomain") - public java.lang.String getSubdomain() { + public String getSubdomain() { return subdomain; } @JsonProperty("subdomain") - public void setSubdomain(java.lang.String subdomain) { + public void setSubdomain(String subdomain) { this.subdomain = subdomain; } @@ -630,12 +630,12 @@ public PodSpecBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ReplicationControllerSpec.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ReplicationControllerSpec.java index b5e15544989..edcc606d891 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ReplicationControllerSpec.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ReplicationControllerSpec.java @@ -48,7 +48,7 @@ public class ReplicationControllerSpec implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -116,12 +116,12 @@ public ReplicationControllerSpecBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ResourceQuotaSpec.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ResourceQuotaSpec.java index 47d1c1b84e7..434bc37b122 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ResourceQuotaSpec.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ResourceQuotaSpec.java @@ -46,9 +46,9 @@ public class ResourceQuotaSpec implements Editable , K private ScopeSelector scopeSelector; @JsonProperty("scopes") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List scopes = new ArrayList(); + private List scopes = new ArrayList(); @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -57,7 +57,7 @@ public class ResourceQuotaSpec implements Editable , K public ResourceQuotaSpec() { } - public ResourceQuotaSpec(Map hard, ScopeSelector scopeSelector, List scopes) { + public ResourceQuotaSpec(Map hard, ScopeSelector scopeSelector, List scopes) { super(); this.hard = hard; this.scopeSelector = scopeSelector; @@ -86,12 +86,12 @@ public void setScopeSelector(ScopeSelector scopeSelector) { @JsonProperty("scopes") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getScopes() { + public List getScopes() { return scopes; } @JsonProperty("scopes") - public void setScopes(List scopes) { + public void setScopes(List scopes) { this.scopes = scopes; } @@ -106,12 +106,12 @@ public ResourceQuotaSpecBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ResourceQuotaStatus.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ResourceQuotaStatus.java index 50e80c5fa86..dd9af350e8b 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ResourceQuotaStatus.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ResourceQuotaStatus.java @@ -43,7 +43,7 @@ public class ResourceQuotaStatus implements Editable @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map used = new LinkedHashMap(); @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -89,12 +89,12 @@ public ResourceQuotaStatusBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ResourceRequirements.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ResourceRequirements.java index d6302abd344..bd491b175de 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ResourceRequirements.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ResourceRequirements.java @@ -49,7 +49,7 @@ public class ResourceRequirements implements Editable requests = new LinkedHashMap(); @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -107,12 +107,12 @@ public ResourceRequirementsBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Secret.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Secret.java index 9d4875a46c0..d8b5acfad84 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Secret.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Secret.java @@ -56,7 +56,7 @@ public class Secret implements Editable , HasMetadata, Namespaced * */ @JsonProperty("apiVersion") - private java.lang.String apiVersion = "v1"; + private String apiVersion = "v1"; @JsonProperty("data") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map data = new LinkedHashMap(); @@ -68,16 +68,16 @@ public class Secret implements Editable , HasMetadata, Namespaced * */ @JsonProperty("kind") - private java.lang.String kind = "Secret"; + private String kind = "Secret"; @JsonProperty("metadata") private ObjectMeta metadata; @JsonProperty("stringData") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map stringData = new LinkedHashMap(); @JsonProperty("type") - private java.lang.String type; + private String type; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -86,7 +86,7 @@ public class Secret implements Editable , HasMetadata, Namespaced public Secret() { } - public Secret(java.lang.String apiVersion, Map data, Boolean immutable, java.lang.String kind, ObjectMeta metadata, Map stringData, java.lang.String type) { + public Secret(String apiVersion, Map data, Boolean immutable, String kind, ObjectMeta metadata, Map stringData, String type) { super(); this.apiVersion = apiVersion; this.data = data; @@ -103,7 +103,7 @@ public Secret(java.lang.String apiVersion, Map data, Boolean imm * */ @JsonProperty("apiVersion") - public java.lang.String getApiVersion() { + public String getApiVersion() { return apiVersion; } @@ -113,7 +113,7 @@ public java.lang.String getApiVersion() { * */ @JsonProperty("apiVersion") - public void setApiVersion(java.lang.String apiVersion) { + public void setApiVersion(String apiVersion) { this.apiVersion = apiVersion; } @@ -143,7 +143,7 @@ public void setImmutable(Boolean immutable) { * */ @JsonProperty("kind") - public java.lang.String getKind() { + public String getKind() { return kind; } @@ -153,7 +153,7 @@ public java.lang.String getKind() { * */ @JsonProperty("kind") - public void setKind(java.lang.String kind) { + public void setKind(String kind) { this.kind = kind; } @@ -178,12 +178,12 @@ public void setStringData(Map stringData) { } @JsonProperty("type") - public java.lang.String getType() { + public String getType() { return type; } @JsonProperty("type") - public void setType(java.lang.String type) { + public void setType(String type) { this.type = type; } @@ -198,12 +198,12 @@ public SecretBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ServiceSpec.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ServiceSpec.java index 222673f3e27..852e75c24d5 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ServiceSpec.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ServiceSpec.java @@ -59,33 +59,33 @@ public class ServiceSpec implements Editable , KubernetesRes @JsonProperty("allocateLoadBalancerNodePorts") private Boolean allocateLoadBalancerNodePorts; @JsonProperty("clusterIP") - private java.lang.String clusterIP; + private String clusterIP; @JsonProperty("clusterIPs") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List clusterIPs = new ArrayList(); + private List clusterIPs = new ArrayList(); @JsonProperty("externalIPs") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List externalIPs = new ArrayList(); + private List externalIPs = new ArrayList(); @JsonProperty("externalName") - private java.lang.String externalName; + private String externalName; @JsonProperty("externalTrafficPolicy") - private java.lang.String externalTrafficPolicy; + private String externalTrafficPolicy; @JsonProperty("healthCheckNodePort") private Integer healthCheckNodePort; @JsonProperty("internalTrafficPolicy") - private java.lang.String internalTrafficPolicy; + private String internalTrafficPolicy; @JsonProperty("ipFamilies") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List ipFamilies = new ArrayList(); + private List ipFamilies = new ArrayList(); @JsonProperty("ipFamilyPolicy") - private java.lang.String ipFamilyPolicy; + private String ipFamilyPolicy; @JsonProperty("loadBalancerClass") - private java.lang.String loadBalancerClass; + private String loadBalancerClass; @JsonProperty("loadBalancerIP") - private java.lang.String loadBalancerIP; + private String loadBalancerIP; @JsonProperty("loadBalancerSourceRanges") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List loadBalancerSourceRanges = new ArrayList(); + private List loadBalancerSourceRanges = new ArrayList(); @JsonProperty("ports") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List ports = new ArrayList(); @@ -95,15 +95,15 @@ public class ServiceSpec implements Editable , KubernetesRes @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map selector = new LinkedHashMap(); @JsonProperty("sessionAffinity") - private java.lang.String sessionAffinity; + private String sessionAffinity; @JsonProperty("sessionAffinityConfig") private SessionAffinityConfig sessionAffinityConfig; @JsonProperty("trafficDistribution") - private java.lang.String trafficDistribution; + private String trafficDistribution; @JsonProperty("type") - private java.lang.String type; + private String type; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -112,7 +112,7 @@ public class ServiceSpec implements Editable , KubernetesRes public ServiceSpec() { } - public ServiceSpec(Boolean allocateLoadBalancerNodePorts, java.lang.String clusterIP, List clusterIPs, List externalIPs, java.lang.String externalName, java.lang.String externalTrafficPolicy, Integer healthCheckNodePort, java.lang.String internalTrafficPolicy, List ipFamilies, java.lang.String ipFamilyPolicy, java.lang.String loadBalancerClass, java.lang.String loadBalancerIP, List loadBalancerSourceRanges, List ports, Boolean publishNotReadyAddresses, Map selector, java.lang.String sessionAffinity, SessionAffinityConfig sessionAffinityConfig, java.lang.String trafficDistribution, java.lang.String type) { + public ServiceSpec(Boolean allocateLoadBalancerNodePorts, String clusterIP, List clusterIPs, List externalIPs, String externalName, String externalTrafficPolicy, Integer healthCheckNodePort, String internalTrafficPolicy, List ipFamilies, String ipFamilyPolicy, String loadBalancerClass, String loadBalancerIP, List loadBalancerSourceRanges, List ports, Boolean publishNotReadyAddresses, Map selector, String sessionAffinity, SessionAffinityConfig sessionAffinityConfig, String trafficDistribution, String type) { super(); this.allocateLoadBalancerNodePorts = allocateLoadBalancerNodePorts; this.clusterIP = clusterIP; @@ -147,54 +147,54 @@ public void setAllocateLoadBalancerNodePorts(Boolean allocateLoadBalancerNodePor } @JsonProperty("clusterIP") - public java.lang.String getClusterIP() { + public String getClusterIP() { return clusterIP; } @JsonProperty("clusterIP") - public void setClusterIP(java.lang.String clusterIP) { + public void setClusterIP(String clusterIP) { this.clusterIP = clusterIP; } @JsonProperty("clusterIPs") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getClusterIPs() { + public List getClusterIPs() { return clusterIPs; } @JsonProperty("clusterIPs") - public void setClusterIPs(List clusterIPs) { + public void setClusterIPs(List clusterIPs) { this.clusterIPs = clusterIPs; } @JsonProperty("externalIPs") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getExternalIPs() { + public List getExternalIPs() { return externalIPs; } @JsonProperty("externalIPs") - public void setExternalIPs(List externalIPs) { + public void setExternalIPs(List externalIPs) { this.externalIPs = externalIPs; } @JsonProperty("externalName") - public java.lang.String getExternalName() { + public String getExternalName() { return externalName; } @JsonProperty("externalName") - public void setExternalName(java.lang.String externalName) { + public void setExternalName(String externalName) { this.externalName = externalName; } @JsonProperty("externalTrafficPolicy") - public java.lang.String getExternalTrafficPolicy() { + public String getExternalTrafficPolicy() { return externalTrafficPolicy; } @JsonProperty("externalTrafficPolicy") - public void setExternalTrafficPolicy(java.lang.String externalTrafficPolicy) { + public void setExternalTrafficPolicy(String externalTrafficPolicy) { this.externalTrafficPolicy = externalTrafficPolicy; } @@ -209,64 +209,64 @@ public void setHealthCheckNodePort(Integer healthCheckNodePort) { } @JsonProperty("internalTrafficPolicy") - public java.lang.String getInternalTrafficPolicy() { + public String getInternalTrafficPolicy() { return internalTrafficPolicy; } @JsonProperty("internalTrafficPolicy") - public void setInternalTrafficPolicy(java.lang.String internalTrafficPolicy) { + public void setInternalTrafficPolicy(String internalTrafficPolicy) { this.internalTrafficPolicy = internalTrafficPolicy; } @JsonProperty("ipFamilies") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getIpFamilies() { + public List getIpFamilies() { return ipFamilies; } @JsonProperty("ipFamilies") - public void setIpFamilies(List ipFamilies) { + public void setIpFamilies(List ipFamilies) { this.ipFamilies = ipFamilies; } @JsonProperty("ipFamilyPolicy") - public java.lang.String getIpFamilyPolicy() { + public String getIpFamilyPolicy() { return ipFamilyPolicy; } @JsonProperty("ipFamilyPolicy") - public void setIpFamilyPolicy(java.lang.String ipFamilyPolicy) { + public void setIpFamilyPolicy(String ipFamilyPolicy) { this.ipFamilyPolicy = ipFamilyPolicy; } @JsonProperty("loadBalancerClass") - public java.lang.String getLoadBalancerClass() { + public String getLoadBalancerClass() { return loadBalancerClass; } @JsonProperty("loadBalancerClass") - public void setLoadBalancerClass(java.lang.String loadBalancerClass) { + public void setLoadBalancerClass(String loadBalancerClass) { this.loadBalancerClass = loadBalancerClass; } @JsonProperty("loadBalancerIP") - public java.lang.String getLoadBalancerIP() { + public String getLoadBalancerIP() { return loadBalancerIP; } @JsonProperty("loadBalancerIP") - public void setLoadBalancerIP(java.lang.String loadBalancerIP) { + public void setLoadBalancerIP(String loadBalancerIP) { this.loadBalancerIP = loadBalancerIP; } @JsonProperty("loadBalancerSourceRanges") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getLoadBalancerSourceRanges() { + public List getLoadBalancerSourceRanges() { return loadBalancerSourceRanges; } @JsonProperty("loadBalancerSourceRanges") - public void setLoadBalancerSourceRanges(List loadBalancerSourceRanges) { + public void setLoadBalancerSourceRanges(List loadBalancerSourceRanges) { this.loadBalancerSourceRanges = loadBalancerSourceRanges; } @@ -302,12 +302,12 @@ public void setSelector(Map selector) { } @JsonProperty("sessionAffinity") - public java.lang.String getSessionAffinity() { + public String getSessionAffinity() { return sessionAffinity; } @JsonProperty("sessionAffinity") - public void setSessionAffinity(java.lang.String sessionAffinity) { + public void setSessionAffinity(String sessionAffinity) { this.sessionAffinity = sessionAffinity; } @@ -322,22 +322,22 @@ public void setSessionAffinityConfig(SessionAffinityConfig sessionAffinityConfig } @JsonProperty("trafficDistribution") - public java.lang.String getTrafficDistribution() { + public String getTrafficDistribution() { return trafficDistribution; } @JsonProperty("trafficDistribution") - public void setTrafficDistribution(java.lang.String trafficDistribution) { + public void setTrafficDistribution(String trafficDistribution) { this.trafficDistribution = trafficDistribution; } @JsonProperty("type") - public java.lang.String getType() { + public String getType() { return type; } @JsonProperty("type") - public void setType(java.lang.String type) { + public void setType(String type) { this.type = type; } @@ -352,12 +352,12 @@ public ServiceSpecBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/VolumeResourceRequirements.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/VolumeResourceRequirements.java index 3f664e07ab6..c3bff9104ec 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/VolumeResourceRequirements.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/VolumeResourceRequirements.java @@ -43,7 +43,7 @@ public class VolumeResourceRequirements implements Editable requests = new LinkedHashMap(); @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -89,12 +89,12 @@ public VolumeResourceRequirementsBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json index 3dc5a1f3c8c..0cf44c32d6c 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json @@ -533,7 +533,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -728,7 +728,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", @@ -761,7 +761,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -1182,7 +1182,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" }, "auth-provider": { "$ref": "#/definitions/kubernetes_config_AuthProviderConfig", @@ -1239,7 +1239,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "name": { "type": "string" @@ -1722,7 +1722,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "volumeHandle": { "type": "string" @@ -1755,7 +1755,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -2052,14 +2052,14 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "data": { "type": "object", "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "immutable": { "type": "boolean" @@ -2509,7 +2509,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "containerID": { "type": "string" @@ -3340,7 +3340,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "readOnly": { "type": "boolean" @@ -3370,7 +3370,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "readOnly": { "type": "boolean" @@ -3793,7 +3793,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "defaultRequest": { "type": "object", @@ -3801,7 +3801,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "max": { "type": "object", @@ -3809,7 +3809,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "maxLimitRequestRatio": { "type": "object", @@ -3817,7 +3817,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "min": { "type": "object", @@ -3825,7 +3825,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "type": { "type": "string" @@ -4462,7 +4462,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "capacity": { "type": "object", @@ -4470,7 +4470,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "conditions": { "type": "array", @@ -4807,7 +4807,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "allocatedResources": { "type": "object", @@ -4815,7 +4815,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "capacity": { "type": "object", @@ -4823,7 +4823,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "conditions": { "type": "array", @@ -5042,7 +5042,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "cephfs": { "$ref": "#/definitions/kubernetes_core_CephFSPersistentVolumeSource", @@ -5702,7 +5702,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "os": { "$ref": "#/definitions/kubernetes_core_PodOS", @@ -5714,7 +5714,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "preemptionPolicy": { "type": "string" @@ -6340,7 +6340,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "template": { "$ref": "#/definitions/kubernetes_core_PodTemplateSpec", @@ -6494,7 +6494,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "scopeSelector": { "$ref": "#/definitions/kubernetes_core_ScopeSelector", @@ -6523,7 +6523,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "used": { "type": "object", @@ -6531,7 +6531,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" } }, "additionalProperties": true, @@ -6557,7 +6557,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "requests": { "type": "object", @@ -6565,7 +6565,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" } }, "additionalProperties": true, @@ -6748,7 +6748,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "immutable": { "type": "boolean" @@ -6767,7 +6767,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "type": { "type": "string" @@ -7233,7 +7233,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "sessionAffinity": { "type": "string" @@ -7809,7 +7809,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "requests": { "type": "object", @@ -7817,7 +7817,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" } }, "additionalProperties": true, diff --git a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json index d0b8d5b7c59..08767563454 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json @@ -533,7 +533,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -728,7 +728,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", @@ -761,7 +761,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -1182,7 +1182,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" }, "auth-provider": { "$ref": "#/definitions/kubernetes_config_AuthProviderConfig", @@ -1239,7 +1239,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "name": { "type": "string" @@ -1722,7 +1722,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "volumeHandle": { "type": "string" @@ -1755,7 +1755,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -2052,14 +2052,14 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "data": { "type": "object", "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "immutable": { "type": "boolean" @@ -2509,7 +2509,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "containerID": { "type": "string" @@ -3340,7 +3340,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "readOnly": { "type": "boolean" @@ -3370,7 +3370,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "readOnly": { "type": "boolean" @@ -3793,7 +3793,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "defaultRequest": { "type": "object", @@ -3801,7 +3801,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "max": { "type": "object", @@ -3809,7 +3809,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "maxLimitRequestRatio": { "type": "object", @@ -3817,7 +3817,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "min": { "type": "object", @@ -3825,7 +3825,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "type": { "type": "string" @@ -4462,7 +4462,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "capacity": { "type": "object", @@ -4470,7 +4470,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "conditions": { "type": "array", @@ -4807,7 +4807,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "allocatedResources": { "type": "object", @@ -4815,7 +4815,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "capacity": { "type": "object", @@ -4823,7 +4823,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "conditions": { "type": "array", @@ -5042,7 +5042,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "cephfs": { "$ref": "#/definitions/kubernetes_core_CephFSPersistentVolumeSource", @@ -5702,7 +5702,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "os": { "$ref": "#/definitions/kubernetes_core_PodOS", @@ -5714,7 +5714,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "preemptionPolicy": { "type": "string" @@ -6340,7 +6340,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "template": { "$ref": "#/definitions/kubernetes_core_PodTemplateSpec", @@ -6494,7 +6494,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "scopeSelector": { "$ref": "#/definitions/kubernetes_core_ScopeSelector", @@ -6523,7 +6523,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "used": { "type": "object", @@ -6531,7 +6531,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" } }, "additionalProperties": true, @@ -6557,7 +6557,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "requests": { "type": "object", @@ -6565,7 +6565,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" } }, "additionalProperties": true, @@ -6748,7 +6748,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "immutable": { "type": "boolean" @@ -6767,7 +6767,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "type": { "type": "string" @@ -7233,7 +7233,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "sessionAffinity": { "type": "string" @@ -7809,7 +7809,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "requests": { "type": "object", @@ -7817,7 +7817,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" } }, "additionalProperties": true, @@ -8594,7 +8594,7 @@ "type": "string" } }, - "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.util.ArrayList\u003cjava.lang.String\u003e\u003e" }, "auth-provider": { "$ref": "#/definitions/kubernetes_config_AuthProviderConfig", @@ -8646,7 +8646,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "name": { "type": "string" @@ -9085,14 +9085,14 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "data": { "type": "object", "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "immutable": { "type": "boolean" @@ -9465,7 +9465,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "containerID": { "type": "string" @@ -9599,7 +9599,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "volumeHandle": { "type": "string" @@ -9627,7 +9627,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true @@ -10379,7 +10379,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "readOnly": { "type": "boolean" @@ -10404,7 +10404,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "readOnly": { "type": "boolean" @@ -10801,7 +10801,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true @@ -10889,7 +10889,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "defaultRequest": { "type": "object", @@ -10897,7 +10897,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "max": { "type": "object", @@ -10905,7 +10905,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "maxLimitRequestRatio": { "type": "object", @@ -10913,7 +10913,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "min": { "type": "object", @@ -10921,7 +10921,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "type": { "type": "string" @@ -11589,7 +11589,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "capacity": { "type": "object", @@ -11597,7 +11597,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "conditions": { "type": "array", @@ -11709,7 +11709,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", @@ -11742,7 +11742,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -12022,7 +12022,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "allocatedResources": { "type": "object", @@ -12030,7 +12030,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "capacity": { "type": "object", @@ -12038,7 +12038,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "conditions": { "type": "array", @@ -12231,7 +12231,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "cephfs": { "$ref": "#/definitions/kubernetes_core_CephFSPersistentVolumeSource", @@ -12794,7 +12794,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "os": { "$ref": "#/definitions/kubernetes_core_PodOS", @@ -12806,7 +12806,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "preemptionPolicy": { "type": "string" @@ -13381,7 +13381,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "template": { "$ref": "#/definitions/kubernetes_core_PodTemplateSpec", @@ -13503,7 +13503,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "scopeSelector": { "$ref": "#/definitions/kubernetes_core_ScopeSelector", @@ -13527,7 +13527,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "used": { "type": "object", @@ -13535,7 +13535,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" } }, "additionalProperties": true @@ -13556,7 +13556,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "requests": { "type": "object", @@ -13564,7 +13564,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" } }, "additionalProperties": true @@ -13706,7 +13706,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "immutable": { "type": "boolean" @@ -13725,7 +13725,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "type": { "type": "string" @@ -14157,7 +14157,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "sessionAffinity": { "type": "string" @@ -14752,7 +14752,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" }, "requests": { "type": "object", @@ -14760,7 +14760,7 @@ "$ref": "#/definitions/kubernetes_resource_Quantity", "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.Quantity\u003e" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1/Endpoint.java b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1/Endpoint.java index 21afaf1fa25..55ad8aa6081 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1/Endpoint.java +++ b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1/Endpoint.java @@ -66,7 +66,7 @@ public class Endpoint implements Editable , KubernetesResource @JsonProperty("addresses") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List addresses = new ArrayList(); + private List addresses = new ArrayList(); @JsonProperty("conditions") private EndpointConditions conditions; @JsonProperty("deprecatedTopology") @@ -75,15 +75,15 @@ public class Endpoint implements Editable , KubernetesResource @JsonProperty("hints") private EndpointHints hints; @JsonProperty("hostname") - private java.lang.String hostname; + private String hostname; @JsonProperty("nodeName") - private java.lang.String nodeName; + private String nodeName; @JsonProperty("targetRef") private io.fabric8.kubernetes.api.model.ObjectReference targetRef; @JsonProperty("zone") - private java.lang.String zone; + private String zone; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -92,7 +92,7 @@ public class Endpoint implements Editable , KubernetesResource public Endpoint() { } - public Endpoint(List addresses, EndpointConditions conditions, Map deprecatedTopology, EndpointHints hints, java.lang.String hostname, java.lang.String nodeName, io.fabric8.kubernetes.api.model.ObjectReference targetRef, java.lang.String zone) { + public Endpoint(List addresses, EndpointConditions conditions, Map deprecatedTopology, EndpointHints hints, String hostname, String nodeName, io.fabric8.kubernetes.api.model.ObjectReference targetRef, String zone) { super(); this.addresses = addresses; this.conditions = conditions; @@ -105,12 +105,12 @@ public Endpoint(List addresses, EndpointConditions conditions, } @JsonProperty("addresses") - public List getAddresses() { + public List getAddresses() { return addresses; } @JsonProperty("addresses") - public void setAddresses(List addresses) { + public void setAddresses(List addresses) { this.addresses = addresses; } @@ -145,22 +145,22 @@ public void setHints(EndpointHints hints) { } @JsonProperty("hostname") - public java.lang.String getHostname() { + public String getHostname() { return hostname; } @JsonProperty("hostname") - public void setHostname(java.lang.String hostname) { + public void setHostname(String hostname) { this.hostname = hostname; } @JsonProperty("nodeName") - public java.lang.String getNodeName() { + public String getNodeName() { return nodeName; } @JsonProperty("nodeName") - public void setNodeName(java.lang.String nodeName) { + public void setNodeName(String nodeName) { this.nodeName = nodeName; } @@ -175,12 +175,12 @@ public void setTargetRef(io.fabric8.kubernetes.api.model.ObjectReference targetR } @JsonProperty("zone") - public java.lang.String getZone() { + public String getZone() { return zone; } @JsonProperty("zone") - public void setZone(java.lang.String zone) { + public void setZone(String zone) { this.zone = zone; } @@ -195,12 +195,12 @@ public EndpointBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1beta1/Endpoint.java b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1beta1/Endpoint.java index e88f0f6c938..57928942b13 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1beta1/Endpoint.java +++ b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1beta1/Endpoint.java @@ -65,22 +65,22 @@ public class Endpoint implements Editable , KubernetesResource @JsonProperty("addresses") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List addresses = new ArrayList(); + private List addresses = new ArrayList(); @JsonProperty("conditions") private EndpointConditions conditions; @JsonProperty("hints") private EndpointHints hints; @JsonProperty("hostname") - private java.lang.String hostname; + private String hostname; @JsonProperty("nodeName") - private java.lang.String nodeName; + private String nodeName; @JsonProperty("targetRef") private io.fabric8.kubernetes.api.model.ObjectReference targetRef; @JsonProperty("topology") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map topology = new LinkedHashMap(); @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -89,7 +89,7 @@ public class Endpoint implements Editable , KubernetesResource public Endpoint() { } - public Endpoint(List addresses, EndpointConditions conditions, EndpointHints hints, java.lang.String hostname, java.lang.String nodeName, io.fabric8.kubernetes.api.model.ObjectReference targetRef, Map topology) { + public Endpoint(List addresses, EndpointConditions conditions, EndpointHints hints, String hostname, String nodeName, io.fabric8.kubernetes.api.model.ObjectReference targetRef, Map topology) { super(); this.addresses = addresses; this.conditions = conditions; @@ -101,12 +101,12 @@ public Endpoint(List addresses, EndpointConditions conditions, } @JsonProperty("addresses") - public List getAddresses() { + public List getAddresses() { return addresses; } @JsonProperty("addresses") - public void setAddresses(List addresses) { + public void setAddresses(List addresses) { this.addresses = addresses; } @@ -131,22 +131,22 @@ public void setHints(EndpointHints hints) { } @JsonProperty("hostname") - public java.lang.String getHostname() { + public String getHostname() { return hostname; } @JsonProperty("hostname") - public void setHostname(java.lang.String hostname) { + public void setHostname(String hostname) { this.hostname = hostname; } @JsonProperty("nodeName") - public java.lang.String getNodeName() { + public String getNodeName() { return nodeName; } @JsonProperty("nodeName") - public void setNodeName(java.lang.String nodeName) { + public void setNodeName(String nodeName) { this.nodeName = nodeName; } @@ -181,12 +181,12 @@ public EndpointBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/kube-schema.json index 40a386a4b63..9e12a002e54 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/kube-schema.json @@ -354,7 +354,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -387,7 +387,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -797,7 +797,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "hints": { "$ref": "#/definitions/kubernetes_discovery_v1_EndpointHints", @@ -1003,7 +1003,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, diff --git a/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/validation-schema.json index c496fc62871..728c663bed4 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/schema/validation-schema.json @@ -354,7 +354,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -387,7 +387,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -797,7 +797,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "hints": { "$ref": "#/definitions/kubernetes_discovery_v1_EndpointHints", @@ -1003,7 +1003,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -1398,7 +1398,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "hints": { "$ref": "#/definitions/kubernetes_discovery_v1_EndpointHints", @@ -1506,14 +1506,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "discovery.k8s.io/v1beta1", + "default": "discovery.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_discovery_v1beta1_EndpointSlice", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice" + "$ref": "#/definitions/kubernetes_discovery_v1_EndpointSlice", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice" } }, "kind": { @@ -1726,7 +1726,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -1759,7 +1759,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", diff --git a/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/kube-schema.json index 6123bb9bfae..cf5a08aeac6 100644 --- a/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/kube-schema.json @@ -367,7 +367,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -400,7 +400,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", diff --git a/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/validation-schema.json index 44aa0eaa2be..1471a214dc6 100644 --- a/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-events/src/main/resources/schema/validation-schema.json @@ -367,7 +367,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -400,7 +400,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -1286,7 +1286,7 @@ }, "apiVersion": { "type": "string", - "default": "events.k8s.io/v1beta1", + "default": "events.k8s.io/v1", "required": true }, "deprecatedCount": { @@ -1338,8 +1338,8 @@ "type": "string" }, "series": { - "$ref": "#/definitions/kubernetes_events_v1beta1_EventSeries", - "existingJavaType": "io.fabric8.kubernetes.api.model.events.v1beta1.EventSeries" + "$ref": "#/definitions/kubernetes_events_v1_EventSeries", + "existingJavaType": "io.fabric8.kubernetes.api.model.events.v1.EventSeries" }, "type": { "type": "string" @@ -1594,7 +1594,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -1627,7 +1627,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/DeploymentRollback.java b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/DeploymentRollback.java index f382cfbbbde..5ae86933dfc 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/DeploymentRollback.java +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/DeploymentRollback.java @@ -75,23 +75,23 @@ public class DeploymentRollback implements Editable , * */ @JsonProperty("apiVersion") - private java.lang.String apiVersion = "extensions/v1beta1"; + private String apiVersion = "extensions/v1beta1"; /** * * (Required) * */ @JsonProperty("kind") - private java.lang.String kind = "DeploymentRollback"; + private String kind = "DeploymentRollback"; @JsonProperty("name") - private java.lang.String name; + private String name; @JsonProperty("rollbackTo") private RollbackConfig rollbackTo; @JsonProperty("updatedAnnotations") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map updatedAnnotations = new LinkedHashMap(); @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -100,7 +100,7 @@ public class DeploymentRollback implements Editable , public DeploymentRollback() { } - public DeploymentRollback(java.lang.String apiVersion, java.lang.String kind, java.lang.String name, RollbackConfig rollbackTo, Map updatedAnnotations) { + public DeploymentRollback(String apiVersion, String kind, String name, RollbackConfig rollbackTo, Map updatedAnnotations) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -115,7 +115,7 @@ public DeploymentRollback(java.lang.String apiVersion, java.lang.String kind, ja * */ @JsonProperty("apiVersion") - public java.lang.String getApiVersion() { + public String getApiVersion() { return apiVersion; } @@ -125,7 +125,7 @@ public java.lang.String getApiVersion() { * */ @JsonProperty("apiVersion") - public void setApiVersion(java.lang.String apiVersion) { + public void setApiVersion(String apiVersion) { this.apiVersion = apiVersion; } @@ -135,7 +135,7 @@ public void setApiVersion(java.lang.String apiVersion) { * */ @JsonProperty("kind") - public java.lang.String getKind() { + public String getKind() { return kind; } @@ -145,17 +145,17 @@ public java.lang.String getKind() { * */ @JsonProperty("kind") - public void setKind(java.lang.String kind) { + public void setKind(String kind) { this.kind = kind; } @JsonProperty("name") - public java.lang.String getName() { + public String getName() { return name; } @JsonProperty("name") - public void setName(java.lang.String name) { + public void setName(String name) { this.name = name; } @@ -190,12 +190,12 @@ public DeploymentRollbackBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/kube-schema.json index 71dd8798ff4..1fc94235271 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/kube-schema.json @@ -222,7 +222,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -402,7 +402,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -435,7 +435,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -944,7 +944,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -1812,7 +1812,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "readOnly": { "type": "boolean" @@ -2720,7 +2720,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "os": { "$ref": "#/definitions/kubernetes_core_PodOS", @@ -2732,7 +2732,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "preemptionPolicy": { "type": "string" @@ -3091,7 +3091,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "requests": { "type": "object", @@ -3099,7 +3099,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" } }, "additionalProperties": true, @@ -3742,7 +3742,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "requests": { "type": "object", @@ -3750,7 +3750,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" } }, "additionalProperties": true, @@ -4252,7 +4252,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/validation-schema.json index 2ed707997ff..bab54af3285 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/schema/validation-schema.json @@ -222,7 +222,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -402,7 +402,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -435,7 +435,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -944,7 +944,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -1812,7 +1812,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "readOnly": { "type": "boolean" @@ -2720,7 +2720,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "os": { "$ref": "#/definitions/kubernetes_core_PodOS", @@ -2732,7 +2732,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "preemptionPolicy": { "type": "string" @@ -3091,7 +3091,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "requests": { "type": "object", @@ -3099,7 +3099,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" } }, "additionalProperties": true, @@ -3742,7 +3742,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "requests": { "type": "object", @@ -3750,7 +3750,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" } }, "additionalProperties": true, @@ -4252,7 +4252,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -5681,7 +5681,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true @@ -5978,7 +5978,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true @@ -6489,7 +6489,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "readOnly": { "type": "boolean" @@ -7009,7 +7009,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true @@ -7448,7 +7448,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -7481,7 +7481,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -7970,7 +7970,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "os": { "$ref": "#/definitions/kubernetes_core_PodOS", @@ -7982,7 +7982,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "preemptionPolicy": { "type": "string" @@ -8430,7 +8430,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "requests": { "type": "object", @@ -8438,7 +8438,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" } }, "additionalProperties": true @@ -9152,7 +9152,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" }, "requests": { "type": "object", @@ -9160,7 +9160,7 @@ "$ref": "#/definitions/k8s_io_apimachinery_pkg_api_resource_Quantity", "existingJavaType": "Quantity" }, - "existingJavaType": "java.util.Map\u003cString, Quantity\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, Quantity\u003e" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/kube-schema.json index f3b8367917f..da821c2ad0e 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/kube-schema.json @@ -75,7 +75,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -108,7 +108,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/validation-schema.json index 49a96d9ae0e..e0c0b78dd87 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/validation-schema.json @@ -75,7 +75,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -108,7 +108,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -2624,14 +2624,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1beta3", + "default": "flowcontrol.apiserver.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_FlowSchema", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchema" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowSchema", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema" } }, "kind": { @@ -2676,8 +2676,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_FlowSchemaCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaCondition" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowSchemaCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchemaCondition" } } }, @@ -2693,9 +2693,6 @@ }, "limitedprioritylevelconfiguration": { "properties": { - "assuredConcurrencyShares": { - "type": "integer" - }, "borrowingLimitPercent": { "type": "integer" }, @@ -2703,8 +2700,11 @@ "type": "integer" }, "limitResponse": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_LimitResponse", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitResponse" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_LimitResponse", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.LimitResponse" + }, + "nominalConcurrencyShares": { + "type": "integer" } }, "additionalProperties": true @@ -2712,8 +2712,8 @@ "limitresponse": { "properties": { "queuing": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_QueuingConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.QueuingConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1_QueuingConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.QueuingConfiguration" }, "type": { "type": "string" @@ -2791,7 +2791,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -2824,7 +2824,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -2891,23 +2891,23 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_NonResourcePolicyRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.NonResourcePolicyRule" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_NonResourcePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.NonResourcePolicyRule" } }, "resourceRules": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_ResourcePolicyRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.ResourcePolicyRule" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_ResourcePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ResourcePolicyRule" } }, "subjects": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_Subject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.Subject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_Subject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.Subject" } } }, @@ -2917,7 +2917,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1beta3", + "default": "flowcontrol.apiserver.k8s.io/v1beta1", "required": true }, "kind": { @@ -2930,12 +2930,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_PriorityLevelConfigurationSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfigurationSpec" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PriorityLevelConfigurationSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationSpec" }, "status": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_PriorityLevelConfigurationStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfigurationStatus" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PriorityLevelConfigurationStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationStatus" } }, "additionalProperties": true @@ -2965,14 +2965,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1beta3", + "default": "flowcontrol.apiserver.k8s.io/v1beta2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_PriorityLevelConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration" } }, "kind": { @@ -2998,12 +2998,12 @@ "prioritylevelconfigurationspec": { "properties": { "exempt": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_ExemptPriorityLevelConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ExemptPriorityLevelConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_ExemptPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.ExemptPriorityLevelConfiguration" }, "limited": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_LimitedPriorityLevelConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitedPriorityLevelConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_LimitedPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.LimitedPriorityLevelConfiguration" }, "type": { "type": "string" @@ -3017,8 +3017,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PriorityLevelConfigurationCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationCondition" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationCondition" } } }, @@ -3214,19 +3214,19 @@ "subject": { "properties": { "group": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1_GroupSubject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.GroupSubject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_GroupSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.GroupSubject" }, "kind": { "type": "string" }, "serviceAccount": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1_ServiceAccountSubject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.ServiceAccountSubject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_ServiceAccountSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ServiceAccountSubject" }, "user": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1_UserSubject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.UserSubject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_UserSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.UserSubject" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/GatewayInfrastructure.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/GatewayInfrastructure.java index f1c19868862..d67c7b380a5 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/GatewayInfrastructure.java +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/GatewayInfrastructure.java @@ -64,7 +64,7 @@ public class GatewayInfrastructure implements Editable labels = new LinkedHashMap(); @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -110,12 +110,12 @@ public GatewayInfrastructureBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/GatewayTLSConfig.java b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/GatewayTLSConfig.java index b02a6f364b6..c55f92f6fb0 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/GatewayTLSConfig.java +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/generated/java/io/fabric8/kubernetes/api/model/gatewayapi/v1/GatewayTLSConfig.java @@ -64,12 +64,12 @@ public class GatewayTLSConfig implements Editable , Kub @JsonInclude(JsonInclude.Include.NON_EMPTY) private List certificateRefs = new ArrayList(); @JsonProperty("mode") - private java.lang.String mode; + private String mode; @JsonProperty("options") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map options = new LinkedHashMap(); @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class GatewayTLSConfig implements Editable , Kub public GatewayTLSConfig() { } - public GatewayTLSConfig(List certificateRefs, java.lang.String mode, Map options) { + public GatewayTLSConfig(List certificateRefs, String mode, Map options) { super(); this.certificateRefs = certificateRefs; this.mode = mode; @@ -97,12 +97,12 @@ public void setCertificateRefs(List certificateRefs) { } @JsonProperty("mode") - public java.lang.String getMode() { + public String getMode() { return mode; } @JsonProperty("mode") - public void setMode(java.lang.String mode) { + public void setMode(String mode) { this.mode = mode; } @@ -127,12 +127,12 @@ public GatewayTLSConfigBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/kube-schema.json index 2ca2377b1cd..6f424fb4321 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/kube-schema.json @@ -57,7 +57,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -153,7 +153,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -186,7 +186,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -546,14 +546,14 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "labels": { "type": "object", "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -695,7 +695,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/validation-schema.json index 60d631c5aae..4c30281427a 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/validation-schema.json @@ -57,7 +57,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -153,7 +153,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -186,7 +186,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -546,14 +546,14 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "labels": { "type": "object", "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -695,7 +695,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true, @@ -3178,7 +3178,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1alpha2", + "default": "gateway.networking.k8s.io/v1", "required": true }, "kind": { @@ -3205,14 +3205,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1beta1", + "default": "gateway.networking.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_GatewayClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClass" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1_GatewayClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1.GatewayClass" } }, "kind": { @@ -3269,14 +3269,14 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "labels": { "type": "object", "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true @@ -3285,14 +3285,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1", + "default": "gateway.networking.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1_Gateway", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1.Gateway" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_Gateway", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.Gateway" } }, "kind": { @@ -3392,7 +3392,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true @@ -3780,7 +3780,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1alpha2", + "default": "gateway.networking.k8s.io/v1", "required": true }, "kind": { @@ -3839,14 +3839,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1", + "default": "gateway.networking.k8s.io/v1alpha2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1_HTTPRoute", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRoute" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPRoute", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRoute" } }, "kind": { @@ -4000,7 +4000,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" } }, "additionalProperties": true @@ -4140,7 +4140,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { "$ref": "#/definitions/kubernetes_apimachinery_Time", @@ -4173,7 +4173,7 @@ "additionalProperties": { "type": "string" }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "managedFields": { "type": "array", @@ -4386,14 +4386,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1alpha2", + "default": "gateway.networking.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_ReferenceGrant", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrant" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_ReferenceGrant", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrant" } }, "kind": { diff --git a/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/kustomize/v1beta1/GeneratorOptions.java b/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/kustomize/v1beta1/GeneratorOptions.java index a19145a0cb9..52ae45215d4 100644 --- a/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/kustomize/v1beta1/GeneratorOptions.java +++ b/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/kustomize/v1beta1/GeneratorOptions.java @@ -50,7 +50,7 @@ public class GeneratorOptions implements Editable , Kub @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map labels = new LinkedHashMap(); @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -118,12 +118,12 @@ public GeneratorOptionsBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/kustomize/v1beta1/HelmChart.java b/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/kustomize/v1beta1/HelmChart.java index 6dfc6633ebb..0981fc230c1 100644 --- a/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/kustomize/v1beta1/HelmChart.java +++ b/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/kustomize/v1beta1/HelmChart.java @@ -53,37 +53,37 @@ public class HelmChart implements Editable , KubernetesResourc @JsonProperty("additionalValuesFiles") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List additionalValuesFiles = new ArrayList(); + private List additionalValuesFiles = new ArrayList(); @JsonProperty("apiVersions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List apiVersions = new ArrayList(); + private List apiVersions = new ArrayList(); @JsonProperty("includeCRDs") private Boolean includeCRDs; @JsonProperty("name") - private java.lang.String name; + private String name; @JsonProperty("nameTemplate") - private java.lang.String nameTemplate; + private String nameTemplate; @JsonProperty("namespace") - private java.lang.String namespace; + private String namespace; @JsonProperty("releaseName") - private java.lang.String releaseName; + private String releaseName; @JsonProperty("repo") - private java.lang.String repo; + private String repo; @JsonProperty("skipHooks") private Boolean skipHooks; @JsonProperty("skipTests") private Boolean skipTests; @JsonProperty("valuesFile") - private java.lang.String valuesFile; + private String valuesFile; @JsonProperty("valuesInline") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map valuesInline = new LinkedHashMap(); @JsonProperty("valuesMerge") - private java.lang.String valuesMerge; + private String valuesMerge; @JsonProperty("version") - private java.lang.String version; + private String version; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -92,7 +92,7 @@ public class HelmChart implements Editable , KubernetesResourc public HelmChart() { } - public HelmChart(List additionalValuesFiles, List apiVersions, Boolean includeCRDs, java.lang.String name, java.lang.String nameTemplate, java.lang.String namespace, java.lang.String releaseName, java.lang.String repo, Boolean skipHooks, Boolean skipTests, java.lang.String valuesFile, Map valuesInline, java.lang.String valuesMerge, java.lang.String version) { + public HelmChart(List additionalValuesFiles, List apiVersions, Boolean includeCRDs, String name, String nameTemplate, String namespace, String releaseName, String repo, Boolean skipHooks, Boolean skipTests, String valuesFile, Map valuesInline, String valuesMerge, String version) { super(); this.additionalValuesFiles = additionalValuesFiles; this.apiVersions = apiVersions; @@ -112,23 +112,23 @@ public HelmChart(List additionalValuesFiles, List getAdditionalValuesFiles() { + public List getAdditionalValuesFiles() { return additionalValuesFiles; } @JsonProperty("additionalValuesFiles") - public void setAdditionalValuesFiles(List additionalValuesFiles) { + public void setAdditionalValuesFiles(List additionalValuesFiles) { this.additionalValuesFiles = additionalValuesFiles; } @JsonProperty("apiVersions") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getApiVersions() { + public List getApiVersions() { return apiVersions; } @JsonProperty("apiVersions") - public void setApiVersions(List apiVersions) { + public void setApiVersions(List apiVersions) { this.apiVersions = apiVersions; } @@ -143,52 +143,52 @@ public void setIncludeCRDs(Boolean includeCRDs) { } @JsonProperty("name") - public java.lang.String getName() { + public String getName() { return name; } @JsonProperty("name") - public void setName(java.lang.String name) { + public void setName(String name) { this.name = name; } @JsonProperty("nameTemplate") - public java.lang.String getNameTemplate() { + public String getNameTemplate() { return nameTemplate; } @JsonProperty("nameTemplate") - public void setNameTemplate(java.lang.String nameTemplate) { + public void setNameTemplate(String nameTemplate) { this.nameTemplate = nameTemplate; } @JsonProperty("namespace") - public java.lang.String getNamespace() { + public String getNamespace() { return namespace; } @JsonProperty("namespace") - public void setNamespace(java.lang.String namespace) { + public void setNamespace(String namespace) { this.namespace = namespace; } @JsonProperty("releaseName") - public java.lang.String getReleaseName() { + public String getReleaseName() { return releaseName; } @JsonProperty("releaseName") - public void setReleaseName(java.lang.String releaseName) { + public void setReleaseName(String releaseName) { this.releaseName = releaseName; } @JsonProperty("repo") - public java.lang.String getRepo() { + public String getRepo() { return repo; } @JsonProperty("repo") - public void setRepo(java.lang.String repo) { + public void setRepo(String repo) { this.repo = repo; } @@ -213,12 +213,12 @@ public void setSkipTests(Boolean skipTests) { } @JsonProperty("valuesFile") - public java.lang.String getValuesFile() { + public String getValuesFile() { return valuesFile; } @JsonProperty("valuesFile") - public void setValuesFile(java.lang.String valuesFile) { + public void setValuesFile(String valuesFile) { this.valuesFile = valuesFile; } @@ -233,22 +233,22 @@ public void setValuesInline(Map valuesInline) { } @JsonProperty("valuesMerge") - public java.lang.String getValuesMerge() { + public String getValuesMerge() { return valuesMerge; } @JsonProperty("valuesMerge") - public void setValuesMerge(java.lang.String valuesMerge) { + public void setValuesMerge(String valuesMerge) { this.valuesMerge = valuesMerge; } @JsonProperty("version") - public java.lang.String getVersion() { + public String getVersion() { return version; } @JsonProperty("version") - public void setVersion(java.lang.String version) { + public void setVersion(String version) { this.version = version; } @@ -263,12 +263,12 @@ public HelmChartBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/kustomize/v1beta1/HelmChartArgs.java b/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/kustomize/v1beta1/HelmChartArgs.java index 1854598d9eb..1a1cde913eb 100644 --- a/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/kustomize/v1beta1/HelmChartArgs.java +++ b/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/kustomize/v1beta1/HelmChartArgs.java @@ -51,35 +51,35 @@ public class HelmChartArgs implements Editable , Kubernete { @JsonProperty("chartHome") - private java.lang.String chartHome; + private String chartHome; @JsonProperty("chartName") - private java.lang.String chartName; + private String chartName; @JsonProperty("chartRepoName") - private java.lang.String chartRepoName; + private String chartRepoName; @JsonProperty("chartRepoUrl") - private java.lang.String chartRepoUrl; + private String chartRepoUrl; @JsonProperty("chartVersion") - private java.lang.String chartVersion; + private String chartVersion; @JsonProperty("extraArgs") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List extraArgs = new ArrayList(); + private List extraArgs = new ArrayList(); @JsonProperty("helmBin") - private java.lang.String helmBin; + private String helmBin; @JsonProperty("helmHome") - private java.lang.String helmHome; + private String helmHome; @JsonProperty("releaseName") - private java.lang.String releaseName; + private String releaseName; @JsonProperty("releaseNamespace") - private java.lang.String releaseNamespace; + private String releaseNamespace; @JsonProperty("values") - private java.lang.String values; + private String values; @JsonProperty("valuesLocal") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map valuesLocal = new LinkedHashMap(); @JsonProperty("valuesMerge") - private java.lang.String valuesMerge; + private String valuesMerge; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -88,7 +88,7 @@ public class HelmChartArgs implements Editable , Kubernete public HelmChartArgs() { } - public HelmChartArgs(java.lang.String chartHome, java.lang.String chartName, java.lang.String chartRepoName, java.lang.String chartRepoUrl, java.lang.String chartVersion, List extraArgs, java.lang.String helmBin, java.lang.String helmHome, java.lang.String releaseName, java.lang.String releaseNamespace, java.lang.String values, Map valuesLocal, java.lang.String valuesMerge) { + public HelmChartArgs(String chartHome, String chartName, String chartRepoName, String chartRepoUrl, String chartVersion, List extraArgs, String helmBin, String helmHome, String releaseName, String releaseNamespace, String values, Map valuesLocal, String valuesMerge) { super(); this.chartHome = chartHome; this.chartName = chartName; @@ -106,113 +106,113 @@ public HelmChartArgs(java.lang.String chartHome, java.lang.String chartName, jav } @JsonProperty("chartHome") - public java.lang.String getChartHome() { + public String getChartHome() { return chartHome; } @JsonProperty("chartHome") - public void setChartHome(java.lang.String chartHome) { + public void setChartHome(String chartHome) { this.chartHome = chartHome; } @JsonProperty("chartName") - public java.lang.String getChartName() { + public String getChartName() { return chartName; } @JsonProperty("chartName") - public void setChartName(java.lang.String chartName) { + public void setChartName(String chartName) { this.chartName = chartName; } @JsonProperty("chartRepoName") - public java.lang.String getChartRepoName() { + public String getChartRepoName() { return chartRepoName; } @JsonProperty("chartRepoName") - public void setChartRepoName(java.lang.String chartRepoName) { + public void setChartRepoName(String chartRepoName) { this.chartRepoName = chartRepoName; } @JsonProperty("chartRepoUrl") - public java.lang.String getChartRepoUrl() { + public String getChartRepoUrl() { return chartRepoUrl; } @JsonProperty("chartRepoUrl") - public void setChartRepoUrl(java.lang.String chartRepoUrl) { + public void setChartRepoUrl(String chartRepoUrl) { this.chartRepoUrl = chartRepoUrl; } @JsonProperty("chartVersion") - public java.lang.String getChartVersion() { + public String getChartVersion() { return chartVersion; } @JsonProperty("chartVersion") - public void setChartVersion(java.lang.String chartVersion) { + public void setChartVersion(String chartVersion) { this.chartVersion = chartVersion; } @JsonProperty("extraArgs") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getExtraArgs() { + public List getExtraArgs() { return extraArgs; } @JsonProperty("extraArgs") - public void setExtraArgs(List extraArgs) { + public void setExtraArgs(List extraArgs) { this.extraArgs = extraArgs; } @JsonProperty("helmBin") - public java.lang.String getHelmBin() { + public String getHelmBin() { return helmBin; } @JsonProperty("helmBin") - public void setHelmBin(java.lang.String helmBin) { + public void setHelmBin(String helmBin) { this.helmBin = helmBin; } @JsonProperty("helmHome") - public java.lang.String getHelmHome() { + public String getHelmHome() { return helmHome; } @JsonProperty("helmHome") - public void setHelmHome(java.lang.String helmHome) { + public void setHelmHome(String helmHome) { this.helmHome = helmHome; } @JsonProperty("releaseName") - public java.lang.String getReleaseName() { + public String getReleaseName() { return releaseName; } @JsonProperty("releaseName") - public void setReleaseName(java.lang.String releaseName) { + public void setReleaseName(String releaseName) { this.releaseName = releaseName; } @JsonProperty("releaseNamespace") - public java.lang.String getReleaseNamespace() { + public String getReleaseNamespace() { return releaseNamespace; } @JsonProperty("releaseNamespace") - public void setReleaseNamespace(java.lang.String releaseNamespace) { + public void setReleaseNamespace(String releaseNamespace) { this.releaseNamespace = releaseNamespace; } @JsonProperty("values") - public java.lang.String getValues() { + public String getValues() { return values; } @JsonProperty("values") - public void setValues(java.lang.String values) { + public void setValues(String values) { this.values = values; } @@ -227,12 +227,12 @@ public void setValuesLocal(Map valuesLocal) { } @JsonProperty("valuesMerge") - public java.lang.String getValuesMerge() { + public String getValuesMerge() { return valuesMerge; } @JsonProperty("valuesMerge") - public void setValuesMerge(java.lang.String valuesMerge) { + public void setValuesMerge(String valuesMerge) { this.valuesMerge = valuesMerge; } @@ -247,12 +247,12 @@ public HelmChartArgsBuilder toBuilder() { } @JsonAnyGetter - public Map getAdditionalProperties() { + public Map getAdditionalProperties() { return this.additionalProperties; } @JsonAnySetter - public void setAdditionalProperty(java.lang.String name, Object value) { + public void setAdditionalProperty(String name, Object value) { this.additionalProperties.put(name, value); } diff --git a/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/kustomize/v1beta1/Kustomization.java b/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/kustomize/v1beta1/Kustomization.java index 48f7ba3111a..2ee5c5528dc 100644 --- a/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/kustomize/v1beta1/Kustomization.java +++ b/kubernetes-model-generator/kubernetes-model-kustomize/src/generated/java/io/fabric8/kubernetes/api/model/kustomize/v1beta1/Kustomization.java @@ -77,13 +77,13 @@ public class Kustomization implements Editable , Kubernete * */ @JsonProperty("apiVersion") - private java.lang.String apiVersion; + private String apiVersion; @JsonProperty("bases") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List bases = new ArrayList(); + private List bases = new ArrayList(); @JsonProperty("buildMetadata") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List buildMetadata = new ArrayList(); + private List buildMetadata = new ArrayList(); @JsonProperty("commonAnnotations") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map commonAnnotations = new LinkedHashMap(); @@ -92,21 +92,21 @@ public class Kustomization implements Editable , Kubernete private Map commonLabels = new LinkedHashMap(); @JsonProperty("components") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List components = new ArrayList(); + private List components = new ArrayList(); @JsonProperty("configMapGenerator") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List configMapGenerator = new ArrayList(); @JsonProperty("configurations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List configurations = new ArrayList(); + private List configurations = new ArrayList(); @JsonProperty("crds") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List crds = new ArrayList(); + private List crds = new ArrayList(); @JsonProperty("generatorOptions") private GeneratorOptions generatorOptions; @JsonProperty("generators") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List generators = new ArrayList(); + private List generators = new ArrayList(); @JsonProperty("helmChartInflationGenerator") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List helmChartInflationGenerator = new ArrayList(); @@ -127,18 +127,18 @@ public class Kustomization implements Editable , Kubernete * */ @JsonProperty("kind") - private java.lang.String kind = "Kustomization"; + private String kind = "Kustomization"; @JsonProperty("labels") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List