diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index ea308f02b51..74c1de28314 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -52,8 +52,8 @@ public class KubeSchema { private io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest v1Beta1AdmissionRequest; private io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse v1Beta1AdmissionResponse; private io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionReview v1Beta1AdmissionReview; - private java.lang.String v1Beta1Operation; - private java.lang.String v1Beta1PatchType; + private String v1Beta1Operation; + private String v1Beta1PatchType; private io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview; private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy v1Beta1ValidatingAdmissionPolicy; private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding v1Beta1ValidatingAdmissionPolicyBinding; @@ -61,8 +61,8 @@ public class KubeSchema { private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList v1Beta1ValidatingAdmissionPolicyList; private io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration; private io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList; - private java.lang.String v1Operation; - private java.lang.String v1PatchType; + private String v1Operation; + private String v1PatchType; private Rule v1Rule; private RuleWithOperations v1RuleWithOperations; private io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview v1SelfSubjectReview; @@ -84,7 +84,7 @@ public class KubeSchema { private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration; private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfigurationList validatingWebhookConfigurationList; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -93,7 +93,7 @@ public class KubeSchema { public KubeSchema() { } - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.authorization.v1.LocalSubjectAccessReview k8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReview k8sSubjectAccessReview, ListOptions listOptions, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration mutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList mutatingWebhookConfigurationList, ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Rule rule, RuleWithOperations ruleWithOperations, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview, io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview selfSubjectReview, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference serviceReference, Status status, String time, TokenRequest tokenRequest, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest v1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse v1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview v1AdmissionReview, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest v1Beta1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse v1Beta1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionReview v1Beta1AdmissionReview, java.lang.String v1Beta1Operation, java.lang.String v1Beta1PatchType, io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy v1Beta1ValidatingAdmissionPolicy, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding v1Beta1ValidatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingList v1Beta1ValidatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList v1Beta1ValidatingAdmissionPolicyList, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList, java.lang.String v1Operation, java.lang.String v1PatchType, Rule v1Rule, RuleWithOperations v1RuleWithOperations, io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview v1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingAdmissionPolicy v1ValidatingAdmissionPolicy, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingAdmissionPolicyBinding v1ValidatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingAdmissionPolicyBindingList v1ValidatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingAdmissionPolicyList v1ValidatingAdmissionPolicyList, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration v1ValidatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfigurationList v1ValidatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.authorization.v1beta1.LocalSubjectAccessReview v1beta1K8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReview v1beta1K8sSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReview v1beta1SelfSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReview v1beta1SelfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicy validatingAdmissionPolicies, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyList validatingAdmissionPoliciesList, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfigurationList validatingWebhookConfigurationList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.authorization.v1.LocalSubjectAccessReview k8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReview k8sSubjectAccessReview, ListOptions listOptions, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration mutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList mutatingWebhookConfigurationList, ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Rule rule, RuleWithOperations ruleWithOperations, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview, io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview selfSubjectReview, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference serviceReference, Status status, String time, TokenRequest tokenRequest, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest v1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse v1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview v1AdmissionReview, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest v1Beta1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse v1Beta1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionReview v1Beta1AdmissionReview, String v1Beta1Operation, String v1Beta1PatchType, io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy v1Beta1ValidatingAdmissionPolicy, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding v1Beta1ValidatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingList v1Beta1ValidatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList v1Beta1ValidatingAdmissionPolicyList, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList, String v1Operation, String v1PatchType, Rule v1Rule, RuleWithOperations v1RuleWithOperations, io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview v1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingAdmissionPolicy v1ValidatingAdmissionPolicy, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingAdmissionPolicyBinding v1ValidatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingAdmissionPolicyBindingList v1ValidatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingAdmissionPolicyList v1ValidatingAdmissionPolicyList, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration v1ValidatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfigurationList v1ValidatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.authorization.v1beta1.LocalSubjectAccessReview v1beta1K8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReview v1beta1K8sSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReview v1beta1SelfSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReview v1beta1SelfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicy validatingAdmissionPolicies, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyList validatingAdmissionPoliciesList, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfigurationList validatingWebhookConfigurationList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -514,22 +514,22 @@ public void setV1Beta1AdmissionReview(io.fabric8.kubernetes.api.model.admission. } @JsonProperty("V1Beta1Operation") - public java.lang.String getV1Beta1Operation() { + public String getV1Beta1Operation() { return v1Beta1Operation; } @JsonProperty("V1Beta1Operation") - public void setV1Beta1Operation(java.lang.String v1Beta1Operation) { + public void setV1Beta1Operation(String v1Beta1Operation) { this.v1Beta1Operation = v1Beta1Operation; } @JsonProperty("V1Beta1PatchType") - public java.lang.String getV1Beta1PatchType() { + public String getV1Beta1PatchType() { return v1Beta1PatchType; } @JsonProperty("V1Beta1PatchType") - public void setV1Beta1PatchType(java.lang.String v1Beta1PatchType) { + public void setV1Beta1PatchType(String v1Beta1PatchType) { this.v1Beta1PatchType = v1Beta1PatchType; } @@ -604,22 +604,22 @@ public void setV1MutatingWebhookConfigurationList(io.fabric8.kubernetes.api.mode } @JsonProperty("V1Operation") - public java.lang.String getV1Operation() { + public String getV1Operation() { return v1Operation; } @JsonProperty("V1Operation") - public void setV1Operation(java.lang.String v1Operation) { + public void setV1Operation(String v1Operation) { this.v1Operation = v1Operation; } @JsonProperty("V1PatchType") - public java.lang.String getV1PatchType() { + public String getV1PatchType() { return v1PatchType; } @JsonProperty("V1PatchType") - public void setV1PatchType(java.lang.String v1PatchType) { + public void setV1PatchType(String v1PatchType) { this.v1PatchType = v1PatchType; } @@ -824,16 +824,16 @@ public void setValidatingWebhookConfigurationList(io.fabric8.kubernetes.api.mode } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 9c37e837d2a..050eeefdf76 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -52,8 +52,8 @@ public class ValidationSchema { private io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest v1Beta1AdmissionRequest; private io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse v1Beta1AdmissionResponse; private io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionReview v1Beta1AdmissionReview; - private java.lang.String v1Beta1Operation; - private java.lang.String v1Beta1PatchType; + private String v1Beta1Operation; + private String v1Beta1PatchType; private io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview; private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy v1Beta1ValidatingAdmissionPolicy; private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding v1Beta1ValidatingAdmissionPolicyBinding; @@ -61,8 +61,8 @@ public class ValidationSchema { private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList v1Beta1ValidatingAdmissionPolicyList; private io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration; private io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList; - private java.lang.String v1Operation; - private java.lang.String v1PatchType; + private String v1Operation; + private String v1PatchType; private Rule v1Rule; private RuleWithOperations v1RuleWithOperations; private io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview v1SelfSubjectReview; @@ -84,7 +84,7 @@ public class ValidationSchema { private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration; private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfigurationList validatingWebhookConfigurationList; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -93,7 +93,7 @@ public class ValidationSchema { public ValidationSchema() { } - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.authorization.v1.LocalSubjectAccessReview k8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReview k8sSubjectAccessReview, ListOptions listOptions, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration mutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList mutatingWebhookConfigurationList, ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Rule rule, RuleWithOperations ruleWithOperations, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview, io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview selfSubjectReview, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference serviceReference, Status status, String time, TokenRequest tokenRequest, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest v1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse v1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview v1AdmissionReview, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest v1Beta1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse v1Beta1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionReview v1Beta1AdmissionReview, java.lang.String v1Beta1Operation, java.lang.String v1Beta1PatchType, io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy v1Beta1ValidatingAdmissionPolicy, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding v1Beta1ValidatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingList v1Beta1ValidatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList v1Beta1ValidatingAdmissionPolicyList, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList, java.lang.String v1Operation, java.lang.String v1PatchType, Rule v1Rule, RuleWithOperations v1RuleWithOperations, io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview v1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingAdmissionPolicy v1ValidatingAdmissionPolicy, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingAdmissionPolicyBinding v1ValidatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingAdmissionPolicyBindingList v1ValidatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingAdmissionPolicyList v1ValidatingAdmissionPolicyList, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration v1ValidatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfigurationList v1ValidatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.authorization.v1beta1.LocalSubjectAccessReview v1beta1K8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReview v1beta1K8sSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReview v1beta1SelfSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReview v1beta1SelfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicy validatingAdmissionPolicies, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyList validatingAdmissionPoliciesList, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfigurationList validatingWebhookConfigurationList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.authorization.v1.LocalSubjectAccessReview k8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReview k8sSubjectAccessReview, ListOptions listOptions, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration mutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList mutatingWebhookConfigurationList, ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Rule rule, RuleWithOperations ruleWithOperations, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview, io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReview selfSubjectReview, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference serviceReference, Status status, String time, TokenRequest tokenRequest, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest v1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse v1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1.AdmissionReview v1AdmissionReview, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest v1Beta1AdmissionRequest, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse v1Beta1AdmissionResponse, io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionReview v1Beta1AdmissionReview, String v1Beta1Operation, String v1Beta1PatchType, io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReview v1Beta1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy v1Beta1ValidatingAdmissionPolicy, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding v1Beta1ValidatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBindingList v1Beta1ValidatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyList v1Beta1ValidatingAdmissionPolicyList, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList, String v1Operation, String v1PatchType, Rule v1Rule, RuleWithOperations v1RuleWithOperations, io.fabric8.kubernetes.api.model.authentication.SelfSubjectReview v1SelfSubjectReview, io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingAdmissionPolicy v1ValidatingAdmissionPolicy, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingAdmissionPolicyBinding v1ValidatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingAdmissionPolicyBindingList v1ValidatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingAdmissionPolicyList v1ValidatingAdmissionPolicyList, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration v1ValidatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfigurationList v1ValidatingWebhookConfigurationList, io.fabric8.kubernetes.api.model.authorization.v1beta1.LocalSubjectAccessReview v1beta1K8sLocalSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReview v1beta1K8sSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReview v1beta1SelfSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReview v1beta1SelfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicy validatingAdmissionPolicies, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyList validatingAdmissionPoliciesList, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBinding validatingAdmissionPolicyBinding, io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBindingList validatingAdmissionPolicyBindingList, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfigurationList validatingWebhookConfigurationList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -514,22 +514,22 @@ public void setV1Beta1AdmissionReview(io.fabric8.kubernetes.api.model.admission. } @JsonProperty("V1Beta1Operation") - public java.lang.String getV1Beta1Operation() { + public String getV1Beta1Operation() { return v1Beta1Operation; } @JsonProperty("V1Beta1Operation") - public void setV1Beta1Operation(java.lang.String v1Beta1Operation) { + public void setV1Beta1Operation(String v1Beta1Operation) { this.v1Beta1Operation = v1Beta1Operation; } @JsonProperty("V1Beta1PatchType") - public java.lang.String getV1Beta1PatchType() { + public String getV1Beta1PatchType() { return v1Beta1PatchType; } @JsonProperty("V1Beta1PatchType") - public void setV1Beta1PatchType(java.lang.String v1Beta1PatchType) { + public void setV1Beta1PatchType(String v1Beta1PatchType) { this.v1Beta1PatchType = v1Beta1PatchType; } @@ -604,22 +604,22 @@ public void setV1MutatingWebhookConfigurationList(io.fabric8.kubernetes.api.mode } @JsonProperty("V1Operation") - public java.lang.String getV1Operation() { + public String getV1Operation() { return v1Operation; } @JsonProperty("V1Operation") - public void setV1Operation(java.lang.String v1Operation) { + public void setV1Operation(String v1Operation) { this.v1Operation = v1Operation; } @JsonProperty("V1PatchType") - public java.lang.String getV1PatchType() { + public String getV1PatchType() { return v1PatchType; } @JsonProperty("V1PatchType") - public void setV1PatchType(java.lang.String v1PatchType) { + public void setV1PatchType(String v1PatchType) { this.v1PatchType = v1PatchType; } @@ -824,16 +824,16 @@ public void setValidatingWebhookConfigurationList(io.fabric8.kubernetes.api.mode } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/TokenRequestStatus.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/TokenRequestStatus.java index cadb26829de..5c3ad9508df 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/TokenRequestStatus.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/TokenRequestStatus.java @@ -58,9 +58,9 @@ public class TokenRequestStatus implements Editable , @JsonProperty("expirationTimestamp") private String expirationTimestamp; @JsonProperty("token") - private java.lang.String token; + private String token; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -69,7 +69,7 @@ public class TokenRequestStatus implements Editable , public TokenRequestStatus() { } - public TokenRequestStatus(String expirationTimestamp, java.lang.String token) { + public TokenRequestStatus(String expirationTimestamp, String token) { super(); this.expirationTimestamp = expirationTimestamp; this.token = token; @@ -86,12 +86,12 @@ public void setExpirationTimestamp(String expirationTimestamp) { } @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; } @@ -106,16 +106,16 @@ public TokenRequestStatusBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } 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 284c02d75ae..a11b3b713aa 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 @@ -2393,8 +2393,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2756,8 +2755,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -2777,16 +2775,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -3061,19 +3057,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -3293,8 +3276,7 @@ "type": "object", "properties": { "expirationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "token": { "type": "string" @@ -4322,8 +4304,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TokenRequest": { "$ref": "#/definitions/kubernetes_authentication_TokenRequest", 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 77684be7844..babb9324d2c 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 @@ -2393,8 +2393,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2756,8 +2755,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -2777,16 +2775,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -3061,19 +3057,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -3293,8 +3276,7 @@ "type": "object", "properties": { "expirationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "token": { "type": "string" @@ -4322,8 +4304,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TokenRequest": { "$ref": "#/definitions/kubernetes_authentication_TokenRequest", @@ -4585,7 +4566,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admission.k8s.io/v1", + "default": "admission.k8s.io/v1beta1", "required": true }, "kind": { @@ -4594,12 +4575,12 @@ "required": true }, "request": { - "$ref": "#/definitions/kubernetes_admission_v1_AdmissionRequest", - "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest" + "$ref": "#/definitions/kubernetes_admission_v1beta1_AdmissionRequest", + "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest" }, "response": { - "$ref": "#/definitions/kubernetes_admission_v1_AdmissionResponse", - "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse" + "$ref": "#/definitions/kubernetes_admission_v1beta1_AdmissionResponse", + "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse" } }, "additionalProperties": true @@ -4694,8 +4675,7 @@ "condition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5016,7 +4996,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1beta1", + "default": "authorization.k8s.io/v1", "required": true }, "kind": { @@ -5029,12 +5009,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewSpec" + "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewSpec" }, "status": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewStatus" + "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewStatus" } }, "additionalProperties": true @@ -5061,8 +5041,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -5114,13 +5093,14 @@ "properties": { "admissionReviewVersions": { "type": "array", + "javaOmitEmpty": true, "items": { "type": "string" } }, "clientConfig": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_WebhookClientConfig", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.WebhookClientConfig" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_WebhookClientConfig", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.WebhookClientConfig" }, "failurePolicy": { "type": "string" @@ -5129,8 +5109,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_MatchCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MatchCondition" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchCondition" } }, "matchPolicy": { @@ -5171,7 +5151,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1", + "default": "admissionregistration.k8s.io/v1beta1", "required": true }, "kind": { @@ -5187,8 +5167,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_MutatingWebhook", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhook" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MutatingWebhook", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhook" } } }, @@ -5302,16 +5282,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -5616,7 +5594,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1beta1", + "default": "authorization.k8s.io/v1", "required": true }, "kind": { @@ -5629,12 +5607,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SelfSubjectAccessReviewSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReviewSpec" + "$ref": "#/definitions/kubernetes_authorization_v1_SelfSubjectAccessReviewSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReviewSpec" }, "status": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewStatus" + "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewStatus" } }, "additionalProperties": true @@ -5656,7 +5634,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authentication.k8s.io/v1", + "default": "authentication.k8s.io/v1alpha1", "required": true }, "kind": { @@ -5669,8 +5647,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "status": { - "$ref": "#/definitions/kubernetes_authentication_SelfSubjectReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.SelfSubjectReviewStatus" + "$ref": "#/definitions/kubernetes_authentication_v1alpha1_SelfSubjectReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReviewStatus" } }, "additionalProperties": true @@ -5688,7 +5666,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1", + "default": "authorization.k8s.io/v1beta1", "required": true }, "kind": { @@ -5701,12 +5679,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_authorization_v1_SelfSubjectRulesReviewSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReviewSpec" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_SelfSubjectRulesReviewSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReviewSpec" }, "status": { - "$ref": "#/definitions/kubernetes_authorization_v1_SubjectRulesReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectRulesReviewStatus" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectRulesReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectRulesReviewStatus" } }, "additionalProperties": true @@ -5828,7 +5806,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1", + "default": "authorization.k8s.io/v1beta1", "required": true }, "kind": { @@ -5841,12 +5819,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 @@ -5915,28 +5893,20 @@ "nonResourceRules": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_NonResourceRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.NonResourceRule" + "$ref": "#/definitions/kubernetes_authorization_v1_NonResourceRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.NonResourceRule" } }, "resourceRules": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_ResourceRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.ResourceRule" + "$ref": "#/definitions/kubernetes_authorization_v1_ResourceRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.ResourceRule" } } }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "tokenrequest": { "properties": { "apiVersion": { @@ -5986,8 +5956,7 @@ "tokenrequeststatus": { "properties": { "expirationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "token": { "type": "string" @@ -6143,7 +6112,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1", + "default": "admissionregistration.k8s.io/v1alpha1", "required": true }, "kind": { @@ -6156,12 +6125,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_ValidatingAdmissionPolicySpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingAdmissionPolicySpec" + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicySpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicySpec" }, "status": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_ValidatingAdmissionPolicyStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingAdmissionPolicyStatus" + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicyStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyStatus" } }, "additionalProperties": true @@ -6170,7 +6139,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1", + "default": "admissionregistration.k8s.io/v1beta1", "required": true }, "kind": { @@ -6183,8 +6152,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 @@ -6193,15 +6162,15 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1alpha1", + "default": "admissionregistration.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicyBinding", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBinding" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBinding", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding" } }, "kind": { @@ -6219,12 +6188,12 @@ "validatingadmissionpolicybindingspec": { "properties": { "matchResources": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_MatchResources", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MatchResources" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchResources", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchResources" }, "paramRef": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_ParamRef", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ParamRef" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ParamRef", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ParamRef" }, "policyName": { "type": "string" @@ -6329,8 +6298,8 @@ "existingJavaType": "Long" }, "typeChecking": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_TypeChecking", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.TypeChecking" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_TypeChecking", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.TypeChecking" } }, "additionalProperties": true @@ -6339,14 +6308,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" @@ -6355,8 +6323,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": { @@ -6394,7 +6362,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1", + "default": "admissionregistration.k8s.io/v1beta1", "required": true }, "kind": { @@ -6410,8 +6378,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_ValidatingWebhook", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhook" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingWebhook", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhook" } } }, @@ -6421,14 +6389,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1beta1", + "default": "admissionregistration.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingWebhookConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_ValidatingWebhookConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration" } }, "kind": { @@ -6477,8 +6445,8 @@ "type": "string" }, "service": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_ServiceReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ServiceReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference" }, "url": { "type": "string" diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 3f67e50aeb4..4d84f16df7e 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -48,7 +48,7 @@ public class KubeSchema { private io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionStatus v1CustomResourceDefinitionStatus; private io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray v1JSONSchemaPropsOrStringArray; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -425,16 +425,16 @@ public void setV1JSONSchemaPropsOrStringArray(io.fabric8.kubernetes.api.model.ap } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index fc4f3764eff..e3763ec7147 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -48,7 +48,7 @@ public class ValidationSchema { private io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionStatus v1CustomResourceDefinitionStatus; private io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray v1JSONSchemaPropsOrStringArray; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -425,16 +425,16 @@ public void setV1JSONSchemaPropsOrStringArray(io.fabric8.kubernetes.api.model.ap } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/CustomResourceDefinitionCondition.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/CustomResourceDefinitionCondition.java index d890d071608..213ffa879cb 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/CustomResourceDefinitionCondition.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/CustomResourceDefinitionCondition.java @@ -61,15 +61,15 @@ public class CustomResourceDefinitionCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class CustomResourceDefinitionCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/CustomResourceDefinitionCondition.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/CustomResourceDefinitionCondition.java index b585f84aac0..f20c775dc3e 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/CustomResourceDefinitionCondition.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/CustomResourceDefinitionCondition.java @@ -61,15 +61,15 @@ public class CustomResourceDefinitionCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class CustomResourceDefinitionCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } 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 5a6138b0b68..91acd9b97f1 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 @@ -172,8 +172,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -918,8 +917,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1904,8 +1902,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -1925,16 +1922,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -2209,19 +2204,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -2439,8 +2421,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", 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 d723d71659e..7f99436f1b7 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 @@ -172,8 +172,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -918,8 +917,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1904,8 +1902,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -1925,16 +1922,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -2209,19 +2204,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -2439,8 +2421,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -2678,7 +2659,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "apiextensions.k8s.io/v1beta1", + "default": "apiextensions.k8s.io/v1", "required": true }, "kind": { @@ -2691,12 +2672,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionSpec" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionSpec" }, "status": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionStatus" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionStatus" } }, "additionalProperties": true @@ -2704,8 +2685,7 @@ "customresourcedefinitioncondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2726,14 +2706,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "apiextensions.k8s.io/v1beta1", + "default": "apiextensions.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinition", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinition", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition" } }, "kind": { @@ -2811,14 +2791,14 @@ "customresourcedefinitionstatus": { "properties": { "acceptedNames": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionNames", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionNames" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionNames", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionNames" }, "conditions": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionCondition" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionCondition" } }, "storedVersions": { @@ -2836,8 +2816,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceColumnDefinition", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceColumnDefinition" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceColumnDefinition", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceColumnDefinition" } }, "deprecated": { @@ -2850,15 +2830,15 @@ "type": "string" }, "schema": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceValidation", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceValidation" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceValidation", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceValidation" }, "selectableFields": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_SelectableField", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.SelectableField" + "$ref": "#/definitions/kubernetes_apiextensions_v1_SelectableField", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.SelectableField" } }, "served": { @@ -2868,8 +2848,8 @@ "type": "boolean" }, "subresources": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresources", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresources" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceSubresources", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceSubresources" } }, "additionalProperties": true @@ -2877,12 +2857,12 @@ "customresourcesubresources": { "properties": { "scale": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresourceScale", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresourceScale" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceSubresourceScale", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceSubresourceScale" }, "status": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresourceStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresourceStatus" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceSubresourceStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceSubresourceStatus" } }, "additionalProperties": true @@ -2907,8 +2887,8 @@ "customresourcevalidation": { "properties": { "openAPIV3Schema": { - "$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 @@ -3036,48 +3016,48 @@ "type": "string" }, "additionalItems": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrBool", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrBool" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrBool", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrBool" }, "additionalProperties": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrBool", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrBool" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrBool", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrBool" }, "allOf": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" } }, "anyOf": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" } }, "default": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSON", + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSON", "existingJavaType": "com.fasterxml.jackson.databind.JsonNode" }, "definitions": { "type": "object", "additionalProperties": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" }, "dependencies": { "type": "object", "additionalProperties": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrStringArray", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrStringArray", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray" }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray\u003e" }, "description": { "type": "string" @@ -3086,12 +3066,12 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSON", + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSON", "existingJavaType": "com.fasterxml.jackson.databind.JsonNode" } }, "example": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSON", + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSON", "existingJavaType": "com.fasterxml.jackson.databind.JsonNode" }, "exclusiveMaximum": { @@ -3101,8 +3081,8 @@ "type": "boolean" }, "externalDocs": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_ExternalDocumentation", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.ExternalDocumentation" + "$ref": "#/definitions/kubernetes_apiextensions_v1_ExternalDocumentation", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.ExternalDocumentation" }, "format": { "type": "string" @@ -3111,8 +3091,8 @@ "type": "string" }, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrArray", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrArray" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrArray", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrArray" }, "maxItems": { "type": "integer", @@ -3148,8 +3128,8 @@ "type": "number" }, "not": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" }, "nullable": { "type": "boolean" @@ -3158,8 +3138,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" } }, "pattern": { @@ -3168,18 +3148,18 @@ "patternProperties": { "type": "object", "additionalProperties": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" }, "properties": { "type": "object", "additionalProperties": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cjava.lang.String, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" }, "required": { "type": "array", @@ -3223,8 +3203,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_ValidationRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.ValidationRule" + "$ref": "#/definitions/kubernetes_apiextensions_v1_ValidationRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.ValidationRule" } } }, @@ -3235,13 +3215,13 @@ "JSONSchemas": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" } }, "Schema": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" } }, "additionalProperties": true @@ -3267,8 +3247,8 @@ } }, "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 @@ -3386,8 +3366,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -3402,16 +3381,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -3699,14 +3676,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "typemeta": { "properties": { "apiVersion": { @@ -3775,8 +3744,8 @@ "type": "string" }, "service": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_ServiceReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.ServiceReference" + "$ref": "#/definitions/kubernetes_apiextensions_v1_ServiceReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.ServiceReference" }, "url": { "type": "string" diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index ac5dcaa4fc0..3feec5bebbe 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -80,7 +80,7 @@ public class KubeSchema { private TypeMeta typeMeta; private UpdateOptions updateOptions; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -710,16 +710,16 @@ public void setUpdateOptions(UpdateOptions updateOptions) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 2545e520fe7..997e0847d8d 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -80,7 +80,7 @@ public class ValidationSchema { private TypeMeta typeMeta; private UpdateOptions updateOptions; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -710,16 +710,16 @@ public void setUpdateOptions(UpdateOptions updateOptions) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DaemonSetCondition.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DaemonSetCondition.java index f473e6e071a..86451d52b3b 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DaemonSetCondition.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DaemonSetCondition.java @@ -61,15 +61,15 @@ public class DaemonSetCondition implements Editable , @JsonProperty("lastTransitionTime") private String lastTransitionTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -78,7 +78,7 @@ public class DaemonSetCondition implements Editable , public DaemonSetCondition() { } - public DaemonSetCondition(String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public DaemonSetCondition(String lastTransitionTime, String message, String reason, String status, String type) { super(); this.lastTransitionTime = lastTransitionTime; this.message = message; @@ -98,42 +98,42 @@ public void setLastTransitionTime(String lastTransitionTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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,16 +148,16 @@ public DaemonSetConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DeploymentCondition.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DeploymentCondition.java index ff74b695ab2..5eff0fd2656 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DeploymentCondition.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DeploymentCondition.java @@ -64,15 +64,15 @@ public class DeploymentCondition implements Editable @JsonProperty("lastUpdateTime") private String lastUpdateTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -81,7 +81,7 @@ public class DeploymentCondition implements Editable public DeploymentCondition() { } - public DeploymentCondition(String lastTransitionTime, String lastUpdateTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public DeploymentCondition(String lastTransitionTime, String lastUpdateTime, String message, String reason, String status, String type) { super(); this.lastTransitionTime = lastTransitionTime; this.lastUpdateTime = lastUpdateTime; @@ -112,42 +112,42 @@ public void setLastUpdateTime(String lastUpdateTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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; } @@ -162,16 +162,16 @@ public DeploymentConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ReplicaSetCondition.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ReplicaSetCondition.java index 6c26761deee..de655ed10ff 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ReplicaSetCondition.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ReplicaSetCondition.java @@ -61,15 +61,15 @@ public class ReplicaSetCondition implements Editable @JsonProperty("lastTransitionTime") private String lastTransitionTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -78,7 +78,7 @@ public class ReplicaSetCondition implements Editable public ReplicaSetCondition() { } - public ReplicaSetCondition(String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public ReplicaSetCondition(String lastTransitionTime, String message, String reason, String status, String type) { super(); this.lastTransitionTime = lastTransitionTime; this.message = message; @@ -98,42 +98,42 @@ public void setLastTransitionTime(String lastTransitionTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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,16 +148,16 @@ public ReplicaSetConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/StatefulSetCondition.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/StatefulSetCondition.java index 753c497b1b3..ed397244575 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/StatefulSetCondition.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/StatefulSetCondition.java @@ -61,15 +61,15 @@ public class StatefulSetCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class StatefulSetCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } 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 c870a2b83b8..cd8bba71c1f 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 @@ -89,8 +89,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -414,8 +413,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -435,16 +433,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -719,19 +715,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -948,8 +931,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1130,12 +1112,10 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1319,8 +1299,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1521,8 +1500,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2650,8 +2628,7 @@ "type": "object", "properties": { "startedAt": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -2670,8 +2647,7 @@ "type": "integer" }, "finishedAt": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2683,8 +2659,7 @@ "type": "integer" }, "startedAt": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -4101,8 +4076,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4267,12 +4241,10 @@ "type": "object", "properties": { "lastHeartbeatTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4759,12 +4731,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5228,8 +5198,7 @@ "type": "object", "properties": { "lastPhaseTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5394,12 +5363,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5925,8 +5892,7 @@ } }, "startTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -6301,8 +6267,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -7429,8 +7394,7 @@ "type": "string" }, "timeAdded": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "value": { "type": "string" @@ -8217,8 +8181,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "Toleration": { "$ref": "#/definitions/kubernetes_core_Toleration", 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 0a0c980f583..b293953e782 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 @@ -89,8 +89,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -414,8 +413,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -435,16 +433,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -719,19 +715,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -948,8 +931,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1130,12 +1112,10 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1319,8 +1299,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1521,8 +1500,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2650,8 +2628,7 @@ "type": "object", "properties": { "startedAt": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -2670,8 +2647,7 @@ "type": "integer" }, "finishedAt": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2683,8 +2659,7 @@ "type": "integer" }, "startedAt": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -4101,8 +4076,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4267,12 +4241,10 @@ "type": "object", "properties": { "lastHeartbeatTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4759,12 +4731,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5228,8 +5198,7 @@ "type": "object", "properties": { "lastPhaseTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5394,12 +5363,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5925,8 +5892,7 @@ } }, "startTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -6301,8 +6267,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -7429,8 +7394,7 @@ "type": "string" }, "timeAdded": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "value": { "type": "string" @@ -8217,8 +8181,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "Toleration": { "$ref": "#/definitions/kubernetes_core_Toleration", @@ -8649,8 +8612,7 @@ "condition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -9010,8 +8972,7 @@ "containerstaterunning": { "properties": { "startedAt": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -9025,8 +8986,7 @@ "type": "integer" }, "finishedAt": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -9038,8 +8998,7 @@ "type": "integer" }, "startedAt": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -9299,8 +9258,7 @@ "daemonsetcondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -9485,12 +9443,10 @@ "deploymentcondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -10870,8 +10826,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -10917,8 +10872,7 @@ "namespacecondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -11061,12 +11015,10 @@ "nodecondition": { "properties": { "lastHeartbeatTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -11393,16 +11345,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -11601,12 +11551,10 @@ "persistentvolumeclaimcondition": { "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -12023,8 +11971,7 @@ "persistentvolumestatus": { "properties": { "lastPhaseTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -12158,12 +12105,10 @@ "podcondition": { "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -12628,8 +12573,7 @@ } }, "startTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -12953,8 +12897,7 @@ "replicasetcondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -13075,8 +13018,7 @@ "replicationcontrollercondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -14015,8 +13957,7 @@ "statefulsetcondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -14318,8 +14259,7 @@ "type": "string" }, "timeAdded": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "value": { "type": "string" @@ -14339,14 +14279,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "toleration": { "properties": { "effect": { diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 3361889298a..4330afbce57 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -41,7 +41,7 @@ public class KubeSchema { private io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler v2beta2HorizontalPodAutoscaler; private io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList v2beta2HorizontalPodAutoscalerList; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -341,16 +341,16 @@ public void setV2beta2HorizontalPodAutoscalerList(io.fabric8.kubernetes.api.mode } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 1724675be71..e1d65f11205 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -41,7 +41,7 @@ public class ValidationSchema { private io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler v2beta2HorizontalPodAutoscaler; private io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList v2beta2HorizontalPodAutoscalerList; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -341,16 +341,16 @@ public void setV2beta2HorizontalPodAutoscalerList(io.fabric8.kubernetes.api.mode } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v1/HorizontalPodAutoscalerStatus.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v1/HorizontalPodAutoscalerStatus.java index e581305cdc4..1d58bb5f2e0 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v1/HorizontalPodAutoscalerStatus.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v1/HorizontalPodAutoscalerStatus.java @@ -69,7 +69,7 @@ public class HorizontalPodAutoscalerStatus implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -148,16 +148,16 @@ public HorizontalPodAutoscalerStatusBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerCondition.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerCondition.java index 27c2f815d29..3f3e3d04adb 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerCondition.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerCondition.java @@ -61,15 +61,15 @@ public class HorizontalPodAutoscalerCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class HorizontalPodAutoscalerCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerStatus.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerStatus.java index b38391d202a..c711885bd4f 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerStatus.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2/HorizontalPodAutoscalerStatus.java @@ -76,7 +76,7 @@ public class HorizontalPodAutoscalerStatus implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -168,16 +168,16 @@ public HorizontalPodAutoscalerStatusBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/HorizontalPodAutoscalerCondition.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/HorizontalPodAutoscalerCondition.java index 2ce06f309a7..1202e6d62e2 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/HorizontalPodAutoscalerCondition.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/HorizontalPodAutoscalerCondition.java @@ -61,15 +61,15 @@ public class HorizontalPodAutoscalerCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class HorizontalPodAutoscalerCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/HorizontalPodAutoscalerStatus.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/HorizontalPodAutoscalerStatus.java index a8f28701432..89bd72f1e27 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/HorizontalPodAutoscalerStatus.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/HorizontalPodAutoscalerStatus.java @@ -76,7 +76,7 @@ public class HorizontalPodAutoscalerStatus implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -168,16 +168,16 @@ public HorizontalPodAutoscalerStatusBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta2/HorizontalPodAutoscalerCondition.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta2/HorizontalPodAutoscalerCondition.java index 645f0ca0fad..ea83a79efb0 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta2/HorizontalPodAutoscalerCondition.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta2/HorizontalPodAutoscalerCondition.java @@ -61,15 +61,15 @@ public class HorizontalPodAutoscalerCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class HorizontalPodAutoscalerCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta2/HorizontalPodAutoscalerStatus.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta2/HorizontalPodAutoscalerStatus.java index c1efd77bf86..a37b96d9a1d 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta2/HorizontalPodAutoscalerStatus.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta2/HorizontalPodAutoscalerStatus.java @@ -76,7 +76,7 @@ public class HorizontalPodAutoscalerStatus implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -168,16 +168,16 @@ public HorizontalPodAutoscalerStatusBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } 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 8f02b96d28a..823113a7c50 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 @@ -371,8 +371,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -392,16 +391,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -676,19 +673,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -903,8 +887,7 @@ "type": "integer" }, "lastScaleTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "observedGeneration": { "type": "integer", @@ -1172,8 +1155,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1283,8 +1265,7 @@ "type": "integer" }, "lastScaleTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "observedGeneration": { "type": "integer", @@ -1691,8 +1672,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1797,8 +1777,7 @@ "type": "integer" }, "lastScaleTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "observedGeneration": { "type": "integer", @@ -2210,8 +2189,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2320,8 +2298,7 @@ "type": "integer" }, "lastScaleTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "observedGeneration": { "type": "integer", @@ -2653,8 +2630,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", 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 3590f826fa8..414d3f77bb3 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 @@ -371,8 +371,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -392,16 +391,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -676,19 +673,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -903,8 +887,7 @@ "type": "integer" }, "lastScaleTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "observedGeneration": { "type": "integer", @@ -1172,8 +1155,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1283,8 +1265,7 @@ "type": "integer" }, "lastScaleTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "observedGeneration": { "type": "integer", @@ -1691,8 +1672,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1797,8 +1777,7 @@ "type": "integer" }, "lastScaleTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "observedGeneration": { "type": "integer", @@ -2210,8 +2189,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2320,8 +2298,7 @@ "type": "integer" }, "lastScaleTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "observedGeneration": { "type": "integer", @@ -2653,8 +2630,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -2766,9 +2742,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 @@ -2869,12 +2848,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 @@ -2882,12 +2861,12 @@ "externalmetricstatus": { "properties": { "current": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricValueStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricValueStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" }, "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" } }, "additionalProperties": true @@ -2967,8 +2946,7 @@ "horizontalpodautoscalercondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2989,14 +2967,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "autoscaling/v2", + "default": "autoscaling/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscaler", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler" + "$ref": "#/definitions/kubernetes_autoscaling_v1_HorizontalPodAutoscaler", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler" } }, "kind": { @@ -3016,35 +2994,28 @@ "maxReplicas": { "type": "integer" }, + "metrics": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_MetricSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.MetricSpec" + } + }, "minReplicas": { "type": "integer" }, "scaleTargetRef": { - "$ref": "#/definitions/kubernetes_autoscaling_v1_CrossVersionObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.CrossVersionObjectReference" - }, - "targetCPUUtilizationPercentage": { - "type": "integer" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.CrossVersionObjectReference" } }, "additionalProperties": true }, "horizontalpodautoscalerstatus": { "properties": { - "conditions": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscalerCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerCondition" - } - }, - "currentMetrics": { - "type": "array", - "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricStatus" - } + "currentCPUUtilizationPercentage": { + "type": "integer" }, "currentReplicas": { "type": "integer" @@ -3053,8 +3024,7 @@ "type": "integer" }, "lastScaleTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "observedGeneration": { "type": "integer", @@ -3083,8 +3053,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingPolicy", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingPolicy" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HPAScalingPolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HPAScalingPolicy" } }, "selectPolicy": { @@ -3279,8 +3249,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -3398,16 +3367,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -3469,33 +3436,40 @@ "objectmetricsource": { "properties": { "describedObject": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_CrossVersionObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.CrossVersionObjectReference" + "$ref": "#/definitions/kubernetes_autoscaling_v2_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.CrossVersionObjectReference" }, "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 }, "objectmetricstatus": { "properties": { - "current": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" + "averageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "describedObject": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_CrossVersionObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.CrossVersionObjectReference" + "currentValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "metric": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" + "metricName": { + "type": "string" + }, + "selector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "target": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.CrossVersionObjectReference" } }, "additionalProperties": true @@ -3560,12 +3534,12 @@ "podsmetricsource": { "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 @@ -3613,12 +3587,9 @@ "name": { "type": "string" }, - "targetAverageUtilization": { - "type": "integer" - }, - "targetAverageValue": { - "$ref": "#/definitions/kubernetes_resource_Quantity", - "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + "target": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricTarget" } }, "additionalProperties": true @@ -3626,8 +3597,8 @@ "resourcemetricstatus": { "properties": { "current": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricValueStatus" }, "name": { "type": "string" @@ -3780,14 +3751,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "typemeta": { "properties": { "apiVersion": { diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index bac423bc097..dbf02214d3c 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -40,7 +40,7 @@ public class KubeSchema { private io.fabric8.kubernetes.api.model.batch.v1.CronJob v1CronJob; private io.fabric8.kubernetes.api.model.batch.v1.CronJobList v1CronJobList; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -318,16 +318,16 @@ public void setV1CronJobList(io.fabric8.kubernetes.api.model.batch.v1.CronJobLis } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index ea0f325e070..6915b7453b7 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -40,7 +40,7 @@ public class ValidationSchema { private io.fabric8.kubernetes.api.model.batch.v1.CronJob v1CronJob; private io.fabric8.kubernetes.api.model.batch.v1.CronJobList v1CronJobList; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -318,16 +318,16 @@ public void setV1CronJobList(io.fabric8.kubernetes.api.model.batch.v1.CronJobLis } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/CronJobStatus.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/CronJobStatus.java index 19c4bb2ffa1..e4d160536ba 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/CronJobStatus.java +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/CronJobStatus.java @@ -65,7 +65,7 @@ public class CronJobStatus implements Editable , Kubernete @JsonProperty("lastSuccessfulTime") private String lastSuccessfulTime; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -123,16 +123,16 @@ public CronJobStatusBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobCondition.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobCondition.java index 7513bf2d495..6d4418a2ece 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobCondition.java +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobCondition.java @@ -64,15 +64,15 @@ public class JobCondition implements Editable , KubernetesR @JsonProperty("lastTransitionTime") private String lastTransitionTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -81,7 +81,7 @@ public class JobCondition implements Editable , KubernetesR public JobCondition() { } - public JobCondition(String lastProbeTime, String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public JobCondition(String lastProbeTime, String lastTransitionTime, String message, String reason, String status, String type) { super(); this.lastProbeTime = lastProbeTime; this.lastTransitionTime = lastTransitionTime; @@ -112,42 +112,42 @@ public void setLastTransitionTime(String lastTransitionTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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; } @@ -162,16 +162,16 @@ public JobConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobStatus.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobStatus.java index e67d7e68e15..25f28150e0a 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobStatus.java +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobStatus.java @@ -69,7 +69,7 @@ public class JobStatus implements Editable , KubernetesResourc @JsonProperty("active") private Integer active; @JsonProperty("completedIndexes") - private java.lang.String completedIndexes; + private String completedIndexes; @JsonProperty("completionTime") private String completionTime; @JsonProperty("conditions") @@ -78,7 +78,7 @@ public class JobStatus implements Editable , KubernetesResourc @JsonProperty("failed") private Integer failed; @JsonProperty("failedIndexes") - private java.lang.String failedIndexes; + private String failedIndexes; @JsonProperty("ready") private Integer ready; @JsonProperty("startTime") @@ -90,7 +90,7 @@ public class JobStatus implements Editable , KubernetesResourc @JsonProperty("uncountedTerminatedPods") private UncountedTerminatedPods uncountedTerminatedPods; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -99,7 +99,7 @@ public class JobStatus implements Editable , KubernetesResourc public JobStatus() { } - public JobStatus(Integer active, java.lang.String completedIndexes, String completionTime, List conditions, Integer failed, java.lang.String failedIndexes, Integer ready, String startTime, Integer succeeded, Integer terminating, UncountedTerminatedPods uncountedTerminatedPods) { + public JobStatus(Integer active, String completedIndexes, String completionTime, List conditions, Integer failed, String failedIndexes, Integer ready, String startTime, Integer succeeded, Integer terminating, UncountedTerminatedPods uncountedTerminatedPods) { super(); this.active = active; this.completedIndexes = completedIndexes; @@ -125,12 +125,12 @@ public void setActive(Integer active) { } @JsonProperty("completedIndexes") - public java.lang.String getCompletedIndexes() { + public String getCompletedIndexes() { return completedIndexes; } @JsonProperty("completedIndexes") - public void setCompletedIndexes(java.lang.String completedIndexes) { + public void setCompletedIndexes(String completedIndexes) { this.completedIndexes = completedIndexes; } @@ -166,12 +166,12 @@ public void setFailed(Integer failed) { } @JsonProperty("failedIndexes") - public java.lang.String getFailedIndexes() { + public String getFailedIndexes() { return failedIndexes; } @JsonProperty("failedIndexes") - public void setFailedIndexes(java.lang.String failedIndexes) { + public void setFailedIndexes(String failedIndexes) { this.failedIndexes = failedIndexes; } @@ -236,16 +236,16 @@ public JobStatusBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1beta1/CronJobStatus.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1beta1/CronJobStatus.java index 8b94618365a..6cba2d219df 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1beta1/CronJobStatus.java +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1beta1/CronJobStatus.java @@ -65,7 +65,7 @@ public class CronJobStatus implements Editable , Kubernete @JsonProperty("lastSuccessfulTime") private String lastSuccessfulTime; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -123,16 +123,16 @@ public CronJobStatusBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } 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 4323c12c773..93319a4f2f9 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 @@ -384,8 +384,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -405,16 +404,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -689,19 +686,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -929,12 +913,10 @@ } }, "lastScheduleTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastSuccessfulTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -980,12 +962,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1111,8 +1091,7 @@ "type": "string" }, "completionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "conditions": { "type": "array", @@ -1132,8 +1111,7 @@ "type": "integer" }, "startTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "succeeded": { "type": "integer" @@ -1419,12 +1397,10 @@ } }, "lastScheduleTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastSuccessfulTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -4690,8 +4666,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", 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 6d5aba13bac..9c5a6e37824 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 @@ -384,8 +384,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -405,16 +404,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -689,19 +686,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -929,12 +913,10 @@ } }, "lastScheduleTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastSuccessfulTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -980,12 +962,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1111,8 +1091,7 @@ "type": "string" }, "completionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "conditions": { "type": "array", @@ -1132,8 +1111,7 @@ "type": "integer" }, "startTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "succeeded": { "type": "integer" @@ -1419,12 +1397,10 @@ } }, "lastScheduleTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastSuccessfulTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -4690,8 +4666,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -5294,12 +5269,10 @@ } }, "lastScheduleTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastSuccessfulTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -6079,12 +6052,10 @@ "jobcondition": { "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -6194,8 +6165,7 @@ "type": "string" }, "completionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "conditions": { "type": "array", @@ -6215,8 +6185,7 @@ "type": "integer" }, "startTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "succeeded": { "type": "integer" @@ -6451,8 +6420,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -6560,16 +6528,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -7880,14 +7846,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "toleration": { "properties": { "effect": { diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 68f1bd45ffd..73258968f62 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -45,7 +45,7 @@ public class KubeSchema { private io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestSpec v1Beta1CertificateSigningRequestSpec; private io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatus v1Beta1CertificateSigningRequestStatus; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -378,16 +378,16 @@ public void setV1Beta1CertificateSigningRequestStatus(io.fabric8.kubernetes.api. } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index b418018c18a..2ddd7d9fad8 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -45,7 +45,7 @@ public class ValidationSchema { private io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestSpec v1Beta1CertificateSigningRequestSpec; private io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatus v1Beta1CertificateSigningRequestStatus; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -378,16 +378,16 @@ public void setV1Beta1CertificateSigningRequestStatus(io.fabric8.kubernetes.api. } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1/CertificateSigningRequestCondition.java b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1/CertificateSigningRequestCondition.java index b27415972ee..a8bd406e26c 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1/CertificateSigningRequestCondition.java +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1/CertificateSigningRequestCondition.java @@ -64,15 +64,15 @@ public class CertificateSigningRequestCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -81,7 +81,7 @@ public class CertificateSigningRequestCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1beta1/CertificateSigningRequestCondition.java b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1beta1/CertificateSigningRequestCondition.java index 940df2fafd0..918d3e8806c 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1beta1/CertificateSigningRequestCondition.java +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1beta1/CertificateSigningRequestCondition.java @@ -64,15 +64,15 @@ public class CertificateSigningRequestCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -81,7 +81,7 @@ public class CertificateSigningRequestCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } 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 6d115d250b5..86b6cc07f30 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 @@ -336,8 +336,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -357,16 +356,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -641,19 +638,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -784,12 +768,10 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1024,12 +1006,10 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1232,8 +1212,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", 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 d8063101a15..104cf984f7a 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 @@ -336,8 +336,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -357,16 +356,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -641,19 +638,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -784,12 +768,10 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1024,12 +1006,10 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1232,8 +1212,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -1363,12 +1342,10 @@ "certificatesigningrequestcondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1772,8 +1749,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -1788,16 +1764,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -2034,14 +2008,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "typemeta": { "properties": { "apiVersion": { diff --git a/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index a7fdf9ec6f2..00ab62f1b6e 100644 --- a/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -35,7 +35,7 @@ public class KubeSchema { private TypeMeta typeMeta; private UpdateOptions updateOptions; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -258,16 +258,16 @@ public void setUpdateOptions(UpdateOptions updateOptions) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index d885e25d184..2b817b8d121 100644 --- a/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -35,7 +35,7 @@ public class ValidationSchema { private TypeMeta typeMeta; private UpdateOptions updateOptions; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -258,16 +258,16 @@ public void setUpdateOptions(UpdateOptions updateOptions) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } 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 adfda5ceac8..3a7826a9531 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 @@ -336,8 +336,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -370,16 +369,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -654,19 +651,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -917,8 +901,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", 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 2a23a2df598..603a109e18b 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 @@ -336,8 +336,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -370,16 +369,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -654,19 +651,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -917,8 +901,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -1302,8 +1285,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -1326,16 +1308,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -1572,14 +1552,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "typemeta": { "properties": { "apiVersion": { diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/APIServiceCondition.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/APIServiceCondition.java index ff92497877f..152a57ae3fb 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/APIServiceCondition.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/APIServiceCondition.java @@ -40,15 +40,15 @@ public class APIServiceCondition implements Editable @JsonProperty("lastTransitionTime") private String lastTransitionTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -57,7 +57,7 @@ public class APIServiceCondition implements Editable public APIServiceCondition() { } - public APIServiceCondition(String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public APIServiceCondition(String lastTransitionTime, String message, String reason, String status, String type) { super(); this.lastTransitionTime = lastTransitionTime; this.message = message; @@ -77,42 +77,42 @@ public void setLastTransitionTime(String lastTransitionTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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; } @@ -127,16 +127,16 @@ public APIServiceConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Condition.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Condition.java index 8314520b450..01cc6069e5d 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Condition.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Condition.java @@ -41,17 +41,17 @@ public class Condition implements Editable , KubernetesResourc @JsonProperty("lastTransitionTime") private String lastTransitionTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("observedGeneration") private Long observedGeneration; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -60,7 +60,7 @@ public class Condition implements Editable , KubernetesResourc public Condition() { } - public Condition(String lastTransitionTime, java.lang.String message, Long observedGeneration, java.lang.String reason, java.lang.String status, java.lang.String type) { + public Condition(String lastTransitionTime, String message, Long observedGeneration, String reason, String status, String type) { super(); this.lastTransitionTime = lastTransitionTime; this.message = message; @@ -81,12 +81,12 @@ public void setLastTransitionTime(String lastTransitionTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @@ -101,32 +101,32 @@ public void setObservedGeneration(Long observedGeneration) { } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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; } @@ -141,16 +141,16 @@ public ConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ContainerStateRunning.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ContainerStateRunning.java index 6c8cefb1a0e..18ac0967453 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ContainerStateRunning.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ContainerStateRunning.java @@ -36,7 +36,7 @@ public class ContainerStateRunning implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -71,16 +71,16 @@ public ContainerStateRunningBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ContainerStateTerminated.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ContainerStateTerminated.java index c4e3284b449..342f5969456 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ContainerStateTerminated.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ContainerStateTerminated.java @@ -40,21 +40,21 @@ public class ContainerStateTerminated implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -63,7 +63,7 @@ public class ContainerStateTerminated implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Event.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Event.java index d71d8264d1d..7b456e643f6 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Event.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Event.java @@ -59,14 +59,14 @@ public class Event implements Editable , HasMetadata, Namespaced { @JsonProperty("action") - private java.lang.String action; + private String action; /** * * (Required) * */ @JsonProperty("apiVersion") - private java.lang.String apiVersion = "v1"; + private String apiVersion = "v1"; @JsonProperty("count") private Integer count; @JsonProperty("eventTime") @@ -81,29 +81,29 @@ public class Event implements Editable , HasMetadata, Namespaced * */ @JsonProperty("kind") - private java.lang.String kind = "Event"; + private String kind = "Event"; @JsonProperty("lastTimestamp") private String lastTimestamp; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("metadata") private ObjectMeta metadata; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("related") private ObjectReference related; @JsonProperty("reportingComponent") - private java.lang.String reportingComponent; + private String reportingComponent; @JsonProperty("reportingInstance") - private java.lang.String reportingInstance; + private String reportingInstance; @JsonProperty("series") private EventSeries series; @JsonProperty("source") private EventSource source; @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 Event implements Editable , HasMetadata, Namespaced public Event() { } - public Event(java.lang.String action, java.lang.String apiVersion, Integer count, MicroTime eventTime, String firstTimestamp, ObjectReference involvedObject, java.lang.String kind, String lastTimestamp, java.lang.String message, ObjectMeta metadata, java.lang.String reason, ObjectReference related, java.lang.String reportingComponent, java.lang.String reportingInstance, EventSeries series, EventSource source, java.lang.String type) { + public Event(String action, String apiVersion, Integer count, MicroTime eventTime, String firstTimestamp, ObjectReference involvedObject, String kind, String lastTimestamp, String message, ObjectMeta metadata, String reason, ObjectReference related, String reportingComponent, String reportingInstance, EventSeries series, EventSource source, String type) { super(); this.action = action; this.apiVersion = apiVersion; @@ -134,12 +134,12 @@ public Event(java.lang.String action, java.lang.String apiVersion, Integer count } @JsonProperty("action") - public java.lang.String getAction() { + public String getAction() { return action; } @JsonProperty("action") - public void setAction(java.lang.String action) { + public void setAction(String action) { this.action = action; } @@ -149,7 +149,7 @@ public void setAction(java.lang.String action) { * */ @JsonProperty("apiVersion") - public java.lang.String getApiVersion() { + public String getApiVersion() { return apiVersion; } @@ -159,7 +159,7 @@ public java.lang.String getApiVersion() { * */ @JsonProperty("apiVersion") - public void setApiVersion(java.lang.String apiVersion) { + public void setApiVersion(String apiVersion) { this.apiVersion = apiVersion; } @@ -209,7 +209,7 @@ public void setInvolvedObject(ObjectReference involvedObject) { * */ @JsonProperty("kind") - public java.lang.String getKind() { + public String getKind() { return kind; } @@ -219,7 +219,7 @@ public java.lang.String getKind() { * */ @JsonProperty("kind") - public void setKind(java.lang.String kind) { + public void setKind(String kind) { this.kind = kind; } @@ -234,12 +234,12 @@ public void setLastTimestamp(String lastTimestamp) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @@ -254,12 +254,12 @@ public void setMetadata(ObjectMeta metadata) { } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @@ -274,22 +274,22 @@ public void setRelated(ObjectReference related) { } @JsonProperty("reportingComponent") - public java.lang.String getReportingComponent() { + public String getReportingComponent() { return reportingComponent; } @JsonProperty("reportingComponent") - public void setReportingComponent(java.lang.String reportingComponent) { + public void setReportingComponent(String reportingComponent) { this.reportingComponent = reportingComponent; } @JsonProperty("reportingInstance") - public java.lang.String getReportingInstance() { + public String getReportingInstance() { return reportingInstance; } @JsonProperty("reportingInstance") - public void setReportingInstance(java.lang.String reportingInstance) { + public void setReportingInstance(String reportingInstance) { this.reportingInstance = reportingInstance; } @@ -314,12 +314,12 @@ public void setSource(EventSource source) { } @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; } @@ -334,16 +334,16 @@ public EventBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index c9183f6f0f6..6d71d59e426 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -78,7 +78,7 @@ public class KubeSchema { private UpdateOptions updateOptions; private WatchEvent watchEvent; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -796,16 +796,16 @@ public void setWatchEvent(WatchEvent watchEvent) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ManagedFieldsEntry.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ManagedFieldsEntry.java index 6cc17a5ed74..0459cf2e997 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ManagedFieldsEntry.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ManagedFieldsEntry.java @@ -40,21 +40,21 @@ public class ManagedFieldsEntry implements Editable , { @JsonProperty("apiVersion") - private java.lang.String apiVersion; + private String apiVersion; @JsonProperty("fieldsType") - private java.lang.String fieldsType; + private String fieldsType; @JsonProperty("fieldsV1") private FieldsV1 fieldsV1; @JsonProperty("manager") - private java.lang.String manager; + private String manager; @JsonProperty("operation") - private java.lang.String operation; + private String operation; @JsonProperty("subresource") - private java.lang.String subresource; + private String subresource; @JsonProperty("time") private String time; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -63,7 +63,7 @@ public class ManagedFieldsEntry implements Editable , public ManagedFieldsEntry() { } - public ManagedFieldsEntry(java.lang.String apiVersion, java.lang.String fieldsType, FieldsV1 fieldsV1, java.lang.String manager, java.lang.String operation, java.lang.String subresource, String time) { + public ManagedFieldsEntry(String apiVersion, String fieldsType, FieldsV1 fieldsV1, String manager, String operation, String subresource, String time) { super(); this.apiVersion = apiVersion; this.fieldsType = fieldsType; @@ -75,22 +75,22 @@ public ManagedFieldsEntry(java.lang.String apiVersion, java.lang.String fieldsTy } @JsonProperty("apiVersion") - public java.lang.String getApiVersion() { + public String getApiVersion() { return apiVersion; } @JsonProperty("apiVersion") - public void setApiVersion(java.lang.String apiVersion) { + public void setApiVersion(String apiVersion) { this.apiVersion = apiVersion; } @JsonProperty("fieldsType") - public java.lang.String getFieldsType() { + public String getFieldsType() { return fieldsType; } @JsonProperty("fieldsType") - public void setFieldsType(java.lang.String fieldsType) { + public void setFieldsType(String fieldsType) { this.fieldsType = fieldsType; } @@ -105,32 +105,32 @@ public void setFieldsV1(FieldsV1 fieldsV1) { } @JsonProperty("manager") - public java.lang.String getManager() { + public String getManager() { return manager; } @JsonProperty("manager") - public void setManager(java.lang.String manager) { + public void setManager(String manager) { this.manager = manager; } @JsonProperty("operation") - public java.lang.String getOperation() { + public String getOperation() { return operation; } @JsonProperty("operation") - public void setOperation(java.lang.String operation) { + public void setOperation(String operation) { this.operation = operation; } @JsonProperty("subresource") - public java.lang.String getSubresource() { + public String getSubresource() { return subresource; } @JsonProperty("subresource") - public void setSubresource(java.lang.String subresource) { + public void setSubresource(String subresource) { this.subresource = subresource; } @@ -155,16 +155,16 @@ public ManagedFieldsEntryBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/NamespaceCondition.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/NamespaceCondition.java index 818f0f638a5..fb3238e1136 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/NamespaceCondition.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/NamespaceCondition.java @@ -40,15 +40,15 @@ public class NamespaceCondition implements Editable , @JsonProperty("lastTransitionTime") private String lastTransitionTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -57,7 +57,7 @@ public class NamespaceCondition implements Editable , public NamespaceCondition() { } - public NamespaceCondition(String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public NamespaceCondition(String lastTransitionTime, String message, String reason, String status, String type) { super(); this.lastTransitionTime = lastTransitionTime; this.message = message; @@ -77,42 +77,42 @@ public void setLastTransitionTime(String lastTransitionTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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; } @@ -127,16 +127,16 @@ public NamespaceConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/NodeCondition.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/NodeCondition.java index ec91e8df64b..0d755b61808 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/NodeCondition.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/NodeCondition.java @@ -43,15 +43,15 @@ public class NodeCondition implements Editable , Kubernete @JsonProperty("lastTransitionTime") private String lastTransitionTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -60,7 +60,7 @@ public class NodeCondition implements Editable , Kubernete public NodeCondition() { } - public NodeCondition(String lastHeartbeatTime, String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public NodeCondition(String lastHeartbeatTime, String lastTransitionTime, String message, String reason, String status, String type) { super(); this.lastHeartbeatTime = lastHeartbeatTime; this.lastTransitionTime = lastTransitionTime; @@ -91,42 +91,42 @@ public void setLastTransitionTime(String lastTransitionTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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; } @@ -141,16 +141,16 @@ public NodeConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } 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 a44a11390ba..b815860102c 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 @@ -51,7 +51,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") @@ -60,32 +60,32 @@ public class ObjectMeta implements Editable , KubernetesResou private String deletionTimestamp; @JsonProperty("finalizers") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List finalizers = new ArrayList<>(); + private List finalizers = new ArrayList<>(); @JsonProperty("generateName") - private java.lang.String generateName; + private String generateName; @JsonProperty("generation") 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<>(); @JsonProperty("name") - private java.lang.String name; + private String name; @JsonProperty("namespace") - private java.lang.String namespace; + private String namespace; @JsonProperty("ownerReferences") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List ownerReferences = new ArrayList<>(); @JsonProperty("resourceVersion") - private java.lang.String resourceVersion; + private String resourceVersion; @JsonProperty("selfLink") - private java.lang.String selfLink; + private String selfLink; @JsonProperty("uid") - private java.lang.String uid; + private String uid; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -94,7 +94,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, String generateName, Long generation, Map labels, List managedFields, String name, String namespace, List ownerReferences, String resourceVersion, String selfLink, String uid) { super(); this.annotations = annotations; this.creationTimestamp = creationTimestamp; @@ -115,12 +115,12 @@ public ObjectMeta(Map annotations, String cr @JsonProperty("annotations") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getAnnotations() { + public Map getAnnotations() { return annotations; } @JsonProperty("annotations") - public void setAnnotations(Map annotations) { + public void setAnnotations(Map annotations) { this.annotations = annotations; } @@ -156,22 +156,22 @@ public void setDeletionTimestamp(String deletionTimestamp) { @JsonProperty("finalizers") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getFinalizers() { + public List getFinalizers() { return finalizers; } @JsonProperty("finalizers") - public void setFinalizers(List finalizers) { + public void setFinalizers(List finalizers) { this.finalizers = finalizers; } @JsonProperty("generateName") - public java.lang.String getGenerateName() { + public String getGenerateName() { return generateName; } @JsonProperty("generateName") - public void setGenerateName(java.lang.String generateName) { + public void setGenerateName(String generateName) { this.generateName = generateName; } @@ -187,12 +187,12 @@ public void setGeneration(Long generation) { @JsonProperty("labels") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getLabels() { + public Map getLabels() { return labels; } @JsonProperty("labels") - public void setLabels(Map labels) { + public void setLabels(Map labels) { this.labels = labels; } @@ -208,22 +208,22 @@ public void setManagedFields(List managedFields) { } @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("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; } @@ -239,32 +239,32 @@ public void setOwnerReferences(List ownerReferences) { } @JsonProperty("resourceVersion") - public java.lang.String getResourceVersion() { + public String getResourceVersion() { return resourceVersion; } @JsonProperty("resourceVersion") - public void setResourceVersion(java.lang.String resourceVersion) { + public void setResourceVersion(String resourceVersion) { this.resourceVersion = resourceVersion; } @JsonProperty("selfLink") - public java.lang.String getSelfLink() { + public String getSelfLink() { return selfLink; } @JsonProperty("selfLink") - public void setSelfLink(java.lang.String selfLink) { + public void setSelfLink(String selfLink) { this.selfLink = selfLink; } @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; } @@ -279,16 +279,16 @@ public ObjectMetaBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaimCondition.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaimCondition.java index 2108503142a..6f0f95b19d6 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaimCondition.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaimCondition.java @@ -43,15 +43,15 @@ public class PersistentVolumeClaimCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -60,7 +60,7 @@ public class PersistentVolumeClaimCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeStatus.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeStatus.java index f7dc5235b61..4ce03cead8e 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeStatus.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeStatus.java @@ -39,13 +39,13 @@ public class PersistentVolumeStatus implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -54,7 +54,7 @@ public class PersistentVolumeStatus implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodCondition.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodCondition.java index 8317428904a..e2ffd430bc4 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodCondition.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodCondition.java @@ -43,15 +43,15 @@ public class PodCondition implements Editable , KubernetesR @JsonProperty("lastTransitionTime") private String lastTransitionTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -60,7 +60,7 @@ public class PodCondition implements Editable , KubernetesR public PodCondition() { } - public PodCondition(String lastProbeTime, String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public PodCondition(String lastProbeTime, String lastTransitionTime, String message, String reason, String status, String type) { super(); this.lastProbeTime = lastProbeTime; this.lastTransitionTime = lastTransitionTime; @@ -91,42 +91,42 @@ public void setLastTransitionTime(String lastTransitionTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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; } @@ -141,16 +141,16 @@ public PodConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodStatus.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodStatus.java index 16982e58f34..d617608b4f9 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodStatus.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodStatus.java @@ -60,7 +60,7 @@ public class PodStatus implements Editable , KubernetesResourc @JsonInclude(JsonInclude.Include.NON_EMPTY) private List ephemeralContainerStatuses = new ArrayList<>(); @JsonProperty("hostIP") - private java.lang.String hostIP; + private String hostIP; @JsonProperty("hostIPs") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List hostIPs = new ArrayList<>(); @@ -68,29 +68,29 @@ public class PodStatus implements Editable , KubernetesResourc @JsonInclude(JsonInclude.Include.NON_EMPTY) private List initContainerStatuses = new ArrayList<>(); @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("nominatedNodeName") - private java.lang.String nominatedNodeName; + private String nominatedNodeName; @JsonProperty("phase") - private java.lang.String phase; + private String phase; @JsonProperty("podIP") - private java.lang.String podIP; + private String podIP; @JsonProperty("podIPs") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List podIPs = new ArrayList<>(); @JsonProperty("qosClass") - private java.lang.String qosClass; + private String qosClass; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("resize") - private java.lang.String resize; + private String resize; @JsonProperty("resourceClaimStatuses") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List resourceClaimStatuses = new ArrayList<>(); @JsonProperty("startTime") private String startTime; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -99,7 +99,7 @@ public class PodStatus implements Editable , KubernetesResourc public PodStatus() { } - public PodStatus(List conditions, List containerStatuses, List ephemeralContainerStatuses, java.lang.String hostIP, List hostIPs, List initContainerStatuses, java.lang.String message, java.lang.String nominatedNodeName, java.lang.String phase, java.lang.String podIP, List podIPs, java.lang.String qosClass, java.lang.String reason, java.lang.String resize, List resourceClaimStatuses, String startTime) { + public PodStatus(List conditions, List containerStatuses, List ephemeralContainerStatuses, String hostIP, List hostIPs, List initContainerStatuses, String message, String nominatedNodeName, String phase, String podIP, List podIPs, String qosClass, String reason, String resize, List resourceClaimStatuses, String startTime) { super(); this.conditions = conditions; this.containerStatuses = containerStatuses; @@ -153,12 +153,12 @@ public void setEphemeralContainerStatuses(List ephemeralContain } @JsonProperty("hostIP") - public java.lang.String getHostIP() { + public String getHostIP() { return hostIP; } @JsonProperty("hostIP") - public void setHostIP(java.lang.String hostIP) { + public void setHostIP(String hostIP) { this.hostIP = hostIP; } @@ -185,42 +185,42 @@ public void setInitContainerStatuses(List initContainerStatuses } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("nominatedNodeName") - public java.lang.String getNominatedNodeName() { + public String getNominatedNodeName() { return nominatedNodeName; } @JsonProperty("nominatedNodeName") - public void setNominatedNodeName(java.lang.String nominatedNodeName) { + public void setNominatedNodeName(String nominatedNodeName) { this.nominatedNodeName = nominatedNodeName; } @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; } @JsonProperty("podIP") - public java.lang.String getPodIP() { + public String getPodIP() { return podIP; } @JsonProperty("podIP") - public void setPodIP(java.lang.String podIP) { + public void setPodIP(String podIP) { this.podIP = podIP; } @@ -236,32 +236,32 @@ public void setPodIPs(List podIPs) { } @JsonProperty("qosClass") - public java.lang.String getQosClass() { + public String getQosClass() { return qosClass; } @JsonProperty("qosClass") - public void setQosClass(java.lang.String qosClass) { + public void setQosClass(String qosClass) { this.qosClass = qosClass; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("resize") - public java.lang.String getResize() { + public String getResize() { return resize; } @JsonProperty("resize") - public void setResize(java.lang.String resize) { + public void setResize(String resize) { this.resize = resize; } @@ -297,16 +297,16 @@ public PodStatusBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ReplicationControllerCondition.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ReplicationControllerCondition.java index 5ebf3b43034..6d305ac3fc0 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ReplicationControllerCondition.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ReplicationControllerCondition.java @@ -40,15 +40,15 @@ public class ReplicationControllerCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -57,7 +57,7 @@ public class ReplicationControllerCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Taint.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Taint.java index 2b023646397..15b255b2747 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Taint.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Taint.java @@ -37,15 +37,15 @@ public class Taint implements Editable , KubernetesResource { @JsonProperty("effect") - private java.lang.String effect; + private String effect; @JsonProperty("key") - private java.lang.String key; + private String key; @JsonProperty("timeAdded") private String timeAdded; @JsonProperty("value") - private java.lang.String value; + private String value; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -54,7 +54,7 @@ public class Taint implements Editable , KubernetesResource public Taint() { } - public Taint(java.lang.String effect, java.lang.String key, String timeAdded, java.lang.String value) { + public Taint(String effect, String key, String timeAdded, String value) { super(); this.effect = effect; this.key = key; @@ -63,22 +63,22 @@ public Taint(java.lang.String effect, java.lang.String key, String timeAdded, ja } @JsonProperty("effect") - public java.lang.String getEffect() { + public String getEffect() { return effect; } @JsonProperty("effect") - public void setEffect(java.lang.String effect) { + public void setEffect(String effect) { this.effect = effect; } @JsonProperty("key") - public java.lang.String getKey() { + public String getKey() { return key; } @JsonProperty("key") - public void setKey(java.lang.String key) { + public void setKey(String key) { this.key = key; } @@ -93,12 +93,12 @@ public void setTimeAdded(String timeAdded) { } @JsonProperty("value") - public java.lang.String getValue() { + public String getValue() { return value; } @JsonProperty("value") - public void setValue(java.lang.String value) { + public void setValue(String value) { this.value = value; } @@ -113,16 +113,16 @@ public TaintBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 852db81f4ae..1d4ca7025a8 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -78,7 +78,7 @@ public class ValidationSchema { private UpdateOptions updateOptions; private WatchEvent watchEvent; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -796,16 +796,16 @@ public void setWatchEvent(WatchEvent watchEvent) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } 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 0cf44c32d6c..732cd90f6df 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 @@ -39,8 +39,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -316,8 +315,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -695,8 +693,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -731,16 +728,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -1015,19 +1010,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_pkg_apis_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_pkg_apis_TypeMeta": { "type": "object", "properties": { @@ -2441,8 +2423,7 @@ "type": "object", "properties": { "startedAt": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -2461,8 +2442,7 @@ "type": "integer" }, "finishedAt": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2474,8 +2454,7 @@ "type": "integer" }, "startedAt": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -3156,8 +3135,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.MicroTime" }, "firstTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "involvedObject": { "$ref": "#/definitions/kubernetes_core_ObjectReference", @@ -3169,8 +3147,7 @@ "required": true }, "lastTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4031,8 +4008,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4197,12 +4173,10 @@ "type": "object", "properties": { "lastHeartbeatTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4689,12 +4663,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5158,8 +5130,7 @@ "type": "object", "properties": { "lastPhaseTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5324,12 +5295,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5896,8 +5865,7 @@ } }, "startTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -6272,8 +6240,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -7400,8 +7367,7 @@ "type": "string" }, "timeAdded": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "value": { "type": "string" @@ -8262,8 +8228,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "Toleration": { "$ref": "#/definitions/kubernetes_core_Toleration", 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 08767563454..3c29d8a2d6f 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 @@ -39,8 +39,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -316,8 +315,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -695,8 +693,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -731,16 +728,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -1015,19 +1010,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_pkg_apis_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_pkg_apis_TypeMeta": { "type": "object", "properties": { @@ -2441,8 +2423,7 @@ "type": "object", "properties": { "startedAt": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -2461,8 +2442,7 @@ "type": "integer" }, "finishedAt": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2474,8 +2454,7 @@ "type": "integer" }, "startedAt": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -3156,8 +3135,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.MicroTime" }, "firstTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "involvedObject": { "$ref": "#/definitions/kubernetes_core_ObjectReference", @@ -3169,8 +3147,7 @@ "required": true }, "lastTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4031,8 +4008,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4197,12 +4173,10 @@ "type": "object", "properties": { "lastHeartbeatTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4689,12 +4663,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5158,8 +5130,7 @@ "type": "object", "properties": { "lastPhaseTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5324,12 +5295,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5896,8 +5865,7 @@ } }, "startTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -6272,8 +6240,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -7400,8 +7367,7 @@ "type": "string" }, "timeAdded": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "value": { "type": "string" @@ -8262,8 +8228,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "Toleration": { "$ref": "#/definitions/kubernetes_core_Toleration", @@ -8465,8 +8430,7 @@ "apiservicecondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -9004,8 +8968,7 @@ "condition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -9412,8 +9375,7 @@ "containerstaterunning": { "properties": { "startedAt": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -9427,8 +9389,7 @@ "type": "integer" }, "finishedAt": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -9440,8 +9401,7 @@ "type": "integer" }, "startedAt": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -10180,8 +10140,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.MicroTime" }, "firstTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "involvedObject": { "$ref": "#/definitions/kubernetes_core_ObjectReference", @@ -10193,8 +10152,7 @@ "required": true }, "lastTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -11134,8 +11092,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -11236,8 +11193,7 @@ "namespacecondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -11380,12 +11336,10 @@ "nodecondition": { "properties": { "lastHeartbeatTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -11712,16 +11666,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -11920,12 +11872,10 @@ "persistentvolumeclaimcondition": { "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -12342,8 +12292,7 @@ "persistentvolumestatus": { "properties": { "lastPhaseTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -12477,12 +12426,10 @@ "podcondition": { "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -12983,8 +12930,7 @@ } }, "startTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -13324,8 +13270,7 @@ "replicationcontrollercondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -14349,8 +14294,7 @@ "type": "string" }, "timeAdded": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_Time", - "existingJavaType": "String" + "type": "string" }, "value": { "type": "string" @@ -14370,14 +14314,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "toleration": { "properties": { "effect": { diff --git a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index fa51089f589..16870c68162 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -38,7 +38,7 @@ public class KubeSchema { private io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice v1EndpointSlice; private io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList v1EndpointSliceList; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -305,16 +305,16 @@ public void setV1EndpointSliceList(io.fabric8.kubernetes.api.model.discovery.v1. } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 21dc2ff51ab..c27e21adf8a 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -38,7 +38,7 @@ public class ValidationSchema { private io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice v1EndpointSlice; private io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList v1EndpointSliceList; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -305,16 +305,16 @@ public void setV1EndpointSliceList(io.fabric8.kubernetes.api.model.discovery.v1. } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } 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 9e12a002e54..ffe41c8adb6 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 @@ -336,8 +336,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -357,16 +356,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -641,19 +638,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -1236,8 +1220,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", 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 3704d4b2ee1..9b830219ce7 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 @@ -336,8 +336,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -357,16 +356,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -641,19 +638,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -1236,8 +1220,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -1437,8 +1420,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_discovery_v1beta1_ForZone", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.ForZone" + "$ref": "#/definitions/kubernetes_discovery_v1_ForZone", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.ForZone" } } }, @@ -1710,8 +1693,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -1726,16 +1708,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -1998,14 +1978,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "typemeta": { "properties": { "apiVersion": { diff --git a/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 3127014eea9..5c20970a34b 100644 --- a/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -38,7 +38,7 @@ public class KubeSchema { private io.fabric8.kubernetes.api.model.events.v1.EventList v1EventList; private io.fabric8.kubernetes.api.model.events.v1.EventSeries v1EventSeries; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -316,16 +316,16 @@ public void setV1EventSeries(io.fabric8.kubernetes.api.model.events.v1.EventSeri } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index aec8cbefc5f..ef33284795b 100644 --- a/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -38,7 +38,7 @@ public class ValidationSchema { private io.fabric8.kubernetes.api.model.events.v1.EventList v1EventList; private io.fabric8.kubernetes.api.model.events.v1.EventSeries v1EventSeries; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -316,16 +316,16 @@ public void setV1EventSeries(io.fabric8.kubernetes.api.model.events.v1.EventSeri } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1/Event.java b/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1/Event.java index deb362071d9..8fade33c0f5 100644 --- a/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1/Event.java +++ b/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1/Event.java @@ -81,14 +81,14 @@ public class Event implements Editable , HasMetadata, Namespaced { @JsonProperty("action") - private java.lang.String action; + private String action; /** * * (Required) * */ @JsonProperty("apiVersion") - private java.lang.String apiVersion = "events.k8s.io/v1"; + private String apiVersion = "events.k8s.io/v1"; @JsonProperty("deprecatedCount") private Integer deprecatedCount; @JsonProperty("deprecatedFirstTimestamp") @@ -105,27 +105,27 @@ public class Event implements Editable , HasMetadata, Namespaced * */ @JsonProperty("kind") - private java.lang.String kind = "Event"; + private String kind = "Event"; @JsonProperty("metadata") private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("note") - private java.lang.String note; + private String note; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("regarding") private io.fabric8.kubernetes.api.model.ObjectReference regarding; @JsonProperty("related") private io.fabric8.kubernetes.api.model.ObjectReference related; @JsonProperty("reportingController") - private java.lang.String reportingController; + private String reportingController; @JsonProperty("reportingInstance") - private java.lang.String reportingInstance; + private String reportingInstance; @JsonProperty("series") private EventSeries series; @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 @@ -134,7 +134,7 @@ public class Event implements Editable , HasMetadata, Namespaced public Event() { } - public Event(java.lang.String action, java.lang.String apiVersion, Integer deprecatedCount, String deprecatedFirstTimestamp, String deprecatedLastTimestamp, EventSource deprecatedSource, MicroTime eventTime, java.lang.String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, java.lang.String note, java.lang.String reason, io.fabric8.kubernetes.api.model.ObjectReference regarding, io.fabric8.kubernetes.api.model.ObjectReference related, java.lang.String reportingController, java.lang.String reportingInstance, EventSeries series, java.lang.String type) { + public Event(String action, String apiVersion, Integer deprecatedCount, String deprecatedFirstTimestamp, String deprecatedLastTimestamp, EventSource deprecatedSource, MicroTime eventTime, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, String note, String reason, io.fabric8.kubernetes.api.model.ObjectReference regarding, io.fabric8.kubernetes.api.model.ObjectReference related, String reportingController, String reportingInstance, EventSeries series, String type) { super(); this.action = action; this.apiVersion = apiVersion; @@ -156,12 +156,12 @@ public Event(java.lang.String action, java.lang.String apiVersion, Integer depre } @JsonProperty("action") - public java.lang.String getAction() { + public String getAction() { return action; } @JsonProperty("action") - public void setAction(java.lang.String action) { + public void setAction(String action) { this.action = action; } @@ -171,7 +171,7 @@ public void setAction(java.lang.String action) { * */ @JsonProperty("apiVersion") - public java.lang.String getApiVersion() { + public String getApiVersion() { return apiVersion; } @@ -181,7 +181,7 @@ public java.lang.String getApiVersion() { * */ @JsonProperty("apiVersion") - public void setApiVersion(java.lang.String apiVersion) { + public void setApiVersion(String apiVersion) { this.apiVersion = apiVersion; } @@ -241,7 +241,7 @@ public void setEventTime(MicroTime eventTime) { * */ @JsonProperty("kind") - public java.lang.String getKind() { + public String getKind() { return kind; } @@ -251,7 +251,7 @@ public java.lang.String getKind() { * */ @JsonProperty("kind") - public void setKind(java.lang.String kind) { + public void setKind(String kind) { this.kind = kind; } @@ -266,22 +266,22 @@ public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { } @JsonProperty("note") - public java.lang.String getNote() { + public String getNote() { return note; } @JsonProperty("note") - public void setNote(java.lang.String note) { + public void setNote(String note) { this.note = note; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @@ -306,22 +306,22 @@ public void setRelated(io.fabric8.kubernetes.api.model.ObjectReference related) } @JsonProperty("reportingController") - public java.lang.String getReportingController() { + public String getReportingController() { return reportingController; } @JsonProperty("reportingController") - public void setReportingController(java.lang.String reportingController) { + public void setReportingController(String reportingController) { this.reportingController = reportingController; } @JsonProperty("reportingInstance") - public java.lang.String getReportingInstance() { + public String getReportingInstance() { return reportingInstance; } @JsonProperty("reportingInstance") - public void setReportingInstance(java.lang.String reportingInstance) { + public void setReportingInstance(String reportingInstance) { this.reportingInstance = reportingInstance; } @@ -336,12 +336,12 @@ public void setSeries(EventSeries series) { } @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; } @@ -356,16 +356,16 @@ public EventBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1beta1/Event.java b/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1beta1/Event.java index defc395c27a..8e2175b5a2a 100644 --- a/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1beta1/Event.java +++ b/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1beta1/Event.java @@ -81,14 +81,14 @@ public class Event implements Editable , HasMetadata, Namespaced { @JsonProperty("action") - private java.lang.String action; + private String action; /** * * (Required) * */ @JsonProperty("apiVersion") - private java.lang.String apiVersion = "events.k8s.io/v1beta1"; + private String apiVersion = "events.k8s.io/v1beta1"; @JsonProperty("deprecatedCount") private Integer deprecatedCount; @JsonProperty("deprecatedFirstTimestamp") @@ -105,27 +105,27 @@ public class Event implements Editable , HasMetadata, Namespaced * */ @JsonProperty("kind") - private java.lang.String kind = "Event"; + private String kind = "Event"; @JsonProperty("metadata") private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("note") - private java.lang.String note; + private String note; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("regarding") private io.fabric8.kubernetes.api.model.ObjectReference regarding; @JsonProperty("related") private io.fabric8.kubernetes.api.model.ObjectReference related; @JsonProperty("reportingController") - private java.lang.String reportingController; + private String reportingController; @JsonProperty("reportingInstance") - private java.lang.String reportingInstance; + private String reportingInstance; @JsonProperty("series") private EventSeries series; @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 @@ -134,7 +134,7 @@ public class Event implements Editable , HasMetadata, Namespaced public Event() { } - public Event(java.lang.String action, java.lang.String apiVersion, Integer deprecatedCount, String deprecatedFirstTimestamp, String deprecatedLastTimestamp, EventSource deprecatedSource, MicroTime eventTime, java.lang.String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, java.lang.String note, java.lang.String reason, io.fabric8.kubernetes.api.model.ObjectReference regarding, io.fabric8.kubernetes.api.model.ObjectReference related, java.lang.String reportingController, java.lang.String reportingInstance, EventSeries series, java.lang.String type) { + public Event(String action, String apiVersion, Integer deprecatedCount, String deprecatedFirstTimestamp, String deprecatedLastTimestamp, EventSource deprecatedSource, MicroTime eventTime, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, String note, String reason, io.fabric8.kubernetes.api.model.ObjectReference regarding, io.fabric8.kubernetes.api.model.ObjectReference related, String reportingController, String reportingInstance, EventSeries series, String type) { super(); this.action = action; this.apiVersion = apiVersion; @@ -156,12 +156,12 @@ public Event(java.lang.String action, java.lang.String apiVersion, Integer depre } @JsonProperty("action") - public java.lang.String getAction() { + public String getAction() { return action; } @JsonProperty("action") - public void setAction(java.lang.String action) { + public void setAction(String action) { this.action = action; } @@ -171,7 +171,7 @@ public void setAction(java.lang.String action) { * */ @JsonProperty("apiVersion") - public java.lang.String getApiVersion() { + public String getApiVersion() { return apiVersion; } @@ -181,7 +181,7 @@ public java.lang.String getApiVersion() { * */ @JsonProperty("apiVersion") - public void setApiVersion(java.lang.String apiVersion) { + public void setApiVersion(String apiVersion) { this.apiVersion = apiVersion; } @@ -241,7 +241,7 @@ public void setEventTime(MicroTime eventTime) { * */ @JsonProperty("kind") - public java.lang.String getKind() { + public String getKind() { return kind; } @@ -251,7 +251,7 @@ public java.lang.String getKind() { * */ @JsonProperty("kind") - public void setKind(java.lang.String kind) { + public void setKind(String kind) { this.kind = kind; } @@ -266,22 +266,22 @@ public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { } @JsonProperty("note") - public java.lang.String getNote() { + public String getNote() { return note; } @JsonProperty("note") - public void setNote(java.lang.String note) { + public void setNote(String note) { this.note = note; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @@ -306,22 +306,22 @@ public void setRelated(io.fabric8.kubernetes.api.model.ObjectReference related) } @JsonProperty("reportingController") - public java.lang.String getReportingController() { + public String getReportingController() { return reportingController; } @JsonProperty("reportingController") - public void setReportingController(java.lang.String reportingController) { + public void setReportingController(String reportingController) { this.reportingController = reportingController; } @JsonProperty("reportingInstance") - public java.lang.String getReportingInstance() { + public String getReportingInstance() { return reportingInstance; } @JsonProperty("reportingInstance") - public void setReportingInstance(java.lang.String reportingInstance) { + public void setReportingInstance(String reportingInstance) { this.reportingInstance = reportingInstance; } @@ -336,12 +336,12 @@ public void setSeries(EventSeries series) { } @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; } @@ -356,16 +356,16 @@ public EventBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } 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 cf5a08aeac6..baf1963f2c3 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 @@ -336,8 +336,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -370,16 +369,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -654,19 +651,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -823,12 +807,10 @@ "type": "integer" }, "deprecatedFirstTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deprecatedLastTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deprecatedSource": { "$ref": "#/definitions/kubernetes_core_EventSource", @@ -946,12 +928,10 @@ "type": "integer" }, "deprecatedFirstTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deprecatedLastTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deprecatedSource": { "$ref": "#/definitions/kubernetes_core_EventSource", @@ -1118,8 +1098,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", 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 1471a214dc6..37c71f0c498 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 @@ -336,8 +336,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -370,16 +369,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -654,19 +651,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -823,12 +807,10 @@ "type": "integer" }, "deprecatedFirstTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deprecatedLastTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deprecatedSource": { "$ref": "#/definitions/kubernetes_core_EventSource", @@ -946,12 +928,10 @@ "type": "integer" }, "deprecatedFirstTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deprecatedLastTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deprecatedSource": { "$ref": "#/definitions/kubernetes_core_EventSource", @@ -1118,8 +1098,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -1293,12 +1272,10 @@ "type": "integer" }, "deprecatedFirstTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deprecatedLastTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deprecatedSource": { "$ref": "#/definitions/kubernetes_core_EventSource", @@ -1573,8 +1550,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -1597,16 +1573,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -1869,14 +1843,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "typemeta": { "properties": { "apiVersion": { diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 9d824629028..e17ea4d9eaf 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -54,7 +54,7 @@ public class KubeSchema { private TypeMeta typeMeta; private UpdateOptions updateOptions; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -387,16 +387,16 @@ public void setUpdateOptions(UpdateOptions updateOptions) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 83326c558ab..2f194aeb828 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -54,7 +54,7 @@ public class ValidationSchema { private TypeMeta typeMeta; private UpdateOptions updateOptions; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -387,16 +387,16 @@ public void setUpdateOptions(UpdateOptions updateOptions) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/DaemonSetCondition.java b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/DaemonSetCondition.java index e9a244b8150..67787276bd0 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/DaemonSetCondition.java +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/DaemonSetCondition.java @@ -61,15 +61,15 @@ public class DaemonSetCondition implements Editable , @JsonProperty("lastTransitionTime") private String lastTransitionTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -78,7 +78,7 @@ public class DaemonSetCondition implements Editable , public DaemonSetCondition() { } - public DaemonSetCondition(String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public DaemonSetCondition(String lastTransitionTime, String message, String reason, String status, String type) { super(); this.lastTransitionTime = lastTransitionTime; this.message = message; @@ -98,42 +98,42 @@ public void setLastTransitionTime(String lastTransitionTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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,16 +148,16 @@ public DaemonSetConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/DeploymentCondition.java b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/DeploymentCondition.java index af4c2c59e16..c2e07a6dc8b 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/DeploymentCondition.java +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/DeploymentCondition.java @@ -64,15 +64,15 @@ public class DeploymentCondition implements Editable @JsonProperty("lastUpdateTime") private String lastUpdateTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -81,7 +81,7 @@ public class DeploymentCondition implements Editable public DeploymentCondition() { } - public DeploymentCondition(String lastTransitionTime, String lastUpdateTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public DeploymentCondition(String lastTransitionTime, String lastUpdateTime, String message, String reason, String status, String type) { super(); this.lastTransitionTime = lastTransitionTime; this.lastUpdateTime = lastUpdateTime; @@ -112,42 +112,42 @@ public void setLastUpdateTime(String lastUpdateTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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; } @@ -162,16 +162,16 @@ public DeploymentConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/ReplicaSetCondition.java b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/ReplicaSetCondition.java index 501e2841c75..5d4ee731431 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/ReplicaSetCondition.java +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/ReplicaSetCondition.java @@ -61,15 +61,15 @@ public class ReplicaSetCondition implements Editable @JsonProperty("lastTransitionTime") private String lastTransitionTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -78,7 +78,7 @@ public class ReplicaSetCondition implements Editable public ReplicaSetCondition() { } - public ReplicaSetCondition(String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public ReplicaSetCondition(String lastTransitionTime, String message, String reason, String status, String type) { super(); this.lastTransitionTime = lastTransitionTime; this.message = message; @@ -98,42 +98,42 @@ public void setLastTransitionTime(String lastTransitionTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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,16 +148,16 @@ public ReplicaSetConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } 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 1fc94235271..4110cdd0e80 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 @@ -384,8 +384,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -405,16 +404,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -689,19 +686,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -3983,8 +3967,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4169,12 +4152,10 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4890,8 +4871,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5160,8 +5140,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", 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 bab54af3285..72f6096f821 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 @@ -384,8 +384,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -405,16 +404,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -689,19 +686,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -3983,8 +3967,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4169,12 +4152,10 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4890,8 +4871,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5160,8 +5140,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -5716,8 +5695,7 @@ "daemonsetcondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5906,12 +5884,10 @@ "deploymentcondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -7187,8 +7163,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -7451,16 +7426,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -8299,8 +8272,7 @@ "replicasetcondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -8823,14 +8795,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "toleration": { "properties": { "effect": { diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1/FlowSchemaCondition.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1/FlowSchemaCondition.java index cb3cc04e241..5e632bdd5b4 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1/FlowSchemaCondition.java +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1/FlowSchemaCondition.java @@ -61,15 +61,15 @@ public class FlowSchemaCondition implements Editable @JsonProperty("lastTransitionTime") private String lastTransitionTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -78,7 +78,7 @@ public class FlowSchemaCondition implements Editable public FlowSchemaCondition() { } - public FlowSchemaCondition(String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public FlowSchemaCondition(String lastTransitionTime, String message, String reason, String status, String type) { super(); this.lastTransitionTime = lastTransitionTime; this.message = message; @@ -98,42 +98,42 @@ public void setLastTransitionTime(String lastTransitionTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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,16 +148,16 @@ public FlowSchemaConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1/PriorityLevelConfigurationCondition.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1/PriorityLevelConfigurationCondition.java index b9c75277b00..7367f06b5b0 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1/PriorityLevelConfigurationCondition.java +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1/PriorityLevelConfigurationCondition.java @@ -61,15 +61,15 @@ public class PriorityLevelConfigurationCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class PriorityLevelConfigurationCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/FlowSchemaCondition.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/FlowSchemaCondition.java index 80a0e1ccbbf..757ee1757cf 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/FlowSchemaCondition.java +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/FlowSchemaCondition.java @@ -61,15 +61,15 @@ public class FlowSchemaCondition implements Editable @JsonProperty("lastTransitionTime") private String lastTransitionTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -78,7 +78,7 @@ public class FlowSchemaCondition implements Editable public FlowSchemaCondition() { } - public FlowSchemaCondition(String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public FlowSchemaCondition(String lastTransitionTime, String message, String reason, String status, String type) { super(); this.lastTransitionTime = lastTransitionTime; this.message = message; @@ -98,42 +98,42 @@ public void setLastTransitionTime(String lastTransitionTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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,16 +148,16 @@ public FlowSchemaConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/PriorityLevelConfigurationCondition.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/PriorityLevelConfigurationCondition.java index 64b758565d8..477674d0282 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/PriorityLevelConfigurationCondition.java +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/PriorityLevelConfigurationCondition.java @@ -61,15 +61,15 @@ public class PriorityLevelConfigurationCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class PriorityLevelConfigurationCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchemaCondition.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchemaCondition.java index 98e725b3ec4..ce403570920 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchemaCondition.java +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/FlowSchemaCondition.java @@ -61,15 +61,15 @@ public class FlowSchemaCondition implements Editable @JsonProperty("lastTransitionTime") private String lastTransitionTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -78,7 +78,7 @@ public class FlowSchemaCondition implements Editable public FlowSchemaCondition() { } - public FlowSchemaCondition(String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public FlowSchemaCondition(String lastTransitionTime, String message, String reason, String status, String type) { super(); this.lastTransitionTime = lastTransitionTime; this.message = message; @@ -98,42 +98,42 @@ public void setLastTransitionTime(String lastTransitionTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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,16 +148,16 @@ public FlowSchemaConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationCondition.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationCondition.java index fe8ef89539d..37bbba8bf39 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationCondition.java +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta2/PriorityLevelConfigurationCondition.java @@ -61,15 +61,15 @@ public class PriorityLevelConfigurationCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class PriorityLevelConfigurationCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta3/FlowSchemaCondition.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta3/FlowSchemaCondition.java index c7d51401fad..b663e0b9e4d 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta3/FlowSchemaCondition.java +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta3/FlowSchemaCondition.java @@ -61,15 +61,15 @@ public class FlowSchemaCondition implements Editable @JsonProperty("lastTransitionTime") private String lastTransitionTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -78,7 +78,7 @@ public class FlowSchemaCondition implements Editable public FlowSchemaCondition() { } - public FlowSchemaCondition(String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public FlowSchemaCondition(String lastTransitionTime, String message, String reason, String status, String type) { super(); this.lastTransitionTime = lastTransitionTime; this.message = message; @@ -98,42 +98,42 @@ public void setLastTransitionTime(String lastTransitionTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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,16 +148,16 @@ public FlowSchemaConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta3/PriorityLevelConfigurationCondition.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta3/PriorityLevelConfigurationCondition.java index a045a2fb677..99f2cfa6612 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta3/PriorityLevelConfigurationCondition.java +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta3/PriorityLevelConfigurationCondition.java @@ -61,15 +61,15 @@ public class PriorityLevelConfigurationCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class PriorityLevelConfigurationCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionCondition.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionCondition.java index f6b4feec7f2..63533673a82 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionCondition.java +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/internal/apiserver/v1alpha1/StorageVersionCondition.java @@ -62,17 +62,17 @@ public class StorageVersionCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -81,7 +81,7 @@ public class StorageVersionCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } 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 da821c2ad0e..714910c0a3b 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 @@ -57,8 +57,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -78,16 +77,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -178,19 +175,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -272,8 +256,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -517,8 +500,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -798,8 +780,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1043,8 +1024,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1324,8 +1304,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1569,8 +1548,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1850,8 +1828,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2095,8 +2072,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2377,8 +2353,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" 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 2b8d81afa07..bf174742be7 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 @@ -57,8 +57,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -78,16 +77,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -178,19 +175,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -272,8 +256,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -517,8 +500,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -798,8 +780,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1043,8 +1024,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1324,8 +1304,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1569,8 +1548,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1850,8 +1828,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2095,8 +2072,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2377,8 +2353,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2602,8 +2577,7 @@ "flowschemacondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2624,14 +2598,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1beta3", + "default": "flowcontrol.apiserver.k8s.io/v1", "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_v1_FlowSchema", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.FlowSchema" } }, "kind": { @@ -2649,22 +2623,22 @@ "flowschemaspec": { "properties": { "distinguisherMethod": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowDistinguisherMethod", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowDistinguisherMethod" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowDistinguisherMethod", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowDistinguisherMethod" }, "matchingPrecedence": { "type": "integer" }, "priorityLevelConfiguration": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationReference" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PriorityLevelConfigurationReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationReference" }, "rules": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PolicyRulesWithSubjects", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PolicyRulesWithSubjects" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PolicyRulesWithSubjects", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PolicyRulesWithSubjects" } } }, @@ -2676,8 +2650,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" } } }, @@ -2712,8 +2686,8 @@ "limitresponse": { "properties": { "queuing": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_QueuingConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.QueuingConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_QueuingConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.QueuingConfiguration" }, "type": { "type": "string" @@ -2761,8 +2735,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -2794,16 +2767,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -2891,23 +2862,23 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1_NonResourcePolicyRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.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_v1_ResourcePolicyRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.ResourcePolicyRule" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_ResourcePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ResourcePolicyRule" } }, "subjects": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1_Subject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.Subject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_Subject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.Subject" } } }, @@ -2943,8 +2914,7 @@ "prioritylevelconfigurationcondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2965,14 +2935,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1", + "default": "flowcontrol.apiserver.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1_PriorityLevelConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfiguration" } }, "kind": { @@ -2998,12 +2968,12 @@ "prioritylevelconfigurationspec": { "properties": { "exempt": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_ExemptPriorityLevelConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ExemptPriorityLevelConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_ExemptPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.ExemptPriorityLevelConfiguration" }, "limited": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_LimitedPriorityLevelConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitedPriorityLevelConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_LimitedPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.LimitedPriorityLevelConfiguration" }, "type": { "type": "string" @@ -3017,8 +2987,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationCondition" + "$ref": "#/definitions/kubernetes_flowcontrol_v1_PriorityLevelConfigurationCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1.PriorityLevelConfigurationCondition" } } }, @@ -3136,8 +3106,7 @@ "storageversioncondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -3214,27 +3183,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" - } - }, - "additionalProperties": true - }, - "time": { - "properties": { - "Time": { - "type": "string" + "$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/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/kube-schema.json index 6f424fb4321..da66c9e751e 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 @@ -7,8 +7,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -135,8 +134,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -156,16 +154,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -256,19 +252,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { 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 2ff037d440c..94ecb2bca39 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 @@ -7,8 +7,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -135,8 +134,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -156,16 +154,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -256,19 +252,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -3111,8 +3094,7 @@ "condition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -3140,7 +3122,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1beta1", + "default": "gateway.networking.k8s.io/v1", "required": true }, "kind": { @@ -3178,7 +3160,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1alpha2", + "default": "gateway.networking.k8s.io/v1", "required": true }, "kind": { @@ -3839,14 +3821,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1alpha2", + "default": "gateway.networking.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPRoute", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRoute" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1_HTTPRoute", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1.HTTPRoute" } }, "kind": { @@ -4127,8 +4109,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -4143,16 +4124,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -4349,7 +4328,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1beta1", + "default": "gateway.networking.k8s.io/v1alpha2", "required": true }, "kind": { @@ -4611,14 +4590,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "tlsroute": { "properties": { "apiVersion": { diff --git a/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 231cb7b977b..319b24bf8ec 100644 --- a/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -40,7 +40,7 @@ public class KubeSchema { private TypeMeta typeMeta; private UpdateOptions updateOptions; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -296,16 +296,16 @@ public void setUpdateOptions(UpdateOptions updateOptions) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index dd4cf665235..2dba841b2cc 100644 --- a/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -40,7 +40,7 @@ public class ValidationSchema { private TypeMeta typeMeta; private UpdateOptions updateOptions; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -296,16 +296,16 @@ public void setUpdateOptions(UpdateOptions updateOptions) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/NodeMetrics.java b/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/NodeMetrics.java index b896052ad76..7713d81a8bf 100644 --- a/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/NodeMetrics.java +++ b/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/NodeMetrics.java @@ -75,25 +75,25 @@ public class NodeMetrics implements Editable , HasMetadata * */ @JsonProperty("apiVersion") - private java.lang.String apiVersion = "metrics.k8s.io/v1beta1"; + private String apiVersion = "metrics.k8s.io/v1beta1"; /** * * (Required) * */ @JsonProperty("kind") - private java.lang.String kind = "NodeMetrics"; + private String kind = "NodeMetrics"; @JsonProperty("metadata") private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("timestamp") private String timestamp; @JsonProperty("usage") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map usage = new LinkedHashMap<>(); + private Map usage = new LinkedHashMap<>(); @JsonProperty("window") private Duration window; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -102,7 +102,7 @@ public class NodeMetrics implements Editable , HasMetadata public NodeMetrics() { } - public NodeMetrics(java.lang.String apiVersion, java.lang.String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, String timestamp, Map usage, Duration window) { + public NodeMetrics(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, String timestamp, Map usage, Duration window) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -118,7 +118,7 @@ public NodeMetrics(java.lang.String apiVersion, java.lang.String kind, io.fabric * */ @JsonProperty("apiVersion") - public java.lang.String getApiVersion() { + public String getApiVersion() { return apiVersion; } @@ -128,7 +128,7 @@ public java.lang.String getApiVersion() { * */ @JsonProperty("apiVersion") - public void setApiVersion(java.lang.String apiVersion) { + public void setApiVersion(String apiVersion) { this.apiVersion = apiVersion; } @@ -138,7 +138,7 @@ public void setApiVersion(java.lang.String apiVersion) { * */ @JsonProperty("kind") - public java.lang.String getKind() { + public String getKind() { return kind; } @@ -148,7 +148,7 @@ public java.lang.String getKind() { * */ @JsonProperty("kind") - public void setKind(java.lang.String kind) { + public void setKind(String kind) { this.kind = kind; } @@ -174,12 +174,12 @@ public void setTimestamp(String timestamp) { @JsonProperty("usage") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getUsage() { + public Map getUsage() { return usage; } @JsonProperty("usage") - public void setUsage(Map usage) { + public void setUsage(Map usage) { this.usage = usage; } @@ -204,16 +204,16 @@ public NodeMetricsBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/PodMetrics.java b/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/PodMetrics.java index f71f55af20d..e0840a9ee7f 100644 --- a/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/PodMetrics.java +++ b/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/PodMetrics.java @@ -77,7 +77,7 @@ public class PodMetrics implements Editable , HasMetadata, Na * */ @JsonProperty("apiVersion") - private java.lang.String apiVersion = "metrics.k8s.io/v1beta1"; + private String apiVersion = "metrics.k8s.io/v1beta1"; @JsonProperty("containers") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List containers = new ArrayList<>(); @@ -87,7 +87,7 @@ public class PodMetrics implements Editable , HasMetadata, Na * */ @JsonProperty("kind") - private java.lang.String kind = "PodMetrics"; + private String kind = "PodMetrics"; @JsonProperty("metadata") private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("timestamp") @@ -95,7 +95,7 @@ public class PodMetrics implements Editable , HasMetadata, Na @JsonProperty("window") private Duration window; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -104,7 +104,7 @@ public class PodMetrics implements Editable , HasMetadata, Na public PodMetrics() { } - public PodMetrics(java.lang.String apiVersion, List containers, java.lang.String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, String timestamp, Duration window) { + public PodMetrics(String apiVersion, List containers, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, String timestamp, Duration window) { super(); this.apiVersion = apiVersion; this.containers = containers; @@ -120,7 +120,7 @@ public PodMetrics(java.lang.String apiVersion, List containers * */ @JsonProperty("apiVersion") - public java.lang.String getApiVersion() { + public String getApiVersion() { return apiVersion; } @@ -130,7 +130,7 @@ public java.lang.String getApiVersion() { * */ @JsonProperty("apiVersion") - public void setApiVersion(java.lang.String apiVersion) { + public void setApiVersion(String apiVersion) { this.apiVersion = apiVersion; } @@ -151,7 +151,7 @@ public void setContainers(List containers) { * */ @JsonProperty("kind") - public java.lang.String getKind() { + public String getKind() { return kind; } @@ -161,7 +161,7 @@ public java.lang.String getKind() { * */ @JsonProperty("kind") - public void setKind(java.lang.String kind) { + public void setKind(String kind) { this.kind = kind; } @@ -206,16 +206,16 @@ public PodMetricsBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-metrics/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-metrics/src/main/resources/schema/kube-schema.json index 759ff2e334f..f63b8918ac1 100644 --- a/kubernetes-model-generator/kubernetes-model-metrics/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-metrics/src/main/resources/schema/kube-schema.json @@ -337,8 +337,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -358,16 +357,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -642,19 +639,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -819,8 +803,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "timestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "usage": { "type": "object", @@ -898,8 +881,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "timestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "window": { "$ref": "#/definitions/kubernetes_apimachinery_Duration", @@ -1038,8 +1020,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", diff --git a/kubernetes-model-generator/kubernetes-model-metrics/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-metrics/src/main/resources/schema/validation-schema.json index ebcd3f4e74d..fdb1e5552d9 100644 --- a/kubernetes-model-generator/kubernetes-model-metrics/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-metrics/src/main/resources/schema/validation-schema.json @@ -337,8 +337,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -358,16 +357,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -642,19 +639,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -819,8 +803,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "timestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "usage": { "type": "object", @@ -898,8 +881,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "timestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "window": { "$ref": "#/definitions/kubernetes_apimachinery_Duration", @@ -1038,8 +1020,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -1377,8 +1358,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -1400,8 +1380,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "timestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "usage": { "type": "object", @@ -1454,16 +1433,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -1629,8 +1606,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "timestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "window": { "$ref": "#/definitions/kubernetes_apimachinery_Duration", @@ -1786,14 +1762,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "typemeta": { "properties": { "apiVersion": { diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 481dfef7e4c..14a778be916 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -52,7 +52,7 @@ public class KubeSchema { private io.fabric8.kubernetes.api.model.networking.v1.IngressClassList v1IngressClassList; private io.fabric8.kubernetes.api.model.networking.v1.IngressList v1IngressList; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -418,16 +418,16 @@ public void setV1IngressList(io.fabric8.kubernetes.api.model.networking.v1.Ingre } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 57baa7e85b4..f734b5cb837 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -52,7 +52,7 @@ public class ValidationSchema { private io.fabric8.kubernetes.api.model.networking.v1.IngressClassList v1IngressClassList; private io.fabric8.kubernetes.api.model.networking.v1.IngressList v1IngressList; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -418,16 +418,16 @@ public void setV1IngressList(io.fabric8.kubernetes.api.model.networking.v1.Ingre } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/kube-schema.json index 277112d7f8a..a76fa2862dc 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/kube-schema.json @@ -89,8 +89,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -414,8 +413,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -435,16 +433,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -719,19 +715,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -2189,8 +2172,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/validation-schema.json index 47954f84cf1..270a18311f8 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/schema/validation-schema.json @@ -89,8 +89,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -414,8 +413,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -435,16 +433,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -719,19 +715,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -2189,8 +2172,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -2297,8 +2279,7 @@ "condition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2418,8 +2399,8 @@ "httpingresspath": { "properties": { "backend": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressBackend", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressBackend" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressBackend", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressBackend" }, "path": { "type": "string" @@ -2507,9 +2488,12 @@ "$ref": "#/definitions/kubernetes_core_TypedLocalObjectReference", "existingJavaType": "io.fabric8.kubernetes.api.model.TypedLocalObjectReference" }, - "service": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressServiceBackend", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressServiceBackend" + "serviceName": { + "type": "string" + }, + "servicePort": { + "$ref": "#/definitions/kubernetes_apimachinery_pkg_util_intstr_IntOrString", + "existingJavaType": "io.fabric8.kubernetes.api.model.IntOrString" } }, "additionalProperties": true @@ -2518,7 +2502,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "networking.k8s.io/v1", + "default": "networking.k8s.io/v1beta1", "required": true }, "kind": { @@ -2531,8 +2515,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressClassSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressClassSpec" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressClassSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassSpec" } }, "additionalProperties": true @@ -2599,14 +2583,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "networking.k8s.io/v1", + "default": "networking.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_networking_v1_Ingress", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.Ingress" + "$ref": "#/definitions/kubernetes_networking_v1beta1_Ingress", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress" } }, "kind": { @@ -2646,8 +2630,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressLoadBalancerIngress", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressLoadBalancerIngress" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressLoadBalancerIngress", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressLoadBalancerIngress" } } }, @@ -2673,8 +2657,8 @@ "type": "string" }, "http": { - "$ref": "#/definitions/kubernetes_networking_v1_HTTPIngressRuleValue", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.HTTPIngressRuleValue" + "$ref": "#/definitions/kubernetes_networking_v1beta1_HTTPIngressRuleValue", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.HTTPIngressRuleValue" } }, "additionalProperties": true @@ -2991,8 +2975,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -3162,16 +3145,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -3540,14 +3521,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "typedlocalobjectreference": { "properties": { "apiGroup": { diff --git a/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/kube-schema.json index 98a9537e366..4a2ca99dceb 100644 --- a/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/kube-schema.json @@ -97,8 +97,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -118,16 +117,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -310,19 +307,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { diff --git a/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/validation-schema.json index 1ff8b829f47..c83f2537704 100644 --- a/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-node/src/main/resources/schema/validation-schema.json @@ -97,8 +97,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -118,16 +117,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -310,19 +307,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -949,8 +933,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -965,16 +948,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -1140,14 +1121,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "node.k8s.io/v1", + "default": "node.k8s.io/v1alpha1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_node_v1_RuntimeClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1.RuntimeClass" + "$ref": "#/definitions/kubernetes_node_v1alpha_RuntimeClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClass" } }, "kind": { @@ -1275,14 +1256,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "toleration": { "properties": { "effect": { diff --git a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 31b13d8105f..0af05e54e69 100644 --- a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -38,7 +38,7 @@ public class KubeSchema { private io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget v1PodDisruptionBudget; private io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetList v1PodDisruptionBudgetList; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -316,16 +316,16 @@ public void setV1PodDisruptionBudgetList(io.fabric8.kubernetes.api.model.policy. } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 7af0bb6dc63..7f3aefd28e1 100644 --- a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -38,7 +38,7 @@ public class ValidationSchema { private io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget v1PodDisruptionBudget; private io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetList v1PodDisruptionBudgetList; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -316,16 +316,16 @@ public void setV1PodDisruptionBudgetList(io.fabric8.kubernetes.api.model.policy. } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/schema/kube-schema.json index ff4cd2e04f0..0aa73f76b96 100644 --- a/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/schema/kube-schema.json @@ -89,8 +89,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -414,8 +413,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -435,16 +433,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -719,19 +715,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -1016,8 +999,7 @@ "disruptedPods": { "type": "object", "additionalProperties": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, @@ -1177,8 +1159,7 @@ "disruptedPods": { "type": "object", "additionalProperties": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, @@ -1275,8 +1256,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", diff --git a/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/schema/validation-schema.json index 69f3289ff55..c1aeb7cf8c8 100644 --- a/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/schema/validation-schema.json @@ -89,8 +89,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -414,8 +413,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -435,16 +433,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -719,19 +715,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -1016,8 +999,7 @@ "disruptedPods": { "type": "object", "additionalProperties": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, @@ -1177,8 +1159,7 @@ "disruptedPods": { "type": "object", "additionalProperties": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, @@ -1275,8 +1256,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -1363,8 +1343,7 @@ "condition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1453,7 +1432,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "policy/v1", + "default": "policy/v1beta1", "required": true }, "deleteOptions": { @@ -1702,8 +1681,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -1718,16 +1696,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -1961,8 +1937,7 @@ "disruptedPods": { "type": "object", "additionalProperties": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, @@ -2100,14 +2075,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "typemeta": { "properties": { "apiVersion": { diff --git a/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/kube-schema.json index 83303b7c1c9..0197220a16f 100644 --- a/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/kube-schema.json @@ -105,8 +105,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -126,16 +125,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -226,19 +223,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { diff --git a/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/validation-schema.json index 7ce3b6d3bd4..abb77cb4ac2 100644 --- a/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/validation-schema.json @@ -105,8 +105,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -126,16 +125,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -226,19 +223,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -875,8 +859,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -891,16 +874,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -1161,14 +1142,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "typemeta": { "properties": { "apiVersion": { diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-resource/src/main/resources/schema/kube-schema.json index c2fc4ac7e99..361237eaed7 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-resource/src/main/resources/schema/kube-schema.json @@ -65,8 +65,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -86,16 +85,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -186,19 +183,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-resource/src/main/resources/schema/validation-schema.json index 5dce4f3232e..2afeb49d3d3 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-resource/src/main/resources/schema/validation-schema.json @@ -65,8 +65,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -86,16 +85,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -186,19 +183,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -1531,8 +1515,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -1736,16 +1719,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -2464,14 +2445,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "typemeta": { "properties": { "apiVersion": { diff --git a/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 0cfba52dc2b..eb212190c64 100644 --- a/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -36,7 +36,7 @@ public class KubeSchema { private io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClass v1PriorityClass; private io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClassList v1PriorityClassList; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -292,16 +292,16 @@ public void setV1PriorityClassList(io.fabric8.kubernetes.api.model.scheduling.v1 } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 4c6f0f6f927..81b401dd222 100644 --- a/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -36,7 +36,7 @@ public class ValidationSchema { private io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClass v1PriorityClass; private io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClassList v1PriorityClassList; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -292,16 +292,16 @@ public void setV1PriorityClassList(io.fabric8.kubernetes.api.model.scheduling.v1 } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/kube-schema.json index fb06dbdca84..224769ed007 100644 --- a/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/kube-schema.json @@ -336,8 +336,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -357,16 +356,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -641,19 +638,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -979,8 +963,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", diff --git a/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/validation-schema.json index e2b74edac1c..9cee5bc59e9 100644 --- a/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/validation-schema.json @@ -336,8 +336,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -357,16 +356,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -641,19 +638,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -979,8 +963,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -1309,8 +1292,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -1325,16 +1307,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -1654,14 +1634,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "typemeta": { "properties": { "apiVersion": { diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 0cc40122b3e..316727d88b6 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -60,7 +60,7 @@ public class KubeSchema { private VolumeAttributesClass volumeAttributesClass; private VolumeAttributesClassList volumeAttributesClassList; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -492,16 +492,16 @@ public void setVolumeAttributesClassList(VolumeAttributesClassList volumeAttribu } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index a43cd03e66b..ba88606eb91 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -60,7 +60,7 @@ public class ValidationSchema { private VolumeAttributesClass volumeAttributesClass; private VolumeAttributesClassList volumeAttributesClassList; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -492,16 +492,16 @@ public void setVolumeAttributesClassList(VolumeAttributesClassList volumeAttribu } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/VolumeError.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/VolumeError.java index c622773833c..dd078cb6290 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/VolumeError.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/VolumeError.java @@ -56,11 +56,11 @@ public class VolumeError implements Editable , KubernetesRes { @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("time") private String time; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -69,19 +69,19 @@ public class VolumeError implements Editable , KubernetesRes public VolumeError() { } - public VolumeError(java.lang.String message, String time) { + public VolumeError(String message, String time) { super(); this.message = message; this.time = time; } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @@ -106,16 +106,16 @@ public VolumeErrorBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storagemigration/v1alpha1/MigrationCondition.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storagemigration/v1alpha1/MigrationCondition.java index 1d2c24ba8c3..8a1552c6408 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storagemigration/v1alpha1/MigrationCondition.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storagemigration/v1alpha1/MigrationCondition.java @@ -61,15 +61,15 @@ public class MigrationCondition implements Editable , @JsonProperty("lastUpdateTime") private String lastUpdateTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -78,7 +78,7 @@ public class MigrationCondition implements Editable , public MigrationCondition() { } - public MigrationCondition(String lastUpdateTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public MigrationCondition(String lastUpdateTime, String message, String reason, String status, String type) { super(); this.lastUpdateTime = lastUpdateTime; this.message = message; @@ -98,42 +98,42 @@ public void setLastUpdateTime(String lastUpdateTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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,16 +148,16 @@ public MigrationConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/kube-schema.json index 04064811147..caf4f6d2df4 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/kube-schema.json @@ -371,8 +371,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -392,16 +391,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -676,19 +673,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -2307,8 +2291,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -2727,8 +2710,7 @@ "type": "object", "properties": { "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2955,8 +2937,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.storagemigration.v1alpha1.StorageVersionMigrationList" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/validation-schema.json index 5ed453a873d..a86640cee29 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/schema/validation-schema.json @@ -371,8 +371,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -392,16 +391,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -676,19 +673,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -2307,8 +2291,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -2727,8 +2710,7 @@ "type": "object", "properties": { "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2955,8 +2937,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.storagemigration.v1alpha1.StorageVersionMigrationList" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -3202,7 +3183,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1beta1", + "default": "storage.k8s.io/v1", "required": true }, "kind": { @@ -3215,8 +3196,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSIDriverSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriverSpec" + "$ref": "#/definitions/kubernetes_storageclass_CSIDriverSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSIDriverSpec" } }, "additionalProperties": true @@ -3225,14 +3206,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1beta1", + "default": "storage.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSIDriver", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriver" + "$ref": "#/definitions/kubernetes_storageclass_CSIDriver", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSIDriver" } }, "kind": { @@ -3271,8 +3252,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_storageclass_TokenRequest", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.TokenRequest" + "$ref": "#/definitions/kubernetes_storageclass_v1beta1_TokenRequest", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.TokenRequest" } }, "volumeLifecycleModes": { @@ -3311,8 +3292,8 @@ "csinodedriver": { "properties": { "allocatable": { - "$ref": "#/definitions/kubernetes_storageclass_VolumeNodeResources", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.VolumeNodeResources" + "$ref": "#/definitions/kubernetes_storageclass_v1beta1_VolumeNodeResources", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.VolumeNodeResources" }, "name": { "type": "string" @@ -3360,8 +3341,8 @@ "drivers": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_storageclass_CSINodeDriver", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSINodeDriver" + "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSINodeDriver", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSINodeDriver" } } }, @@ -3899,8 +3880,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -3908,8 +3888,7 @@ "migrationcondition": { "properties": { "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4001,16 +3980,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -4810,14 +4787,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "tokenrequest": { "properties": { "audience": { @@ -5060,8 +5029,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 9744f74727d..4713d49822b 100644 --- a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -31,7 +31,7 @@ public class KubeSchema { private MachineAutoscaler v1beta1MachineAutoscaler; private MachineAutoscalerList v1beta1MachineAutoscalerList; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -188,16 +188,16 @@ public void setV1beta1MachineAutoscalerList(MachineAutoscalerList v1beta1Machine } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index e97847027f1..42feec69984 100644 --- a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -31,7 +31,7 @@ public class ValidationSchema { private MachineAutoscaler v1beta1MachineAutoscaler; private MachineAutoscalerList v1beta1MachineAutoscalerList; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -188,16 +188,16 @@ public void setV1beta1MachineAutoscalerList(MachineAutoscalerList v1beta1Machine } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/main/resources/schema/kube-schema.json index 1010a689d80..53dcbd7c8f2 100644 --- a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/main/resources/schema/kube-schema.json @@ -174,8 +174,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -195,16 +194,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -411,19 +408,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -853,8 +837,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", diff --git a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/main/resources/schema/validation-schema.json index 77541dedf15..c1db040a7d5 100644 --- a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/main/resources/schema/validation-schema.json @@ -174,8 +174,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -195,16 +194,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -411,19 +408,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -853,8 +837,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -1244,8 +1227,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -1260,16 +1242,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -1503,14 +1483,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "typemeta": { "properties": { "apiVersion": { diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 1e47b039561..d073c3d8191 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -113,7 +113,7 @@ public class KubeSchema { private String time; private TypeMeta typeMeta; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -721,16 +721,16 @@ public void setTypeMeta(TypeMeta typeMeta) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 1b5651a7dfa..037379dfbdd 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -113,7 +113,7 @@ public class ValidationSchema { private String time; private TypeMeta typeMeta; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -721,16 +721,16 @@ public void setTypeMeta(TypeMeta typeMeta) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterOperatorStatusCondition.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterOperatorStatusCondition.java index 188e0ffeedf..d1e24152d70 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterOperatorStatusCondition.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/ClusterOperatorStatusCondition.java @@ -61,15 +61,15 @@ public class ClusterOperatorStatusCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class ClusterOperatorStatusCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/UpdateHistory.java b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/UpdateHistory.java index 7fb965a0a1c..b4705e43b6d 100644 --- a/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/UpdateHistory.java +++ b/kubernetes-model-generator/openshift-model-config/src/generated/java/io/fabric8/openshift/api/model/config/v1/UpdateHistory.java @@ -61,21 +61,21 @@ public class UpdateHistory implements Editable , Kubernete { @JsonProperty("acceptedRisks") - private java.lang.String acceptedRisks; + private String acceptedRisks; @JsonProperty("completionTime") private String completionTime; @JsonProperty("image") - private java.lang.String image; + private String image; @JsonProperty("startedTime") private String startedTime; @JsonProperty("state") - private java.lang.String state; + private String state; @JsonProperty("verified") private Boolean verified; @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 @@ -84,7 +84,7 @@ public class UpdateHistory implements Editable , Kubernete public UpdateHistory() { } - public UpdateHistory(java.lang.String acceptedRisks, String completionTime, java.lang.String image, String startedTime, java.lang.String state, Boolean verified, java.lang.String version) { + public UpdateHistory(String acceptedRisks, String completionTime, String image, String startedTime, String state, Boolean verified, String version) { super(); this.acceptedRisks = acceptedRisks; this.completionTime = completionTime; @@ -96,12 +96,12 @@ public UpdateHistory(java.lang.String acceptedRisks, String completionTime, java } @JsonProperty("acceptedRisks") - public java.lang.String getAcceptedRisks() { + public String getAcceptedRisks() { return acceptedRisks; } @JsonProperty("acceptedRisks") - public void setAcceptedRisks(java.lang.String acceptedRisks) { + public void setAcceptedRisks(String acceptedRisks) { this.acceptedRisks = acceptedRisks; } @@ -116,12 +116,12 @@ public void setCompletionTime(String completionTime) { } @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; } @@ -136,12 +136,12 @@ public void setStartedTime(String startedTime) { } @JsonProperty("state") - public java.lang.String getState() { + public String getState() { return state; } @JsonProperty("state") - public void setState(java.lang.String state) { + public void setState(String state) { this.state = state; } @@ -156,12 +156,12 @@ public void setVerified(Boolean verified) { } @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; } @@ -176,16 +176,16 @@ public UpdateHistoryBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-config/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-config/src/main/resources/schema/kube-schema.json index 858aa165b75..62c0a172e7b 100644 --- a/kubernetes-model-generator/openshift-model-config/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-config/src/main/resources/schema/kube-schema.json @@ -76,8 +76,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -266,8 +265,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -287,16 +285,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -503,19 +499,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -1739,8 +1722,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5440,15 +5422,13 @@ "type": "string" }, "completionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "image": { "type": "string" }, "startedTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "state": { "type": "string" @@ -5894,8 +5874,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.config.v1.TLSProfileSpec" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", diff --git a/kubernetes-model-generator/openshift-model-config/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-config/src/main/resources/schema/validation-schema.json index f261b98d3d9..7f2d2188463 100644 --- a/kubernetes-model-generator/openshift-model-config/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-config/src/main/resources/schema/validation-schema.json @@ -76,8 +76,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -266,8 +265,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -287,16 +285,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -503,19 +499,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -1739,8 +1722,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5440,15 +5422,13 @@ "type": "string" }, "completionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "image": { "type": "string" }, "startedTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "state": { "type": "string" @@ -5894,8 +5874,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.config.v1.TLSProfileSpec" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -6664,8 +6643,7 @@ "clusteroperatorstatuscondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -6934,8 +6912,7 @@ "condition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -8547,8 +8524,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -8923,16 +8899,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -10068,14 +10042,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "tlsprofilespec": { "properties": { "ciphers": { @@ -10184,15 +10150,13 @@ "type": "string" }, "completionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "image": { "type": "string" }, "startedTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "state": { "type": "string" diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index d2fb7320a69..31e25fdd284 100644 --- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -52,7 +52,7 @@ public class KubeSchema { private String time; private TypeMeta typeMeta; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -330,16 +330,16 @@ public void setTypeMeta(TypeMeta typeMeta) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 68663d303e7..69c89a4296d 100644 --- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -52,7 +52,7 @@ public class ValidationSchema { private String time; private TypeMeta typeMeta; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -330,16 +330,16 @@ public void setTypeMeta(TypeMeta typeMeta) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-console/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-console/src/main/resources/schema/kube-schema.json index 8bbdc8e0d81..3bfb34ab8bb 100644 --- a/kubernetes-model-generator/openshift-model-console/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-console/src/main/resources/schema/kube-schema.json @@ -222,8 +222,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -243,16 +242,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -459,19 +456,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -1478,8 +1462,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", diff --git a/kubernetes-model-generator/openshift-model-console/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-console/src/main/resources/schema/validation-schema.json index 5037dfd7d61..8aad0f36f17 100644 --- a/kubernetes-model-generator/openshift-model-console/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-console/src/main/resources/schema/validation-schema.json @@ -222,8 +222,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -243,16 +242,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -459,19 +456,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -1478,8 +1462,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -2341,8 +2324,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -2373,16 +2355,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -2584,14 +2564,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "typemeta": { "properties": { "apiVersion": { diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index d2dc94f578a..83d14dc9716 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -95,7 +95,7 @@ public class KubeSchema { private TypeMeta typeMeta; private io.fabric8.openshift.api.model.hive.vsphere.v1.OSDisk vsphereOSDisk; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -626,16 +626,16 @@ public void setVsphereOSDisk(io.fabric8.openshift.api.model.hive.vsphere.v1.OSDi } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index a555653fd0d..7c9cc5c2075 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -95,7 +95,7 @@ public class ValidationSchema { private TypeMeta typeMeta; private io.fabric8.openshift.api.model.hive.vsphere.v1.OSDisk vsphereOSDisk; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -626,16 +626,16 @@ public void setVsphereOSDisk(io.fabric8.openshift.api.model.hive.vsphere.v1.OSDi } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/CheckpointSpec.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/CheckpointSpec.java index 815dbdadfa6..f054a3e5d66 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/CheckpointSpec.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/CheckpointSpec.java @@ -57,13 +57,13 @@ public class CheckpointSpec implements Editable , Kuberne { @JsonProperty("lastBackupChecksum") - private java.lang.String lastBackupChecksum; + private String lastBackupChecksum; @JsonProperty("lastBackupRef") private BackupReference lastBackupRef; @JsonProperty("lastBackupTime") private String lastBackupTime; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -72,7 +72,7 @@ public class CheckpointSpec implements Editable , Kuberne public CheckpointSpec() { } - public CheckpointSpec(java.lang.String lastBackupChecksum, BackupReference lastBackupRef, String lastBackupTime) { + public CheckpointSpec(String lastBackupChecksum, BackupReference lastBackupRef, String lastBackupTime) { super(); this.lastBackupChecksum = lastBackupChecksum; this.lastBackupRef = lastBackupRef; @@ -80,12 +80,12 @@ public CheckpointSpec(java.lang.String lastBackupChecksum, BackupReference lastB } @JsonProperty("lastBackupChecksum") - public java.lang.String getLastBackupChecksum() { + public String getLastBackupChecksum() { return lastBackupChecksum; } @JsonProperty("lastBackupChecksum") - public void setLastBackupChecksum(java.lang.String lastBackupChecksum) { + public void setLastBackupChecksum(String lastBackupChecksum) { this.lastBackupChecksum = lastBackupChecksum; } @@ -120,16 +120,16 @@ public CheckpointSpecBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterClaimCondition.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterClaimCondition.java index e919ec3f56c..a9be7b28260 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterClaimCondition.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterClaimCondition.java @@ -64,15 +64,15 @@ public class ClusterClaimCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -81,7 +81,7 @@ public class ClusterClaimCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeploymentCondition.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeploymentCondition.java index e2c9d0e38d9..6d1e55e4152 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeploymentCondition.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeploymentCondition.java @@ -64,15 +64,15 @@ public class ClusterDeploymentCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -81,7 +81,7 @@ public class ClusterDeploymentCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeploymentStatus.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeploymentStatus.java index c499f0aa849..0ad663a116d 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeploymentStatus.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeploymentStatus.java @@ -68,12 +68,12 @@ public class ClusterDeploymentStatus implements Editable certificateBundles = new ArrayList<>(); @JsonProperty("cliImage") - private java.lang.String cliImage; + private String cliImage; @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List conditions = new ArrayList<>(); @@ -82,21 +82,21 @@ public class ClusterDeploymentStatus implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -105,7 +105,7 @@ public class ClusterDeploymentStatus implements Editable certificateBundles, java.lang.String cliImage, List conditions, Integer installRestarts, String installStartedTimestamp, java.lang.String installVersion, String installedTimestamp, java.lang.String installerImage, PlatformStatus platformStatus, java.lang.String powerState, io.fabric8.kubernetes.api.model.LocalObjectReference provisionRef, java.lang.String webConsoleURL) { + public ClusterDeploymentStatus(String apiURL, List certificateBundles, String cliImage, List conditions, Integer installRestarts, String installStartedTimestamp, String installVersion, String installedTimestamp, String installerImage, PlatformStatus platformStatus, String powerState, io.fabric8.kubernetes.api.model.LocalObjectReference provisionRef, String webConsoleURL) { super(); this.apiURL = apiURL; this.certificateBundles = certificateBundles; @@ -123,12 +123,12 @@ public ClusterDeploymentStatus(java.lang.String apiURL, List certificateBundl } @JsonProperty("cliImage") - public java.lang.String getCliImage() { + public String getCliImage() { return cliImage; } @JsonProperty("cliImage") - public void setCliImage(java.lang.String cliImage) { + public void setCliImage(String cliImage) { this.cliImage = cliImage; } @@ -185,12 +185,12 @@ public void setInstallStartedTimestamp(String installStartedTimestamp) { } @JsonProperty("installVersion") - public java.lang.String getInstallVersion() { + public String getInstallVersion() { return installVersion; } @JsonProperty("installVersion") - public void setInstallVersion(java.lang.String installVersion) { + public void setInstallVersion(String installVersion) { this.installVersion = installVersion; } @@ -205,12 +205,12 @@ public void setInstalledTimestamp(String installedTimestamp) { } @JsonProperty("installerImage") - public java.lang.String getInstallerImage() { + public String getInstallerImage() { return installerImage; } @JsonProperty("installerImage") - public void setInstallerImage(java.lang.String installerImage) { + public void setInstallerImage(String installerImage) { this.installerImage = installerImage; } @@ -225,12 +225,12 @@ public void setPlatformStatus(PlatformStatus platformStatus) { } @JsonProperty("powerState") - public java.lang.String getPowerState() { + public String getPowerState() { return powerState; } @JsonProperty("powerState") - public void setPowerState(java.lang.String powerState) { + public void setPowerState(String powerState) { this.powerState = powerState; } @@ -245,12 +245,12 @@ public void setProvisionRef(io.fabric8.kubernetes.api.model.LocalObjectReference } @JsonProperty("webConsoleURL") - public java.lang.String getWebConsoleURL() { + public String getWebConsoleURL() { return webConsoleURL; } @JsonProperty("webConsoleURL") - public void setWebConsoleURL(java.lang.String webConsoleURL) { + public void setWebConsoleURL(String webConsoleURL) { this.webConsoleURL = webConsoleURL; } @@ -265,16 +265,16 @@ public ClusterDeploymentStatusBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeprovisionCondition.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeprovisionCondition.java index 1a8641a46c6..52a84017457 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeprovisionCondition.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeprovisionCondition.java @@ -64,15 +64,15 @@ public class ClusterDeprovisionCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -81,7 +81,7 @@ public class ClusterDeprovisionCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterPoolCondition.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterPoolCondition.java index 51dc5bda003..d28220bd852 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterPoolCondition.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterPoolCondition.java @@ -64,15 +64,15 @@ public class ClusterPoolCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -81,7 +81,7 @@ public class ClusterPoolCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterPoolReference.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterPoolReference.java index 1512b363a10..0e00c7c35ef 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterPoolReference.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterPoolReference.java @@ -58,17 +58,17 @@ public class ClusterPoolReference implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -77,7 +77,7 @@ public class ClusterPoolReference implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterProvisionCondition.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterProvisionCondition.java index 295cf59fcaa..2f175d52499 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterProvisionCondition.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterProvisionCondition.java @@ -64,15 +64,15 @@ public class ClusterProvisionCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -81,7 +81,7 @@ public class ClusterProvisionCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterStateStatus.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterStateStatus.java index a4983d1951a..66f213bb07c 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterStateStatus.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterStateStatus.java @@ -63,7 +63,7 @@ public class ClusterStateStatus implements Editable , @JsonProperty("lastUpdated") private String lastUpdated; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -110,16 +110,16 @@ public ClusterStateStatusBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/DNSZoneCondition.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/DNSZoneCondition.java index 19d38c5af14..a876d6d481c 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/DNSZoneCondition.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/DNSZoneCondition.java @@ -64,15 +64,15 @@ public class DNSZoneCondition implements Editable , Kub @JsonProperty("lastTransitionTime") private String lastTransitionTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -81,7 +81,7 @@ public class DNSZoneCondition implements Editable , Kub public DNSZoneCondition() { } - public DNSZoneCondition(String lastProbeTime, String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public DNSZoneCondition(String lastProbeTime, String lastTransitionTime, String message, String reason, String status, String type) { super(); this.lastProbeTime = lastProbeTime; this.lastTransitionTime = lastTransitionTime; @@ -112,42 +112,42 @@ public void setLastTransitionTime(String lastTransitionTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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; } @@ -162,16 +162,16 @@ public DNSZoneConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/DNSZoneStatus.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/DNSZoneStatus.java index 598d691694e..b40450989b9 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/DNSZoneStatus.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/DNSZoneStatus.java @@ -77,9 +77,9 @@ public class DNSZoneStatus implements Editable , Kubernete private String lastSyncTimestamp; @JsonProperty("nameServers") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List nameServers = new ArrayList<>(); + private List nameServers = new ArrayList<>(); @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -88,7 +88,7 @@ public class DNSZoneStatus implements Editable , Kubernete public DNSZoneStatus() { } - public DNSZoneStatus(AWSDNSZoneStatus aws, AzureDNSZoneStatus azure, List conditions, GCPDNSZoneStatus gcp, Long lastSyncGeneration, String lastSyncTimestamp, List nameServers) { + public DNSZoneStatus(AWSDNSZoneStatus aws, AzureDNSZoneStatus azure, List conditions, GCPDNSZoneStatus gcp, Long lastSyncGeneration, String lastSyncTimestamp, List nameServers) { super(); this.aws = aws; this.azure = azure; @@ -162,12 +162,12 @@ public void setLastSyncTimestamp(String lastSyncTimestamp) { @JsonProperty("nameServers") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getNameServers() { + public List getNameServers() { return nameServers; } @JsonProperty("nameServers") - public void setNameServers(List nameServers) { + public void setNameServers(List nameServers) { this.nameServers = nameServers; } @@ -182,16 +182,16 @@ public DNSZoneStatusBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/HiveConfigCondition.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/HiveConfigCondition.java index 86e7e8f8a16..244de6fb1b7 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/HiveConfigCondition.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/HiveConfigCondition.java @@ -64,15 +64,15 @@ public class HiveConfigCondition implements Editable @JsonProperty("lastTransitionTime") private String lastTransitionTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -81,7 +81,7 @@ public class HiveConfigCondition implements Editable public HiveConfigCondition() { } - public HiveConfigCondition(String lastProbeTime, String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public HiveConfigCondition(String lastProbeTime, String lastTransitionTime, String message, String reason, String status, String type) { super(); this.lastProbeTime = lastProbeTime; this.lastTransitionTime = lastTransitionTime; @@ -112,42 +112,42 @@ public void setLastTransitionTime(String lastTransitionTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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; } @@ -162,16 +162,16 @@ public HiveConfigConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/MachinePoolCondition.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/MachinePoolCondition.java index ffe40aa6045..3fe924f8868 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/MachinePoolCondition.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/MachinePoolCondition.java @@ -64,15 +64,15 @@ public class MachinePoolCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -81,7 +81,7 @@ public class MachinePoolCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/kube-schema.json index 7bd22ce8562..7f170a6a8b6 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/kube-schema.json @@ -277,8 +277,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -298,16 +297,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -514,19 +511,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -3107,8 +3091,7 @@ "type": "string" }, "timeAdded": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "value": { "type": "string" @@ -3698,8 +3681,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5441,8 +5423,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.hive.v1.BackupReference" }, "lastBackupTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -5496,12 +5477,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5641,12 +5620,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5811,15 +5788,13 @@ "type": "integer" }, "installStartedTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "installVersion": { "type": "string" }, "installedTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "installerImage": { "type": "string" @@ -5882,12 +5857,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -6302,12 +6275,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -6367,8 +6338,7 @@ "type": "string" }, "claimedTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "clusterDeploymentCustomization": { "$ref": "#/definitions/kubernetes_core_LocalObjectReference", @@ -6532,12 +6502,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -6845,8 +6813,7 @@ } }, "lastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -6999,12 +6966,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -7116,8 +7081,7 @@ "existingJavaType": "Long" }, "lastSyncTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "nameServers": { "type": "array", @@ -7325,12 +7289,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -7626,12 +7588,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -9048,8 +9008,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.hive.v1.SyncSetList" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", diff --git a/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/validation-schema.json index c29877e9276..d5afe407b26 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-hive/src/main/resources/schema/validation-schema.json @@ -277,8 +277,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -298,16 +297,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -514,19 +511,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -3107,8 +3091,7 @@ "type": "string" }, "timeAdded": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "value": { "type": "string" @@ -3698,8 +3681,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5441,8 +5423,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.hive.v1.BackupReference" }, "lastBackupTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -5496,12 +5477,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5641,12 +5620,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5811,15 +5788,13 @@ "type": "integer" }, "installStartedTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "installVersion": { "type": "string" }, "installedTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "installerImage": { "type": "string" @@ -5882,12 +5857,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -6302,12 +6275,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -6367,8 +6338,7 @@ "type": "string" }, "claimedTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "clusterDeploymentCustomization": { "$ref": "#/definitions/kubernetes_core_LocalObjectReference", @@ -6532,12 +6502,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -6845,8 +6813,7 @@ } }, "lastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -6999,12 +6966,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -7116,8 +7081,7 @@ "existingJavaType": "Long" }, "lastSyncTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "nameServers": { "type": "array", @@ -7325,12 +7289,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -7626,12 +7588,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -9048,8 +9008,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.hive.v1.SyncSetList" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -9622,8 +9581,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.hive.v1.BackupReference" }, "lastBackupTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -9690,12 +9648,10 @@ "clusterclaimcondition": { "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -9808,12 +9764,10 @@ "clusterdeploymentcondition": { "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -9962,15 +9916,13 @@ "type": "integer" }, "installStartedTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "installVersion": { "type": "string" }, "installedTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "installerImage": { "type": "string" @@ -10022,12 +9974,10 @@ "clusterdeprovisioncondition": { "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -10301,8 +10251,7 @@ "clusteroperatorstatuscondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -10375,12 +10324,10 @@ "clusterpoolcondition": { "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -10429,8 +10376,7 @@ "type": "string" }, "claimedTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "clusterDeploymentCustomization": { "$ref": "#/definitions/kubernetes_core_LocalObjectReference", @@ -10573,12 +10519,10 @@ "clusterprovisioncondition": { "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -10826,8 +10770,7 @@ } }, "lastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -11277,12 +11220,10 @@ "dnszonecondition": { "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -11378,8 +11319,7 @@ "existingJavaType": "Long" }, "lastSyncTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "nameServers": { "type": "array", @@ -12146,12 +12086,10 @@ "hiveconfigcondition": { "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -12816,23 +12754,19 @@ }, "machinepool": { "properties": { - "osDisk": { - "$ref": "#/definitions/os_hive_azure_v1_OSDisk", - "existingJavaType": "io.fabric8.openshift.api.model.hive.azure.v1.OSDisk" + "cpu": { + "$ref": "#/definitions/os_hive_ovirt_v1_CPU", + "existingJavaType": "io.fabric8.openshift.api.model.hive.ovirt.v1.CPU" }, - "osImage": { - "$ref": "#/definitions/os_hive_azure_v1_OSImage", - "existingJavaType": "io.fabric8.openshift.api.model.hive.azure.v1.OSImage" + "memoryMB": { + "type": "integer" }, - "type": { - "type": "string" + "osDisk": { + "$ref": "#/definitions/os_hive_ovirt_v1_Disk", + "existingJavaType": "io.fabric8.openshift.api.model.hive.ovirt.v1.Disk" }, - "zones": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } + "vmType": { + "type": "string" } }, "additionalProperties": true @@ -12851,12 +12785,10 @@ "machinepoolcondition": { "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -12960,41 +12892,37 @@ }, "machinepoolplatform": { "properties": { - "additionalSecurityGroupIDs": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } + "alibabacloud": { + "$ref": "#/definitions/os_hive_alibabacloud_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.hive.alibabacloud.v1.MachinePool" }, - "metadataService": { - "$ref": "#/definitions/os_hive_aws_v1_EC2Metadata", - "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.EC2Metadata" + "aws": { + "$ref": "#/definitions/os_hive_aws_v1_MachinePoolPlatform", + "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.MachinePoolPlatform" }, - "rootVolume": { - "$ref": "#/definitions/os_hive_aws_v1_EC2RootVolume", - "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.EC2RootVolume" + "azure": { + "$ref": "#/definitions/os_hive_azure_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.hive.azure.v1.MachinePool" }, - "spotMarketOptions": { - "$ref": "#/definitions/os_hive_aws_v1_SpotMarketOptions", - "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.SpotMarketOptions" + "gcp": { + "$ref": "#/definitions/os_hive_gcp_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.hive.gcp.v1.MachinePool" }, - "subnets": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } + "ibmcloud": { + "$ref": "#/definitions/os_hive_ibmcloud_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.hive.ibmcloud.v1.MachinePool" }, - "type": { - "type": "string" + "openstack": { + "$ref": "#/definitions/os_hive_openstack_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.hive.openstack.v1.MachinePool" }, - "zones": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } + "ovirt": { + "$ref": "#/definitions/os_hive_ovirt_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.hive.ovirt.v1.MachinePool" + }, + "vsphere": { + "$ref": "#/definitions/os_hive_vsphere_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.hive.vsphere.v1.MachinePool" } }, "additionalProperties": true @@ -13125,8 +13053,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -13192,7 +13119,7 @@ }, "metadata": { "properties": { - "hostedZoneRole": { + "resourceGroupName": { "type": "string" } }, @@ -13353,16 +13280,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -13509,15 +13434,8 @@ }, "osdisk": { "properties": { - "diskEncryptionSet": { - "$ref": "#/definitions/os_hive_azure_v1_DiskEncryptionSet", - "existingJavaType": "io.fabric8.openshift.api.model.hive.azure.v1.DiskEncryptionSet" - }, "diskSizeGB": { "type": "integer" - }, - "diskType": { - "type": "string" } }, "additionalProperties": true @@ -13658,21 +13576,11 @@ }, "platform": { "properties": { - "certificatesSecretRef": { - "$ref": "#/definitions/kubernetes_core_LocalObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" - }, "credentialsSecretRef": { "$ref": "#/definitions/kubernetes_core_LocalObjectReference", "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" }, - "ovirt_cluster_id": { - "type": "string" - }, - "ovirt_network_name": { - "type": "string" - }, - "storage_domain_id": { + "region": { "type": "string" } }, @@ -13680,9 +13588,9 @@ }, "platformstatus": { "properties": { - "aws": { - "$ref": "#/definitions/os_hive_aws_v1_PlatformStatus", - "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.AwsPlatformStatus" + "privateLink": { + "$ref": "#/definitions/os_hive_aws_v1_PrivateLinkAccessStatus", + "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.PrivateLinkAccessStatus" } }, "additionalProperties": true @@ -15264,8 +15172,7 @@ "type": "string" }, "timeAdded": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "value": { "type": "string" @@ -15296,14 +15203,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "toleration": { "properties": { "effect": { diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index ccd817b42e0..8ce785249b8 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -33,7 +33,7 @@ public class KubeSchema { private TypeMeta typeMeta; private io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool vSphereMachinePool; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -256,16 +256,16 @@ public void setVSphereMachinePool(io.fabric8.openshift.api.model.installer.vsphe } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index b9292878d84..c3cf1cbdf2a 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -33,7 +33,7 @@ public class ValidationSchema { private TypeMeta typeMeta; private io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool vSphereMachinePool; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -256,16 +256,16 @@ public void setVSphereMachinePool(io.fabric8.openshift.api.model.installer.vsphe } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/kube-schema.json index a40c040cad7..0a9805a8d25 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/kube-schema.json @@ -210,8 +210,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -231,16 +230,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -447,19 +444,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -2876,8 +2860,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", diff --git a/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/validation-schema.json index 228e93da139..b567432ec67 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-installer/src/main/resources/schema/validation-schema.json @@ -210,8 +210,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -231,16 +230,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -447,19 +444,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -2876,8 +2860,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -3397,47 +3380,6 @@ "additionalProperties": true }, "machinepool": { - "properties": { - "additionalNetworkIDs": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } - }, - "additionalSecurityGroupIDs": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } - }, - "failureDomains": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "$ref": "#/definitions/os_installer_openstack_v1_FailureDomain", - "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.FailureDomain" - } - }, - "rootVolume": { - "$ref": "#/definitions/os_installer_openstack_v1_RootVolume", - "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.RootVolume" - }, - "serverGroupPolicy": { - "type": "string" - }, - "type": { - "type": "string" - }, - "zones": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } - } - }, "additionalProperties": true }, "machinepoolplatform": { @@ -3515,8 +3457,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -3659,16 +3600,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -3737,8 +3676,15 @@ }, "osdisk": { "properties": { + "diskEncryptionSet": { + "$ref": "#/definitions/os_installer_azure_v1_DiskEncryptionSet", + "existingJavaType": "io.fabric8.openshift.api.model.installer.azure.v1.DiskEncryptionSet" + }, "diskSizeGB": { "type": "integer" + }, + "diskType": { + "type": "string" } }, "additionalProperties": true @@ -3795,6 +3741,38 @@ "additionalProperties": true }, "platform": { + "properties": { + "defaultMachinePlatform": { + "$ref": "#/definitions/os_installer_alibabacloud_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool" + }, + "privateZoneID": { + "type": "string" + }, + "region": { + "type": "string" + }, + "resourceGroupID": { + "type": "string" + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" + }, + "vpcID": { + "type": "string" + }, + "vswitchIDs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + } + }, "additionalProperties": true }, "porttarget": { @@ -4092,14 +4070,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "topology": { "properties": { "computeCluster": { diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index a07a219d527..2e8bffd278f 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -47,7 +47,7 @@ public class KubeSchema { private NutanixCategory v1NutanixCategory; private NutanixResourceIdentifier v1NutanixResourceIdentifier; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -292,16 +292,16 @@ public void setV1NutanixResourceIdentifier(NutanixResourceIdentifier v1NutanixRe } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index f34211662f3..abed4bdef39 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -47,7 +47,7 @@ public class ValidationSchema { private NutanixCategory v1NutanixCategory; private NutanixResourceIdentifier v1NutanixResourceIdentifier; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -292,16 +292,16 @@ public void setV1NutanixResourceIdentifier(NutanixResourceIdentifier v1NutanixRe } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/Condition.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/Condition.java index cb0c7b22786..b34a0616dc5 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/Condition.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/Condition.java @@ -62,17 +62,17 @@ public class Condition implements Editable , KubernetesResourc @JsonProperty("lastTransitionTime") private String lastTransitionTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("severity") - private java.lang.String severity; + private String severity; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -81,7 +81,7 @@ public class Condition implements Editable , KubernetesResourc public Condition() { } - public Condition(String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String severity, java.lang.String status, java.lang.String type) { + public Condition(String lastTransitionTime, String message, String reason, String severity, String status, String type) { super(); this.lastTransitionTime = lastTransitionTime; this.message = message; @@ -102,52 +102,52 @@ public void setLastTransitionTime(String lastTransitionTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("severity") - public java.lang.String getSeverity() { + public String getSeverity() { return severity; } @JsonProperty("severity") - public void setSeverity(java.lang.String severity) { + public void setSeverity(String severity) { this.severity = severity; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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; } @@ -162,16 +162,16 @@ public ConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/LastOperation.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/LastOperation.java index a60520432dd..f86c8f3cb50 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/LastOperation.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/LastOperation.java @@ -58,15 +58,15 @@ public class LastOperation implements Editable , Kubernete { @JsonProperty("description") - private java.lang.String description; + private String description; @JsonProperty("lastUpdated") private String lastUpdated; @JsonProperty("state") - private java.lang.String state; + private String state; @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 @@ -75,7 +75,7 @@ public class LastOperation implements Editable , Kubernete public LastOperation() { } - public LastOperation(java.lang.String description, String lastUpdated, java.lang.String state, java.lang.String type) { + public LastOperation(String description, String lastUpdated, String state, String type) { super(); this.description = description; this.lastUpdated = lastUpdated; @@ -84,12 +84,12 @@ public LastOperation(java.lang.String description, String lastUpdated, java.lang } @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; } @@ -104,22 +104,22 @@ public void setLastUpdated(String lastUpdated) { } @JsonProperty("state") - public java.lang.String getState() { + public String getState() { return state; } @JsonProperty("state") - public void setState(java.lang.String state) { + public void setState(String state) { this.state = state; } @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; } @@ -134,16 +134,16 @@ public LastOperationBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineStatus.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineStatus.java index b014e0ec6f1..26d368fe4c1 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineStatus.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineStatus.java @@ -77,7 +77,7 @@ public class MachineStatus implements Editable , Kubernete @JsonProperty("lastOperation") private LastOperation lastOperation; @JsonProperty("lastUpdated") - private String lastUpdated; + private java.lang.String lastUpdated; @JsonProperty("nodeRef") private io.fabric8.kubernetes.api.model.ObjectReference nodeRef; @JsonProperty("phase") @@ -95,7 +95,7 @@ public class MachineStatus implements Editable , Kubernete public MachineStatus() { } - public MachineStatus(List addresses, List conditions, java.lang.String errorMessage, java.lang.String errorReason, LastOperation lastOperation, String lastUpdated, io.fabric8.kubernetes.api.model.ObjectReference nodeRef, java.lang.String phase, Map providerStatus) { + public MachineStatus(List addresses, List conditions, java.lang.String errorMessage, java.lang.String errorReason, LastOperation lastOperation, java.lang.String lastUpdated, io.fabric8.kubernetes.api.model.ObjectReference nodeRef, java.lang.String phase, Map providerStatus) { super(); this.addresses = addresses; this.conditions = conditions; @@ -161,12 +161,12 @@ public void setLastOperation(LastOperation lastOperation) { } @JsonProperty("lastUpdated") - public String getLastUpdated() { + public java.lang.String getLastUpdated() { return lastUpdated; } @JsonProperty("lastUpdated") - public void setLastUpdated(String lastUpdated) { + public void setLastUpdated(java.lang.String lastUpdated) { this.lastUpdated = lastUpdated; } diff --git a/kubernetes-model-generator/openshift-model-machine/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-machine/src/main/resources/schema/kube-schema.json index a82261b8f98..0f6ac356350 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-machine/src/main/resources/schema/kube-schema.json @@ -76,8 +76,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -266,8 +265,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -287,16 +285,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -503,19 +499,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -670,8 +653,7 @@ "type": "string" }, "timeAdded": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "value": { "type": "string" @@ -1633,8 +1615,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1665,8 +1646,7 @@ "type": "string" }, "lastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "state": { "type": "string" @@ -2100,8 +2080,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.machine.v1beta1.LastOperation" }, "lastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "nodeRef": { "$ref": "#/definitions/kubernetes_core_ObjectReference", @@ -2280,8 +2259,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", diff --git a/kubernetes-model-generator/openshift-model-machine/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-machine/src/main/resources/schema/validation-schema.json index bc8b231e63b..8134a5e5135 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-machine/src/main/resources/schema/validation-schema.json @@ -76,8 +76,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -266,8 +265,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -287,16 +285,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -503,19 +499,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -670,8 +653,7 @@ "type": "string" }, "timeAdded": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "value": { "type": "string" @@ -1633,8 +1615,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1665,8 +1646,7 @@ "type": "string" }, "lastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "state": { "type": "string" @@ -2100,8 +2080,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.machine.v1beta1.LastOperation" }, "lastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "nodeRef": { "$ref": "#/definitions/kubernetes_core_ObjectReference", @@ -2280,8 +2259,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -2445,16 +2423,16 @@ "condition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" }, - "reason": { - "type": "string" + "observedGeneration": { + "type": "integer", + "existingJavaType": "Long" }, - "severity": { + "reason": { "type": "string" }, "status": { @@ -2836,8 +2814,7 @@ "type": "string" }, "lastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "state": { "type": "string" @@ -3239,8 +3216,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.machine.v1beta1.LastOperation" }, "lastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "nodeRef": { "$ref": "#/definitions/kubernetes_core_ObjectReference", @@ -3291,8 +3267,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -3970,8 +3945,7 @@ "type": "string" }, "timeAdded": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "value": { "type": "string" @@ -3979,14 +3953,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "typemeta": { "properties": { "apiVersion": { diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 9c95af0c8e0..c0f3198b1b4 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -43,7 +43,7 @@ public class KubeSchema { private String time; private TypeMeta typeMeta; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -266,16 +266,16 @@ public void setTypeMeta(TypeMeta typeMeta) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index a1f32f3e907..876ce593ce1 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -43,7 +43,7 @@ public class ValidationSchema { private String time; private TypeMeta typeMeta; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -266,16 +266,16 @@ public void setTypeMeta(TypeMeta typeMeta) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfigCondition.java b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfigCondition.java index 5b6fde55a96..a955dc67d11 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfigCondition.java +++ b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfigCondition.java @@ -61,15 +61,15 @@ public class ContainerRuntimeConfigCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class ContainerRuntimeConfigCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfigStatusCondition.java b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfigStatusCondition.java index e5f94c58bae..76dbf3ffe58 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfigStatusCondition.java +++ b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfigStatusCondition.java @@ -61,15 +61,15 @@ public class ControllerConfigStatusCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class ControllerConfigStatusCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfigCondition.java b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfigCondition.java index c36c7c5ef0c..6315be2ec02 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfigCondition.java +++ b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfigCondition.java @@ -61,15 +61,15 @@ public class KubeletConfigCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class KubeletConfigCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPoolCondition.java b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPoolCondition.java index a8518ddac93..c62af05fc1b 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPoolCondition.java +++ b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPoolCondition.java @@ -61,15 +61,15 @@ public class MachineConfigPoolCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class MachineConfigPoolCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-machineconfig/src/main/resources/schema/kube-schema.json index 8ada893e4a6..429c9aa3f0f 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-machineconfig/src/main/resources/schema/kube-schema.json @@ -222,8 +222,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -243,16 +242,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -459,19 +456,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -2018,8 +2002,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2353,8 +2336,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2427,8 +2409,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2626,8 +2607,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2923,8 +2903,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-machineconfig/src/main/resources/schema/validation-schema.json index 8f942067ba2..c39db3a0149 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-machineconfig/src/main/resources/schema/validation-schema.json @@ -222,8 +222,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -243,16 +242,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -459,19 +456,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -2018,8 +2002,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2353,8 +2336,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2427,8 +2409,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2626,8 +2607,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2923,8 +2903,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -3235,8 +3214,7 @@ "containerruntimeconfigcondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -3518,8 +3496,7 @@ "controllerconfigstatuscondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -3873,8 +3850,7 @@ "kubeletconfigcondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4131,8 +4107,7 @@ "machineconfigpoolcondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4334,8 +4309,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -4460,16 +4434,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -4961,14 +4933,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "tlsprofilespec": { "properties": { "ciphers": { diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 82a3496351c..050d9cbf9cb 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -59,7 +59,7 @@ public class KubeSchema { private String time; private TypeMeta typeMeta; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -370,16 +370,16 @@ public void setTypeMeta(TypeMeta typeMeta) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 09d557ebcf7..64da7c4fefe 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -59,7 +59,7 @@ public class ValidationSchema { private String time; private TypeMeta typeMeta; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -370,16 +370,16 @@ public void setTypeMeta(TypeMeta typeMeta) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestCondition.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestCondition.java index 7c6d1b64308..3c68d92d706 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestCondition.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestCondition.java @@ -64,15 +64,15 @@ public class CredentialsRequestCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -81,7 +81,7 @@ public class CredentialsRequestCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestStatus.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestStatus.java index 3803c125144..f4712e72086 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestStatus.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequestStatus.java @@ -69,7 +69,7 @@ public class CredentialsRequestStatus implements Editable providerStatus = new LinkedHashMap<>(); @@ -85,7 +85,7 @@ public class CredentialsRequestStatus implements Editable conditions, java.lang.String lastSyncCloudCredsSecretResourceVersion, Long lastSyncGeneration, String lastSyncTimestamp, Map providerStatus, Boolean provisioned) { + public CredentialsRequestStatus(List conditions, java.lang.String lastSyncCloudCredsSecretResourceVersion, Long lastSyncGeneration, java.lang.String lastSyncTimestamp, Map providerStatus, Boolean provisioned) { super(); this.conditions = conditions; this.lastSyncCloudCredsSecretResourceVersion = lastSyncCloudCredsSecretResourceVersion; @@ -127,12 +127,12 @@ public void setLastSyncGeneration(Long lastSyncGeneration) { } @JsonProperty("lastSyncTimestamp") - public String getLastSyncTimestamp() { + public java.lang.String getLastSyncTimestamp() { return lastSyncTimestamp; } @JsonProperty("lastSyncTimestamp") - public void setLastSyncTimestamp(String lastSyncTimestamp) { + public void setLastSyncTimestamp(java.lang.String lastSyncTimestamp) { this.lastSyncTimestamp = lastSyncTimestamp; } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatus.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatus.java index b1def1217b3..66422439986 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatus.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHostStatus.java @@ -68,21 +68,21 @@ public class BareMetalHostStatus implements Editable @JsonProperty("errorCount") private Integer errorCount; @JsonProperty("errorMessage") - private java.lang.String errorMessage; + private String errorMessage; @JsonProperty("errorType") - private java.lang.String errorType; + private String errorType; @JsonProperty("goodCredentials") private CredentialsStatus goodCredentials; @JsonProperty("hardware") private HardwareDetails hardware; @JsonProperty("hardwareProfile") - private java.lang.String hardwareProfile; + private String hardwareProfile; @JsonProperty("lastUpdated") private String lastUpdated; @JsonProperty("operationHistory") private OperationHistory operationHistory; @JsonProperty("operationalStatus") - private java.lang.String operationalStatus; + private String operationalStatus; @JsonProperty("poweredOn") private Boolean poweredOn; @JsonProperty("provisioning") @@ -90,7 +90,7 @@ public class BareMetalHostStatus implements Editable @JsonProperty("triedCredentials") private CredentialsStatus triedCredentials; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -99,7 +99,7 @@ public class BareMetalHostStatus implements Editable public BareMetalHostStatus() { } - public BareMetalHostStatus(Integer errorCount, java.lang.String errorMessage, java.lang.String errorType, CredentialsStatus goodCredentials, HardwareDetails hardware, java.lang.String hardwareProfile, String lastUpdated, OperationHistory operationHistory, java.lang.String operationalStatus, Boolean poweredOn, ProvisionStatus provisioning, CredentialsStatus triedCredentials) { + public BareMetalHostStatus(Integer errorCount, String errorMessage, String errorType, CredentialsStatus goodCredentials, HardwareDetails hardware, String hardwareProfile, String lastUpdated, OperationHistory operationHistory, String operationalStatus, Boolean poweredOn, ProvisionStatus provisioning, CredentialsStatus triedCredentials) { super(); this.errorCount = errorCount; this.errorMessage = errorMessage; @@ -126,22 +126,22 @@ public void setErrorCount(Integer errorCount) { } @JsonProperty("errorMessage") - public java.lang.String getErrorMessage() { + public String getErrorMessage() { return errorMessage; } @JsonProperty("errorMessage") - public void setErrorMessage(java.lang.String errorMessage) { + public void setErrorMessage(String errorMessage) { this.errorMessage = errorMessage; } @JsonProperty("errorType") - public java.lang.String getErrorType() { + public String getErrorType() { return errorType; } @JsonProperty("errorType") - public void setErrorType(java.lang.String errorType) { + public void setErrorType(String errorType) { this.errorType = errorType; } @@ -166,12 +166,12 @@ public void setHardware(HardwareDetails hardware) { } @JsonProperty("hardwareProfile") - public java.lang.String getHardwareProfile() { + public String getHardwareProfile() { return hardwareProfile; } @JsonProperty("hardwareProfile") - public void setHardwareProfile(java.lang.String hardwareProfile) { + public void setHardwareProfile(String hardwareProfile) { this.hardwareProfile = hardwareProfile; } @@ -196,12 +196,12 @@ public void setOperationHistory(OperationHistory operationHistory) { } @JsonProperty("operationalStatus") - public java.lang.String getOperationalStatus() { + public String getOperationalStatus() { return operationalStatus; } @JsonProperty("operationalStatus") - public void setOperationalStatus(java.lang.String operationalStatus) { + public void setOperationalStatus(String operationalStatus) { this.operationalStatus = operationalStatus; } @@ -246,16 +246,16 @@ public BareMetalHostStatusBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/OperationMetric.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/OperationMetric.java index b297769ee02..d2b742442b2 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/OperationMetric.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/OperationMetric.java @@ -60,7 +60,7 @@ public class OperationMetric implements Editable , Kuber @JsonProperty("start") private String start; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -106,16 +106,16 @@ public OperationMetricBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationStatus.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationStatus.java index 1de666a4571..e0d85f4e039 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationStatus.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1beta1/Metal3RemediationStatus.java @@ -59,11 +59,11 @@ public class Metal3RemediationStatus implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -72,7 +72,7 @@ public class Metal3RemediationStatus implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouterStatusCondition.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouterStatusCondition.java index 286cca28ef8..ac9ce87c568 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouterStatusCondition.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouterStatusCondition.java @@ -61,15 +61,15 @@ public class EgressRouterStatusCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class EgressRouterStatusCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-miscellaneous/src/main/resources/schema/kube-schema.json index 7826c1bab33..cbd0c76d27e 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/main/resources/schema/kube-schema.json @@ -36,8 +36,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -194,8 +193,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -384,8 +382,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -405,16 +402,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -621,19 +616,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -1052,8 +1034,7 @@ "type": "string" }, "timeAdded": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "value": { "type": "string" @@ -1399,12 +1380,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1504,8 +1483,7 @@ "existingJavaType": "Long" }, "lastSyncTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "providerStatus": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_runtime_RawExtension", @@ -2382,8 +2360,7 @@ "type": "string" }, "lastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "operationHistory": { "$ref": "#/definitions/os_metal3_v1alpha1_OperationHistory", @@ -2691,12 +2668,10 @@ "type": "object", "properties": { "end": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "start": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -2982,8 +2957,7 @@ "type": "object", "properties": { "lastRemediated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "phase": { "type": "string" @@ -3283,8 +3257,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -3555,8 +3528,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-miscellaneous/src/main/resources/schema/validation-schema.json index 43e31020b1e..c153b934b63 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/main/resources/schema/validation-schema.json @@ -36,8 +36,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -194,8 +193,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -384,8 +382,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -405,16 +402,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -621,19 +616,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -1052,8 +1034,7 @@ "type": "string" }, "timeAdded": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "value": { "type": "string" @@ -1399,12 +1380,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1504,8 +1483,7 @@ "existingJavaType": "Long" }, "lastSyncTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "providerStatus": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_runtime_RawExtension", @@ -2382,8 +2360,7 @@ "type": "string" }, "lastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "operationHistory": { "$ref": "#/definitions/os_metal3_v1alpha1_OperationHistory", @@ -2691,12 +2668,10 @@ "type": "object", "properties": { "end": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "start": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -2982,8 +2957,7 @@ "type": "object", "properties": { "lastRemediated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "phase": { "type": "string" @@ -3283,8 +3257,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -3555,8 +3528,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -3889,8 +3861,7 @@ "type": "string" }, "lastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "operationHistory": { "$ref": "#/definitions/os_metal3_v1alpha1_OperationHistory", @@ -3952,8 +3923,7 @@ "condition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4081,12 +4051,10 @@ "credentialsrequestcondition": { "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4170,8 +4138,7 @@ "existingJavaType": "Long" }, "lastSyncTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "providerStatus": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_runtime_RawExtension", @@ -4324,8 +4291,7 @@ "egressrouterstatuscondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5083,8 +5049,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -5154,8 +5119,7 @@ "metal3remediationstatus": { "properties": { "lastRemediated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "phase": { "type": "string" @@ -5415,16 +5379,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -5533,12 +5495,10 @@ "operationmetric": { "properties": { "end": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "start": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -5546,8 +5506,7 @@ "operatorcondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -6230,8 +6189,7 @@ "type": "string" }, "timeAdded": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "value": { "type": "string" @@ -6239,14 +6197,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "toleration": { "properties": { "effect": { diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 39a7346429d..9ae3b41fcaa 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -55,7 +55,7 @@ public class KubeSchema { private String time; private TypeMeta typeMeta; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -344,16 +344,16 @@ public void setTypeMeta(TypeMeta typeMeta) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index a4085719537..f999d49e061 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -55,7 +55,7 @@ public class ValidationSchema { private String time; private TypeMeta typeMeta; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -344,16 +344,16 @@ public void setTypeMeta(TypeMeta typeMeta) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Condition.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Condition.java index 8ebc420c6c1..3e1b441351e 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Condition.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Condition.java @@ -62,17 +62,17 @@ public class Condition implements Editable , KubernetesResourc @JsonProperty("lastTransitionTime") private String lastTransitionTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("observedGeneration") private Long observedGeneration; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -81,7 +81,7 @@ public class Condition implements Editable , KubernetesResourc public Condition() { } - public Condition(String lastTransitionTime, java.lang.String message, Long observedGeneration, java.lang.String reason, java.lang.String status, java.lang.String type) { + public Condition(String lastTransitionTime, String message, Long observedGeneration, String reason, String status, String type) { super(); this.lastTransitionTime = lastTransitionTime; this.message = message; @@ -102,12 +102,12 @@ public void setLastTransitionTime(String lastTransitionTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @@ -122,32 +122,32 @@ public void setObservedGeneration(Long observedGeneration) { } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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; } @@ -162,16 +162,16 @@ public ConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/kube-schema.json index 114daab530b..0348a020901 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/kube-schema.json @@ -230,8 +230,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -251,16 +250,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -467,19 +464,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -1724,12 +1708,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4107,8 +4089,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -8226,8 +8207,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.ThanosRulerList" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/validation-schema.json index 8257657080b..af3f6fa37fe 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-monitoring/src/main/resources/schema/validation-schema.json @@ -230,8 +230,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -251,16 +250,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -467,19 +464,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -1724,12 +1708,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4107,8 +4089,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -8226,8 +8207,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.ThanosRulerList" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -9394,8 +9374,7 @@ "condition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -10596,8 +10575,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -10805,16 +10783,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -11091,12 +11067,10 @@ "persistentvolumeclaimcondition": { "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -14355,14 +14329,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "timeinterval": { "properties": { "daysOfMonth": { diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index d01e8ab0633..ea91dcacc67 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -124,7 +124,7 @@ public class KubeSchema { private String time; private TypeMeta typeMeta; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -798,16 +798,16 @@ public void setTypeMeta(TypeMeta typeMeta) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 106fdfe4b54..f0987ceb88a 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -124,7 +124,7 @@ public class ValidationSchema { private String time; private TypeMeta typeMeta; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -798,16 +798,16 @@ public void setTypeMeta(TypeMeta typeMeta) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/LogEntry.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/LogEntry.java index 9ca85f83d69..a1acff70660 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/LogEntry.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/LogEntry.java @@ -62,15 +62,15 @@ public class LogEntry implements Editable , KubernetesResource @JsonProperty("latency") private Duration latency; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("success") private Boolean success; @JsonProperty("time") private String time; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -79,7 +79,7 @@ public class LogEntry implements Editable , KubernetesResource public LogEntry() { } - public LogEntry(Duration latency, java.lang.String message, java.lang.String reason, Boolean success, String time) { + public LogEntry(Duration latency, String message, String reason, Boolean success, String time) { super(); this.latency = latency; this.message = message; @@ -99,22 +99,22 @@ public void setLatency(Duration latency) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @@ -149,16 +149,16 @@ public LogEntryBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/OutageEntry.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/OutageEntry.java index be0f3294aa5..8a2adbc6b6f 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/OutageEntry.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/OutageEntry.java @@ -66,14 +66,14 @@ public class OutageEntry implements Editable , KubernetesRes @JsonInclude(JsonInclude.Include.NON_EMPTY) private List endLogs = new ArrayList<>(); @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("start") private String start; @JsonProperty("startLogs") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List startLogs = new ArrayList<>(); @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -82,7 +82,7 @@ public class OutageEntry implements Editable , KubernetesRes public OutageEntry() { } - public OutageEntry(String end, List endLogs, java.lang.String message, String start, List startLogs) { + public OutageEntry(String end, List endLogs, String message, String start, List startLogs) { super(); this.end = end; this.endLogs = endLogs; @@ -113,12 +113,12 @@ public void setEndLogs(List endLogs) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @@ -154,16 +154,16 @@ public OutageEntryBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheckCondition.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheckCondition.java index c5936cdc32d..807481a05c8 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheckCondition.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheckCondition.java @@ -61,15 +61,15 @@ public class PodNetworkConnectivityCheckCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class PodNetworkConnectivityCheckCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSZoneCondition.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSZoneCondition.java index 6490f355e90..57fc4a8a242 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSZoneCondition.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSZoneCondition.java @@ -61,15 +61,15 @@ public class DNSZoneCondition implements Editable , Kub @JsonProperty("lastTransitionTime") private String lastTransitionTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -78,7 +78,7 @@ public class DNSZoneCondition implements Editable , Kub public DNSZoneCondition() { } - public DNSZoneCondition(String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public DNSZoneCondition(String lastTransitionTime, String message, String reason, String status, String type) { super(); this.lastTransitionTime = lastTransitionTime; this.message = message; @@ -98,42 +98,42 @@ public void setLastTransitionTime(String lastTransitionTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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,16 +148,16 @@ public DNSZoneConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeStatus.java index a98c768506e..9ca549b0123 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeStatus.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/NodeStatus.java @@ -69,22 +69,22 @@ public class NodeStatus implements Editable , KubernetesResou @JsonProperty("lastFailedCount") private Integer lastFailedCount; @JsonProperty("lastFailedReason") - private java.lang.String lastFailedReason; + private String lastFailedReason; @JsonProperty("lastFailedRevision") private Integer lastFailedRevision; @JsonProperty("lastFailedRevisionErrors") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List lastFailedRevisionErrors = new ArrayList<>(); + private List lastFailedRevisionErrors = new ArrayList<>(); @JsonProperty("lastFailedTime") private String lastFailedTime; @JsonProperty("lastFallbackCount") private Integer lastFallbackCount; @JsonProperty("nodeName") - private java.lang.String nodeName; + private String nodeName; @JsonProperty("targetRevision") private Integer targetRevision; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -93,7 +93,7 @@ public class NodeStatus implements Editable , KubernetesResou public NodeStatus() { } - public NodeStatus(Integer currentRevision, Integer lastFailedCount, java.lang.String lastFailedReason, Integer lastFailedRevision, List lastFailedRevisionErrors, String lastFailedTime, Integer lastFallbackCount, java.lang.String nodeName, Integer targetRevision) { + public NodeStatus(Integer currentRevision, Integer lastFailedCount, String lastFailedReason, Integer lastFailedRevision, List lastFailedRevisionErrors, String lastFailedTime, Integer lastFallbackCount, String nodeName, Integer targetRevision) { super(); this.currentRevision = currentRevision; this.lastFailedCount = lastFailedCount; @@ -127,12 +127,12 @@ public void setLastFailedCount(Integer lastFailedCount) { } @JsonProperty("lastFailedReason") - public java.lang.String getLastFailedReason() { + public String getLastFailedReason() { return lastFailedReason; } @JsonProperty("lastFailedReason") - public void setLastFailedReason(java.lang.String lastFailedReason) { + public void setLastFailedReason(String lastFailedReason) { this.lastFailedReason = lastFailedReason; } @@ -148,12 +148,12 @@ public void setLastFailedRevision(Integer lastFailedRevision) { @JsonProperty("lastFailedRevisionErrors") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getLastFailedRevisionErrors() { + public List getLastFailedRevisionErrors() { return lastFailedRevisionErrors; } @JsonProperty("lastFailedRevisionErrors") - public void setLastFailedRevisionErrors(List lastFailedRevisionErrors) { + public void setLastFailedRevisionErrors(List lastFailedRevisionErrors) { this.lastFailedRevisionErrors = lastFailedRevisionErrors; } @@ -178,12 +178,12 @@ public void setLastFallbackCount(Integer lastFallbackCount) { } @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; } @@ -208,16 +208,16 @@ 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OperatorCondition.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OperatorCondition.java index c62f8f39ea0..837ae4d3c4e 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OperatorCondition.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OperatorCondition.java @@ -61,15 +61,15 @@ public class OperatorCondition implements Editable , K @JsonProperty("lastTransitionTime") private String lastTransitionTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -78,7 +78,7 @@ public class OperatorCondition implements Editable , K public OperatorCondition() { } - public OperatorCondition(String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public OperatorCondition(String lastTransitionTime, String message, String reason, String status, String type) { super(); this.lastTransitionTime = lastTransitionTime; this.message = message; @@ -98,42 +98,42 @@ public void setLastTransitionTime(String lastTransitionTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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,16 +148,16 @@ public OperatorConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceAccountIssuerStatus.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceAccountIssuerStatus.java index dd4a60304c4..4322fa6a531 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceAccountIssuerStatus.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceAccountIssuerStatus.java @@ -58,9 +58,9 @@ public class ServiceAccountIssuerStatus implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -69,7 +69,7 @@ public class ServiceAccountIssuerStatus implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/kube-schema.json index b05c1bb11d1..509cd1a4794 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/kube-schema.json @@ -267,8 +267,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -288,16 +287,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -504,19 +501,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -1233,8 +1217,7 @@ "type": "boolean" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -1247,8 +1230,7 @@ "type": "object", "properties": { "end": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "endLogs": { "type": "array", @@ -1262,8 +1244,7 @@ "type": "string" }, "start": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "startLogs": { "type": "array", @@ -1317,8 +1298,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2875,8 +2855,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4868,8 +4847,7 @@ } }, "lastFailedTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastFallbackCount": { "type": "integer" @@ -5228,8 +5206,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5581,8 +5558,7 @@ "type": "object", "properties": { "expirationTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "name": { "type": "string" @@ -6733,8 +6709,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.StorageList" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", diff --git a/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/validation-schema.json index 76552df2800..ac772cf69b8 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-operator/src/main/resources/schema/validation-schema.json @@ -267,8 +267,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -288,16 +287,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -504,19 +501,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -1233,8 +1217,7 @@ "type": "boolean" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -1247,8 +1230,7 @@ "type": "object", "properties": { "end": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "endLogs": { "type": "array", @@ -1262,8 +1244,7 @@ "type": "string" }, "start": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "startLogs": { "type": "array", @@ -1317,8 +1298,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -2875,8 +2855,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4868,8 +4847,7 @@ } }, "lastFailedTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastFallbackCount": { "type": "integer" @@ -5228,8 +5206,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5581,8 +5558,7 @@ "type": "object", "properties": { "expirationTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "name": { "type": "string" @@ -6733,8 +6709,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.operator.v1.StorageList" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -8142,8 +8117,7 @@ "dnszonecondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -9761,8 +9735,7 @@ "type": "boolean" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -9805,8 +9778,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -10136,8 +10108,7 @@ } }, "lastFailedTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastFallbackCount": { "type": "integer" @@ -10169,16 +10140,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -10478,8 +10447,7 @@ "operatorcondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -10552,8 +10520,7 @@ "outageentry": { "properties": { "end": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "endLogs": { "type": "array", @@ -10567,8 +10534,7 @@ "type": "string" }, "start": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "startLogs": { "type": "array", @@ -10799,8 +10765,7 @@ "podnetworkconnectivitycheckcondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -11158,8 +11123,7 @@ "serviceaccountissuerstatus": { "properties": { "expirationTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "name": { "type": "string" @@ -11871,14 +11835,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "tlsprofilespec": { "properties": { "ciphers": { diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 090948e5a29..164edc2c5eb 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -66,7 +66,7 @@ public class KubeSchema { private String time; private TypeMeta typeMeta; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -421,16 +421,16 @@ public void setTypeMeta(TypeMeta typeMeta) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 40bcf6c3a9d..1658a07cad5 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -66,7 +66,7 @@ public class ValidationSchema { private String time; private TypeMeta typeMeta; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -421,16 +421,16 @@ public void setTypeMeta(TypeMeta typeMeta) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupStatus.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupStatus.java index 3d6d988c3e8..ce547e5cc79 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupStatus.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroupStatus.java @@ -66,11 +66,11 @@ public class OperatorGroupStatus implements Editable private String lastUpdated; @JsonProperty("namespaces") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List namespaces = new ArrayList<>(); + private List namespaces = new ArrayList<>(); @JsonProperty("serviceAccountRef") private io.fabric8.kubernetes.api.model.ObjectReference serviceAccountRef; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -79,7 +79,7 @@ public class OperatorGroupStatus implements Editable public OperatorGroupStatus() { } - public OperatorGroupStatus(List conditions, String lastUpdated, List namespaces, io.fabric8.kubernetes.api.model.ObjectReference serviceAccountRef) { + public OperatorGroupStatus(List conditions, String lastUpdated, List namespaces, io.fabric8.kubernetes.api.model.ObjectReference serviceAccountRef) { super(); this.conditions = conditions; this.lastUpdated = lastUpdated; @@ -110,12 +110,12 @@ public void setLastUpdated(String lastUpdated) { @JsonProperty("namespaces") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getNamespaces() { + public List getNamespaces() { return namespaces; } @JsonProperty("namespaces") - public void setNamespaces(List namespaces) { + public void setNamespaces(List namespaces) { this.namespaces = namespaces; } @@ -140,16 +140,16 @@ public OperatorGroupStatusBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/BundleLookupCondition.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/BundleLookupCondition.java index 387086f6fac..aebe01efc7f 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/BundleLookupCondition.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/BundleLookupCondition.java @@ -64,15 +64,15 @@ public class BundleLookupCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -81,7 +81,7 @@ public class BundleLookupCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceStatus.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceStatus.java index a6d0931262e..6b8208e9a4c 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceStatus.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSourceStatus.java @@ -73,13 +73,13 @@ public class CatalogSourceStatus implements Editable @JsonProperty("latestImageRegistryPoll") private String latestImageRegistryPoll; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("registryService") private RegistryServiceStatus registryService; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -88,7 +88,7 @@ public class CatalogSourceStatus implements Editable public CatalogSourceStatus() { } - public CatalogSourceStatus(List conditions, ConfigMapResourceReference configMapReference, GRPCConnectionState connectionState, String latestImageRegistryPoll, java.lang.String message, java.lang.String reason, RegistryServiceStatus registryService) { + public CatalogSourceStatus(List conditions, ConfigMapResourceReference configMapReference, GRPCConnectionState connectionState, String latestImageRegistryPoll, String message, String reason, RegistryServiceStatus registryService) { super(); this.conditions = conditions; this.configMapReference = configMapReference; @@ -141,22 +141,22 @@ public void setLatestImageRegistryPoll(String latestImageRegistryPoll) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @@ -181,16 +181,16 @@ public CatalogSourceStatusBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionCondition.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionCondition.java index 72dd8c84de7..b981f9616a2 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionCondition.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionCondition.java @@ -63,13 +63,13 @@ public class ClusterServiceVersionCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class ClusterServiceVersionCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatus.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatus.java index cfcf6ad8e26..9592ab2ce95 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatus.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersionStatus.java @@ -79,16 +79,16 @@ public class ClusterServiceVersionStatus implements Editable requirementStatus = new ArrayList<>(); @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -97,7 +97,7 @@ public class ClusterServiceVersionStatus implements Editable conditions, String lastTransitionTime, String lastUpdateTime, java.lang.String message, java.lang.String phase, java.lang.String reason, List requirementStatus) { + public ClusterServiceVersionStatus(String certsLastUpdated, String certsRotateAt, CleanupStatus cleanup, List conditions, String lastTransitionTime, String lastUpdateTime, String message, String phase, String reason, List requirementStatus) { super(); this.certsLastUpdated = certsLastUpdated; this.certsRotateAt = certsRotateAt; @@ -173,32 +173,32 @@ public void setLastUpdateTime(String lastUpdateTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @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; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @@ -224,16 +224,16 @@ public ClusterServiceVersionStatusBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ConfigMapResourceReference.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ConfigMapResourceReference.java index 0ae872a0edc..a9133d7f6e3 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ConfigMapResourceReference.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ConfigMapResourceReference.java @@ -61,15 +61,15 @@ public class ConfigMapResourceReference implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class ConfigMapResourceReference implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/GRPCConnectionState.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/GRPCConnectionState.java index 8ad8f4f446d..e285aa4a2e2 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/GRPCConnectionState.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/GRPCConnectionState.java @@ -57,13 +57,13 @@ public class GRPCConnectionState implements Editable { @JsonProperty("address") - private java.lang.String address; + private String address; @JsonProperty("lastConnect") private String lastConnect; @JsonProperty("lastObservedState") - private java.lang.String lastObservedState; + private String lastObservedState; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -72,7 +72,7 @@ public class GRPCConnectionState implements Editable public GRPCConnectionState() { } - public GRPCConnectionState(java.lang.String address, String lastConnect, java.lang.String lastObservedState) { + public GRPCConnectionState(String address, String lastConnect, String lastObservedState) { super(); this.address = address; this.lastConnect = lastConnect; @@ -80,12 +80,12 @@ public GRPCConnectionState(java.lang.String address, String lastConnect, java.la } @JsonProperty("address") - public java.lang.String getAddress() { + public String getAddress() { return address; } @JsonProperty("address") - public void setAddress(java.lang.String address) { + public void setAddress(String address) { this.address = address; } @@ -100,12 +100,12 @@ public void setLastConnect(String lastConnect) { } @JsonProperty("lastObservedState") - public java.lang.String getLastObservedState() { + public String getLastObservedState() { return lastObservedState; } @JsonProperty("lastObservedState") - public void setLastObservedState(java.lang.String lastObservedState) { + public void setLastObservedState(String lastObservedState) { this.lastObservedState = lastObservedState; } @@ -120,16 +120,16 @@ public GRPCConnectionStateBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanCondition.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanCondition.java index 2b08b59af27..4372d80743e 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanCondition.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanCondition.java @@ -64,15 +64,15 @@ public class InstallPlanCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -81,7 +81,7 @@ public class InstallPlanCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatus.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatus.java index 619593a30ed..9df2a144a03 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatus.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlanStatus.java @@ -69,21 +69,21 @@ public class InstallPlanStatus implements Editable , K private List bundleLookups = new ArrayList<>(); @JsonProperty("catalogSources") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List catalogSources = new ArrayList<>(); + private List catalogSources = new ArrayList<>(); @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List conditions = new ArrayList<>(); @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("phase") - private java.lang.String phase; + private String phase; @JsonProperty("plan") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List plan = new ArrayList<>(); @JsonProperty("startTime") private String startTime; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -92,7 +92,7 @@ public class InstallPlanStatus implements Editable , K public InstallPlanStatus() { } - public InstallPlanStatus(io.fabric8.kubernetes.api.model.ObjectReference attenuatedServiceAccountRef, List bundleLookups, List catalogSources, List conditions, java.lang.String message, java.lang.String phase, List plan, String startTime) { + public InstallPlanStatus(io.fabric8.kubernetes.api.model.ObjectReference attenuatedServiceAccountRef, List bundleLookups, List catalogSources, List conditions, String message, String phase, List plan, String startTime) { super(); this.attenuatedServiceAccountRef = attenuatedServiceAccountRef; this.bundleLookups = bundleLookups; @@ -127,12 +127,12 @@ public void setBundleLookups(List bundleLookups) { @JsonProperty("catalogSources") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getCatalogSources() { + public List getCatalogSources() { return catalogSources; } @JsonProperty("catalogSources") - public void setCatalogSources(List catalogSources) { + public void setCatalogSources(List catalogSources) { this.catalogSources = catalogSources; } @@ -148,22 +148,22 @@ public void setConditions(List conditions) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @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; } @@ -199,16 +199,16 @@ public InstallPlanStatusBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/RegistryServiceStatus.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/RegistryServiceStatus.java index 74b5bb54533..bee6238f5e5 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/RegistryServiceStatus.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/RegistryServiceStatus.java @@ -61,15 +61,15 @@ public class RegistryServiceStatus implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class RegistryServiceStatus implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionCatalogHealth.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionCatalogHealth.java index ebf8dfea9dc..0e2666444ae 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionCatalogHealth.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionCatalogHealth.java @@ -62,7 +62,7 @@ public class SubscriptionCatalogHealth implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -119,16 +119,16 @@ public SubscriptionCatalogHealthBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionCondition.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionCondition.java index 394755d3e02..d46a9940db7 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionCondition.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionCondition.java @@ -60,9 +60,19 @@ public class SubscriptionCondition implements Editable , KubernetesResource { + /** + * last time we got an update on a given condition + * + */ @JsonProperty("lastHeartbeatTime") + @JsonPropertyDescription("last time we got an update on a given condition") private String lastHeartbeatTime; + /** + * last time the condition transit from one status to another + * + */ @JsonProperty("lastTransitionTime") + @JsonPropertyDescription("last time the condition transit from one status to another") private String lastTransitionTime; /** * human-readable message indicating details about last transition @@ -70,30 +80,30 @@ public class SubscriptionCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -106,6 +116,10 @@ public SubscriptionCondition() { * * @param reason * one-word CamelCase reason for the condition's last transition. + * @param lastHeartbeatTime + * last time we got an update on a given condition. + * @param lastTransitionTime + * last time the condition transit from one status to another. * @param message * human-readable message indicating details about last transition. * @param type @@ -113,7 +127,7 @@ public SubscriptionCondition() { * @param status * status of the condition. */ - public SubscriptionCondition(String lastHeartbeatTime, String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public SubscriptionCondition(String lastHeartbeatTime, String lastTransitionTime, String message, String reason, String status, String type) { super(); this.lastHeartbeatTime = lastHeartbeatTime; this.lastTransitionTime = lastTransitionTime; @@ -123,21 +137,37 @@ public SubscriptionCondition(String lastHeartbeatTime, String lastTransitionTime this.type = type; } + /** + * last time we got an update on a given condition + * + */ @JsonProperty("lastHeartbeatTime") public String getLastHeartbeatTime() { return lastHeartbeatTime; } + /** + * last time we got an update on a given condition + * + */ @JsonProperty("lastHeartbeatTime") public void setLastHeartbeatTime(String lastHeartbeatTime) { this.lastHeartbeatTime = lastHeartbeatTime; } + /** + * last time the condition transit from one status to another + * + */ @JsonProperty("lastTransitionTime") public String getLastTransitionTime() { return lastTransitionTime; } + /** + * last time the condition transit from one status to another + * + */ @JsonProperty("lastTransitionTime") public void setLastTransitionTime(String lastTransitionTime) { this.lastTransitionTime = lastTransitionTime; @@ -148,7 +178,7 @@ public void setLastTransitionTime(String lastTransitionTime) { * */ @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @@ -157,7 +187,7 @@ public java.lang.String getMessage() { * */ @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @@ -166,7 +196,7 @@ public void setMessage(java.lang.String message) { * */ @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @@ -175,7 +205,7 @@ public java.lang.String getReason() { * */ @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @@ -184,7 +214,7 @@ public void setReason(java.lang.String reason) { * */ @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @@ -193,7 +223,7 @@ public java.lang.String getStatus() { * */ @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @@ -202,7 +232,7 @@ public void setStatus(java.lang.String status) { * */ @JsonProperty("type") - public java.lang.String getType() { + public String getType() { return type; } @@ -211,7 +241,7 @@ public java.lang.String getType() { * */ @JsonProperty("type") - public void setType(java.lang.String type) { + public void setType(String type) { this.type = type; } @@ -226,16 +256,16 @@ public SubscriptionConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionStatus.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionStatus.java index 8b94d031639..2dbcde47dd8 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionStatus.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/SubscriptionStatus.java @@ -71,23 +71,23 @@ public class SubscriptionStatus implements Editable , @JsonInclude(JsonInclude.Include.NON_EMPTY) private List conditions = new ArrayList<>(); @JsonProperty("currentCSV") - private java.lang.String currentCSV; + private String currentCSV; @JsonProperty("installPlanGeneration") private Integer installPlanGeneration; @JsonProperty("installPlanRef") private io.fabric8.kubernetes.api.model.ObjectReference installPlanRef; @JsonProperty("installedCSV") - private java.lang.String installedCSV; + private String installedCSV; @JsonProperty("installplan") private InstallPlanReference installplan; @JsonProperty("lastUpdated") private String lastUpdated; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("state") - private java.lang.String state; + private String state; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -96,7 +96,7 @@ public class SubscriptionStatus implements Editable , public SubscriptionStatus() { } - public SubscriptionStatus(List catalogHealth, List conditions, java.lang.String currentCSV, Integer installPlanGeneration, io.fabric8.kubernetes.api.model.ObjectReference installPlanRef, java.lang.String installedCSV, InstallPlanReference installplan, String lastUpdated, java.lang.String reason, java.lang.String state) { + public SubscriptionStatus(List catalogHealth, List conditions, String currentCSV, Integer installPlanGeneration, io.fabric8.kubernetes.api.model.ObjectReference installPlanRef, String installedCSV, InstallPlanReference installplan, String lastUpdated, String reason, String state) { super(); this.catalogHealth = catalogHealth; this.conditions = conditions; @@ -133,12 +133,12 @@ public void setConditions(List conditions) { } @JsonProperty("currentCSV") - public java.lang.String getCurrentCSV() { + public String getCurrentCSV() { return currentCSV; } @JsonProperty("currentCSV") - public void setCurrentCSV(java.lang.String currentCSV) { + public void setCurrentCSV(String currentCSV) { this.currentCSV = currentCSV; } @@ -163,12 +163,12 @@ public void setInstallPlanRef(io.fabric8.kubernetes.api.model.ObjectReference in } @JsonProperty("installedCSV") - public java.lang.String getInstalledCSV() { + public String getInstalledCSV() { return installedCSV; } @JsonProperty("installedCSV") - public void setInstalledCSV(java.lang.String installedCSV) { + public void setInstalledCSV(String installedCSV) { this.installedCSV = installedCSV; } @@ -193,22 +193,22 @@ public void setLastUpdated(String lastUpdated) { } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("state") - public java.lang.String getState() { + public String getState() { return state; } @JsonProperty("state") - public void setState(java.lang.String state) { + public void setState(String state) { this.state = state; } @@ -223,16 +223,16 @@ public SubscriptionStatusBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/kube-schema.json index 2a5706861dd..f00532600b3 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/kube-schema.json @@ -151,8 +151,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -346,8 +345,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -367,16 +365,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -583,19 +579,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -714,12 +697,10 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4343,12 +4324,10 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4732,8 +4711,7 @@ } }, "lastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "namespaces": { "type": "array", @@ -5023,12 +5001,10 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5244,8 +5220,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.operatorhub.v1alpha1.GRPCConnectionState" }, "latestImageRegistryPoll": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5332,12 +5307,10 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5527,12 +5500,10 @@ "type": "object", "properties": { "certsLastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "certsRotateAt": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "cleanup": { "$ref": "#/definitions/os_operatorhub_v1alpha1_CleanupStatus", @@ -5547,12 +5518,10 @@ } }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5582,8 +5551,7 @@ "type": "object", "properties": { "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "name": { "type": "string" @@ -5665,8 +5633,7 @@ "type": "string" }, "lastConnect": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastObservedState": { "type": "string" @@ -5782,12 +5749,10 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5937,8 +5902,7 @@ } }, "startTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -5997,8 +5961,7 @@ "type": "object", "properties": { "createdAt": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "port": { "type": "string" @@ -6346,8 +6309,7 @@ "type": "boolean" }, "lastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -6360,12 +6322,12 @@ "type": "object", "properties": { "lastHeartbeatTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string", + "description": "last time we got an update on a given condition" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string", + "description": "last time the condition transit from one status to another" }, "message": { "type": "string", @@ -6560,8 +6522,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.operatorhub.v1alpha1.InstallPlanReference" }, "lastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "reason": { "type": "string" @@ -6779,8 +6740,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.operatorhub.v1alpha1.SubscriptionList" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/validation-schema.json index 57484857440..9e3795dc89a 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/main/resources/schema/validation-schema.json @@ -151,8 +151,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -346,8 +345,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -367,16 +365,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -583,19 +579,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -714,12 +697,10 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4343,12 +4324,10 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -4732,8 +4711,7 @@ } }, "lastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "namespaces": { "type": "array", @@ -5023,12 +5001,10 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5244,8 +5220,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.operatorhub.v1alpha1.GRPCConnectionState" }, "latestImageRegistryPoll": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5332,12 +5307,10 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5527,12 +5500,10 @@ "type": "object", "properties": { "certsLastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "certsRotateAt": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "cleanup": { "$ref": "#/definitions/os_operatorhub_v1alpha1_CleanupStatus", @@ -5547,12 +5518,10 @@ } }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5582,8 +5551,7 @@ "type": "object", "properties": { "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "name": { "type": "string" @@ -5665,8 +5633,7 @@ "type": "string" }, "lastConnect": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastObservedState": { "type": "string" @@ -5782,12 +5749,10 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5937,8 +5902,7 @@ } }, "startTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -5997,8 +5961,7 @@ "type": "object", "properties": { "createdAt": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "port": { "type": "string" @@ -6346,8 +6309,7 @@ "type": "boolean" }, "lastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -6360,12 +6322,12 @@ "type": "object", "properties": { "lastHeartbeatTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string", + "description": "last time we got an update on a given condition" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string", + "description": "last time the condition transit from one status to another" }, "message": { "type": "string", @@ -6560,8 +6522,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.operatorhub.v1alpha1.InstallPlanReference" }, "lastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "reason": { "type": "string" @@ -6779,8 +6740,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.operatorhub.v1alpha1.SubscriptionList" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -7093,12 +7053,10 @@ "bundlelookupcondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -7254,8 +7212,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.operatorhub.v1alpha1.GRPCConnectionState" }, "latestImageRegistryPoll": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -7377,12 +7334,10 @@ "clusterserviceversioncondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -7556,12 +7511,10 @@ "clusterserviceversionstatus": { "properties": { "certsLastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "certsRotateAt": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "cleanup": { "$ref": "#/definitions/os_operatorhub_v1alpha1_CleanupStatus", @@ -7576,12 +7529,10 @@ } }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -7644,8 +7595,7 @@ "condition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -7713,8 +7663,7 @@ "configmapresourcereference": { "properties": { "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "name": { "type": "string" @@ -8153,12 +8102,10 @@ "deploymentcondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -8795,8 +8742,7 @@ "type": "string" }, "lastConnect": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastObservedState": { "type": "string" @@ -8981,12 +8927,10 @@ "installplancondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -9115,8 +9059,7 @@ } }, "startTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -9350,8 +9293,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -9471,16 +9413,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -9849,8 +9789,7 @@ } }, "lastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "namespaces": { "type": "array", @@ -10741,8 +10680,7 @@ "registryservicestatus": { "properties": { "createdAt": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "port": { "type": "string" @@ -11482,8 +11420,7 @@ "type": "boolean" }, "lastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -11491,12 +11428,12 @@ "subscriptioncondition": { "properties": { "lastHeartbeatTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string", + "description": "last time we got an update on a given condition" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string", + "description": "last time the condition transit from one status to another" }, "message": { "type": "string", @@ -11670,8 +11607,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.operatorhub.v1alpha1.InstallPlanReference" }, "lastUpdated": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "reason": { "type": "string" @@ -11705,14 +11641,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "toleration": { "properties": { "effect": { diff --git a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 6314672bcd1..483f4a2798b 100644 --- a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -31,7 +31,7 @@ public class KubeSchema { private String time; private TypeMeta typeMeta; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -188,16 +188,16 @@ public void setTypeMeta(TypeMeta typeMeta) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 92c5662df0e..7a146d36f02 100644 --- a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -31,7 +31,7 @@ public class ValidationSchema { private String time; private TypeMeta typeMeta; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -188,16 +188,16 @@ public void setTypeMeta(TypeMeta typeMeta) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/MigrationCondition.java b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/MigrationCondition.java index efa68d1aa1a..0d4fc53f4ba 100644 --- a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/MigrationCondition.java +++ b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/MigrationCondition.java @@ -61,15 +61,15 @@ public class MigrationCondition implements Editable , @JsonProperty("lastUpdateTime") private String lastUpdateTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -78,7 +78,7 @@ public class MigrationCondition implements Editable , public MigrationCondition() { } - public MigrationCondition(String lastUpdateTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public MigrationCondition(String lastUpdateTime, String message, String reason, String status, String type) { super(); this.lastUpdateTime = lastUpdateTime; this.message = message; @@ -98,42 +98,42 @@ public void setLastUpdateTime(String lastUpdateTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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,16 +148,16 @@ public MigrationConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/StorageStateStatus.java b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/StorageStateStatus.java index 35f8332190c..f4add4d507e 100644 --- a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/StorageStateStatus.java +++ b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/StorageStateStatus.java @@ -59,14 +59,14 @@ public class StorageStateStatus implements Editable , { @JsonProperty("currentStorageVersionHash") - private java.lang.String currentStorageVersionHash; + private String currentStorageVersionHash; @JsonProperty("lastHeartbeatTime") private String lastHeartbeatTime; @JsonProperty("persistedStorageVersionHashes") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List persistedStorageVersionHashes = new ArrayList<>(); + private List persistedStorageVersionHashes = new ArrayList<>(); @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -75,7 +75,7 @@ public class StorageStateStatus implements Editable , public StorageStateStatus() { } - public StorageStateStatus(java.lang.String currentStorageVersionHash, String lastHeartbeatTime, List persistedStorageVersionHashes) { + public StorageStateStatus(String currentStorageVersionHash, String lastHeartbeatTime, List persistedStorageVersionHashes) { super(); this.currentStorageVersionHash = currentStorageVersionHash; this.lastHeartbeatTime = lastHeartbeatTime; @@ -83,12 +83,12 @@ public StorageStateStatus(java.lang.String currentStorageVersionHash, String las } @JsonProperty("currentStorageVersionHash") - public java.lang.String getCurrentStorageVersionHash() { + public String getCurrentStorageVersionHash() { return currentStorageVersionHash; } @JsonProperty("currentStorageVersionHash") - public void setCurrentStorageVersionHash(java.lang.String currentStorageVersionHash) { + public void setCurrentStorageVersionHash(String currentStorageVersionHash) { this.currentStorageVersionHash = currentStorageVersionHash; } @@ -104,12 +104,12 @@ public void setLastHeartbeatTime(String lastHeartbeatTime) { @JsonProperty("persistedStorageVersionHashes") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public List getPersistedStorageVersionHashes() { + public List getPersistedStorageVersionHashes() { return persistedStorageVersionHashes; } @JsonProperty("persistedStorageVersionHashes") - public void setPersistedStorageVersionHashes(List persistedStorageVersionHashes) { + public void setPersistedStorageVersionHashes(List persistedStorageVersionHashes) { this.persistedStorageVersionHashes = persistedStorageVersionHashes; } @@ -124,16 +124,16 @@ public StorageStateStatusBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/main/resources/schema/kube-schema.json index 3401b7ad2c0..59c8db183a3 100644 --- a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/main/resources/schema/kube-schema.json @@ -174,8 +174,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -195,16 +194,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -411,19 +408,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -524,8 +508,7 @@ "type": "object", "properties": { "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -631,8 +614,7 @@ "type": "string" }, "lastHeartbeatTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "persistedStorageVersionHashes": { "type": "array", @@ -795,8 +777,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.storageversionmigrator.v1alpha1.StorageVersionMigrationList" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", diff --git a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/main/resources/schema/validation-schema.json index e1f999714b6..ab1684f9f08 100644 --- a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/main/resources/schema/validation-schema.json @@ -174,8 +174,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -195,16 +194,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -411,19 +408,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -524,8 +508,7 @@ "type": "object", "properties": { "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -631,8 +614,7 @@ "type": "string" }, "lastHeartbeatTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "persistedStorageVersionHashes": { "type": "array", @@ -795,8 +777,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.storageversionmigrator.v1alpha1.StorageVersionMigrationList" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -1001,8 +982,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -1010,8 +990,7 @@ "migrationcondition": { "properties": { "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1038,16 +1017,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -1291,8 +1268,7 @@ "type": "string" }, "lastHeartbeatTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "persistedStorageVersionHashes": { "type": "array", @@ -1382,14 +1358,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "typemeta": { "properties": { "apiVersion": { diff --git a/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 66468607fcd..19db56f61eb 100644 --- a/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -31,7 +31,7 @@ public class KubeSchema { private TunedList tunedList; private TypeMeta typeMeta; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -188,16 +188,16 @@ public void setTypeMeta(TypeMeta typeMeta) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index 22de6c40f19..e041da19b00 100644 --- a/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -31,7 +31,7 @@ public class ValidationSchema { private TunedList tunedList; private TypeMeta typeMeta; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -188,16 +188,16 @@ public void setTypeMeta(TypeMeta typeMeta) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/openshift/api/model/tuned/v1/ProfileStatusCondition.java b/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/openshift/api/model/tuned/v1/ProfileStatusCondition.java index 0bf436e4f41..2acbf5c1d41 100644 --- a/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/openshift/api/model/tuned/v1/ProfileStatusCondition.java +++ b/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/openshift/api/model/tuned/v1/ProfileStatusCondition.java @@ -61,15 +61,15 @@ public class ProfileStatusCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class ProfileStatusCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-tuned/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-tuned/src/main/resources/schema/kube-schema.json index cade79283ff..86cd16f5849 100644 --- a/kubernetes-model-generator/openshift-model-tuned/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-tuned/src/main/resources/schema/kube-schema.json @@ -174,8 +174,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -195,16 +194,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -411,19 +408,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -629,8 +613,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -883,8 +866,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "Tuned": { "$ref": "#/definitions/os_tuned_v1_Tuned", diff --git a/kubernetes-model-generator/openshift-model-tuned/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-tuned/src/main/resources/schema/validation-schema.json index a19be778cc6..9cf5e32d5ed 100644 --- a/kubernetes-model-generator/openshift-model-tuned/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-tuned/src/main/resources/schema/validation-schema.json @@ -174,8 +174,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -195,16 +194,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -411,19 +408,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -629,8 +613,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -883,8 +866,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "Tuned": { "$ref": "#/definitions/os_tuned_v1_Tuned", @@ -1072,8 +1054,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -1088,16 +1069,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -1293,8 +1272,7 @@ "profilestatuscondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -1402,14 +1380,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "tuned": { "properties": { "apiVersion": { diff --git a/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 7edd428946d..b6c2e88abe9 100644 --- a/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -33,7 +33,7 @@ public class KubeSchema { private String time; private TypeMeta typeMeta; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -201,16 +201,16 @@ public void setTypeMeta(TypeMeta typeMeta) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index b3c11fbb43c..9321f2e7490 100644 --- a/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -33,7 +33,7 @@ public class ValidationSchema { private String time; private TypeMeta typeMeta; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -201,16 +201,16 @@ public void setTypeMeta(TypeMeta typeMeta) { } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model-whereabouts/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-whereabouts/src/main/resources/schema/kube-schema.json index 79a1fd6dc7f..713fd10c8a6 100644 --- a/kubernetes-model-generator/openshift-model-whereabouts/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model-whereabouts/src/main/resources/schema/kube-schema.json @@ -174,8 +174,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -195,16 +194,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -411,19 +408,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -712,8 +696,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", diff --git a/kubernetes-model-generator/openshift-model-whereabouts/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model-whereabouts/src/main/resources/schema/validation-schema.json index 0fc9b4b4ae6..c407853523c 100644 --- a/kubernetes-model-generator/openshift-model-whereabouts/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model-whereabouts/src/main/resources/schema/validation-schema.json @@ -174,8 +174,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -195,16 +194,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -411,19 +408,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -712,8 +696,7 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.Status" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TypeMeta": { "$ref": "#/definitions/kubernetes_apimachinery_TypeMeta", @@ -969,8 +952,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -985,16 +967,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -1230,14 +1210,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "typemeta": { "properties": { "apiVersion": { diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 4a2b84d33af..428739597eb 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -210,7 +210,7 @@ public class KubeSchema { private UserOAuthAccessToken userOAuthAccessToken; private UserOAuthAccessTokenList userOAuthAccessTokenList; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -1401,16 +1401,16 @@ public void setUserOAuthAccessTokenList(UserOAuthAccessTokenList userOAuthAccess } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index f8459fd6208..0913d66155c 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -210,7 +210,7 @@ public class ValidationSchema { private UserOAuthAccessToken userOAuthAccessToken; private UserOAuthAccessTokenList userOAuthAccessTokenList; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -1401,16 +1401,16 @@ public void setUserOAuthAccessTokenList(UserOAuthAccessTokenList userOAuthAccess } @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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildCondition.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildCondition.java index 0a624b7a163..d65f9f3d20b 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildCondition.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildCondition.java @@ -64,15 +64,15 @@ public class BuildCondition implements Editable , Kuberne @JsonProperty("lastUpdateTime") private String lastUpdateTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -81,7 +81,7 @@ public class BuildCondition implements Editable , Kuberne public BuildCondition() { } - public BuildCondition(String lastTransitionTime, String lastUpdateTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public BuildCondition(String lastTransitionTime, String lastUpdateTime, String message, String reason, String status, String type) { super(); this.lastTransitionTime = lastTransitionTime; this.lastUpdateTime = lastUpdateTime; @@ -112,42 +112,42 @@ public void setLastUpdateTime(String lastUpdateTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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; } @@ -162,16 +162,16 @@ public BuildConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildStatus.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildStatus.java index d6f12245493..57d3d46f84c 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildStatus.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildStatus.java @@ -79,24 +79,24 @@ public class BuildStatus implements Editable , KubernetesRes @JsonProperty("duration") private Long duration; @JsonProperty("logSnippet") - private java.lang.String logSnippet; + private String logSnippet; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("output") private BuildStatusOutput output; @JsonProperty("outputDockerImageReference") - private java.lang.String outputDockerImageReference; + private String outputDockerImageReference; @JsonProperty("phase") - private java.lang.String phase; + private String phase; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("stages") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List stages = new ArrayList<>(); @JsonProperty("startTimestamp") private String startTimestamp; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -105,7 +105,7 @@ public class BuildStatus implements Editable , KubernetesRes public BuildStatus() { } - public BuildStatus(Boolean cancelled, String completionTimestamp, List conditions, io.fabric8.kubernetes.api.model.ObjectReference config, Long duration, java.lang.String logSnippet, java.lang.String message, BuildStatusOutput output, java.lang.String outputDockerImageReference, java.lang.String phase, java.lang.String reason, List stages, String startTimestamp) { + public BuildStatus(Boolean cancelled, String completionTimestamp, List conditions, io.fabric8.kubernetes.api.model.ObjectReference config, Long duration, String logSnippet, String message, BuildStatusOutput output, String outputDockerImageReference, String phase, String reason, List stages, String startTimestamp) { super(); this.cancelled = cancelled; this.completionTimestamp = completionTimestamp; @@ -174,22 +174,22 @@ public void setDuration(Long duration) { } @JsonProperty("logSnippet") - public java.lang.String getLogSnippet() { + public String getLogSnippet() { return logSnippet; } @JsonProperty("logSnippet") - public void setLogSnippet(java.lang.String logSnippet) { + public void setLogSnippet(String logSnippet) { this.logSnippet = logSnippet; } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @@ -204,32 +204,32 @@ public void setOutput(BuildStatusOutput output) { } @JsonProperty("outputDockerImageReference") - public java.lang.String getOutputDockerImageReference() { + public String getOutputDockerImageReference() { return outputDockerImageReference; } @JsonProperty("outputDockerImageReference") - public void setOutputDockerImageReference(java.lang.String outputDockerImageReference) { + public void setOutputDockerImageReference(String outputDockerImageReference) { this.outputDockerImageReference = outputDockerImageReference; } @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; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @@ -265,16 +265,16 @@ public BuildStatusBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentCondition.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentCondition.java index 0015a02b949..a92614367da 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentCondition.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentCondition.java @@ -64,15 +64,15 @@ public class DeploymentCondition implements Editable @JsonProperty("lastUpdateTime") private String lastUpdateTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -81,7 +81,7 @@ public class DeploymentCondition implements Editable public DeploymentCondition() { } - public DeploymentCondition(String lastTransitionTime, String lastUpdateTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public DeploymentCondition(String lastTransitionTime, String lastUpdateTime, String message, String reason, String status, String type) { super(); this.lastTransitionTime = lastTransitionTime; this.lastUpdateTime = lastUpdateTime; @@ -112,42 +112,42 @@ public void setLastUpdateTime(String lastUpdateTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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; } @@ -162,16 +162,16 @@ public DeploymentConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageChangeTriggerStatus.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageChangeTriggerStatus.java index 856200efa81..5f054b1194b 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageChangeTriggerStatus.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageChangeTriggerStatus.java @@ -61,9 +61,9 @@ public class ImageChangeTriggerStatus implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -72,7 +72,7 @@ public class ImageChangeTriggerStatus implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageSignature.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageSignature.java index 9eb4a116a7f..3318e308c6b 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageSignature.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageSignature.java @@ -80,16 +80,16 @@ public class ImageSignature implements Editable , HasMeta * */ @JsonProperty("apiVersion") - private java.lang.String apiVersion = "image.openshift.io/v1"; + private String apiVersion = "image.openshift.io/v1"; @JsonProperty("conditions") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List conditions = new ArrayList<>(); @JsonProperty("content") - private java.lang.String content; + private String content; @JsonProperty("created") private String created; @JsonProperty("imageIdentity") - private java.lang.String imageIdentity; + private String imageIdentity; @JsonProperty("issuedBy") private SignatureIssuer issuedBy; @JsonProperty("issuedTo") @@ -100,16 +100,16 @@ public class ImageSignature implements Editable , HasMeta * */ @JsonProperty("kind") - private java.lang.String kind = "ImageSignature"; + private String kind = "ImageSignature"; @JsonProperty("metadata") private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("signedClaims") @JsonInclude(JsonInclude.Include.NON_EMPTY) - private Map signedClaims = new LinkedHashMap<>(); + private Map signedClaims = 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 @@ -118,7 +118,7 @@ public class ImageSignature implements Editable , HasMeta public ImageSignature() { } - public ImageSignature(java.lang.String apiVersion, List conditions, java.lang.String content, String created, java.lang.String imageIdentity, SignatureIssuer issuedBy, SignatureSubject issuedTo, java.lang.String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, Map signedClaims, java.lang.String type) { + public ImageSignature(String apiVersion, List conditions, String content, String created, String imageIdentity, SignatureIssuer issuedBy, SignatureSubject issuedTo, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, Map signedClaims, String type) { super(); this.apiVersion = apiVersion; this.conditions = conditions; @@ -139,7 +139,7 @@ public ImageSignature(java.lang.String apiVersion, List cond * */ @JsonProperty("apiVersion") - public java.lang.String getApiVersion() { + public String getApiVersion() { return apiVersion; } @@ -149,7 +149,7 @@ public java.lang.String getApiVersion() { * */ @JsonProperty("apiVersion") - public void setApiVersion(java.lang.String apiVersion) { + public void setApiVersion(String apiVersion) { this.apiVersion = apiVersion; } @@ -165,12 +165,12 @@ public void setConditions(List conditions) { } @JsonProperty("content") - public java.lang.String getContent() { + public String getContent() { return content; } @JsonProperty("content") - public void setContent(java.lang.String content) { + public void setContent(String content) { this.content = content; } @@ -185,12 +185,12 @@ public void setCreated(String created) { } @JsonProperty("imageIdentity") - public java.lang.String getImageIdentity() { + public String getImageIdentity() { return imageIdentity; } @JsonProperty("imageIdentity") - public void setImageIdentity(java.lang.String imageIdentity) { + public void setImageIdentity(String imageIdentity) { this.imageIdentity = imageIdentity; } @@ -220,7 +220,7 @@ public void setIssuedTo(SignatureSubject issuedTo) { * */ @JsonProperty("kind") - public java.lang.String getKind() { + public String getKind() { return kind; } @@ -230,7 +230,7 @@ public java.lang.String getKind() { * */ @JsonProperty("kind") - public void setKind(java.lang.String kind) { + public void setKind(String kind) { this.kind = kind; } @@ -246,22 +246,22 @@ public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { @JsonProperty("signedClaims") @JsonInclude(JsonInclude.Include.NON_EMPTY) - public Map getSignedClaims() { + public Map getSignedClaims() { return signedClaims; } @JsonProperty("signedClaims") - public void setSignedClaims(Map signedClaims) { + public void setSignedClaims(Map signedClaims) { this.signedClaims = signedClaims; } @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; } @@ -276,16 +276,16 @@ public ImageSignatureBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RouteIngressCondition.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RouteIngressCondition.java index 6f4cdbc2996..884db2305e1 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RouteIngressCondition.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RouteIngressCondition.java @@ -61,15 +61,15 @@ public class RouteIngressCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class RouteIngressCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SignatureCondition.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SignatureCondition.java index e96767460d4..8a849a6f881 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SignatureCondition.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SignatureCondition.java @@ -64,15 +64,15 @@ public class SignatureCondition implements Editable , @JsonProperty("lastTransitionTime") private String lastTransitionTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -81,7 +81,7 @@ public class SignatureCondition implements Editable , public SignatureCondition() { } - public SignatureCondition(String lastProbeTime, String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public SignatureCondition(String lastProbeTime, String lastTransitionTime, String message, String reason, String status, String type) { super(); this.lastProbeTime = lastProbeTime; this.lastTransitionTime = lastTransitionTime; @@ -112,42 +112,42 @@ public void setLastTransitionTime(String lastTransitionTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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; } @@ -162,16 +162,16 @@ public SignatureConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/StageInfo.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/StageInfo.java index 2765c99cfb0..ebc0feb9c0f 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/StageInfo.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/StageInfo.java @@ -62,14 +62,14 @@ public class StageInfo implements Editable , KubernetesResourc @JsonProperty("durationMilliseconds") private Long durationMilliseconds; @JsonProperty("name") - private java.lang.String name; + private String name; @JsonProperty("startTime") private String startTime; @JsonProperty("steps") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List steps = new ArrayList<>(); @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class StageInfo implements Editable , KubernetesResourc public StageInfo() { } - public StageInfo(Long durationMilliseconds, java.lang.String name, String startTime, List steps) { + public StageInfo(Long durationMilliseconds, String name, String startTime, List steps) { super(); this.durationMilliseconds = durationMilliseconds; this.name = name; @@ -97,12 +97,12 @@ public void setDurationMilliseconds(Long durationMilliseconds) { } @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; } @@ -138,16 +138,16 @@ public StageInfoBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/StepInfo.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/StepInfo.java index 11cdb926b41..181a4ca13f8 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/StepInfo.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/StepInfo.java @@ -59,11 +59,11 @@ public class StepInfo implements Editable , KubernetesResource @JsonProperty("durationMilliseconds") private Long durationMilliseconds; @JsonProperty("name") - private java.lang.String name; + private String name; @JsonProperty("startTime") private String startTime; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -72,7 +72,7 @@ public class StepInfo implements Editable , KubernetesResource public StepInfo() { } - public StepInfo(Long durationMilliseconds, java.lang.String name, String startTime) { + public StepInfo(Long durationMilliseconds, String name, String startTime) { super(); this.durationMilliseconds = durationMilliseconds; this.name = name; @@ -90,12 +90,12 @@ public void setDurationMilliseconds(Long durationMilliseconds) { } @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; } @@ -120,16 +120,16 @@ public StepInfoBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TagEvent.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TagEvent.java index 16aeaa7002e..1cd019ef8ae 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TagEvent.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TagEvent.java @@ -60,13 +60,13 @@ public class TagEvent implements Editable , KubernetesResource @JsonProperty("created") private String created; @JsonProperty("dockerImageReference") - private java.lang.String dockerImageReference; + private String dockerImageReference; @JsonProperty("generation") private Long generation; @JsonProperty("image") - private java.lang.String image; + private String image; @JsonIgnore - private Map additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -75,7 +75,7 @@ public class TagEvent implements Editable , KubernetesResource public TagEvent() { } - public TagEvent(String created, java.lang.String dockerImageReference, Long generation, java.lang.String image) { + public TagEvent(String created, String dockerImageReference, Long generation, String image) { super(); this.created = created; this.dockerImageReference = dockerImageReference; @@ -94,12 +94,12 @@ public void setCreated(String created) { } @JsonProperty("dockerImageReference") - public java.lang.String getDockerImageReference() { + public String getDockerImageReference() { return dockerImageReference; } @JsonProperty("dockerImageReference") - public void setDockerImageReference(java.lang.String dockerImageReference) { + public void setDockerImageReference(String dockerImageReference) { this.dockerImageReference = dockerImageReference; } @@ -114,12 +114,12 @@ public void setGeneration(Long generation) { } @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; } @@ -134,16 +134,16 @@ public TagEventBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TagEventCondition.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TagEventCondition.java index 3b1cac67b26..50960e8e63a 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TagEventCondition.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TagEventCondition.java @@ -64,15 +64,15 @@ public class TagEventCondition implements Editable , K @JsonProperty("lastTransitionTime") private String lastTransitionTime; @JsonProperty("message") - private java.lang.String message; + private String message; @JsonProperty("reason") - private java.lang.String reason; + private String reason; @JsonProperty("status") - private java.lang.String status; + private String status; @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 @@ -81,7 +81,7 @@ public class TagEventCondition implements Editable , K public TagEventCondition() { } - public TagEventCondition(Long generation, String lastTransitionTime, java.lang.String message, java.lang.String reason, java.lang.String status, java.lang.String type) { + public TagEventCondition(Long generation, String lastTransitionTime, String message, String reason, String status, String type) { super(); this.generation = generation; this.lastTransitionTime = lastTransitionTime; @@ -112,42 +112,42 @@ public void setLastTransitionTime(String lastTransitionTime) { } @JsonProperty("message") - public java.lang.String getMessage() { + public String getMessage() { return message; } @JsonProperty("message") - public void setMessage(java.lang.String message) { + public void setMessage(String message) { this.message = message; } @JsonProperty("reason") - public java.lang.String getReason() { + public String getReason() { return reason; } @JsonProperty("reason") - public void setReason(java.lang.String reason) { + public void setReason(String reason) { this.reason = reason; } @JsonProperty("status") - public java.lang.String getStatus() { + public String getStatus() { return status; } @JsonProperty("status") - public void setStatus(java.lang.String status) { + public void setStatus(String status) { this.status = status; } @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; } @@ -162,16 +162,16 @@ public TagEventConditionBuilder 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstanceCondition.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstanceCondition.java index bc0b66e046e..71db9d3a86b 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstanceCondition.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstanceCondition.java @@ -61,15 +61,15 @@ public class TemplateInstanceCondition implements Editable additionalProperties = new LinkedHashMap(); + private Map additionalProperties = new LinkedHashMap(); /** * No args constructor for use in serialization @@ -78,7 +78,7 @@ public class TemplateInstanceCondition implements Editable 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); } - public void setAdditionalProperties(Map additionalProperties) { + public void setAdditionalProperties(Map additionalProperties) { this.additionalProperties = additionalProperties; } diff --git a/kubernetes-model-generator/openshift-model/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model/src/main/resources/schema/kube-schema.json index 81a7ad0236a..b137379ac8d 100644 --- a/kubernetes-model-generator/openshift-model/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/openshift-model/src/main/resources/schema/kube-schema.json @@ -76,8 +76,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -401,8 +400,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -422,16 +420,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -706,19 +702,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -2633,8 +2616,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5611,12 +5593,10 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -6067,8 +6047,7 @@ "type": "boolean" }, "completionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "conditions": { "type": "array", @@ -6114,8 +6093,7 @@ } }, "startTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -6656,8 +6634,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.ImageStreamTagReference" }, "lastTriggerTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTriggeredImageID": { "type": "string" @@ -6940,8 +6917,7 @@ "type": "string" }, "startTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "steps": { "type": "array", @@ -6969,8 +6945,7 @@ "type": "string" }, "startTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -7088,12 +7063,10 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -8070,8 +8043,7 @@ "type": "string" }, "created": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "imageIdentity": { "type": "string" @@ -8605,12 +8577,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -8686,8 +8656,7 @@ "type": "object", "properties": { "created": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "dockerImageReference": { "type": "string" @@ -8714,8 +8683,7 @@ "existingJavaType": "Long" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -10043,8 +10011,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -10970,8 +10937,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -11786,8 +11752,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.TemplateList" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TokenReview": { "$ref": "#/definitions/kubernetes_authentication_TokenReview", diff --git a/kubernetes-model-generator/openshift-model/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/openshift-model/src/main/resources/schema/validation-schema.json index ed0acfc0412..e9d0593231d 100644 --- a/kubernetes-model-generator/openshift-model/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/openshift-model/src/main/resources/schema/validation-schema.json @@ -76,8 +76,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -401,8 +400,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -422,16 +420,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -706,19 +702,6 @@ "io.fabric8.kubernetes.api.model.KubernetesResource" ] }, - "kubernetes_apimachinery_Time": { - "type": "object", - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true, - "existingJavaType": "String", - "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.KubernetesResource" - ] - }, "kubernetes_apimachinery_TypeMeta": { "type": "object", "properties": { @@ -2633,8 +2616,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -5611,12 +5593,10 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -6067,8 +6047,7 @@ "type": "boolean" }, "completionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "conditions": { "type": "array", @@ -6114,8 +6093,7 @@ } }, "startTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -6656,8 +6634,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.ImageStreamTagReference" }, "lastTriggerTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTriggeredImageID": { "type": "string" @@ -6940,8 +6917,7 @@ "type": "string" }, "startTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "steps": { "type": "array", @@ -6969,8 +6945,7 @@ "type": "string" }, "startTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true, @@ -7088,12 +7063,10 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -8070,8 +8043,7 @@ "type": "string" }, "created": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "imageIdentity": { "type": "string" @@ -8605,12 +8577,10 @@ "type": "object", "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -8686,8 +8656,7 @@ "type": "object", "properties": { "created": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "dockerImageReference": { "type": "string" @@ -8714,8 +8683,7 @@ "existingJavaType": "Long" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -10043,8 +10011,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -10970,8 +10937,7 @@ "type": "object", "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -11786,8 +11752,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.TemplateList" }, "Time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "TokenReview": { "$ref": "#/definitions/kubernetes_authentication_TokenReview", @@ -12274,12 +12239,10 @@ "buildcondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -12671,8 +12634,7 @@ "type": "boolean" }, "completionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "conditions": { "type": "array", @@ -12718,8 +12680,7 @@ } }, "startTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -13382,8 +13343,7 @@ "condition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -13925,12 +13885,10 @@ "deploymentcondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -15532,8 +15490,7 @@ "existingJavaType": "io.fabric8.openshift.api.model.ImageStreamTagReference" }, "lastTriggerTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTriggeredImageID": { "type": "string" @@ -15692,8 +15649,7 @@ "type": "string" }, "created": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "imageIdentity": { "type": "string" @@ -16550,8 +16506,7 @@ "type": "string" }, "time": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -16630,8 +16585,7 @@ "namespacecondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -17106,16 +17060,14 @@ "existingJavaType": "java.util.Map\u003cjava.lang.String, java.lang.String\u003e" }, "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "deletionGracePeriodSeconds": { "type": "integer", "existingJavaType": "Long" }, "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "finalizers": { "type": "array", @@ -18926,8 +18878,7 @@ "routeingresscondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -19607,12 +19558,10 @@ "signaturecondition": { "properties": { "lastProbeTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -19753,8 +19702,7 @@ "type": "string" }, "startTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "steps": { "type": "array", @@ -19854,8 +19802,7 @@ "type": "string" }, "startTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" } }, "additionalProperties": true @@ -20054,8 +20001,7 @@ "tagevent": { "properties": { "created": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "dockerImageReference": { "type": "string" @@ -20077,8 +20023,7 @@ "existingJavaType": "Long" }, "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -20245,8 +20190,7 @@ "templateinstancecondition": { "properties": { "lastTransitionTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" + "type": "string" }, "message": { "type": "string" @@ -20390,14 +20334,6 @@ }, "additionalProperties": true }, - "time": { - "properties": { - "Time": { - "type": "string" - } - }, - "additionalProperties": true - }, "tlsconfig": { "properties": { "caCertificate": { diff --git a/kubernetes-model-generator/pkg/schemagen/generate.go b/kubernetes-model-generator/pkg/schemagen/generate.go index ffdb0a8089b..9f4df9d9300 100644 --- a/kubernetes-model-generator/pkg/schemagen/generate.go +++ b/kubernetes-model-generator/pkg/schemagen/generate.go @@ -322,6 +322,12 @@ func (g *schemaGenerator) getPropertyDescriptor(t reflect.Type, desc string, omi if ok { t = tt } + stringPropertyDescriptor := &JSONPropertyDescriptor{ + JSONDescriptor: &JSONDescriptor{ + Type: "string", + Description: desc, + }, + } switch t.Kind() { case reflect.Bool: return JSONPropertyDescriptor{ @@ -358,21 +364,11 @@ func (g *schemaGenerator) getPropertyDescriptor(t reflect.Type, desc string, omi }, } case reflect.String: - return JSONPropertyDescriptor{ - JSONDescriptor: &JSONDescriptor{ - Type: "string", - Description: desc, - }, - } + return *stringPropertyDescriptor case reflect.Array: case reflect.Slice: if g.javaTypeArrayList(t.Elem()) == "String" { - return JSONPropertyDescriptor{ - JSONDescriptor: &JSONDescriptor{ - Type: "string", - Description: desc, - }, - } + return *stringPropertyDescriptor } return JSONPropertyDescriptor{ JSONDescriptor: &JSONDescriptor{ @@ -399,6 +395,10 @@ func (g *schemaGenerator) getPropertyDescriptor(t reflect.Type, desc string, omi } case reflect.Struct: definedType, ok := g.types[t] + javaType := g.javaType(t) + if javaType == "String" { + return *stringPropertyDescriptor + } if !ok { g.types[t] = &JSONObjectDescriptor{} definedType = g.generateObjectDescriptor(t) @@ -409,7 +409,7 @@ func (g *schemaGenerator) getPropertyDescriptor(t reflect.Type, desc string, omi Reference: g.generateReference(t), }, ExistingJavaTypeDescriptor: &ExistingJavaTypeDescriptor{ - ExistingJavaType: g.javaType(t), + ExistingJavaType: javaType, }, } }