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 6afbf8a5e08..6265a9765a3 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 @@ -109,7 +109,7 @@ public class KubeSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("DeleteOptions") @@ -267,7 +267,7 @@ public KubeSchema() { * @param objectMeta * @param time */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList 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, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.Rule rule, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.RuleWithOperations ruleWithOperations, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference serviceReference, Status status, String time, 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.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList, java.lang.String v1Operation, java.lang.String v1PatchType, io.fabric8.kubernetes.api.model.admissionregistration.v1.Rule v1Rule, io.fabric8.kubernetes.api.model.admissionregistration.v1.RuleWithOperations v1RuleWithOperations, io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference, 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.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, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.Rule rule, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.RuleWithOperations ruleWithOperations, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference serviceReference, Status status, String time, 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.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList, java.lang.String v1Operation, java.lang.String v1PatchType, io.fabric8.kubernetes.api.model.admissionregistration.v1.Rule v1Rule, io.fabric8.kubernetes.api.model.admissionregistration.v1.RuleWithOperations v1RuleWithOperations, io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference, 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.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfigurationList validatingWebhookConfigurationList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -342,12 +342,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 c58f6f97810..2ab7ad748de 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 @@ -109,7 +109,7 @@ public class ValidationSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("DeleteOptions") @@ -267,7 +267,7 @@ public ValidationSchema() { * @param objectMeta * @param time */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList 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, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.Rule rule, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.RuleWithOperations ruleWithOperations, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference serviceReference, Status status, String time, 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.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList, java.lang.String v1Operation, java.lang.String v1PatchType, io.fabric8.kubernetes.api.model.admissionregistration.v1.Rule v1Rule, io.fabric8.kubernetes.api.model.admissionregistration.v1.RuleWithOperations v1RuleWithOperations, io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference, 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.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, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.Rule rule, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.RuleWithOperations ruleWithOperations, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReview selfSubjectAccessReview, io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReview selfSubjectRulesReview, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference serviceReference, Status status, String time, 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.admissionregistration.v1.MutatingWebhookConfiguration v1MutatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfigurationList v1MutatingWebhookConfigurationList, java.lang.String v1Operation, java.lang.String v1PatchType, io.fabric8.kubernetes.api.model.admissionregistration.v1.Rule v1Rule, io.fabric8.kubernetes.api.model.admissionregistration.v1.RuleWithOperations v1RuleWithOperations, io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference v1ServiceReference, 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.v1beta1.ValidatingWebhookConfiguration validatingWebhookConfiguration, io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfigurationList validatingWebhookConfigurationList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -342,12 +342,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 9a0ff138ddd..c23efe369d5 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 @@ -1282,7 +1282,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -2640,7 +2640,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", 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 26b562c7585..9de4415657c 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 @@ -1282,7 +1282,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -2640,7 +2640,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", @@ -2926,7 +2926,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admission.k8s.io/v1beta1", + "default": "admission.k8s.io/v1", "required": true }, "kind": { @@ -2935,12 +2935,12 @@ "required": true }, "request": { - "$ref": "#/definitions/kubernetes_admission_v1beta1_AdmissionRequest", - "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest" + "$ref": "#/definitions/kubernetes_admission_v1_AdmissionRequest", + "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest" }, "response": { - "$ref": "#/definitions/kubernetes_admission_v1beta1_AdmissionResponse", - "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse" + "$ref": "#/definitions/kubernetes_admission_v1_AdmissionResponse", + "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse" } }, "additionalProperties": true @@ -3394,7 +3394,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1", + "default": "admissionregistration.k8s.io/v1beta1", "required": true }, "kind": { @@ -3410,8 +3410,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" } } }, @@ -3793,12 +3793,12 @@ "selfsubjectaccessreviewspec": { "properties": { "nonResourceAttributes": { - "$ref": "#/definitions/kubernetes_authorization_v1_NonResourceAttributes", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.NonResourceAttributes" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_NonResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.NonResourceAttributes" }, "resourceAttributes": { - "$ref": "#/definitions/kubernetes_authorization_v1_ResourceAttributes", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_ResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.ResourceAttributes" } }, "additionalProperties": true @@ -3807,7 +3807,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1", + "default": "authorization.k8s.io/v1beta1", "required": true }, "kind": { @@ -3820,12 +3820,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 @@ -3947,7 +3947,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1", + "default": "authorization.k8s.io/v1beta1", "required": true }, "kind": { @@ -3960,12 +3960,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 @@ -4034,15 +4034,15 @@ "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" } } }, @@ -4191,13 +4191,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" @@ -4220,8 +4221,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_RuleWithOperations", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.RuleWithOperations" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_RuleWithOperations", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.RuleWithOperations" } }, "sideEffects": { @@ -4264,14 +4265,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1", + "default": "admissionregistration.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_ValidatingWebhookConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingWebhookConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration" } }, "kind": { 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 a32a54b83fa..111c40cd99c 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 @@ -91,7 +91,7 @@ public class KubeSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("CustomResourceDefinition") @@ -198,7 +198,7 @@ public KubeSchema() { * @param time * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition customResourceDefinition, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionCondition customResourceDefinitionCondition, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList customResourceDefinitionList, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionNames customResourceDefinitionNames, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionSpec customResourceDefinitionSpec, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionStatus customResourceDefinitionStatus, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray jSONSchemaPropsOrStringArray, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, ConversionReview v1ConversionReview, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition v1CustomResourceDefinition, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionCondition v1CustomResourceDefinitionCondition, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionList v1CustomResourceDefinitionList, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionNames v1CustomResourceDefinitionNames, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionSpec v1CustomResourceDefinitionSpec, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionStatus v1CustomResourceDefinitionStatus, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray v1JSONSchemaPropsOrStringArray) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition customResourceDefinition, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionCondition customResourceDefinitionCondition, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList customResourceDefinitionList, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionNames customResourceDefinitionNames, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionSpec customResourceDefinitionSpec, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionStatus customResourceDefinitionStatus, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray jSONSchemaPropsOrStringArray, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, ConversionReview v1ConversionReview, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition v1CustomResourceDefinition, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionCondition v1CustomResourceDefinitionCondition, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionList v1CustomResourceDefinitionList, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionNames v1CustomResourceDefinitionNames, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionSpec v1CustomResourceDefinitionSpec, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionStatus v1CustomResourceDefinitionStatus, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray v1JSONSchemaPropsOrStringArray) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -256,12 +256,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 c5b97be816e..893a403e923 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 @@ -91,7 +91,7 @@ public class ValidationSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("CustomResourceDefinition") @@ -198,7 +198,7 @@ public ValidationSchema() { * @param time * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition customResourceDefinition, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionCondition customResourceDefinitionCondition, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList customResourceDefinitionList, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionNames customResourceDefinitionNames, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionSpec customResourceDefinitionSpec, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionStatus customResourceDefinitionStatus, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray jSONSchemaPropsOrStringArray, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, ConversionReview v1ConversionReview, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition v1CustomResourceDefinition, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionCondition v1CustomResourceDefinitionCondition, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionList v1CustomResourceDefinitionList, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionNames v1CustomResourceDefinitionNames, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionSpec v1CustomResourceDefinitionSpec, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionStatus v1CustomResourceDefinitionStatus, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray v1JSONSchemaPropsOrStringArray) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition customResourceDefinition, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionCondition customResourceDefinitionCondition, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionList customResourceDefinitionList, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionNames customResourceDefinitionNames, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionSpec customResourceDefinitionSpec, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionStatus customResourceDefinitionStatus, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray jSONSchemaPropsOrStringArray, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, ConversionReview v1ConversionReview, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition v1CustomResourceDefinition, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionCondition v1CustomResourceDefinitionCondition, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionList v1CustomResourceDefinitionList, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionNames v1CustomResourceDefinitionNames, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionSpec v1CustomResourceDefinitionSpec, io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionStatus v1CustomResourceDefinitionStatus, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray v1JSONSchemaPropsOrStringArray) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -256,12 +256,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 f3f5902c66a..538250b5677 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 @@ -1736,7 +1736,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -2293,7 +2293,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", 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 399a0738762..0030899866f 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 @@ -1736,7 +1736,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -2293,7 +2293,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", @@ -2590,12 +2590,19 @@ }, "customresourceconversion": { "properties": { + "conversionReviewVersions": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } + }, "strategy": { "type": "string" }, - "webhook": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_WebhookConversion", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.WebhookConversion" + "webhookClientConfig": { + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_WebhookClientConfig", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.WebhookClientConfig" } }, "additionalProperties": true @@ -2652,14 +2659,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": { @@ -2762,8 +2769,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceColumnDefinition", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceColumnDefinition" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceColumnDefinition", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceColumnDefinition" } }, "deprecated": { @@ -2776,8 +2783,8 @@ "type": "string" }, "schema": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceValidation", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceValidation" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceValidation", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceValidation" }, "served": { "type": "boolean" @@ -2786,8 +2793,8 @@ "type": "boolean" }, "subresources": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceSubresources", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceSubresources" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresources", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresources" } }, "additionalProperties": true @@ -2795,12 +2802,12 @@ "customresourcesubresources": { "properties": { "scale": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceSubresourceScale", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceSubresourceScale" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresourceScale", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresourceScale" }, "status": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceSubresourceStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceSubresourceStatus" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresourceStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresourceStatus" } }, "additionalProperties": true @@ -3190,8 +3197,8 @@ } }, "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 @@ -3675,8 +3682,8 @@ "type": "string" }, "service": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_ServiceReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.ServiceReference" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_ServiceReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.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 9ee35eaa97f..0326d6a00e5 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 @@ -123,7 +123,7 @@ public class KubeSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("Binding") private Binding binding; @JsonProperty("ComponentStatusList") @@ -299,7 +299,7 @@ public KubeSchema() { * @param time * @param endpointPort */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, Binding binding, ComponentStatusList componentStatusList, ConfigMap configMap, ConfigMapList configMapList, ContainerStatus containerStatus, ControllerRevision controllerRevision, ControllerRevisionList controllerRevisionList, CreateOptions createOptions, DaemonSet daemonSet, DaemonSetList daemonSetList, DeleteOptions deleteOptions, Deployment deployment, DeploymentList deploymentList, EndpointPort endpointPort, Endpoints endpoints, EndpointsList endpointsList, EnvVar envVar, GetOptions getOptions, Info info, LimitRangeList limitRangeList, ListOptions listOptions, Namespace namespace, NamespaceList namespaceList, Node node, NodeList nodeList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, PersistentVolume persistentVolume, io.fabric8.kubernetes.api.model.PersistentVolumeClaim persistentVolumeClaim, PersistentVolumeClaimList persistentVolumeClaimList, PersistentVolumeList persistentVolumeList, PodList podList, PodTemplateList podTemplateList, Quantity quantity, ReplicaSet replicaSet, ReplicaSetList replicaSetList, ReplicationControllerList replicationControllerList, ResourceQuota resourceQuota, ResourceQuotaList resourceQuotaList, RootPaths rootPaths, Secret secret, SecretList secretList, ServiceAccount serviceAccount, ServiceAccountList serviceAccountList, ServiceList serviceList, StatefulSet statefulSet, StatefulSetList statefulSetList, Status status, String time, Toleration toleration, TypeMeta typeMeta, UpdateOptions updateOptions) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Binding binding, ComponentStatusList componentStatusList, ConfigMap configMap, ConfigMapList configMapList, ContainerStatus containerStatus, ControllerRevision controllerRevision, ControllerRevisionList controllerRevisionList, CreateOptions createOptions, DaemonSet daemonSet, DaemonSetList daemonSetList, DeleteOptions deleteOptions, Deployment deployment, DeploymentList deploymentList, EndpointPort endpointPort, Endpoints endpoints, EndpointsList endpointsList, EnvVar envVar, GetOptions getOptions, Info info, LimitRangeList limitRangeList, ListOptions listOptions, Namespace namespace, NamespaceList namespaceList, Node node, NodeList nodeList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, PersistentVolume persistentVolume, io.fabric8.kubernetes.api.model.PersistentVolumeClaim persistentVolumeClaim, PersistentVolumeClaimList persistentVolumeClaimList, PersistentVolumeList persistentVolumeList, PodList podList, PodTemplateList podTemplateList, Quantity quantity, ReplicaSet replicaSet, ReplicaSetList replicaSetList, ReplicationControllerList replicationControllerList, ResourceQuota resourceQuota, ResourceQuotaList resourceQuotaList, RootPaths rootPaths, Secret secret, SecretList secretList, ServiceAccount serviceAccount, ServiceAccountList serviceAccountList, ServiceList serviceList, StatefulSet statefulSet, StatefulSetList statefulSetList, Status status, String time, Toleration toleration, TypeMeta typeMeta, UpdateOptions updateOptions) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -380,12 +380,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 d98b8011f0a..6a6e904cbda 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 @@ -123,7 +123,7 @@ public class ValidationSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("Binding") private Binding binding; @JsonProperty("ComponentStatusList") @@ -299,7 +299,7 @@ public ValidationSchema() { * @param time * @param endpointPort */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, Binding binding, ComponentStatusList componentStatusList, ConfigMap configMap, ConfigMapList configMapList, ContainerStatus containerStatus, ControllerRevision controllerRevision, ControllerRevisionList controllerRevisionList, CreateOptions createOptions, DaemonSet daemonSet, DaemonSetList daemonSetList, DeleteOptions deleteOptions, Deployment deployment, DeploymentList deploymentList, EndpointPort endpointPort, Endpoints endpoints, EndpointsList endpointsList, EnvVar envVar, GetOptions getOptions, Info info, LimitRangeList limitRangeList, ListOptions listOptions, Namespace namespace, NamespaceList namespaceList, Node node, NodeList nodeList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, PersistentVolume persistentVolume, io.fabric8.kubernetes.api.model.PersistentVolumeClaim persistentVolumeClaim, PersistentVolumeClaimList persistentVolumeClaimList, PersistentVolumeList persistentVolumeList, PodList podList, PodTemplateList podTemplateList, Quantity quantity, ReplicaSet replicaSet, ReplicaSetList replicaSetList, ReplicationControllerList replicationControllerList, ResourceQuota resourceQuota, ResourceQuotaList resourceQuotaList, RootPaths rootPaths, Secret secret, SecretList secretList, ServiceAccount serviceAccount, ServiceAccountList serviceAccountList, ServiceList serviceList, StatefulSet statefulSet, StatefulSetList statefulSetList, Status status, String time, Toleration toleration, TypeMeta typeMeta, UpdateOptions updateOptions) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Binding binding, ComponentStatusList componentStatusList, ConfigMap configMap, ConfigMapList configMapList, ContainerStatus containerStatus, ControllerRevision controllerRevision, ControllerRevisionList controllerRevisionList, CreateOptions createOptions, DaemonSet daemonSet, DaemonSetList daemonSetList, DeleteOptions deleteOptions, Deployment deployment, DeploymentList deploymentList, EndpointPort endpointPort, Endpoints endpoints, EndpointsList endpointsList, EnvVar envVar, GetOptions getOptions, Info info, LimitRangeList limitRangeList, ListOptions listOptions, Namespace namespace, NamespaceList namespaceList, Node node, NodeList nodeList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, PersistentVolume persistentVolume, io.fabric8.kubernetes.api.model.PersistentVolumeClaim persistentVolumeClaim, PersistentVolumeClaimList persistentVolumeClaimList, PersistentVolumeList persistentVolumeList, PodList podList, PodTemplateList podTemplateList, Quantity quantity, ReplicaSet replicaSet, ReplicaSetList replicaSetList, ReplicationControllerList replicationControllerList, ResourceQuota resourceQuota, ResourceQuotaList resourceQuotaList, RootPaths rootPaths, Secret secret, SecretList secretList, ServiceAccount serviceAccount, ServiceAccountList serviceAccountList, ServiceList serviceList, StatefulSet statefulSet, StatefulSetList statefulSetList, Status status, String time, Toleration toleration, TypeMeta typeMeta, UpdateOptions updateOptions) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -380,12 +380,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 a00e2daa6ec..04419202602 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 @@ -310,7 +310,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -7558,7 +7558,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "Binding": { "$ref": "#/definitions/kubernetes_core_Binding", 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 1f434ded7e4..4fa6347a9b3 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 @@ -310,7 +310,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -7558,7 +7558,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "Binding": { "$ref": "#/definitions/kubernetes_core_Binding", 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 1178997af40..a39f3f8154e 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 @@ -85,7 +85,7 @@ public class KubeSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("DeleteOptions") @@ -171,7 +171,7 @@ public KubeSchema() { * @param time * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Scale scale, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler v1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList v1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler v2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList v2HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler v2beta1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList v2beta1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler v2beta2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList v2beta2HorizontalPodAutoscalerList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Scale scale, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler v1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList v1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler v2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList v2HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler v2beta1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList v2beta1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler v2beta2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList v2beta2HorizontalPodAutoscalerList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -222,12 +222,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 de4f5b70d3a..812bd670607 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 @@ -85,7 +85,7 @@ public class ValidationSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("DeleteOptions") @@ -171,7 +171,7 @@ public ValidationSchema() { * @param time * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Scale scale, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler v1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList v1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler v2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList v2HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler v2beta1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList v2beta1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler v2beta2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList v2beta2HorizontalPodAutoscalerList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Scale scale, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler v1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerList v1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler v2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerList v2HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler v2beta1HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerList v2beta1HorizontalPodAutoscalerList, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler v2beta2HorizontalPodAutoscaler, io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerList v2beta2HorizontalPodAutoscalerList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -222,12 +222,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 1320d8e42de..801246ee12b 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 @@ -267,7 +267,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -2599,7 +2599,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", 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 c334a9338a8..750d014ee12 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 @@ -267,7 +267,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -2599,7 +2599,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", @@ -2778,9 +2778,12 @@ "container": { "type": "string" }, - "current": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" + "currentAverageUtilization": { + "type": "integer" + }, + "currentAverageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, "name": { "type": "string" @@ -2868,33 +2871,33 @@ }, "externalmetricsource": { "properties": { - "metricName": { - "type": "string" - }, - "metricSelector": { - "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", - "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" - }, - "targetAverageValue": { - "$ref": "#/definitions/kubernetes_resource_Quantity", - "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + "metric": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" }, - "targetValue": { - "$ref": "#/definitions/kubernetes_resource_Quantity", - "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + "target": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" } }, "additionalProperties": true }, "externalmetricstatus": { "properties": { - "current": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" + "currentAverageValue": { + "$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" + "currentValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + }, + "metricName": { + "type": "string" + }, + "metricSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" } }, "additionalProperties": true @@ -2996,14 +2999,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "autoscaling/v2beta1", + "default": "autoscaling/v2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_HorizontalPodAutoscaler", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler" + "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscaler", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler" } }, "kind": { @@ -3020,6 +3023,10 @@ }, "horizontalpodautoscalerspec": { "properties": { + "behavior": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HorizontalPodAutoscalerBehavior", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerBehavior" + }, "maxReplicas": { "type": "integer" }, @@ -3027,36 +3034,24 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_MetricSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.MetricSpec" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricSpec" } }, "minReplicas": { "type": "integer" }, "scaleTargetRef": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_CrossVersionObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.CrossVersionObjectReference" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.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" @@ -3337,24 +3332,24 @@ "metricstatus": { "properties": { "containerResource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ContainerResourceMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ContainerResourceMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2_ContainerResourceMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ContainerResourceMetricStatus" }, "external": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ExternalMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ExternalMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2_ExternalMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ExternalMetricStatus" }, "object": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ObjectMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ObjectMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2_ObjectMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ObjectMetricStatus" }, "pods": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_PodsMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.PodsMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2_PodsMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.PodsMetricStatus" }, "resource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ResourceMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ResourceMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2_ResourceMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ResourceMetricStatus" }, "type": { "type": "string" @@ -3582,12 +3577,12 @@ "podsmetricstatus": { "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" }, "metric": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricIdentifier", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricIdentifier" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricIdentifier" } }, "additionalProperties": true @@ -3620,17 +3615,20 @@ "type": "string" }, "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricTarget" } }, "additionalProperties": true }, "resourcemetricstatus": { "properties": { - "current": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricValueStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricValueStatus" + "currentAverageUtilization": { + "type": "integer" + }, + "currentAverageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, "name": { "type": "string" 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 81f6d6f9a61..cf892331fd6 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 @@ -84,7 +84,7 @@ public class KubeSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("CronJob") @@ -164,7 +164,7 @@ public KubeSchema() { * @param info * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob cronJob, io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobList cronJobList, DeleteOptions deleteOptions, GetOptions getOptions, Info info, Job job, JobList jobList, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, PodTemplate podTemplateList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.batch.v1.CronJob v1CronJob, io.fabric8.kubernetes.api.model.batch.v1.CronJobList v1CronJobList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob cronJob, io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobList cronJobList, DeleteOptions deleteOptions, GetOptions getOptions, Info info, Job job, JobList jobList, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, PodTemplate podTemplateList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.batch.v1.CronJob v1CronJob, io.fabric8.kubernetes.api.model.batch.v1.CronJobList v1CronJobList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -213,12 +213,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 0a43cc1c3af..37cde5237ab 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 @@ -84,7 +84,7 @@ public class ValidationSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("CronJob") @@ -164,7 +164,7 @@ public ValidationSchema() { * @param info * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob cronJob, io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobList cronJobList, DeleteOptions deleteOptions, GetOptions getOptions, Info info, Job job, JobList jobList, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, PodTemplate podTemplateList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.batch.v1.CronJob v1CronJob, io.fabric8.kubernetes.api.model.batch.v1.CronJobList v1CronJobList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob cronJob, io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobList cronJobList, DeleteOptions deleteOptions, GetOptions getOptions, Info info, Job job, JobList jobList, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, PodTemplate podTemplateList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.batch.v1.CronJob v1CronJob, io.fabric8.kubernetes.api.model.batch.v1.CronJobList v1CronJobList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -213,12 +213,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 c7328b5ac47..258849a593a 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 @@ -280,7 +280,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -4293,7 +4293,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", 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 26386048f91..87ddb2f5ed2 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 @@ -280,7 +280,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -4293,7 +4293,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", @@ -4808,7 +4808,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "batch/v1", + "default": "batch/v1beta1", "required": true }, "kind": { @@ -4821,12 +4821,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_batch_v1_CronJobSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJobSpec" + "$ref": "#/definitions/kubernetes_batch_v1beta1_CronJobSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobSpec" }, "status": { - "$ref": "#/definitions/kubernetes_batch_v1_CronJobStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJobStatus" + "$ref": "#/definitions/kubernetes_batch_v1beta1_CronJobStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobStatus" } }, "additionalProperties": true @@ -4835,14 +4835,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "batch/v1", + "default": "batch/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_batch_v1_CronJob", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJob" + "$ref": "#/definitions/kubernetes_batch_v1beta1_CronJob", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob" } }, "kind": { @@ -4866,8 +4866,8 @@ "type": "integer" }, "jobTemplate": { - "$ref": "#/definitions/kubernetes_batch_v1_JobTemplateSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.JobTemplateSpec" + "$ref": "#/definitions/kubernetes_batch_v1beta1_JobTemplateSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.JobTemplateSpec" }, "schedule": { "type": "string" 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 52a513710eb..450d697c00d 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 @@ -85,7 +85,7 @@ public class KubeSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CertificateSigningRequest") private io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequest certificateSigningRequest; @JsonProperty("CertificateSigningRequestCondition") @@ -174,7 +174,7 @@ public KubeSchema() { * @param status * @param v1Beta1CertificateSigningRequest */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequest certificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestCondition certificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestList certificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestSpec certificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestStatus certificateSigningRequestStatus, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest v1Beta1CertificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestCondition v1Beta1CertificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestList v1Beta1CertificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestSpec v1Beta1CertificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatus v1Beta1CertificateSigningRequestStatus) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequest certificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestCondition certificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestList certificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestSpec certificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestStatus certificateSigningRequestStatus, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest v1Beta1CertificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestCondition v1Beta1CertificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestList v1Beta1CertificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestSpec v1Beta1CertificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatus v1Beta1CertificateSigningRequestStatus) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -226,12 +226,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 c26cdbce5f5..b3832c1d924 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 @@ -85,7 +85,7 @@ public class ValidationSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CertificateSigningRequest") private io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequest certificateSigningRequest; @JsonProperty("CertificateSigningRequestCondition") @@ -174,7 +174,7 @@ public ValidationSchema() { * @param status * @param v1Beta1CertificateSigningRequest */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequest certificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestCondition certificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestList certificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestSpec certificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestStatus certificateSigningRequestStatus, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest v1Beta1CertificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestCondition v1Beta1CertificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestList v1Beta1CertificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestSpec v1Beta1CertificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatus v1Beta1CertificateSigningRequestStatus) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequest certificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestCondition certificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestList certificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestSpec certificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestStatus certificateSigningRequestStatus, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest v1Beta1CertificateSigningRequest, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestCondition v1Beta1CertificateSigningRequestCondition, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestList v1Beta1CertificateSigningRequestList, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestSpec v1Beta1CertificateSigningRequestSpec, io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatus v1Beta1CertificateSigningRequestStatus) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -226,12 +226,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 387efcb4799..47509c7291f 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 @@ -232,7 +232,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -1086,7 +1086,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CertificateSigningRequest": { "$ref": "#/definitions/kubernetes_certificates_v1_CertificateSigningRequest", 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 82dbd074b46..3940df66153 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 @@ -232,7 +232,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -1086,7 +1086,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CertificateSigningRequest": { "$ref": "#/definitions/kubernetes_certificates_v1_CertificateSigningRequest", @@ -1302,14 +1302,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "certificates.k8s.io/v1beta1", + "default": "certificates.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_certificates_v1beta1_CertificateSigningRequest", - "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest" + "$ref": "#/definitions/kubernetes_certificates_v1_CertificateSigningRequest", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequest" } }, "kind": { @@ -1377,8 +1377,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_certificates_v1_CertificateSigningRequestCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestCondition" + "$ref": "#/definitions/kubernetes_certificates_v1beta1_CertificateSigningRequestCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestCondition" } } }, 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 6306287d295..634dbf0d960 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 @@ -79,7 +79,7 @@ public class KubeSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("DeleteOptions") @@ -144,7 +144,7 @@ public KubeSchema() { * @param info * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, Lease lease, LeaseList leaseList, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, Lease lease, LeaseList leaseList, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -188,12 +188,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 a965ee7c8e3..1f6e732e4f2 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 @@ -79,7 +79,7 @@ public class ValidationSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("DeleteOptions") @@ -144,7 +144,7 @@ public ValidationSchema() { * @param info * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, Lease lease, LeaseList leaseList, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, Lease lease, LeaseList leaseList, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -188,12 +188,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 e6ccf049dca..72874114aff 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 @@ -232,7 +232,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -859,7 +859,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", 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 efdec51ba1c..aeb5ecd95c0 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 @@ -232,7 +232,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -859,7 +859,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", diff --git a/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java b/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java index 3858af83266..324dfc96b2b 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java @@ -26,7 +26,7 @@ import io.sundr.builder.annotations.Buildable; import java.util.ArrayList; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -47,7 +47,7 @@ public class KubernetesList extends DefaultKubernetesResourceList implements KubernetesResource { @JsonIgnore - private Map additionalProperties = new HashMap(); + private Map additionalProperties = new LinkedHashMap<>(); /** * No args constructor for use in serialization 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 4e134365e88..d252a64f42a 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 @@ -81,7 +81,7 @@ public class KubeSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("DeleteOptions") @@ -158,7 +158,7 @@ public KubeSchema() { * @param info * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, EndpointPort discoveryEndpointPort, io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice endpointSlice, io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSliceList endpointSliceList, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice v1EndpointSlice, io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList v1EndpointSliceList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, EndpointPort discoveryEndpointPort, io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice endpointSlice, io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSliceList endpointSliceList, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice v1EndpointSlice, io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList v1EndpointSliceList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -206,12 +206,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 00389b4c847..ac1e6894587 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 @@ -81,7 +81,7 @@ public class ValidationSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("DeleteOptions") @@ -158,7 +158,7 @@ public ValidationSchema() { * @param info * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, EndpointPort discoveryEndpointPort, io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice endpointSlice, io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSliceList endpointSliceList, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice v1EndpointSlice, io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList v1EndpointSliceList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, EndpointPort discoveryEndpointPort, io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice endpointSlice, io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSliceList endpointSliceList, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice v1EndpointSlice, io.fabric8.kubernetes.api.model.discovery.v1.EndpointSliceList v1EndpointSliceList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -206,12 +206,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 7a92d7e5c34..66cf5abe406 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 @@ -232,7 +232,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -1170,7 +1170,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", 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 c61733f1d2d..d4ad63192c5 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 @@ -232,7 +232,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -1170,7 +1170,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", @@ -1434,8 +1434,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" } } }, @@ -1500,14 +1500,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "discovery.k8s.io/v1beta1", + "default": "discovery.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_discovery_v1beta1_EndpointSlice", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice" + "$ref": "#/definitions/kubernetes_discovery_v1_EndpointSlice", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice" } }, "kind": { 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 e65a1fa7bcb..1bdfd8a8db9 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 @@ -81,7 +81,7 @@ public class KubeSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("DeleteOptions") @@ -161,7 +161,7 @@ public KubeSchema() { * @param status * @param v1Event */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.events.v1beta1.Event v1Beta1Event, io.fabric8.kubernetes.api.model.events.v1beta1.EventList v1Beta1EventList, io.fabric8.kubernetes.api.model.events.v1beta1.EventSeries v1Beta1EventSeries, io.fabric8.kubernetes.api.model.events.v1.Event v1Event, io.fabric8.kubernetes.api.model.events.v1.EventList v1EventList, io.fabric8.kubernetes.api.model.events.v1.EventSeries v1EventSeries) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.events.v1beta1.Event v1Beta1Event, io.fabric8.kubernetes.api.model.events.v1beta1.EventList v1Beta1EventList, io.fabric8.kubernetes.api.model.events.v1beta1.EventSeries v1Beta1EventSeries, io.fabric8.kubernetes.api.model.events.v1.Event v1Event, io.fabric8.kubernetes.api.model.events.v1.EventList v1EventList, io.fabric8.kubernetes.api.model.events.v1.EventSeries v1EventSeries) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -210,12 +210,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 f194e2c82a6..ec203242aae 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 @@ -81,7 +81,7 @@ public class ValidationSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("DeleteOptions") @@ -161,7 +161,7 @@ public ValidationSchema() { * @param status * @param v1Event */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.events.v1beta1.Event v1Beta1Event, io.fabric8.kubernetes.api.model.events.v1beta1.EventList v1Beta1EventList, io.fabric8.kubernetes.api.model.events.v1beta1.EventSeries v1Beta1EventSeries, io.fabric8.kubernetes.api.model.events.v1.Event v1Event, io.fabric8.kubernetes.api.model.events.v1.EventList v1EventList, io.fabric8.kubernetes.api.model.events.v1.EventSeries v1EventSeries) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.events.v1beta1.Event v1Beta1Event, io.fabric8.kubernetes.api.model.events.v1beta1.EventList v1Beta1EventList, io.fabric8.kubernetes.api.model.events.v1beta1.EventSeries v1Beta1EventSeries, io.fabric8.kubernetes.api.model.events.v1.Event v1Event, io.fabric8.kubernetes.api.model.events.v1.EventList v1EventList, io.fabric8.kubernetes.api.model.events.v1.EventSeries v1EventSeries) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -210,12 +210,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 383369f872d..797554e9b1b 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 @@ -232,7 +232,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -1064,7 +1064,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", 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 7120f9b70e7..56d12fc34a0 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 @@ -232,7 +232,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -1064,7 +1064,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", @@ -1283,7 +1283,7 @@ }, "apiVersion": { "type": "string", - "default": "events.k8s.io/v1", + "default": "events.k8s.io/v1beta1", "required": true }, "deprecatedCount": { @@ -1335,8 +1335,8 @@ "type": "string" }, "series": { - "$ref": "#/definitions/kubernetes_events_v1_EventSeries", - "existingJavaType": "io.fabric8.kubernetes.api.model.events.v1.EventSeries" + "$ref": "#/definitions/kubernetes_events_v1beta1_EventSeries", + "existingJavaType": "io.fabric8.kubernetes.api.model.events.v1beta1.EventSeries" }, "type": { "type": "string" 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 80bf16a11bb..2f7b369f8ea 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 @@ -97,7 +97,7 @@ public class KubeSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("DaemonSet") @@ -192,7 +192,7 @@ public KubeSchema() { * @param time * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DaemonSet daemonSet, DaemonSetList daemonSetList, DeleteOptions deleteOptions, Deployment deployment, DeploymentList deploymentList, DeploymentRollback deploymentRollback, GetOptions getOptions, Info info, Ingress ingress, IngressList ingressList, ListOptions listOptions, NetworkPolicy networkPolicy, NetworkPolicyList networkPolicyList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, ReplicaSet replicaSet, ReplicaSetList replicaSetList, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DaemonSet daemonSet, DaemonSetList daemonSetList, DeleteOptions deleteOptions, Deployment deployment, DeploymentList deploymentList, DeploymentRollback deploymentRollback, GetOptions getOptions, Info info, Ingress ingress, IngressList ingressList, ListOptions listOptions, NetworkPolicy networkPolicy, NetworkPolicyList networkPolicyList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, ReplicaSet replicaSet, ReplicaSetList replicaSetList, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -246,12 +246,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 a30d32ce2e3..7c8219a84f1 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 @@ -97,7 +97,7 @@ public class ValidationSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("DaemonSet") @@ -192,7 +192,7 @@ public ValidationSchema() { * @param time * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DaemonSet daemonSet, DaemonSetList daemonSetList, DeleteOptions deleteOptions, Deployment deployment, DeploymentList deploymentList, DeploymentRollback deploymentRollback, GetOptions getOptions, Info info, Ingress ingress, IngressList ingressList, ListOptions listOptions, NetworkPolicy networkPolicy, NetworkPolicyList networkPolicyList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, ReplicaSet replicaSet, ReplicaSetList replicaSetList, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DaemonSet daemonSet, DaemonSetList daemonSetList, DeleteOptions deleteOptions, Deployment deployment, DeploymentList deploymentList, DeploymentRollback deploymentRollback, GetOptions getOptions, Info info, Ingress ingress, IngressList ingressList, ListOptions listOptions, NetworkPolicy networkPolicy, NetworkPolicyList networkPolicyList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, ReplicaSet replicaSet, ReplicaSetList replicaSetList, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -246,12 +246,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 f9174240106..6b77062014e 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 @@ -310,7 +310,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -4842,7 +4842,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", 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 d8d26b479ba..b98fec6c115 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 @@ -310,7 +310,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -4842,7 +4842,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", 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 28b416afd2b..21a1bd0005a 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 @@ -1333,22 +1333,22 @@ "flowschemaspec": { "properties": { "distinguisherMethod": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowDistinguisherMethod", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowDistinguisherMethod" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowDistinguisherMethod", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowDistinguisherMethod" }, "matchingPrecedence": { "type": "integer" }, "priorityLevelConfiguration": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PriorityLevelConfigurationReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationReference" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationReference" }, "rules": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PolicyRulesWithSubjects", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PolicyRulesWithSubjects" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PolicyRulesWithSubjects", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PolicyRulesWithSubjects" } } }, @@ -1381,8 +1381,8 @@ "type": "integer" }, "limitResponse": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_LimitResponse", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.LimitResponse" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_LimitResponse", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitResponse" } }, "additionalProperties": true @@ -1569,23 +1569,23 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_NonResourcePolicyRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.NonResourcePolicyRule" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_NonResourcePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.NonResourcePolicyRule" } }, "resourceRules": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_ResourcePolicyRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ResourcePolicyRule" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_ResourcePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.ResourcePolicyRule" } }, "subjects": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_Subject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.Subject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_Subject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.Subject" } } }, @@ -1643,14 +1643,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1beta1", + "default": "flowcontrol.apiserver.k8s.io/v1beta2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PriorityLevelConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfiguration" } }, "kind": { @@ -1676,8 +1676,8 @@ "prioritylevelconfigurationspec": { "properties": { "limited": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_LimitedPriorityLevelConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitedPriorityLevelConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_LimitedPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.LimitedPriorityLevelConfiguration" }, "type": { "type": "string" @@ -1691,8 +1691,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_v1beta1_PriorityLevelConfigurationCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationCondition" } } }, 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 198f392f2f2..0fd0210b480 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 @@ -3106,7 +3106,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1alpha2", + "default": "gateway.networking.k8s.io/v1beta1", "required": true }, "kind": { @@ -3119,12 +3119,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_GatewaySpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewaySpec" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_GatewaySpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewaySpec" }, "status": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_GatewayStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayStatus" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_GatewayStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayStatus" } }, "additionalProperties": true @@ -3144,7 +3144,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1beta1", + "default": "gateway.networking.k8s.io/v1alpha2", "required": true }, "kind": { @@ -3157,12 +3157,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_GatewayClassSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClassSpec" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_GatewayClassSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClassSpec" }, "status": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_GatewayClassStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClassStatus" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_GatewayClassStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClassStatus" } }, "additionalProperties": true @@ -3225,14 +3225,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1beta1", + "default": "gateway.networking.k8s.io/v1alpha2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_Gateway", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.Gateway" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_Gateway", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.Gateway" } }, "kind": { @@ -3450,8 +3450,8 @@ "httprequestmirrorfilter": { "properties": { "backendRef": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_BackendObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.BackendObjectReference" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_BackendObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.BackendObjectReference" } }, "additionalProperties": true @@ -3481,7 +3481,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1beta1", + "default": "gateway.networking.k8s.io/v1alpha2", "required": true }, "kind": { @@ -3494,12 +3494,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPRouteSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRouteSpec" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPRouteSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRouteSpec" }, "status": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPRouteStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRouteStatus" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPRouteStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRouteStatus" } }, "additionalProperties": true @@ -3536,14 +3536,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1alpha2", + "default": "gateway.networking.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPRoute", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRoute" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPRoute", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRoute" } }, "kind": { @@ -3628,16 +3628,16 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_ParentReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ParentReference" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_ParentReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ParentReference" } }, "rules": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_HTTPRouteRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.HTTPRouteRule" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_HTTPRouteRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.HTTPRouteRule" } } }, @@ -3708,8 +3708,8 @@ "listener": { "properties": { "allowedRoutes": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_AllowedRoutes", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.AllowedRoutes" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_AllowedRoutes", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.AllowedRoutes" }, "hostname": { "type": "string" @@ -3724,8 +3724,8 @@ "type": "string" }, "tls": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_GatewayTLSConfig", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayTLSConfig" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_GatewayTLSConfig", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayTLSConfig" } }, "additionalProperties": true @@ -3748,8 +3748,8 @@ "supportedKinds": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_RouteGroupKind", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.RouteGroupKind" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_RouteGroupKind", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.RouteGroupKind" } } }, @@ -4138,8 +4138,8 @@ "type": "string" }, "parentRef": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_ParentReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ParentReference" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_ParentReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ParentReference" } }, "additionalProperties": true @@ -4149,8 +4149,8 @@ "parents": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_RouteParentStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.RouteParentStatus" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_RouteParentStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.RouteParentStatus" } } }, 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 6b304f79623..650b69f4344 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 @@ -83,7 +83,7 @@ public class KubeSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("DeleteOptions") @@ -157,7 +157,7 @@ public KubeSchema() { * @param info * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, NodeMetrics nodeMetrics, NodeMetricsList nodeMetricsList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, PodMetrics podMetrics, PodMetricsList podMetricsList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, NodeMetrics nodeMetrics, NodeMetricsList nodeMetricsList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, PodMetrics podMetrics, PodMetricsList podMetricsList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -204,12 +204,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 8a1a01ce3fa..998321e5d84 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 @@ -83,7 +83,7 @@ public class ValidationSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("DeleteOptions") @@ -157,7 +157,7 @@ public ValidationSchema() { * @param info * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, NodeMetrics nodeMetrics, NodeMetricsList nodeMetricsList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, PodMetrics podMetrics, PodMetricsList podMetricsList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, NodeMetrics nodeMetrics, NodeMetricsList nodeMetricsList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, PodMetrics podMetrics, PodMetricsList podMetricsList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -204,12 +204,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 75173e74334..284025f1958 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 @@ -233,7 +233,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -968,7 +968,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", 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 6bbdd73a45f..fd2cf8a5e3c 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 @@ -233,7 +233,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -968,7 +968,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", 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 f6de734b604..1a392a6c21f 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 @@ -91,7 +91,7 @@ public class KubeSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("DeleteOptions") @@ -189,7 +189,7 @@ public KubeSchema() { * @param v1IngressList * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress ingress, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass ingressClass, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList ingressClassList, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList ingressList, ListOptions listOptions, NetworkPolicy networkPolicy, NetworkPolicyList networkPolicyList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, ClusterCIDR v1Alpha1ClusterCIDR, ClusterCIDRList v1Alpha1ClusterCIDRList, io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress, io.fabric8.kubernetes.api.model.networking.v1.IngressClass v1IngressClass, io.fabric8.kubernetes.api.model.networking.v1.IngressClassList v1IngressClassList, io.fabric8.kubernetes.api.model.networking.v1.IngressList v1IngressList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress ingress, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass ingressClass, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList ingressClassList, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList ingressList, ListOptions listOptions, NetworkPolicy networkPolicy, NetworkPolicyList networkPolicyList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, ClusterCIDR v1Alpha1ClusterCIDR, ClusterCIDRList v1Alpha1ClusterCIDRList, io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress, io.fabric8.kubernetes.api.model.networking.v1.IngressClass v1IngressClass, io.fabric8.kubernetes.api.model.networking.v1.IngressClassList v1IngressClassList, io.fabric8.kubernetes.api.model.networking.v1.IngressList v1IngressList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -244,12 +244,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 5ea5fbd911c..be6805527be 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 @@ -91,7 +91,7 @@ public class ValidationSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("DeleteOptions") @@ -189,7 +189,7 @@ public ValidationSchema() { * @param v1IngressList * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress ingress, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass ingressClass, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList ingressClassList, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList ingressList, ListOptions listOptions, NetworkPolicy networkPolicy, NetworkPolicyList networkPolicyList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, ClusterCIDR v1Alpha1ClusterCIDR, ClusterCIDRList v1Alpha1ClusterCIDRList, io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress, io.fabric8.kubernetes.api.model.networking.v1.IngressClass v1IngressClass, io.fabric8.kubernetes.api.model.networking.v1.IngressClassList v1IngressClassList, io.fabric8.kubernetes.api.model.networking.v1.IngressList v1IngressList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress ingress, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass ingressClass, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassList ingressClassList, io.fabric8.kubernetes.api.model.networking.v1beta1.IngressList ingressList, ListOptions listOptions, NetworkPolicy networkPolicy, NetworkPolicyList networkPolicyList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, ClusterCIDR v1Alpha1ClusterCIDR, ClusterCIDRList v1Alpha1ClusterCIDRList, io.fabric8.kubernetes.api.model.networking.v1.Ingress v1Ingress, io.fabric8.kubernetes.api.model.networking.v1.IngressClass v1IngressClass, io.fabric8.kubernetes.api.model.networking.v1.IngressClassList v1IngressClassList, io.fabric8.kubernetes.api.model.networking.v1.IngressList v1IngressList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -244,12 +244,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 9d7367f4afd..34890cb358f 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 @@ -310,7 +310,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -2027,7 +2027,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", 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 6631e6aaf98..2944f51860f 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 @@ -310,7 +310,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -2027,7 +2027,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", @@ -2407,8 +2407,8 @@ "paths": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_networking_v1_HTTPIngressPath", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.HTTPIngressPath" + "$ref": "#/definitions/kubernetes_networking_v1beta1_HTTPIngressPath", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.HTTPIngressPath" } } }, @@ -2479,12 +2479,9 @@ "$ref": "#/definitions/kubernetes_core_TypedLocalObjectReference", "existingJavaType": "io.fabric8.kubernetes.api.model.TypedLocalObjectReference" }, - "serviceName": { - "type": "string" - }, - "servicePort": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_util_intstr_IntOrString", - "existingJavaType": "io.fabric8.kubernetes.api.model.IntOrString" + "service": { + "$ref": "#/definitions/kubernetes_networking_v1_IngressServiceBackend", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressServiceBackend" } }, "additionalProperties": true @@ -2516,14 +2513,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_IngressClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressClass" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClass" } }, "kind": { diff --git a/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 922ec6f0a56..6d16bf56e3e 100644 --- a/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -66,7 +66,7 @@ public class KubeSchema { @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("Info") private Info info; @JsonProperty("ObjectMeta") @@ -117,7 +117,7 @@ public KubeSchema() { * @param info * @param status */ - public KubeSchema(BaseKubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Quantity quantity, Status status, TypeMeta typeMeta, io.fabric8.kubernetes.api.model.node.v1.RuntimeClass v1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1.RuntimeClassList v1RuntimeClassList, io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClass v1alpha1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClassList v1alpha1RuntimeClassList, io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClass v1beta1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClassList v1beta1RuntimeClassList) { + public KubeSchema(KubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Quantity quantity, Status status, TypeMeta typeMeta, io.fabric8.kubernetes.api.model.node.v1.RuntimeClass v1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1.RuntimeClassList v1RuntimeClassList, io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClass v1alpha1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClassList v1alpha1RuntimeClassList, io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClass v1beta1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClassList v1beta1RuntimeClassList) { super(); this.baseKubernetesList = baseKubernetesList; this.info = info; @@ -135,12 +135,12 @@ public KubeSchema(BaseKubernetesList baseKubernetesList, Info info, io.fabric8.k } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } diff --git a/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index c8b60bf5994..45e5b3eeaf4 100644 --- a/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -66,7 +66,7 @@ public class ValidationSchema { @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("Info") private Info info; @JsonProperty("ObjectMeta") @@ -117,7 +117,7 @@ public ValidationSchema() { * @param info * @param status */ - public ValidationSchema(BaseKubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Quantity quantity, Status status, TypeMeta typeMeta, io.fabric8.kubernetes.api.model.node.v1.RuntimeClass v1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1.RuntimeClassList v1RuntimeClassList, io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClass v1alpha1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClassList v1alpha1RuntimeClassList, io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClass v1beta1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClassList v1beta1RuntimeClassList) { + public ValidationSchema(KubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Quantity quantity, Status status, TypeMeta typeMeta, io.fabric8.kubernetes.api.model.node.v1.RuntimeClass v1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1.RuntimeClassList v1RuntimeClassList, io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClass v1alpha1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClassList v1alpha1RuntimeClassList, io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClass v1beta1RuntimeClass, io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClassList v1beta1RuntimeClassList) { super(); this.baseKubernetesList = baseKubernetesList; this.info = info; @@ -135,12 +135,12 @@ public ValidationSchema(BaseKubernetesList baseKubernetesList, Info info, io.fab } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 4dc6cce9cfd..a511f9fc55b 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 @@ -45,7 +45,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -795,7 +795,7 @@ "properties": { "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "Info": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_version_Info", 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 aad466697fa..c89d43b90ac 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 @@ -45,7 +45,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -795,7 +795,7 @@ "properties": { "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "Info": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_version_Info", @@ -1110,12 +1110,9 @@ "properties": { "apiVersion": { "type": "string", - "default": "node.k8s.io/v1", + "default": "node.k8s.io/v1alpha1", "required": true }, - "handler": { - "type": "string" - }, "kind": { "type": "string", "default": "RuntimeClass", @@ -1125,13 +1122,9 @@ "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, - "overhead": { - "$ref": "#/definitions/kubernetes_node_v1_Overhead", - "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1.Overhead" - }, - "scheduling": { - "$ref": "#/definitions/kubernetes_node_v1_Scheduling", - "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1.Scheduling" + "spec": { + "$ref": "#/definitions/kubernetes_node_v1alpha_RuntimeClassSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClassSpec" } }, "additionalProperties": true @@ -1140,14 +1133,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "node.k8s.io/v1beta1", + "default": "node.k8s.io/v1alpha1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_node_v1beta1_RuntimeClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClass" + "$ref": "#/definitions/kubernetes_node_v1alpha_RuntimeClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClass" } }, "kind": { 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 f43fe6df6d0..63dfaa9c2db 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 @@ -87,7 +87,7 @@ public class KubeSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("DeleteOptions") @@ -176,7 +176,7 @@ public KubeSchema() { * @param podSecurityPolicyList * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, io.fabric8.kubernetes.api.model.policy.v1beta1.Eviction eviction, GetOptions getOptions, Info info, RunAsUserStrategyOptions kubernetesRunAsUserStrategyOptions, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget podDisruptionBudget, io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetList podDisruptionBudgetList, PodSecurityPolicy podSecurityPolicy, PodSecurityPolicyList podSecurityPolicyList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.policy.v1.Eviction v1Eviction, io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget v1PodDisruptionBudget, io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetList v1PodDisruptionBudgetList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, io.fabric8.kubernetes.api.model.policy.v1beta1.Eviction eviction, GetOptions getOptions, Info info, RunAsUserStrategyOptions kubernetesRunAsUserStrategyOptions, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget podDisruptionBudget, io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetList podDisruptionBudgetList, PodSecurityPolicy podSecurityPolicy, PodSecurityPolicyList podSecurityPolicyList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.policy.v1.Eviction v1Eviction, io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget v1PodDisruptionBudget, io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetList v1PodDisruptionBudgetList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -228,12 +228,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 d947ba3f988..ad5dce8a6ff 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 @@ -87,7 +87,7 @@ public class ValidationSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("DeleteOptions") @@ -176,7 +176,7 @@ public ValidationSchema() { * @param podSecurityPolicyList * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, io.fabric8.kubernetes.api.model.policy.v1beta1.Eviction eviction, GetOptions getOptions, Info info, RunAsUserStrategyOptions kubernetesRunAsUserStrategyOptions, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget podDisruptionBudget, io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetList podDisruptionBudgetList, PodSecurityPolicy podSecurityPolicy, PodSecurityPolicyList podSecurityPolicyList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.policy.v1.Eviction v1Eviction, io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget v1PodDisruptionBudget, io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetList v1PodDisruptionBudgetList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, io.fabric8.kubernetes.api.model.policy.v1beta1.Eviction eviction, GetOptions getOptions, Info info, RunAsUserStrategyOptions kubernetesRunAsUserStrategyOptions, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget podDisruptionBudget, io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetList podDisruptionBudgetList, PodSecurityPolicy podSecurityPolicy, PodSecurityPolicyList podSecurityPolicyList, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.policy.v1.Eviction v1Eviction, io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget v1PodDisruptionBudget, io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetList v1PodDisruptionBudgetList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -228,12 +228,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 a40e0487985..937d5c11a82 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 @@ -310,7 +310,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -1617,7 +1617,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", 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 d6ad0b395e9..70eb0663688 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 @@ -310,7 +310,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -1617,7 +1617,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", @@ -2354,7 +2354,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "policy/v1beta1", + "default": "policy/v1", "required": true }, "kind": { @@ -2367,12 +2367,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudgetSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetSpec" + "$ref": "#/definitions/kubernetes_policy_v1_PodDisruptionBudgetSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetSpec" }, "status": { - "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudgetStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetStatus" + "$ref": "#/definitions/kubernetes_policy_v1_PodDisruptionBudgetStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetStatus" } }, "additionalProperties": true @@ -2381,14 +2381,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "policy/v1", + "default": "policy/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_policy_v1_PodDisruptionBudget", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudget" + "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudget", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudget" } }, "kind": { 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 d73bc0291b3..5df8fba1f1b 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 @@ -79,7 +79,7 @@ public class KubeSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("DeleteOptions") @@ -153,7 +153,7 @@ public KubeSchema() { * @param info * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClass v1Beta1PriorityClass, io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClassList v1Beta1PriorityClassList, io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClass v1PriorityClass, io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClassList v1PriorityClassList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClass v1Beta1PriorityClass, io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClassList v1Beta1PriorityClassList, io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClass v1PriorityClass, io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClassList v1PriorityClassList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -200,12 +200,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 0369516eb5d..3aa4c8e9f25 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 @@ -79,7 +79,7 @@ public class ValidationSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CreateOptions") private CreateOptions createOptions; @JsonProperty("DeleteOptions") @@ -153,7 +153,7 @@ public ValidationSchema() { * @param info * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClass v1Beta1PriorityClass, io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClassList v1Beta1PriorityClassList, io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClass v1PriorityClass, io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClassList v1PriorityClassList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClass v1Beta1PriorityClass, io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClassList v1Beta1PriorityClassList, io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClass v1PriorityClass, io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClassList v1PriorityClassList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -200,12 +200,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 0aa7efb71d3..5270e882e70 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 @@ -232,7 +232,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -925,7 +925,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", 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 e146dd2ee9e..2c37111425e 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 @@ -232,7 +232,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -925,7 +925,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CreateOptions": { "$ref": "#/definitions/kubernetes_apimachinery_CreateOptions", @@ -1485,7 +1485,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "scheduling.k8s.io/v1", + "default": "scheduling.k8s.io/v1beta1", "required": true }, "description": { 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 c8004fbb82c..834592096b8 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 @@ -95,7 +95,7 @@ public class KubeSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CSIDriver") private io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriver cSIDriver; @JsonProperty("CSIDriverList") @@ -205,7 +205,7 @@ public KubeSchema() { * @param time * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriver cSIDriver, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriverList cSIDriverList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSINode cSINode, io.fabric8.kubernetes.api.model.storage.v1beta1.CSINodeList cSINodeList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIStorageCapacity cSIStorageCapacity, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIStorageCapacityList cSIStorageCapacityList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, StorageClass storageClass, StorageClassList storageClassList, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.storage.CSIDriver v1CSIDriver, io.fabric8.kubernetes.api.model.storage.CSIDriverList v1CSIDriverList, io.fabric8.kubernetes.api.model.storage.CSINode v1CSINode, io.fabric8.kubernetes.api.model.storage.CSINodeList v1CSINodeList, io.fabric8.kubernetes.api.model.storage.CSIStorageCapacity v1CSIStorageCapacity, io.fabric8.kubernetes.api.model.storage.CSIStorageCapacityList v1CSIStorageCapacityList, VolumeAttachment volumeAttachment, VolumeAttachmentList volumeAttachmentList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriver cSIDriver, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriverList cSIDriverList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSINode cSINode, io.fabric8.kubernetes.api.model.storage.v1beta1.CSINodeList cSINodeList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIStorageCapacity cSIStorageCapacity, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIStorageCapacityList cSIStorageCapacityList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, StorageClass storageClass, StorageClassList storageClassList, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.storage.CSIDriver v1CSIDriver, io.fabric8.kubernetes.api.model.storage.CSIDriverList v1CSIDriverList, io.fabric8.kubernetes.api.model.storage.CSINode v1CSINode, io.fabric8.kubernetes.api.model.storage.CSINodeList v1CSINodeList, io.fabric8.kubernetes.api.model.storage.CSIStorageCapacity v1CSIStorageCapacity, io.fabric8.kubernetes.api.model.storage.CSIStorageCapacityList v1CSIStorageCapacityList, VolumeAttachment volumeAttachment, VolumeAttachmentList volumeAttachmentList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -264,12 +264,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 2aa6bc138b0..5f1d3d188fd 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 @@ -95,7 +95,7 @@ public class ValidationSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CSIDriver") private io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriver cSIDriver; @JsonProperty("CSIDriverList") @@ -205,7 +205,7 @@ public ValidationSchema() { * @param time * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriver cSIDriver, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriverList cSIDriverList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSINode cSINode, io.fabric8.kubernetes.api.model.storage.v1beta1.CSINodeList cSINodeList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIStorageCapacity cSIStorageCapacity, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIStorageCapacityList cSIStorageCapacityList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, StorageClass storageClass, StorageClassList storageClassList, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.storage.CSIDriver v1CSIDriver, io.fabric8.kubernetes.api.model.storage.CSIDriverList v1CSIDriverList, io.fabric8.kubernetes.api.model.storage.CSINode v1CSINode, io.fabric8.kubernetes.api.model.storage.CSINodeList v1CSINodeList, io.fabric8.kubernetes.api.model.storage.CSIStorageCapacity v1CSIStorageCapacity, io.fabric8.kubernetes.api.model.storage.CSIStorageCapacityList v1CSIStorageCapacityList, VolumeAttachment volumeAttachment, VolumeAttachmentList volumeAttachmentList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriver cSIDriver, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriverList cSIDriverList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSINode cSINode, io.fabric8.kubernetes.api.model.storage.v1beta1.CSINodeList cSINodeList, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIStorageCapacity cSIStorageCapacity, io.fabric8.kubernetes.api.model.storage.v1beta1.CSIStorageCapacityList cSIStorageCapacityList, CreateOptions createOptions, DeleteOptions deleteOptions, GetOptions getOptions, Info info, ListOptions listOptions, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.kubernetes.api.model.ObjectReference objectReference, Patch patch, PatchOptions patchOptions, Quantity quantity, RootPaths rootPaths, Status status, StorageClass storageClass, StorageClassList storageClassList, String time, TypeMeta typeMeta, UpdateOptions updateOptions, io.fabric8.kubernetes.api.model.storage.CSIDriver v1CSIDriver, io.fabric8.kubernetes.api.model.storage.CSIDriverList v1CSIDriverList, io.fabric8.kubernetes.api.model.storage.CSINode v1CSINode, io.fabric8.kubernetes.api.model.storage.CSINodeList v1CSINodeList, io.fabric8.kubernetes.api.model.storage.CSIStorageCapacity v1CSIStorageCapacity, io.fabric8.kubernetes.api.model.storage.CSIStorageCapacityList v1CSIStorageCapacityList, VolumeAttachment volumeAttachment, VolumeAttachmentList volumeAttachmentList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -264,12 +264,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 d491c394542..f265673092b 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 @@ -267,7 +267,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -2645,7 +2645,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CSIDriver": { "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSIDriver", 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 58b122057a8..65915e67edd 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 @@ -267,7 +267,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -2645,7 +2645,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CSIDriver": { "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSIDriver", @@ -3036,8 +3036,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_storageclass_v1beta1_TokenRequest", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.TokenRequest" + "$ref": "#/definitions/kubernetes_storageclass_TokenRequest", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.TokenRequest" } }, "volumeLifecycleModes": { @@ -3076,8 +3076,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" @@ -3098,14 +3098,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1", + "default": "storage.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_storageclass_CSINode", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSINode" + "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSINode", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSINode" } }, "kind": { @@ -3125,8 +3125,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" } } }, @@ -3214,14 +3214,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_CSIStorageCapacity", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSIStorageCapacity" + "$ref": "#/definitions/kubernetes_storageclass_CSIStorageCapacity", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSIStorageCapacity" } }, "kind": { 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 bc8e2ae8ccd..a2e088861e0 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 @@ -75,7 +75,7 @@ public class KubeSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("ClusterAutoscaler") private ClusterAutoscaler clusterAutoscaler; @JsonProperty("ClusterAutoscalerList") @@ -122,7 +122,7 @@ public KubeSchema() { * @param info * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, ClusterAutoscaler clusterAutoscaler, ClusterAutoscalerList clusterAutoscalerList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta, MachineAutoscaler v1beta1MachineAutoscaler, MachineAutoscalerList v1beta1MachineAutoscalerList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ClusterAutoscaler clusterAutoscaler, ClusterAutoscalerList clusterAutoscalerList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta, MachineAutoscaler v1beta1MachineAutoscaler, MachineAutoscalerList v1beta1MachineAutoscalerList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -160,12 +160,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 ecd2f2cb7f3..6a43f5a8eaf 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 @@ -75,7 +75,7 @@ public class ValidationSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("ClusterAutoscaler") private ClusterAutoscaler clusterAutoscaler; @JsonProperty("ClusterAutoscalerList") @@ -122,7 +122,7 @@ public ValidationSchema() { * @param info * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, ClusterAutoscaler clusterAutoscaler, ClusterAutoscalerList clusterAutoscalerList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta, MachineAutoscaler v1beta1MachineAutoscaler, MachineAutoscalerList v1beta1MachineAutoscalerList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ClusterAutoscaler clusterAutoscaler, ClusterAutoscalerList clusterAutoscalerList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta, MachineAutoscaler v1beta1MachineAutoscaler, MachineAutoscalerList v1beta1MachineAutoscalerList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -160,12 +160,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 067de4ec581..2fb4bd601dc 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 @@ -122,7 +122,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cjava.util.Map\u003cString, Object\u003e\u003e" @@ -813,7 +813,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "ClusterAutoscaler": { "$ref": "#/definitions/os_clusterautoscaling_v1_ClusterAutoscaler", 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 02cfab5e7b8..bde92abf732 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 @@ -122,7 +122,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cjava.util.Map\u003cString, Object\u003e\u003e" @@ -813,7 +813,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "ClusterAutoscaler": { "$ref": "#/definitions/os_clusterautoscaling_v1_ClusterAutoscaler", 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 4a0326c764e..50a0de64f60 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 @@ -157,7 +157,7 @@ public class KubeSchema { @JsonProperty("AuthenticationList") private AuthenticationList authenticationList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("Build") private Build build; @JsonProperty("BuildList") @@ -307,7 +307,7 @@ public KubeSchema() { * @param imageContentPolicyList * @param time */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIServer aPIServer, APIServerList aPIServerList, Authentication authentication, AuthenticationList authenticationList, BaseKubernetesList baseKubernetesList, Build build, BuildList buildList, ClusterOperator clusterOperator, ClusterOperatorList clusterOperatorList, ClusterVersion clusterVersion, ClusterVersionList clusterVersionList, ConfigMapFileReference configMapFileReference, Console console, ConsoleList consoleList, DNS dns, DNSList dNSList, DNSZone dNSZone, FeatureGate featureGate, FeatureGateList featureGateList, Image image, ImageContentPolicy imageContentPolicy, ImageContentPolicyList imageContentPolicyList, ImageList imageList, Info info, Infrastructure infrastructure, InfrastructureList infrastructureList, Ingress ingress, IngressList ingressList, Network network, NetworkList networkList, OAuth oAuth, OAuthList oAuthList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OperatorHub operatorHub, OperatorHubList operatorHubList, Patch patch, Project project, ProjectList projectList, Proxy proxy, ProxyList proxyList, ResourceAttributes resourceAttributes, Scheduler scheduler, SchedulerList schedulerList, SecretNameReference secretNameReference, Status status, TLSProfileSpec tLSProfileSpec, String time, TypeMeta typeMeta) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIServer aPIServer, APIServerList aPIServerList, Authentication authentication, AuthenticationList authenticationList, KubernetesList baseKubernetesList, Build build, BuildList buildList, ClusterOperator clusterOperator, ClusterOperatorList clusterOperatorList, ClusterVersion clusterVersion, ClusterVersionList clusterVersionList, ConfigMapFileReference configMapFileReference, Console console, ConsoleList consoleList, DNS dns, DNSList dNSList, DNSZone dNSZone, FeatureGate featureGate, FeatureGateList featureGateList, Image image, ImageContentPolicy imageContentPolicy, ImageContentPolicyList imageContentPolicyList, ImageList imageList, Info info, Infrastructure infrastructure, InfrastructureList infrastructureList, Ingress ingress, IngressList ingressList, Network network, NetworkList networkList, OAuth oAuth, OAuthList oAuthList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OperatorHub operatorHub, OperatorHubList operatorHubList, Patch patch, Project project, ProjectList projectList, Proxy proxy, ProxyList proxyList, ResourceAttributes resourceAttributes, Scheduler scheduler, SchedulerList schedulerList, SecretNameReference secretNameReference, Status status, TLSProfileSpec tLSProfileSpec, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -422,12 +422,12 @@ public void setAuthenticationList(AuthenticationList authenticationList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 f46d9e2f875..f6141f26374 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 @@ -157,7 +157,7 @@ public class ValidationSchema { @JsonProperty("AuthenticationList") private AuthenticationList authenticationList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("Build") private Build build; @JsonProperty("BuildList") @@ -307,7 +307,7 @@ public ValidationSchema() { * @param imageContentPolicyList * @param time */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIServer aPIServer, APIServerList aPIServerList, Authentication authentication, AuthenticationList authenticationList, BaseKubernetesList baseKubernetesList, Build build, BuildList buildList, ClusterOperator clusterOperator, ClusterOperatorList clusterOperatorList, ClusterVersion clusterVersion, ClusterVersionList clusterVersionList, ConfigMapFileReference configMapFileReference, Console console, ConsoleList consoleList, DNS dns, DNSList dNSList, DNSZone dNSZone, FeatureGate featureGate, FeatureGateList featureGateList, Image image, ImageContentPolicy imageContentPolicy, ImageContentPolicyList imageContentPolicyList, ImageList imageList, Info info, Infrastructure infrastructure, InfrastructureList infrastructureList, Ingress ingress, IngressList ingressList, Network network, NetworkList networkList, OAuth oAuth, OAuthList oAuthList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OperatorHub operatorHub, OperatorHubList operatorHubList, Patch patch, Project project, ProjectList projectList, Proxy proxy, ProxyList proxyList, ResourceAttributes resourceAttributes, Scheduler scheduler, SchedulerList schedulerList, SecretNameReference secretNameReference, Status status, TLSProfileSpec tLSProfileSpec, String time, TypeMeta typeMeta) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIServer aPIServer, APIServerList aPIServerList, Authentication authentication, AuthenticationList authenticationList, KubernetesList baseKubernetesList, Build build, BuildList buildList, ClusterOperator clusterOperator, ClusterOperatorList clusterOperatorList, ClusterVersion clusterVersion, ClusterVersionList clusterVersionList, ConfigMapFileReference configMapFileReference, Console console, ConsoleList consoleList, DNS dns, DNSList dNSList, DNSZone dNSZone, FeatureGate featureGate, FeatureGateList featureGateList, Image image, ImageContentPolicy imageContentPolicy, ImageContentPolicyList imageContentPolicyList, ImageList imageList, Info info, Infrastructure infrastructure, InfrastructureList infrastructureList, Ingress ingress, IngressList ingressList, Network network, NetworkList networkList, OAuth oAuth, OAuthList oAuthList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OperatorHub operatorHub, OperatorHubList operatorHubList, Patch patch, Project project, ProjectList projectList, Proxy proxy, ProxyList proxyList, ResourceAttributes resourceAttributes, Scheduler scheduler, SchedulerList schedulerList, SecretNameReference secretNameReference, Status status, TLSProfileSpec tLSProfileSpec, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -422,12 +422,12 @@ public void setAuthenticationList(AuthenticationList authenticationList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 a2702ce5efa..94eb9539a5e 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 @@ -214,7 +214,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -4778,7 +4778,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "Build": { "$ref": "#/definitions/os_config_v1_Build", 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 b24069ad7c8..674469c73d9 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 @@ -214,7 +214,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -4778,7 +4778,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "Build": { "$ref": "#/definitions/os_config_v1_Build", 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 7f69d40630f..fa15d10929c 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 @@ -96,7 +96,7 @@ public class KubeSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("ConsoleCLIDownload") private ConsoleCLIDownload consoleCLIDownload; @JsonProperty("ConsoleCLIDownloadList") @@ -176,7 +176,7 @@ public KubeSchema() { * @param info * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, ConsoleCLIDownload consoleCLIDownload, ConsoleCLIDownloadList consoleCLIDownloadList, ConsoleExternalLogLink consoleExternalLogLink, ConsoleExternalLogLinkList consoleExternalLogLinkList, ConsoleLink consoleLink, ConsoleLinkList consoleLinkList, ConsoleNotification consoleNotification, ConsoleNotificationList consoleNotificationList, ConsolePluginList consolePlugin, ConsolePluginList consolePluginList, ConsoleQuickStart consoleQuickStart, ConsoleQuickStartList consoleQuickStartList, ConsoleYAMLSample consoleYAMLSample, ConsoleYAMLSampleList consoleYAMLSampleList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, ResourceAttributes resourceAttributes, Status status, String time, TypeMeta typeMeta) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ConsoleCLIDownload consoleCLIDownload, ConsoleCLIDownloadList consoleCLIDownloadList, ConsoleExternalLogLink consoleExternalLogLink, ConsoleExternalLogLinkList consoleExternalLogLinkList, ConsoleLink consoleLink, ConsoleLinkList consoleLinkList, ConsoleNotification consoleNotification, ConsoleNotificationList consoleNotificationList, ConsolePluginList consolePlugin, ConsolePluginList consolePluginList, ConsoleQuickStart consoleQuickStart, ConsoleQuickStartList consoleQuickStartList, ConsoleYAMLSample consoleYAMLSample, ConsoleYAMLSampleList consoleYAMLSampleList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, ResourceAttributes resourceAttributes, Status status, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -225,12 +225,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 69ad9cb8de4..c1a5a57232a 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 @@ -96,7 +96,7 @@ public class ValidationSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("ConsoleCLIDownload") private ConsoleCLIDownload consoleCLIDownload; @JsonProperty("ConsoleCLIDownloadList") @@ -176,7 +176,7 @@ public ValidationSchema() { * @param info * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, ConsoleCLIDownload consoleCLIDownload, ConsoleCLIDownloadList consoleCLIDownloadList, ConsoleExternalLogLink consoleExternalLogLink, ConsoleExternalLogLinkList consoleExternalLogLinkList, ConsoleLink consoleLink, ConsoleLinkList consoleLinkList, ConsoleNotification consoleNotification, ConsoleNotificationList consoleNotificationList, ConsolePluginList consolePlugin, ConsolePluginList consolePluginList, ConsoleQuickStart consoleQuickStart, ConsoleQuickStartList consoleQuickStartList, ConsoleYAMLSample consoleYAMLSample, ConsoleYAMLSampleList consoleYAMLSampleList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, ResourceAttributes resourceAttributes, Status status, String time, TypeMeta typeMeta) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ConsoleCLIDownload consoleCLIDownload, ConsoleCLIDownloadList consoleCLIDownloadList, ConsoleExternalLogLink consoleExternalLogLink, ConsoleExternalLogLinkList consoleExternalLogLinkList, ConsoleLink consoleLink, ConsoleLinkList consoleLinkList, ConsoleNotification consoleNotification, ConsoleNotificationList consoleNotificationList, ConsolePluginList consolePlugin, ConsolePluginList consolePluginList, ConsoleQuickStart consoleQuickStart, ConsoleQuickStartList consoleQuickStartList, ConsoleYAMLSample consoleYAMLSample, ConsoleYAMLSampleList consoleYAMLSampleList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, ResourceAttributes resourceAttributes, Status status, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -225,12 +225,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 2b427ca8572..e7a0f200230 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 @@ -170,7 +170,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -1392,7 +1392,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "ConsoleCLIDownload": { "$ref": "#/definitions/os_console_v1_ConsoleCLIDownload", 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 b87fc594bc6..0bd22f25bcd 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 @@ -170,7 +170,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -1392,7 +1392,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "ConsoleCLIDownload": { "$ref": "#/definitions/os_console_v1_ConsoleCLIDownload", 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 eb71ec1cb3b..d4412454530 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 @@ -140,7 +140,7 @@ public class KubeSchema { @JsonProperty("AzureOSDisk") private io.fabric8.openshift.api.model.hive.azure.v1.OSDisk azureOSDisk; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("Checkpoint") private Checkpoint checkpoint; @JsonProperty("CheckpointList") @@ -287,7 +287,7 @@ public KubeSchema() { * @param dNSZoneList * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, io.fabric8.openshift.api.model.hive.azure.v1.OSDisk azureOSDisk, BaseKubernetesList baseKubernetesList, Checkpoint checkpoint, CheckpointList checkpointList, ClusterClaim clusterClaim, ClusterClaimList clusterClaimList, ClusterDeployment clusterDeployment, ClusterDeploymentList clusterDeploymentList, ClusterDeprovision clusterDeprovision, ClusterDeprovisionList clusterDeprovisionList, ClusterImageSet clusterImageSet, ClusterImageSetList clusterImageSetList, ClusterOperatorStatusCondition clusterOperatorStatusCondition, ClusterPool clusterPool, ClusterPoolList clusterPoolList, ClusterProvision clusterProvision, ClusterProvisionList clusterProvisionList, ClusterRelocate clusterRelocate, ClusterRelocateList clusterRelocateList, ClusterState clusterState, ClusterStateList clusterStateList, DNSZone dNSZone, DNSZoneList dNSZoneList, io.fabric8.openshift.api.model.hive.gcp.v1.OSDisk gcpOSDisk, HiveConfig hiveConfig, HiveConfigList hiveConfigList, io.fabric8.kubernetes.api.model.LocalObjectReference localObjectReference, MachinePool machinePool, MachinePoolList machinePoolList, MachinePoolNameLease machinePoolNameLease, MachinePoolNameLeaseList machinePoolNameLeaseList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, SelectorSyncIdentityProvider selectorSyncIdentityProvider, SelectorSyncIdentityProviderList selectorSyncIdentityProviderList, SelectorSyncSet selectorSyncSet, SelectorSyncSetList selectorSyncSetList, Status status, SyncIdentityProvider syncIdentityProvider, SyncIdentityProviderList syncIdentityProviderList, SyncSet syncSet, SyncSetList syncSetList, String time, TypeMeta typeMeta, io.fabric8.openshift.api.model.hive.vsphere.v1.OSDisk vsphereOSDisk) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, io.fabric8.openshift.api.model.hive.azure.v1.OSDisk azureOSDisk, KubernetesList baseKubernetesList, Checkpoint checkpoint, CheckpointList checkpointList, ClusterClaim clusterClaim, ClusterClaimList clusterClaimList, ClusterDeployment clusterDeployment, ClusterDeploymentList clusterDeploymentList, ClusterDeprovision clusterDeprovision, ClusterDeprovisionList clusterDeprovisionList, ClusterImageSet clusterImageSet, ClusterImageSetList clusterImageSetList, ClusterOperatorStatusCondition clusterOperatorStatusCondition, ClusterPool clusterPool, ClusterPoolList clusterPoolList, ClusterProvision clusterProvision, ClusterProvisionList clusterProvisionList, ClusterRelocate clusterRelocate, ClusterRelocateList clusterRelocateList, ClusterState clusterState, ClusterStateList clusterStateList, DNSZone dNSZone, DNSZoneList dNSZoneList, io.fabric8.openshift.api.model.hive.gcp.v1.OSDisk gcpOSDisk, HiveConfig hiveConfig, HiveConfigList hiveConfigList, io.fabric8.kubernetes.api.model.LocalObjectReference localObjectReference, MachinePool machinePool, MachinePoolList machinePoolList, MachinePoolNameLease machinePoolNameLease, MachinePoolNameLeaseList machinePoolNameLeaseList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, SelectorSyncIdentityProvider selectorSyncIdentityProvider, SelectorSyncIdentityProviderList selectorSyncIdentityProviderList, SelectorSyncSet selectorSyncSet, SelectorSyncSetList selectorSyncSetList, Status status, SyncIdentityProvider syncIdentityProvider, SyncIdentityProviderList syncIdentityProviderList, SyncSet syncSet, SyncSetList syncSetList, String time, TypeMeta typeMeta, io.fabric8.openshift.api.model.hive.vsphere.v1.OSDisk vsphereOSDisk) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -369,12 +369,12 @@ public void setAzureOSDisk(io.fabric8.openshift.api.model.hive.azure.v1.OSDisk a } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 21743daafed..0801c9d6f0a 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 @@ -140,7 +140,7 @@ public class ValidationSchema { @JsonProperty("AzureOSDisk") private io.fabric8.openshift.api.model.hive.azure.v1.OSDisk azureOSDisk; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("Checkpoint") private Checkpoint checkpoint; @JsonProperty("CheckpointList") @@ -287,7 +287,7 @@ public ValidationSchema() { * @param dNSZoneList * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, io.fabric8.openshift.api.model.hive.azure.v1.OSDisk azureOSDisk, BaseKubernetesList baseKubernetesList, Checkpoint checkpoint, CheckpointList checkpointList, ClusterClaim clusterClaim, ClusterClaimList clusterClaimList, ClusterDeployment clusterDeployment, ClusterDeploymentList clusterDeploymentList, ClusterDeprovision clusterDeprovision, ClusterDeprovisionList clusterDeprovisionList, ClusterImageSet clusterImageSet, ClusterImageSetList clusterImageSetList, ClusterOperatorStatusCondition clusterOperatorStatusCondition, ClusterPool clusterPool, ClusterPoolList clusterPoolList, ClusterProvision clusterProvision, ClusterProvisionList clusterProvisionList, ClusterRelocate clusterRelocate, ClusterRelocateList clusterRelocateList, ClusterState clusterState, ClusterStateList clusterStateList, DNSZone dNSZone, DNSZoneList dNSZoneList, io.fabric8.openshift.api.model.hive.gcp.v1.OSDisk gcpOSDisk, HiveConfig hiveConfig, HiveConfigList hiveConfigList, io.fabric8.kubernetes.api.model.LocalObjectReference localObjectReference, MachinePool machinePool, MachinePoolList machinePoolList, MachinePoolNameLease machinePoolNameLease, MachinePoolNameLeaseList machinePoolNameLeaseList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, SelectorSyncIdentityProvider selectorSyncIdentityProvider, SelectorSyncIdentityProviderList selectorSyncIdentityProviderList, SelectorSyncSet selectorSyncSet, SelectorSyncSetList selectorSyncSetList, Status status, SyncIdentityProvider syncIdentityProvider, SyncIdentityProviderList syncIdentityProviderList, SyncSet syncSet, SyncSetList syncSetList, String time, TypeMeta typeMeta, io.fabric8.openshift.api.model.hive.vsphere.v1.OSDisk vsphereOSDisk) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, io.fabric8.openshift.api.model.hive.azure.v1.OSDisk azureOSDisk, KubernetesList baseKubernetesList, Checkpoint checkpoint, CheckpointList checkpointList, ClusterClaim clusterClaim, ClusterClaimList clusterClaimList, ClusterDeployment clusterDeployment, ClusterDeploymentList clusterDeploymentList, ClusterDeprovision clusterDeprovision, ClusterDeprovisionList clusterDeprovisionList, ClusterImageSet clusterImageSet, ClusterImageSetList clusterImageSetList, ClusterOperatorStatusCondition clusterOperatorStatusCondition, ClusterPool clusterPool, ClusterPoolList clusterPoolList, ClusterProvision clusterProvision, ClusterProvisionList clusterProvisionList, ClusterRelocate clusterRelocate, ClusterRelocateList clusterRelocateList, ClusterState clusterState, ClusterStateList clusterStateList, DNSZone dNSZone, DNSZoneList dNSZoneList, io.fabric8.openshift.api.model.hive.gcp.v1.OSDisk gcpOSDisk, HiveConfig hiveConfig, HiveConfigList hiveConfigList, io.fabric8.kubernetes.api.model.LocalObjectReference localObjectReference, MachinePool machinePool, MachinePoolList machinePoolList, MachinePoolNameLease machinePoolNameLease, MachinePoolNameLeaseList machinePoolNameLeaseList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, SelectorSyncIdentityProvider selectorSyncIdentityProvider, SelectorSyncIdentityProviderList selectorSyncIdentityProviderList, SelectorSyncSet selectorSyncSet, SelectorSyncSetList selectorSyncSetList, Status status, SyncIdentityProvider syncIdentityProvider, SyncIdentityProviderList syncIdentityProviderList, SyncSet syncSet, SyncSetList syncSetList, String time, TypeMeta typeMeta, io.fabric8.openshift.api.model.hive.vsphere.v1.OSDisk vsphereOSDisk) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -369,12 +369,12 @@ public void setAzureOSDisk(io.fabric8.openshift.api.model.hive.azure.v1.OSDisk a } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 91012377d64..f8f6891212c 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 @@ -225,7 +225,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cjava.util.Map\u003cString, Object\u003e\u003e" @@ -8083,7 +8083,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "Checkpoint": { "$ref": "#/definitions/os_hive_v1_Checkpoint", 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 992521ebfb6..a4f0483915f 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 @@ -225,7 +225,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cjava.util.Map\u003cString, Object\u003e\u003e" @@ -8083,7 +8083,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "Checkpoint": { "$ref": "#/definitions/os_hive_v1_Checkpoint", @@ -11739,19 +11739,19 @@ }, "machinepool": { "properties": { - "osDisk": { - "$ref": "#/definitions/os_hive_gcp_v1_OSDisk", - "existingJavaType": "io.fabric8.openshift.api.model.hive.gcp.v1.OSDisk" + "coresPerSocket": { + "type": "integer" }, - "type": { - "type": "string" + "cpus": { + "type": "integer" }, - "zones": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } + "memoryMB": { + "type": "integer", + "existingJavaType": "Long" + }, + "osDisk": { + "$ref": "#/definitions/os_hive_vsphere_v1_OSDisk", + "existingJavaType": "io.fabric8.openshift.api.model.hive.vsphere.v1.OSDisk" } }, "additionalProperties": true @@ -11879,30 +11879,29 @@ }, "machinepoolplatform": { "properties": { - "rootVolume": { - "$ref": "#/definitions/os_hive_aws_v1_EC2RootVolume", - "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.EC2RootVolume" + "aws": { + "$ref": "#/definitions/os_hive_aws_v1_MachinePoolPlatform", + "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.MachinePoolPlatform" }, - "spotMarketOptions": { - "$ref": "#/definitions/os_hive_aws_v1_SpotMarketOptions", - "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.SpotMarketOptions" + "azure": { + "$ref": "#/definitions/os_hive_azure_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.hive.azure.v1.MachinePool" }, - "subnets": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } + "gcp": { + "$ref": "#/definitions/os_hive_gcp_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.hive.gcp.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 @@ -12492,28 +12491,18 @@ }, "platform": { "properties": { - "certificatesSecretRef": { - "$ref": "#/definitions/kubernetes_core_LocalObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" - }, - "cloud": { - "type": "string" - }, - "credentialsSecretRef": { + "libvirtSSHPrivateKeySecretRef": { "$ref": "#/definitions/kubernetes_core_LocalObjectReference", "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" - }, - "trunkSupport": { - "type": "boolean" } }, "additionalProperties": true }, "platformstatus": { "properties": { - "privateLink": { - "$ref": "#/definitions/os_hive_aws_v1_PrivateLinkAccessStatus", - "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.PrivateLinkAccessStatus" + "aws": { + "$ref": "#/definitions/os_hive_aws_v1_PlatformStatus", + "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.PlatformStatus" } }, "additionalProperties": true 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 5d1a0342f1d..df036c7ac55 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 @@ -85,7 +85,7 @@ public class KubeSchema { @JsonProperty("BaremetalMachinePool") private io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool baremetalMachinePool; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("GcpMachinePool") private io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool gcpMachinePool; @JsonProperty("IBMCloudMachinePool") @@ -142,7 +142,7 @@ public KubeSchema() { * @param azureMachinePool * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool alibabaCloudMachinePool, io.fabric8.openshift.api.model.installer.aws.v1.MachinePool awsMachinePool, io.fabric8.openshift.api.model.installer.azure.v1.MachinePool azureMachinePool, io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool baremetalMachinePool, BaseKubernetesList baseKubernetesList, io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool gcpMachinePool, io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool iBMCloudMachinePool, InstallConfig installConfig, io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool libvirtMachinePool, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool openStackMachinePool, io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool ovirtMachinePool, Patch patch, Status status, String time, TypeMeta typeMeta, io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool vSphereMachinePool) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool alibabaCloudMachinePool, io.fabric8.openshift.api.model.installer.aws.v1.MachinePool awsMachinePool, io.fabric8.openshift.api.model.installer.azure.v1.MachinePool azureMachinePool, io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool baremetalMachinePool, KubernetesList baseKubernetesList, io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool gcpMachinePool, io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool iBMCloudMachinePool, InstallConfig installConfig, io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool libvirtMachinePool, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool openStackMachinePool, io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool ovirtMachinePool, Patch patch, Status status, String time, TypeMeta typeMeta, io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool vSphereMachinePool) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -226,12 +226,12 @@ public void setBaremetalMachinePool(io.fabric8.openshift.api.model.installer.bar } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 8ecc4cedad7..9ddf8baba7e 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 @@ -85,7 +85,7 @@ public class ValidationSchema { @JsonProperty("BaremetalMachinePool") private io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool baremetalMachinePool; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("GcpMachinePool") private io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool gcpMachinePool; @JsonProperty("IBMCloudMachinePool") @@ -142,7 +142,7 @@ public ValidationSchema() { * @param azureMachinePool * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool alibabaCloudMachinePool, io.fabric8.openshift.api.model.installer.aws.v1.MachinePool awsMachinePool, io.fabric8.openshift.api.model.installer.azure.v1.MachinePool azureMachinePool, io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool baremetalMachinePool, BaseKubernetesList baseKubernetesList, io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool gcpMachinePool, io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool iBMCloudMachinePool, InstallConfig installConfig, io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool libvirtMachinePool, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool openStackMachinePool, io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool ovirtMachinePool, Patch patch, Status status, String time, TypeMeta typeMeta, io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool vSphereMachinePool) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool alibabaCloudMachinePool, io.fabric8.openshift.api.model.installer.aws.v1.MachinePool awsMachinePool, io.fabric8.openshift.api.model.installer.azure.v1.MachinePool azureMachinePool, io.fabric8.openshift.api.model.installer.baremetal.v1.MachinePool baremetalMachinePool, KubernetesList baseKubernetesList, io.fabric8.openshift.api.model.installer.gcp.v1.MachinePool gcpMachinePool, io.fabric8.openshift.api.model.installer.ibmcloud.v1.MachinePool iBMCloudMachinePool, InstallConfig installConfig, io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool libvirtMachinePool, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool openStackMachinePool, io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool ovirtMachinePool, Patch patch, Status status, String time, TypeMeta typeMeta, io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool vSphereMachinePool) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -226,12 +226,12 @@ public void setBaremetalMachinePool(io.fabric8.openshift.api.model.installer.bar } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 71f72ae49b9..c104a60bfb3 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 @@ -130,7 +130,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cjava.util.Map\u003cString, Object\u003e\u003e" @@ -1915,7 +1915,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "GcpMachinePool": { "$ref": "#/definitions/os_installer_gcp_v1_MachinePool", 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 416c738d59f..00c202469af 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 @@ -130,7 +130,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cjava.util.Map\u003cString, Object\u003e\u003e" @@ -1915,7 +1915,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "GcpMachinePool": { "$ref": "#/definitions/os_installer_gcp_v1_MachinePool", @@ -2610,6 +2610,9 @@ "properties": { "diskSizeGB": { "type": "integer" + }, + "diskType": { + "type": "string" } }, "additionalProperties": true @@ -2642,33 +2645,47 @@ }, "platform": { "properties": { - "affinityGroups": { - "type": "array", - "items": { - "$ref": "#/definitions/os_installer_ovirt_v1_AffinityGroup", - "existingJavaType": "io.fabric8.openshift.api.model.installer.ovirt.v1.AffinityGroup" - } + "apiVIP": { + "type": "string" }, - "api_vip": { + "cluster": { + "type": "string" + }, + "clusterOSImage": { + "type": "string" + }, + "datacenter": { + "type": "string" + }, + "defaultDatastore": { "type": "string" }, "defaultMachinePlatform": { - "$ref": "#/definitions/os_installer_ovirt_v1_MachinePool", - "existingJavaType": "io.fabric8.openshift.api.model.installer.ovirt.v1.MachinePool" + "$ref": "#/definitions/os_installer_vsphere_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool" }, - "ingress_vip": { + "diskType": { "type": "string" }, - "ovirt_cluster_id": { + "folder": { "type": "string" }, - "ovirt_network_name": { + "ingressVIP": { "type": "string" }, - "ovirt_storage_domain_id": { + "network": { "type": "string" }, - "vnicProfileID": { + "password": { + "type": "string" + }, + "resourcePool": { + "type": "string" + }, + "username": { + "type": "string" + }, + "vCenter": { "type": "string" } }, 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 01e03c6424d..b8f94e22436 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 @@ -79,7 +79,7 @@ public class KubeSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("Info") private Info info; @JsonProperty("Machine") @@ -132,7 +132,7 @@ public KubeSchema() { * @param info * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, Info info, Machine machine, MachineHealthCheck machineHealthCheck, MachineHealthCheckList machineHealthCheckList, MachineList machineList, MachineSet machineSet, MachineSetList machineSetList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Info info, Machine machine, MachineHealthCheck machineHealthCheck, MachineHealthCheckList machineHealthCheckList, MachineList machineList, MachineSet machineSet, MachineSetList machineSetList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -172,12 +172,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 a63e6159c9b..e6f7e69444a 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 @@ -79,7 +79,7 @@ public class ValidationSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("Info") private Info info; @JsonProperty("Machine") @@ -132,7 +132,7 @@ public ValidationSchema() { * @param info * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, Info info, Machine machine, MachineHealthCheck machineHealthCheck, MachineHealthCheckList machineHealthCheckList, MachineList machineList, MachineSet machineSet, MachineSetList machineSetList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Info info, Machine machine, MachineHealthCheck machineHealthCheck, MachineHealthCheckList machineHealthCheckList, MachineList machineList, MachineSet machineSet, MachineSetList machineSetList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -172,12 +172,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 4cb72d7e733..6056f63db2e 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 @@ -184,7 +184,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cjava.util.Map\u003cString, Object\u003e\u003e" @@ -1237,7 +1237,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "Info": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_version_Info", 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 2f607b83c04..a853c9e773b 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 @@ -184,7 +184,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cjava.util.Map\u003cString, Object\u003e\u003e" @@ -1237,7 +1237,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "Info": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_version_Info", 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 00cc1d674e2..c694fa25188 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 @@ -87,7 +87,7 @@ public class KubeSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("ContainerRuntimeConfig") private ContainerRuntimeConfig containerRuntimeConfig; @JsonProperty("ContainerRuntimeConfigList") @@ -152,7 +152,7 @@ public KubeSchema() { * @param info * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, ContainerRuntimeConfig containerRuntimeConfig, ContainerRuntimeConfigList containerRuntimeConfigList, ControllerConfig controllerConfig, ControllerConfigList controllerConfigList, Info info, KubeletConfig kubeletConfig, KubeletConfigList kubeletConfigList, MachineConfig machineConfig, MachineConfigList machineConfigList, MachineConfigPool machineConfigPool, MachineConfigPoolList machineConfigPoolList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ContainerRuntimeConfig containerRuntimeConfig, ContainerRuntimeConfigList containerRuntimeConfigList, ControllerConfig controllerConfig, ControllerConfigList controllerConfigList, Info info, KubeletConfig kubeletConfig, KubeletConfigList kubeletConfigList, MachineConfig machineConfig, MachineConfigList machineConfigList, MachineConfigPool machineConfigPool, MachineConfigPoolList machineConfigPoolList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -196,12 +196,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 fb0f22e8d81..e6031feab91 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 @@ -87,7 +87,7 @@ public class ValidationSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("ContainerRuntimeConfig") private ContainerRuntimeConfig containerRuntimeConfig; @JsonProperty("ContainerRuntimeConfigList") @@ -152,7 +152,7 @@ public ValidationSchema() { * @param info * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, ContainerRuntimeConfig containerRuntimeConfig, ContainerRuntimeConfigList containerRuntimeConfigList, ControllerConfig controllerConfig, ControllerConfigList controllerConfigList, Info info, KubeletConfig kubeletConfig, KubeletConfigList kubeletConfigList, MachineConfig machineConfig, MachineConfigList machineConfigList, MachineConfigPool machineConfigPool, MachineConfigPoolList machineConfigPoolList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, ContainerRuntimeConfig containerRuntimeConfig, ContainerRuntimeConfigList containerRuntimeConfigList, ControllerConfig controllerConfig, ControllerConfigList controllerConfigList, Info info, KubeletConfig kubeletConfig, KubeletConfigList kubeletConfigList, MachineConfig machineConfig, MachineConfigList machineConfigList, MachineConfigPool machineConfigPool, MachineConfigPoolList machineConfigPoolList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -196,12 +196,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 4d772a51f2c..df5f483721a 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 @@ -170,7 +170,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cjava.util.Map\u003cString, Object\u003e\u003e" @@ -2225,7 +2225,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "ContainerRuntimeConfig": { "$ref": "#/definitions/os_machineconfig_v1_ContainerRuntimeConfig", 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 2262ac4c46b..4e37414cee3 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 @@ -170,7 +170,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cjava.util.Map\u003cString, Object\u003e\u003e" @@ -2225,7 +2225,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "ContainerRuntimeConfig": { "$ref": "#/definitions/os_machineconfig_v1_ContainerRuntimeConfig", 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 8646fb01acd..0c1fd798f9c 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 @@ -103,7 +103,7 @@ public class KubeSchema { @JsonProperty("BareMetalHostList") private BareMetalHostList bareMetalHostList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("Config") private Config config; @JsonProperty("ConfigList") @@ -172,7 +172,7 @@ public KubeSchema() { * @param info * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIRequestCount aPIRequestCount, APIRequestCountList aPIRequestCountList, BareMetalHost bareMetalHost, BareMetalHostList bareMetalHostList, BaseKubernetesList baseKubernetesList, Config config, ConfigList configList, CredentialsRequest credentialsRequest, CredentialsRequestList credentialsRequestList, EgressRouter egressRouter, EgressRouterList egressRouterList, Info info, NetworkAttachmentDefinition networkAttachmentDefinition, NetworkAttachmentDefinitionList networkAttachmentDefinitionList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OperatorPKI operatorPKI, OperatorPKIList operatorPKIList, Patch patch, Status status, String time, TypeMeta typeMeta) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIRequestCount aPIRequestCount, APIRequestCountList aPIRequestCountList, BareMetalHost bareMetalHost, BareMetalHostList bareMetalHostList, KubernetesList baseKubernetesList, Config config, ConfigList configList, CredentialsRequest credentialsRequest, CredentialsRequestList credentialsRequestList, EgressRouter egressRouter, EgressRouterList egressRouterList, Info info, NetworkAttachmentDefinition networkAttachmentDefinition, NetworkAttachmentDefinitionList networkAttachmentDefinitionList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OperatorPKI operatorPKI, OperatorPKIList operatorPKIList, Patch patch, Status status, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -260,12 +260,12 @@ public void setBareMetalHostList(BareMetalHostList bareMetalHostList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 5d7a814bf27..83b65f8949b 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 @@ -103,7 +103,7 @@ public class ValidationSchema { @JsonProperty("BareMetalHostList") private BareMetalHostList bareMetalHostList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("Config") private Config config; @JsonProperty("ConfigList") @@ -172,7 +172,7 @@ public ValidationSchema() { * @param info * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIRequestCount aPIRequestCount, APIRequestCountList aPIRequestCountList, BareMetalHost bareMetalHost, BareMetalHostList bareMetalHostList, BaseKubernetesList baseKubernetesList, Config config, ConfigList configList, CredentialsRequest credentialsRequest, CredentialsRequestList credentialsRequestList, EgressRouter egressRouter, EgressRouterList egressRouterList, Info info, NetworkAttachmentDefinition networkAttachmentDefinition, NetworkAttachmentDefinitionList networkAttachmentDefinitionList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OperatorPKI operatorPKI, OperatorPKIList operatorPKIList, Patch patch, Status status, String time, TypeMeta typeMeta) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIRequestCount aPIRequestCount, APIRequestCountList aPIRequestCountList, BareMetalHost bareMetalHost, BareMetalHostList bareMetalHostList, KubernetesList baseKubernetesList, Config config, ConfigList configList, CredentialsRequest credentialsRequest, CredentialsRequestList credentialsRequestList, EgressRouter egressRouter, EgressRouterList egressRouterList, Info info, NetworkAttachmentDefinition networkAttachmentDefinition, NetworkAttachmentDefinitionList networkAttachmentDefinitionList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OperatorPKI operatorPKI, OperatorPKIList operatorPKIList, Patch patch, Status status, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -260,12 +260,12 @@ public void setBareMetalHostList(BareMetalHostList bareMetalHostList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 82c8b068f69..a4b36f0005d 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 @@ -332,7 +332,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cjava.util.Map\u003cString, Object\u003e\u003e" @@ -3075,7 +3075,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "Config": { "$ref": "#/definitions/os_imageregistry_v1_Config", 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 ebb1666cc97..b43b5b1332b 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 @@ -332,7 +332,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cjava.util.Map\u003cString, Object\u003e\u003e" @@ -3075,7 +3075,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "Config": { "$ref": "#/definitions/os_imageregistry_v1_Config", 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 e40fb195f8b..89533771e4f 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 @@ -107,7 +107,7 @@ public class KubeSchema { @JsonProperty("AlertmanagerList") private AlertmanagerList alertmanagerList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("Info") private Info info; @JsonProperty("ObjectMeta") @@ -182,7 +182,7 @@ public KubeSchema() { * @param time * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, Alertmanager alertmanager, AlertmanagerConfig alertmanagerConfig, AlertmanagerConfigList alertmanagerConfigList, AlertmanagerList alertmanagerList, BaseKubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PodMonitor podMonitor, PodMonitorList podMonitorList, Probe probe, ProbeList probeList, Prometheus prometheus, PrometheusList prometheusList, PrometheusRule prometheusRule, PrometheusRuleList prometheusRuleList, ServiceMonitor serviceMonitor, ServiceMonitorList serviceMonitorList, Status status, ThanosRuler thanosRuler, ThanosRulerList thanosRulerList, String time, TypeMeta typeMeta) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, Alertmanager alertmanager, AlertmanagerConfig alertmanagerConfig, AlertmanagerConfigList alertmanagerConfigList, AlertmanagerList alertmanagerList, KubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PodMonitor podMonitor, PodMonitorList podMonitorList, Probe probe, ProbeList probeList, Prometheus prometheus, PrometheusList prometheusList, PrometheusRule prometheusRule, PrometheusRuleList prometheusRuleList, ServiceMonitor serviceMonitor, ServiceMonitorList serviceMonitorList, Status status, ThanosRuler thanosRuler, ThanosRulerList thanosRulerList, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -272,12 +272,12 @@ public void setAlertmanagerList(AlertmanagerList alertmanagerList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 5723ef96199..c4b72d08e8f 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 @@ -107,7 +107,7 @@ public class ValidationSchema { @JsonProperty("AlertmanagerList") private AlertmanagerList alertmanagerList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("Info") private Info info; @JsonProperty("ObjectMeta") @@ -182,7 +182,7 @@ public ValidationSchema() { * @param time * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, Alertmanager alertmanager, AlertmanagerConfig alertmanagerConfig, AlertmanagerConfigList alertmanagerConfigList, AlertmanagerList alertmanagerList, BaseKubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PodMonitor podMonitor, PodMonitorList podMonitorList, Probe probe, ProbeList probeList, Prometheus prometheus, PrometheusList prometheusList, PrometheusRule prometheusRule, PrometheusRuleList prometheusRuleList, ServiceMonitor serviceMonitor, ServiceMonitorList serviceMonitorList, Status status, ThanosRuler thanosRuler, ThanosRulerList thanosRulerList, String time, TypeMeta typeMeta) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, Alertmanager alertmanager, AlertmanagerConfig alertmanagerConfig, AlertmanagerConfigList alertmanagerConfigList, AlertmanagerList alertmanagerList, KubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PodMonitor podMonitor, PodMonitorList podMonitorList, Probe probe, ProbeList probeList, Prometheus prometheus, PrometheusList prometheusList, PrometheusRule prometheusRule, PrometheusRuleList prometheusRuleList, ServiceMonitor serviceMonitor, ServiceMonitorList serviceMonitorList, Status status, ThanosRuler thanosRuler, ThanosRulerList thanosRulerList, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -272,12 +272,12 @@ public void setAlertmanagerList(AlertmanagerList alertmanagerList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 09a7447563d..7a508daabc5 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 @@ -183,7 +183,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -6512,7 +6512,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "Info": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_version_Info", 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 7bd60fda5fd..cf4b5cf3fc6 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 @@ -183,7 +183,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -6512,7 +6512,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "Info": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_version_Info", @@ -9150,23 +9150,40 @@ }, "probe": { "properties": { - "apiVersion": { - "type": "string", - "default": "monitoring.coreos.com/v1", - "required": true + "exec": { + "$ref": "#/definitions/kubernetes_core_ExecAction", + "existingJavaType": "io.fabric8.kubernetes.api.model.ExecAction" }, - "kind": { - "type": "string", - "default": "Probe", - "required": true + "failureThreshold": { + "type": "integer" }, - "metadata": { - "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", - "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + "grpc": { + "$ref": "#/definitions/kubernetes_core_GRPCAction", + "existingJavaType": "io.fabric8.kubernetes.api.model.GRPCAction" }, - "spec": { - "$ref": "#/definitions/os_monitoring_v1_ProbeSpec", - "existingJavaType": "io.fabric8.openshift.api.model.monitoring.v1.ProbeSpec" + "httpGet": { + "$ref": "#/definitions/kubernetes_core_HTTPGetAction", + "existingJavaType": "io.fabric8.kubernetes.api.model.HTTPGetAction" + }, + "initialDelaySeconds": { + "type": "integer" + }, + "periodSeconds": { + "type": "integer" + }, + "successThreshold": { + "type": "integer" + }, + "tcpSocket": { + "$ref": "#/definitions/kubernetes_core_TCPSocketAction", + "existingJavaType": "io.fabric8.kubernetes.api.model.TCPSocketAction" + }, + "terminationGracePeriodSeconds": { + "type": "integer", + "existingJavaType": "Long" + }, + "timeoutSeconds": { + "type": "integer" } }, "additionalProperties": true 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 9eda747e269..0ab3c7d11a6 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 @@ -172,7 +172,7 @@ public class KubeSchema { @JsonProperty("AuthenticationList") private AuthenticationList authenticationList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CSISnapshotController") private CSISnapshotController cSISnapshotController; @JsonProperty("CSISnapshotControllerList") @@ -356,7 +356,7 @@ public KubeSchema() { * @param openShiftControllerManagerList * @param etcd */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, Authentication authentication, AuthenticationList authenticationList, BaseKubernetesList baseKubernetesList, CSISnapshotController cSISnapshotController, CSISnapshotControllerList cSISnapshotControllerList, CloudCredential cloudCredential, CloudCredentialList cloudCredentialList, ClusterCSIDriver clusterCSIDriver, ClusterCSIDriverList clusterCSIDriverList, Config config, ConfigList configList, ConfigMapFileReference configMapFileReference, Console console, ConsoleList consoleList, DNS dns, DNSList dNSList, DNSRecord dNSRecord, DNSRecordList dNSRecordList, Etcd etcd, EtcdList etcdList, ImageContentSourcePolicy imageContentSourcePolicy, ImageContentSourcePolicyList imageContentSourcePolicyList, ImagePruner imagePruner, ImagePrunerList imagePrunerList, Info info, IngressController ingressController, IngressControllerList ingressControllerList, KubeAPIServer kubeAPIServer, KubeAPIServerList kubeAPIServerList, KubeControllerManager kubeControllerManager, KubeControllerManagerList kubeControllerManagerList, KubeScheduler kubeScheduler, KubeSchedulerList kubeSchedulerList, KubeStorageVersionMigrator kubeStorageVersionMigrator, KubeStorageVersionMigratorList kubeStorageVersionMigratorList, Network network, NetworkList networkList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OpenShiftAPIServer openShiftAPIServer, OpenShiftAPIServerList openShiftAPIServerList, OpenShiftControllerManager openShiftContollerManager, OpenShiftControllerManagerList openShiftControllerManagerList, Patch patch, PodNetworkConnectivityCheck podNetworkConnectivityCheck, PodNetworkConnectivityCheckList podNetworkConnectivityCheckList, Quantity quantity, SecretNameReference secretNameReference, ServiceCA serviceCA, ServiceCAList serviceCAList, ServiceCatalogAPIServer serviceCatalogAPIServer, ServiceCatalogAPIServerList serviceCatalogAPIServerList, ServiceCatalogControllerManager serviceCatalogControllerManager, ServiceCatalogControllerManagerList serviceCatalogControllerManagerList, Status status, Storage storage, StorageList storageList, String time, TypeMeta typeMeta) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, Authentication authentication, AuthenticationList authenticationList, KubernetesList baseKubernetesList, CSISnapshotController cSISnapshotController, CSISnapshotControllerList cSISnapshotControllerList, CloudCredential cloudCredential, CloudCredentialList cloudCredentialList, ClusterCSIDriver clusterCSIDriver, ClusterCSIDriverList clusterCSIDriverList, Config config, ConfigList configList, ConfigMapFileReference configMapFileReference, Console console, ConsoleList consoleList, DNS dns, DNSList dNSList, DNSRecord dNSRecord, DNSRecordList dNSRecordList, Etcd etcd, EtcdList etcdList, ImageContentSourcePolicy imageContentSourcePolicy, ImageContentSourcePolicyList imageContentSourcePolicyList, ImagePruner imagePruner, ImagePrunerList imagePrunerList, Info info, IngressController ingressController, IngressControllerList ingressControllerList, KubeAPIServer kubeAPIServer, KubeAPIServerList kubeAPIServerList, KubeControllerManager kubeControllerManager, KubeControllerManagerList kubeControllerManagerList, KubeScheduler kubeScheduler, KubeSchedulerList kubeSchedulerList, KubeStorageVersionMigrator kubeStorageVersionMigrator, KubeStorageVersionMigratorList kubeStorageVersionMigratorList, Network network, NetworkList networkList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OpenShiftAPIServer openShiftAPIServer, OpenShiftAPIServerList openShiftAPIServerList, OpenShiftControllerManager openShiftContollerManager, OpenShiftControllerManagerList openShiftControllerManagerList, Patch patch, PodNetworkConnectivityCheck podNetworkConnectivityCheck, PodNetworkConnectivityCheckList podNetworkConnectivityCheckList, Quantity quantity, SecretNameReference secretNameReference, ServiceCA serviceCA, ServiceCAList serviceCAList, ServiceCatalogAPIServer serviceCatalogAPIServer, ServiceCatalogAPIServerList serviceCatalogAPIServerList, ServiceCatalogControllerManager serviceCatalogControllerManager, ServiceCatalogControllerManagerList serviceCatalogControllerManagerList, Status status, Storage storage, StorageList storageList, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -461,12 +461,12 @@ public void setAuthenticationList(AuthenticationList authenticationList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 8b7a2135403..df3bbda91f3 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 @@ -172,7 +172,7 @@ public class ValidationSchema { @JsonProperty("AuthenticationList") private AuthenticationList authenticationList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CSISnapshotController") private CSISnapshotController cSISnapshotController; @JsonProperty("CSISnapshotControllerList") @@ -356,7 +356,7 @@ public ValidationSchema() { * @param openShiftControllerManagerList * @param etcd */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, Authentication authentication, AuthenticationList authenticationList, BaseKubernetesList baseKubernetesList, CSISnapshotController cSISnapshotController, CSISnapshotControllerList cSISnapshotControllerList, CloudCredential cloudCredential, CloudCredentialList cloudCredentialList, ClusterCSIDriver clusterCSIDriver, ClusterCSIDriverList clusterCSIDriverList, Config config, ConfigList configList, ConfigMapFileReference configMapFileReference, Console console, ConsoleList consoleList, DNS dns, DNSList dNSList, DNSRecord dNSRecord, DNSRecordList dNSRecordList, Etcd etcd, EtcdList etcdList, ImageContentSourcePolicy imageContentSourcePolicy, ImageContentSourcePolicyList imageContentSourcePolicyList, ImagePruner imagePruner, ImagePrunerList imagePrunerList, Info info, IngressController ingressController, IngressControllerList ingressControllerList, KubeAPIServer kubeAPIServer, KubeAPIServerList kubeAPIServerList, KubeControllerManager kubeControllerManager, KubeControllerManagerList kubeControllerManagerList, KubeScheduler kubeScheduler, KubeSchedulerList kubeSchedulerList, KubeStorageVersionMigrator kubeStorageVersionMigrator, KubeStorageVersionMigratorList kubeStorageVersionMigratorList, Network network, NetworkList networkList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OpenShiftAPIServer openShiftAPIServer, OpenShiftAPIServerList openShiftAPIServerList, OpenShiftControllerManager openShiftContollerManager, OpenShiftControllerManagerList openShiftControllerManagerList, Patch patch, PodNetworkConnectivityCheck podNetworkConnectivityCheck, PodNetworkConnectivityCheckList podNetworkConnectivityCheckList, Quantity quantity, SecretNameReference secretNameReference, ServiceCA serviceCA, ServiceCAList serviceCAList, ServiceCatalogAPIServer serviceCatalogAPIServer, ServiceCatalogAPIServerList serviceCatalogAPIServerList, ServiceCatalogControllerManager serviceCatalogControllerManager, ServiceCatalogControllerManagerList serviceCatalogControllerManagerList, Status status, Storage storage, StorageList storageList, String time, TypeMeta typeMeta) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, Authentication authentication, AuthenticationList authenticationList, KubernetesList baseKubernetesList, CSISnapshotController cSISnapshotController, CSISnapshotControllerList cSISnapshotControllerList, CloudCredential cloudCredential, CloudCredentialList cloudCredentialList, ClusterCSIDriver clusterCSIDriver, ClusterCSIDriverList clusterCSIDriverList, Config config, ConfigList configList, ConfigMapFileReference configMapFileReference, Console console, ConsoleList consoleList, DNS dns, DNSList dNSList, DNSRecord dNSRecord, DNSRecordList dNSRecordList, Etcd etcd, EtcdList etcdList, ImageContentSourcePolicy imageContentSourcePolicy, ImageContentSourcePolicyList imageContentSourcePolicyList, ImagePruner imagePruner, ImagePrunerList imagePrunerList, Info info, IngressController ingressController, IngressControllerList ingressControllerList, KubeAPIServer kubeAPIServer, KubeAPIServerList kubeAPIServerList, KubeControllerManager kubeControllerManager, KubeControllerManagerList kubeControllerManagerList, KubeScheduler kubeScheduler, KubeSchedulerList kubeSchedulerList, KubeStorageVersionMigrator kubeStorageVersionMigrator, KubeStorageVersionMigratorList kubeStorageVersionMigratorList, Network network, NetworkList networkList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OpenShiftAPIServer openShiftAPIServer, OpenShiftAPIServerList openShiftAPIServerList, OpenShiftControllerManager openShiftContollerManager, OpenShiftControllerManagerList openShiftControllerManagerList, Patch patch, PodNetworkConnectivityCheck podNetworkConnectivityCheck, PodNetworkConnectivityCheckList podNetworkConnectivityCheckList, Quantity quantity, SecretNameReference secretNameReference, ServiceCA serviceCA, ServiceCAList serviceCAList, ServiceCatalogAPIServer serviceCatalogAPIServer, ServiceCatalogAPIServerList serviceCatalogAPIServerList, ServiceCatalogControllerManager serviceCatalogControllerManager, ServiceCatalogControllerManagerList serviceCatalogControllerManagerList, Status status, Storage storage, StorageList storageList, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -461,12 +461,12 @@ public void setAuthenticationList(AuthenticationList authenticationList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 77ec4cdf98e..153a9fd10b4 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 @@ -184,7 +184,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -5915,7 +5915,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CSISnapshotController": { "$ref": "#/definitions/os_operator_v1_CSISnapshotController", 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 a23cb29932b..a746a829254 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 @@ -184,7 +184,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -5915,7 +5915,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CSISnapshotController": { "$ref": "#/definitions/os_operator_v1_CSISnapshotController", 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 ac8d6a100b4..b347984a47d 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 @@ -106,7 +106,7 @@ public class KubeSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CatalogSource") private CatalogSource catalogSource; @JsonProperty("CatalogSourceList") @@ -201,7 +201,7 @@ public KubeSchema() { * @param operatorCondition * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CatalogSource catalogSource, CatalogSourceList catalogSourceList, ClusterServiceVersion clusterServiceVersion, ClusterServiceVersionList clusterServiceVersionList, Deployment deployment, Info info, InstallPlan installPlan, InstallPlanList installPlanList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Operator operator, OperatorCondition operatorCondition, OperatorConditionList operatorConditionList, OperatorGroup operatorGroup, OperatorGroupList operatorGroupList, OperatorList operatorList, PackageManifest packageManifest, PackageManifestList packageManifestList, Patch patch, PolicyRule policyRule, Quantity quantity, RuleWithOperations ruleWithOperations, Status status, Subscription subscription, SubscriptionList subscriptionList, String time, TypeMeta typeMeta) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CatalogSource catalogSource, CatalogSourceList catalogSourceList, ClusterServiceVersion clusterServiceVersion, ClusterServiceVersionList clusterServiceVersionList, Deployment deployment, Info info, InstallPlan installPlan, InstallPlanList installPlanList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Operator operator, OperatorCondition operatorCondition, OperatorConditionList operatorConditionList, OperatorGroup operatorGroup, OperatorGroupList operatorGroupList, OperatorList operatorList, PackageManifest packageManifest, PackageManifestList packageManifestList, Patch patch, PolicyRule policyRule, Quantity quantity, RuleWithOperations ruleWithOperations, Status status, Subscription subscription, SubscriptionList subscriptionList, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -255,12 +255,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 3ad8f10d79f..f47a4edbc1e 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 @@ -106,7 +106,7 @@ public class ValidationSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("CatalogSource") private CatalogSource catalogSource; @JsonProperty("CatalogSourceList") @@ -201,7 +201,7 @@ public ValidationSchema() { * @param operatorCondition * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, CatalogSource catalogSource, CatalogSourceList catalogSourceList, ClusterServiceVersion clusterServiceVersion, ClusterServiceVersionList clusterServiceVersionList, Deployment deployment, Info info, InstallPlan installPlan, InstallPlanList installPlanList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Operator operator, OperatorCondition operatorCondition, OperatorConditionList operatorConditionList, OperatorGroup operatorGroup, OperatorGroupList operatorGroupList, OperatorList operatorList, PackageManifest packageManifest, PackageManifestList packageManifestList, Patch patch, PolicyRule policyRule, Quantity quantity, RuleWithOperations ruleWithOperations, Status status, Subscription subscription, SubscriptionList subscriptionList, String time, TypeMeta typeMeta) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, CatalogSource catalogSource, CatalogSourceList catalogSourceList, ClusterServiceVersion clusterServiceVersion, ClusterServiceVersionList clusterServiceVersionList, Deployment deployment, Info info, InstallPlan installPlan, InstallPlanList installPlanList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Operator operator, OperatorCondition operatorCondition, OperatorConditionList operatorConditionList, OperatorGroup operatorGroup, OperatorGroupList operatorGroupList, OperatorList operatorList, PackageManifest packageManifest, PackageManifestList packageManifestList, Patch patch, PolicyRule policyRule, Quantity quantity, RuleWithOperations ruleWithOperations, Status status, Subscription subscription, SubscriptionList subscriptionList, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -255,12 +255,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 818a0584600..82c964a64f2 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 @@ -308,7 +308,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -6257,7 +6257,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CatalogSource": { "$ref": "#/definitions/os_operatorhub_v1alpha1_CatalogSource", 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 665d1496f72..3e13cf1903b 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 @@ -308,7 +308,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -6257,7 +6257,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "CatalogSource": { "$ref": "#/definitions/os_operatorhub_v1alpha1_CatalogSource", @@ -7177,13 +7177,13 @@ "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" }, - "lastUpdateTime": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" - }, "message": { "type": "string" }, + "observedGeneration": { + "type": "integer", + "existingJavaType": "Long" + }, "reason": { "type": "string" }, 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 50b1ad70e32..58986d2aa52 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 @@ -75,7 +75,7 @@ public class KubeSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("Info") private Info info; @JsonProperty("ObjectMeta") @@ -122,7 +122,7 @@ public KubeSchema() { * @param info * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, StorageState storageState, StorageStateList storageStateList, StorageVersionMigration storageVersionMigration, StorageVersionMigrationList storageVersionMigrationList, String time, TypeMeta typeMeta) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, StorageState storageState, StorageStateList storageStateList, StorageVersionMigration storageVersionMigration, StorageVersionMigrationList storageVersionMigrationList, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -160,12 +160,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 b7b1914335a..9bb9d608915 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 @@ -75,7 +75,7 @@ public class ValidationSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("Info") private Info info; @JsonProperty("ObjectMeta") @@ -122,7 +122,7 @@ public ValidationSchema() { * @param info * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, StorageState storageState, StorageStateList storageStateList, StorageVersionMigration storageVersionMigration, StorageVersionMigrationList storageVersionMigrationList, String time, TypeMeta typeMeta) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Status status, StorageState storageState, StorageStateList storageStateList, StorageVersionMigration storageVersionMigration, StorageVersionMigrationList storageVersionMigrationList, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -160,12 +160,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 77a589549c4..b00669a3e52 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 @@ -122,7 +122,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cjava.util.Map\u003cString, Object\u003e\u003e" @@ -760,7 +760,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "Info": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_version_Info", 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 8148d8f760b..ec814152af1 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 @@ -122,7 +122,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cjava.util.Map\u003cString, Object\u003e\u003e" @@ -760,7 +760,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "Info": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_version_Info", 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 ad07a7d9881..4c2996344c3 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 @@ -75,7 +75,7 @@ public class KubeSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("Info") private Info info; @JsonProperty("ObjectMeta") @@ -122,7 +122,7 @@ public KubeSchema() { * @param info * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Profile profile, ProfileList profileList, Status status, String time, Tuned tuned, TunedList tunedList, TypeMeta typeMeta) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Profile profile, ProfileList profileList, Status status, String time, Tuned tuned, TunedList tunedList, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -160,12 +160,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 a9d2f237503..411ee4387ef 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 @@ -75,7 +75,7 @@ public class ValidationSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("Info") private Info info; @JsonProperty("ObjectMeta") @@ -122,7 +122,7 @@ public ValidationSchema() { * @param info * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Profile profile, ProfileList profileList, Status status, String time, Tuned tuned, TunedList tunedList, TypeMeta typeMeta) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, Profile profile, ProfileList profileList, Status status, String time, Tuned tuned, TunedList tunedList, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -160,12 +160,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 fa6364f2999..0adcf2ea718 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 @@ -122,7 +122,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cjava.util.Map\u003cString, Object\u003e\u003e" @@ -838,7 +838,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "Info": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_version_Info", 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 bc5e69ccd5b..0d989782b46 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 @@ -122,7 +122,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cjava.util.Map\u003cString, Object\u003e\u003e" @@ -838,7 +838,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "Info": { "$ref": "#/definitions/kubernetes_apimachinery_pkg_version_Info", 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 5b5f110dc6b..3bb543006eb 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 @@ -77,7 +77,7 @@ public class KubeSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("IPAllocation") private IPAllocation iPAllocation; @JsonProperty("IPPool") @@ -127,7 +127,7 @@ public KubeSchema() { * @param info * @param status */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, IPAllocation iPAllocation, IPPool iPPool, IPPoolList iPPoolList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OverlappingRangeIPReservation overlappingRangeIPReservation, OverlappingRangeIPReservationList overlappingRangeIPReservationList, Patch patch, Status status, String time, TypeMeta typeMeta) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, IPAllocation iPAllocation, IPPool iPPool, IPPoolList iPPoolList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OverlappingRangeIPReservation overlappingRangeIPReservation, OverlappingRangeIPReservationList overlappingRangeIPReservationList, Patch patch, Status status, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -166,12 +166,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 877f5343c19..39a2f7a5e92 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 @@ -77,7 +77,7 @@ public class ValidationSchema { @JsonProperty("APIGroupList") private APIGroupList aPIGroupList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("IPAllocation") private IPAllocation iPAllocation; @JsonProperty("IPPool") @@ -127,7 +127,7 @@ public ValidationSchema() { * @param info * @param status */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, BaseKubernetesList baseKubernetesList, IPAllocation iPAllocation, IPPool iPPool, IPPoolList iPPoolList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OverlappingRangeIPReservation overlappingRangeIPReservation, OverlappingRangeIPReservationList overlappingRangeIPReservationList, Patch patch, Status status, String time, TypeMeta typeMeta) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, KubernetesList baseKubernetesList, IPAllocation iPAllocation, IPPool iPPool, IPPoolList iPPoolList, Info info, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, OverlappingRangeIPReservation overlappingRangeIPReservation, OverlappingRangeIPReservationList overlappingRangeIPReservationList, Patch patch, Status status, String time, TypeMeta typeMeta) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -166,12 +166,12 @@ public void setAPIGroupList(APIGroupList aPIGroupList) { } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 665d5453451..fddd77262ec 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 @@ -122,7 +122,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -673,7 +673,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "IPAllocation": { "$ref": "#/definitions/os_whereabouts_v1alpha1_IPAllocation", 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 f6a25a1bc88..cdc6b0280c5 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 @@ -122,7 +122,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -673,7 +673,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "IPAllocation": { "$ref": "#/definitions/os_whereabouts_v1alpha1_IPAllocation", 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 82bccf30d09..3d717102248 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 @@ -254,7 +254,7 @@ public class KubeSchema { @JsonProperty("AppliedClusterResourceQuotaList") private AppliedClusterResourceQuotaList appliedClusterResourceQuotaList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("BrokerTemplateInstance") private BrokerTemplateInstance brokerTemplateInstance; @JsonProperty("BrokerTemplateInstanceList") @@ -568,7 +568,7 @@ public KubeSchema() { * @param imageTag * @param user */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, AggregationRule aggregationRule, AppliedClusterResourceQuota appliedClusterResourceQuota, AppliedClusterResourceQuotaList appliedClusterResourceQuotaList, BaseKubernetesList baseKubernetesList, BrokerTemplateInstance brokerTemplateInstance, BrokerTemplateInstanceList brokerTemplateInstanceList, BuildConfigList buildConfigList, BuildList buildList, BuildRequest buildRequest, ClusterNetwork clusterNetwork, ClusterNetworkList clusterNetworkList, ClusterResourceQuota clusterResourceQuota, ClusterResourceQuotaList clusterResourceQuotaList, Config config, CreateOptions createOptions, DeleteOptions deleteOptions, DeploymentConfig deploymentConfig, DeploymentConfigList deploymentConfigList, EgressNetworkPolicy egressNetworkPolicy, EgressNetworkPolicyList egressNetworkPolicyList, GetOptions getOptions, Group group, GroupList groupList, HelmChartRepository helmChartRepository, HelmChartRepositoryList helmChartRepositoryList, HostSubnet hostSubnet, HostSubnetList hostSubnetList, Identity identity, IdentityList identityList, ImageList imageList, ImageSignature imageSignature, ImageStreamImage imageStreamImage, ImageStreamImport imageStreamImport, ImageStreamList imageStreamList, ImageStreamMapping imageStreamMapping, ImageStreamTagList imageStreamTagList, ImageTag imageTag, ImageTagList imageTagList, Info info, ListOptions listOptions, LocalResourceAccessReview localResourceAccessReview, LocalSubjectAccessReview localSubjectAccessReview, NetNamespace netNamespace, NetNamespaceList netNamespaceList, OAuthAccessToken oAuthAccessToken, OAuthAccessTokenList oAuthAccessTokenList, OAuthAuthorizeToken oAuthAuthorizeToken, OAuthAuthorizeTokenList oAuthAuthorizeTokenList, OAuthClient oAuthClient, OAuthClientAuthorization oAuthClientAuthorization, OAuthClientAuthorizationList oAuthClientAuthorizationList, OAuthClientList oAuthClientList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, RoleBindingRestrictionList openShiftRoleBindingRestrictionList, ClusterRole openshiftClusterRole, ClusterRoleBinding openshiftClusterRoleBinding, ClusterRoleBindingList openshiftClusterRoleBindingList, ClusterRoleList openshiftClusterRoleList, ClusterRoleScopeRestriction openshiftClusterRoleScopeRestriction, Role openshiftRole, RoleBinding openshiftRoleBinding, RoleBindingList openshiftRoleBindingList, RoleBindingRestriction openshiftRoleBindingRestriction, RoleBindingRestrictionSpec openshiftRoleBindingRestrictionSpec, RoleList openshiftRoleList, Patch patch, PatchOptions patchOptions, PodSecurityPolicyReview podSecurityPolicyReview, PodSecurityPolicySelfSubjectReview podSecurityPolicySelfSubjectReview, PodSecurityPolicySubjectReview podSecurityPolicySubjectReview, Project project, ProjectList projectList, ProjectRequest projectRequest, Quantity quantity, RangeAllocation rangeAllocation, RangeAllocationList rangeAllocationList, ResourceAccessReview resourceAccessReview, ResourceAccessReviewResponse resourceAccessReviewResponse, RootPaths rootPaths, Route route, RouteList routeList, SecurityContextConstraints securityContextConstraints, SecurityContextConstraintsList securityContextConstraintsList, SelfSubjectRulesReview selfSubjectRulesReview, Status status, SubjectAccessReview subjectAccessReview, SubjectAccessReviewResponse subjectAccessReviewResponse, SubjectRulesReview subjectRulesReview, TagEvent tagEvent, Template template, TemplateInstance templateInstance, TemplateInstanceList templateInstanceList, TemplateList templateList, String time, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, User user, UserIdentityMapping userIdentityMapping, UserList userList, UserOAuthAccessToken userOAuthAccessToken, UserOAuthAccessTokenList userOAuthAccessTokenList) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, AggregationRule aggregationRule, AppliedClusterResourceQuota appliedClusterResourceQuota, AppliedClusterResourceQuotaList appliedClusterResourceQuotaList, KubernetesList baseKubernetesList, BrokerTemplateInstance brokerTemplateInstance, BrokerTemplateInstanceList brokerTemplateInstanceList, BuildConfigList buildConfigList, BuildList buildList, BuildRequest buildRequest, ClusterNetwork clusterNetwork, ClusterNetworkList clusterNetworkList, ClusterResourceQuota clusterResourceQuota, ClusterResourceQuotaList clusterResourceQuotaList, Config config, CreateOptions createOptions, DeleteOptions deleteOptions, DeploymentConfig deploymentConfig, DeploymentConfigList deploymentConfigList, EgressNetworkPolicy egressNetworkPolicy, EgressNetworkPolicyList egressNetworkPolicyList, GetOptions getOptions, Group group, GroupList groupList, HelmChartRepository helmChartRepository, HelmChartRepositoryList helmChartRepositoryList, HostSubnet hostSubnet, HostSubnetList hostSubnetList, Identity identity, IdentityList identityList, ImageList imageList, ImageSignature imageSignature, ImageStreamImage imageStreamImage, ImageStreamImport imageStreamImport, ImageStreamList imageStreamList, ImageStreamMapping imageStreamMapping, ImageStreamTagList imageStreamTagList, ImageTag imageTag, ImageTagList imageTagList, Info info, ListOptions listOptions, LocalResourceAccessReview localResourceAccessReview, LocalSubjectAccessReview localSubjectAccessReview, NetNamespace netNamespace, NetNamespaceList netNamespaceList, OAuthAccessToken oAuthAccessToken, OAuthAccessTokenList oAuthAccessTokenList, OAuthAuthorizeToken oAuthAuthorizeToken, OAuthAuthorizeTokenList oAuthAuthorizeTokenList, OAuthClient oAuthClient, OAuthClientAuthorization oAuthClientAuthorization, OAuthClientAuthorizationList oAuthClientAuthorizationList, OAuthClientList oAuthClientList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, RoleBindingRestrictionList openShiftRoleBindingRestrictionList, ClusterRole openshiftClusterRole, ClusterRoleBinding openshiftClusterRoleBinding, ClusterRoleBindingList openshiftClusterRoleBindingList, ClusterRoleList openshiftClusterRoleList, ClusterRoleScopeRestriction openshiftClusterRoleScopeRestriction, Role openshiftRole, RoleBinding openshiftRoleBinding, RoleBindingList openshiftRoleBindingList, RoleBindingRestriction openshiftRoleBindingRestriction, RoleBindingRestrictionSpec openshiftRoleBindingRestrictionSpec, RoleList openshiftRoleList, Patch patch, PatchOptions patchOptions, PodSecurityPolicyReview podSecurityPolicyReview, PodSecurityPolicySelfSubjectReview podSecurityPolicySelfSubjectReview, PodSecurityPolicySubjectReview podSecurityPolicySubjectReview, Project project, ProjectList projectList, ProjectRequest projectRequest, Quantity quantity, RangeAllocation rangeAllocation, RangeAllocationList rangeAllocationList, ResourceAccessReview resourceAccessReview, ResourceAccessReviewResponse resourceAccessReviewResponse, RootPaths rootPaths, Route route, RouteList routeList, SecurityContextConstraints securityContextConstraints, SecurityContextConstraintsList securityContextConstraintsList, SelfSubjectRulesReview selfSubjectRulesReview, Status status, SubjectAccessReview subjectAccessReview, SubjectAccessReviewResponse subjectAccessReviewResponse, SubjectRulesReview subjectRulesReview, TagEvent tagEvent, Template template, TemplateInstance templateInstance, TemplateInstanceList templateInstanceList, TemplateList templateList, String time, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, User user, UserIdentityMapping userIdentityMapping, UserList userList, UserOAuthAccessToken userOAuthAccessToken, UserOAuthAccessTokenList userOAuthAccessTokenList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -727,12 +727,12 @@ public void setAppliedClusterResourceQuotaList(AppliedClusterResourceQuotaList a } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 59a8e96ed36..321962a1795 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 @@ -254,7 +254,7 @@ public class ValidationSchema { @JsonProperty("AppliedClusterResourceQuotaList") private AppliedClusterResourceQuotaList appliedClusterResourceQuotaList; @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; + private KubernetesList baseKubernetesList; @JsonProperty("BrokerTemplateInstance") private BrokerTemplateInstance brokerTemplateInstance; @JsonProperty("BrokerTemplateInstanceList") @@ -568,7 +568,7 @@ public ValidationSchema() { * @param imageTag * @param user */ - public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, AggregationRule aggregationRule, AppliedClusterResourceQuota appliedClusterResourceQuota, AppliedClusterResourceQuotaList appliedClusterResourceQuotaList, BaseKubernetesList baseKubernetesList, BrokerTemplateInstance brokerTemplateInstance, BrokerTemplateInstanceList brokerTemplateInstanceList, BuildConfigList buildConfigList, BuildList buildList, BuildRequest buildRequest, ClusterNetwork clusterNetwork, ClusterNetworkList clusterNetworkList, ClusterResourceQuota clusterResourceQuota, ClusterResourceQuotaList clusterResourceQuotaList, Config config, CreateOptions createOptions, DeleteOptions deleteOptions, DeploymentConfig deploymentConfig, DeploymentConfigList deploymentConfigList, EgressNetworkPolicy egressNetworkPolicy, EgressNetworkPolicyList egressNetworkPolicyList, GetOptions getOptions, Group group, GroupList groupList, HelmChartRepository helmChartRepository, HelmChartRepositoryList helmChartRepositoryList, HostSubnet hostSubnet, HostSubnetList hostSubnetList, Identity identity, IdentityList identityList, ImageList imageList, ImageSignature imageSignature, ImageStreamImage imageStreamImage, ImageStreamImport imageStreamImport, ImageStreamList imageStreamList, ImageStreamMapping imageStreamMapping, ImageStreamTagList imageStreamTagList, ImageTag imageTag, ImageTagList imageTagList, Info info, ListOptions listOptions, LocalResourceAccessReview localResourceAccessReview, LocalSubjectAccessReview localSubjectAccessReview, NetNamespace netNamespace, NetNamespaceList netNamespaceList, OAuthAccessToken oAuthAccessToken, OAuthAccessTokenList oAuthAccessTokenList, OAuthAuthorizeToken oAuthAuthorizeToken, OAuthAuthorizeTokenList oAuthAuthorizeTokenList, OAuthClient oAuthClient, OAuthClientAuthorization oAuthClientAuthorization, OAuthClientAuthorizationList oAuthClientAuthorizationList, OAuthClientList oAuthClientList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, RoleBindingRestrictionList openShiftRoleBindingRestrictionList, ClusterRole openshiftClusterRole, ClusterRoleBinding openshiftClusterRoleBinding, ClusterRoleBindingList openshiftClusterRoleBindingList, ClusterRoleList openshiftClusterRoleList, ClusterRoleScopeRestriction openshiftClusterRoleScopeRestriction, Role openshiftRole, RoleBinding openshiftRoleBinding, RoleBindingList openshiftRoleBindingList, RoleBindingRestriction openshiftRoleBindingRestriction, RoleBindingRestrictionSpec openshiftRoleBindingRestrictionSpec, RoleList openshiftRoleList, Patch patch, PatchOptions patchOptions, PodSecurityPolicyReview podSecurityPolicyReview, PodSecurityPolicySelfSubjectReview podSecurityPolicySelfSubjectReview, PodSecurityPolicySubjectReview podSecurityPolicySubjectReview, Project project, ProjectList projectList, ProjectRequest projectRequest, Quantity quantity, RangeAllocation rangeAllocation, RangeAllocationList rangeAllocationList, ResourceAccessReview resourceAccessReview, ResourceAccessReviewResponse resourceAccessReviewResponse, RootPaths rootPaths, Route route, RouteList routeList, SecurityContextConstraints securityContextConstraints, SecurityContextConstraintsList securityContextConstraintsList, SelfSubjectRulesReview selfSubjectRulesReview, Status status, SubjectAccessReview subjectAccessReview, SubjectAccessReviewResponse subjectAccessReviewResponse, SubjectRulesReview subjectRulesReview, TagEvent tagEvent, Template template, TemplateInstance templateInstance, TemplateInstanceList templateInstanceList, TemplateList templateList, String time, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, User user, UserIdentityMapping userIdentityMapping, UserList userList, UserOAuthAccessToken userOAuthAccessToken, UserOAuthAccessTokenList userOAuthAccessTokenList) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, AggregationRule aggregationRule, AppliedClusterResourceQuota appliedClusterResourceQuota, AppliedClusterResourceQuotaList appliedClusterResourceQuotaList, KubernetesList baseKubernetesList, BrokerTemplateInstance brokerTemplateInstance, BrokerTemplateInstanceList brokerTemplateInstanceList, BuildConfigList buildConfigList, BuildList buildList, BuildRequest buildRequest, ClusterNetwork clusterNetwork, ClusterNetworkList clusterNetworkList, ClusterResourceQuota clusterResourceQuota, ClusterResourceQuotaList clusterResourceQuotaList, Config config, CreateOptions createOptions, DeleteOptions deleteOptions, DeploymentConfig deploymentConfig, DeploymentConfigList deploymentConfigList, EgressNetworkPolicy egressNetworkPolicy, EgressNetworkPolicyList egressNetworkPolicyList, GetOptions getOptions, Group group, GroupList groupList, HelmChartRepository helmChartRepository, HelmChartRepositoryList helmChartRepositoryList, HostSubnet hostSubnet, HostSubnetList hostSubnetList, Identity identity, IdentityList identityList, ImageList imageList, ImageSignature imageSignature, ImageStreamImage imageStreamImage, ImageStreamImport imageStreamImport, ImageStreamList imageStreamList, ImageStreamMapping imageStreamMapping, ImageStreamTagList imageStreamTagList, ImageTag imageTag, ImageTagList imageTagList, Info info, ListOptions listOptions, LocalResourceAccessReview localResourceAccessReview, LocalSubjectAccessReview localSubjectAccessReview, NetNamespace netNamespace, NetNamespaceList netNamespaceList, OAuthAccessToken oAuthAccessToken, OAuthAccessTokenList oAuthAccessTokenList, OAuthAuthorizeToken oAuthAuthorizeToken, OAuthAuthorizeTokenList oAuthAuthorizeTokenList, OAuthClient oAuthClient, OAuthClientAuthorization oAuthClientAuthorization, OAuthClientAuthorizationList oAuthClientAuthorizationList, OAuthClientList oAuthClientList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, RoleBindingRestrictionList openShiftRoleBindingRestrictionList, ClusterRole openshiftClusterRole, ClusterRoleBinding openshiftClusterRoleBinding, ClusterRoleBindingList openshiftClusterRoleBindingList, ClusterRoleList openshiftClusterRoleList, ClusterRoleScopeRestriction openshiftClusterRoleScopeRestriction, Role openshiftRole, RoleBinding openshiftRoleBinding, RoleBindingList openshiftRoleBindingList, RoleBindingRestriction openshiftRoleBindingRestriction, RoleBindingRestrictionSpec openshiftRoleBindingRestrictionSpec, RoleList openshiftRoleList, Patch patch, PatchOptions patchOptions, PodSecurityPolicyReview podSecurityPolicyReview, PodSecurityPolicySelfSubjectReview podSecurityPolicySelfSubjectReview, PodSecurityPolicySubjectReview podSecurityPolicySubjectReview, Project project, ProjectList projectList, ProjectRequest projectRequest, Quantity quantity, RangeAllocation rangeAllocation, RangeAllocationList rangeAllocationList, ResourceAccessReview resourceAccessReview, ResourceAccessReviewResponse resourceAccessReviewResponse, RootPaths rootPaths, Route route, RouteList routeList, SecurityContextConstraints securityContextConstraints, SecurityContextConstraintsList securityContextConstraintsList, SelfSubjectRulesReview selfSubjectRulesReview, Status status, SubjectAccessReview subjectAccessReview, SubjectAccessReviewResponse subjectAccessReviewResponse, SubjectRulesReview subjectRulesReview, TagEvent tagEvent, Template template, TemplateInstance templateInstance, TemplateInstanceList templateInstanceList, TemplateList templateList, String time, TokenReview tokenReview, TypeMeta typeMeta, UpdateOptions updateOptions, User user, UserIdentityMapping userIdentityMapping, UserList userList, UserOAuthAccessToken userOAuthAccessToken, UserOAuthAccessTokenList userOAuthAccessTokenList) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -727,12 +727,12 @@ public void setAppliedClusterResourceQuotaList(AppliedClusterResourceQuotaList a } @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { + public KubernetesList getBaseKubernetesList() { return baseKubernetesList; } @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { + public void setBaseKubernetesList(KubernetesList baseKubernetesList) { this.baseKubernetesList = baseKubernetesList; } 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 1517b2bcada..087cbbc1373 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 @@ -297,7 +297,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -10907,7 +10907,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "BrokerTemplateInstance": { "$ref": "#/definitions/os_template_BrokerTemplateInstance", 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 e33ffbd2f0c..4e1075da28a 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 @@ -297,7 +297,7 @@ } }, "additionalProperties": true, - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.KubernetesResource\u003e" @@ -10907,7 +10907,7 @@ }, "BaseKubernetesList": { "$ref": "#/definitions/kubernetes_apimachinery_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" }, "BrokerTemplateInstance": { "$ref": "#/definitions/os_template_BrokerTemplateInstance",