From 999a851c04c34456ec03278cf9af70841e26a932 Mon Sep 17 00:00:00 2001 From: Sun Seng David TAN Date: Fri, 22 Sep 2023 17:59:32 +0200 Subject: [PATCH] fixup! chore (kubernetes-model-generator) : Update Kubernetes Model to v1.28.2 --- .../v1beta1/ValidatingAdmissionPolicy.java | 3 +- .../ValidatingAdmissionPolicyBinding.java | 3 +- .../main/resources/schema/kube-schema.json | 6 +- .../resources/schema/validation-schema.json | 155 ++++++++------- .../resources/schema/validation-schema.json | 107 +++++------ .../resources/schema/validation-schema.json | 181 +++++++++--------- .../resources/schema/validation-schema.json | 16 +- .../resources/schema/validation-schema.json | 16 +- .../resources/schema/validation-schema.json | 6 +- .../resources/schema/validation-schema.json | 76 ++++---- .../resources/schema/validation-schema.json | 6 +- .../resources/schema/validation-schema.json | 41 ++-- .../resources/schema/validation-schema.json | 21 +- .../resources/schema/validation-schema.json | 6 +- .../resources/schema/validation-schema.json | 8 +- .../resources/schema/validation-schema.json | 14 +- .../resources/schema/validation-schema.json | 31 +-- .../resources/schema/validation-schema.json | 134 +++++++------ .../resources/schema/validation-schema.json | 40 ---- .../pkg/schemagen/generate.go | 4 +- 20 files changed, 419 insertions(+), 455 deletions(-) diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicy.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicy.java index 43ca9aa25e0..6c1e82ff56f 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicy.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicy.java @@ -17,7 +17,6 @@ import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.Namespaced; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -66,7 +65,7 @@ @Version("v1beta1") @Group("admissionregistration.k8s.io") @Generated("jsonschema2pojo") -public class ValidatingAdmissionPolicy implements Editable , HasMetadata, Namespaced +public class ValidatingAdmissionPolicy implements Editable , HasMetadata { /** diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyBinding.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyBinding.java index d6761b7b021..94a67bde719 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyBinding.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingAdmissionPolicyBinding.java @@ -17,7 +17,6 @@ import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.LocalObjectReference; -import io.fabric8.kubernetes.api.model.Namespaced; import io.fabric8.kubernetes.api.model.ObjectReference; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -65,7 +64,7 @@ @Version("v1beta1") @Group("admissionregistration.k8s.io") @Generated("jsonschema2pojo") -public class ValidatingAdmissionPolicyBinding implements Editable , HasMetadata, Namespaced +public class ValidatingAdmissionPolicyBinding implements Editable , HasMetadata { /** 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 846cbfeed89..76c9dc48d63 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 @@ -1488,8 +1488,7 @@ "additionalProperties": true, "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy", "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.HasMetadata", - "io.fabric8.kubernetes.api.model.Namespaced" + "io.fabric8.kubernetes.api.model.HasMetadata" ] }, "kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBinding": { @@ -1517,8 +1516,7 @@ "additionalProperties": true, "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding", "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.HasMetadata", - "io.fabric8.kubernetes.api.model.Namespaced" + "io.fabric8.kubernetes.api.model.HasMetadata" ] }, "kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBindingList": { 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 d050e84e8e9..83ad4fd0e9e 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 @@ -1488,8 +1488,7 @@ "additionalProperties": true, "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicy", "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.HasMetadata", - "io.fabric8.kubernetes.api.model.Namespaced" + "io.fabric8.kubernetes.api.model.HasMetadata" ] }, "kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBinding": { @@ -1517,8 +1516,7 @@ "additionalProperties": true, "javaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding", "javaInterfaces": [ - "io.fabric8.kubernetes.api.model.HasMetadata", - "io.fabric8.kubernetes.api.model.Namespaced" + "io.fabric8.kubernetes.api.model.HasMetadata" ] }, "kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBindingList": { @@ -4124,7 +4122,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admission.k8s.io/v1beta1", + "default": "admission.k8s.io/v1", "required": true }, "kind": { @@ -4133,12 +4131,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 @@ -4555,7 +4553,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1beta1", + "default": "authorization.k8s.io/v1", "required": true }, "kind": { @@ -4568,12 +4566,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewSpec" + "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewSpec" }, "status": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewStatus" + "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewStatus" } }, "additionalProperties": true @@ -4653,13 +4651,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" @@ -4668,8 +4667,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_MatchCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MatchCondition" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchCondition" } }, "matchPolicy": { @@ -4710,7 +4709,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1", + "default": "admissionregistration.k8s.io/v1beta1", "required": true }, "kind": { @@ -4726,8 +4725,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" } } }, @@ -4737,14 +4736,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1beta1", + "default": "admissionregistration.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MutatingWebhookConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfiguration" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_MutatingWebhookConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhookConfiguration" } }, "kind": { @@ -5155,7 +5154,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1", + "default": "authorization.k8s.io/v1beta1", "required": true }, "kind": { @@ -5168,12 +5167,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_authorization_v1_SelfSubjectAccessReviewSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReviewSpec" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_SelfSubjectAccessReviewSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReviewSpec" }, "status": { - "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewStatus" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewStatus" } }, "additionalProperties": true @@ -5195,7 +5194,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authentication.k8s.io/v1beta1", + "default": "authentication.k8s.io/v1alpha1", "required": true }, "kind": { @@ -5208,8 +5207,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "status": { - "$ref": "#/definitions/kubernetes_authentication_v1beta1_SelfSubjectReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.v1beta1.SelfSubjectReviewStatus" + "$ref": "#/definitions/kubernetes_authentication_v1alpha1_SelfSubjectReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authentication.v1alpha1.SelfSubjectReviewStatus" } }, "additionalProperties": true @@ -5227,7 +5226,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1beta1", + "default": "authorization.k8s.io/v1", "required": true }, "kind": { @@ -5240,12 +5239,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SelfSubjectRulesReviewSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReviewSpec" + "$ref": "#/definitions/kubernetes_authorization_v1_SelfSubjectRulesReviewSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReviewSpec" }, "status": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectRulesReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectRulesReviewStatus" + "$ref": "#/definitions/kubernetes_authorization_v1_SubjectRulesReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectRulesReviewStatus" } }, "additionalProperties": true @@ -5402,7 +5401,7 @@ }, "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" }, - "groups": { + "group": { "type": "array", "javaOmitEmpty": true, "items": { @@ -5410,12 +5409,12 @@ } }, "nonResourceAttributes": { - "$ref": "#/definitions/kubernetes_authorization_v1_NonResourceAttributes", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.NonResourceAttributes" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_NonResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.NonResourceAttributes" }, "resourceAttributes": { - "$ref": "#/definitions/kubernetes_authorization_v1_ResourceAttributes", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_ResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.ResourceAttributes" }, "uid": { "type": "string" @@ -5454,15 +5453,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" } } }, @@ -5604,8 +5603,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ExpressionWarning", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ExpressionWarning" + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ExpressionWarning", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ExpressionWarning" } } }, @@ -5682,7 +5681,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1alpha1", + "default": "admissionregistration.k8s.io/v1beta1", "required": true }, "kind": { @@ -5695,12 +5694,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicySpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicySpec" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicySpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicySpec" }, "status": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicyStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyStatus" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyStatus" } }, "additionalProperties": true @@ -5732,15 +5731,15 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1alpha1", + "default": "admissionregistration.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ValidatingAdmissionPolicyBinding", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ValidatingAdmissionPolicyBinding" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingAdmissionPolicyBinding", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingAdmissionPolicyBinding" } }, "kind": { @@ -5811,8 +5810,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_AuditAnnotation", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.AuditAnnotation" + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_AuditAnnotation", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.AuditAnnotation" } }, "failurePolicy": { @@ -5822,31 +5821,31 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchCondition" + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_MatchCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.MatchCondition" } }, "matchConstraints": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MatchResources", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MatchResources" + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_MatchResources", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.MatchResources" }, "paramKind": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ParamKind", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ParamKind" + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_ParamKind", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.ParamKind" }, "validations": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_Validation", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.Validation" + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_Validation", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.Validation" } }, "variables": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_Variable", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.Variable" + "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_Variable", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.Variable" } } }, @@ -5867,8 +5866,8 @@ "existingJavaType": "Long" }, "typeChecking": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1alpha1_TypeChecking", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1alpha1.TypeChecking" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_TypeChecking", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.TypeChecking" } }, "additionalProperties": true @@ -5931,7 +5930,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1beta1", + "default": "admissionregistration.k8s.io/v1", "required": true }, "kind": { @@ -5947,8 +5946,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingWebhook", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhook" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_ValidatingWebhook", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhook" } } }, @@ -5958,14 +5957,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1beta1", + "default": "admissionregistration.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingWebhookConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhookConfiguration" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_ValidatingWebhookConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhookConfiguration" } }, "kind": { @@ -6014,8 +6013,8 @@ "type": "string" }, "service": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_ServiceReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ServiceReference" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ServiceReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ServiceReference" }, "url": { "type": "string" diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json index f3066600a47..782a05ed548 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 @@ -2578,13 +2578,13 @@ }, "customresourcecolumndefinition": { "properties": { - "description": { + "JSONPath": { "type": "string" }, - "format": { + "description": { "type": "string" }, - "jsonPath": { + "format": { "type": "string" }, "name": { @@ -2601,19 +2601,12 @@ }, "customresourceconversion": { "properties": { - "conversionReviewVersions": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } - }, "strategy": { "type": "string" }, - "webhookClientConfig": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_WebhookClientConfig", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.WebhookClientConfig" + "webhook": { + "$ref": "#/definitions/kubernetes_apiextensions_v1_WebhookConversion", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.WebhookConversion" } }, "additionalProperties": true @@ -2670,14 +2663,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": { @@ -2813,12 +2806,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 @@ -2843,8 +2836,8 @@ "customresourcevalidation": { "properties": { "openAPIV3Schema": { - "$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 @@ -2972,48 +2965,48 @@ "type": "string" }, "additionalItems": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrBool", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrBool" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrBool", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrBool" }, "additionalProperties": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrBool", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrBool" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrBool", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrBool" }, "allOf": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" } }, "anyOf": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" } }, "default": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSON", + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSON", "existingJavaType": "com.fasterxml.jackson.databind.JsonNode" }, "definitions": { "type": "object", "additionalProperties": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" }, "dependencies": { "type": "object", "additionalProperties": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrStringArray", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrStringArray", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray\u003e" + "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray\u003e" }, "description": { "type": "string" @@ -3022,12 +3015,12 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSON", + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSON", "existingJavaType": "com.fasterxml.jackson.databind.JsonNode" } }, "example": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSON", + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSON", "existingJavaType": "com.fasterxml.jackson.databind.JsonNode" }, "exclusiveMaximum": { @@ -3037,8 +3030,8 @@ "type": "boolean" }, "externalDocs": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_ExternalDocumentation", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.ExternalDocumentation" + "$ref": "#/definitions/kubernetes_apiextensions_v1_ExternalDocumentation", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.ExternalDocumentation" }, "format": { "type": "string" @@ -3047,8 +3040,8 @@ "type": "string" }, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrArray", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrArray" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrArray", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrArray" }, "maxItems": { "type": "integer", @@ -3084,8 +3077,8 @@ "type": "number" }, "not": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" }, "nullable": { "type": "boolean" @@ -3094,8 +3087,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" } }, "pattern": { @@ -3104,18 +3097,18 @@ "patternProperties": { "type": "object", "additionalProperties": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" }, "properties": { "type": "object", "additionalProperties": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" }, "required": { "type": "array", @@ -3159,8 +3152,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_ValidationRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.ValidationRule" + "$ref": "#/definitions/kubernetes_apiextensions_v1_ValidationRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.ValidationRule" } } }, @@ -3700,8 +3693,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-autoscaling/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-autoscaling/src/main/resources/schema/validation-schema.json index 9acaaab38c4..014ce16726d 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 @@ -2766,9 +2766,12 @@ "name": { "type": "string" }, - "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricTarget", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricTarget" + "targetAverageUtilization": { + "type": "integer" + }, + "targetAverageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" } }, "additionalProperties": true @@ -2778,12 +2781,9 @@ "container": { "type": "string" }, - "currentAverageUtilization": { - "type": "integer" - }, - "currentAverageValue": { - "$ref": "#/definitions/kubernetes_resource_Quantity", - "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + "current": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricValueStatus" }, "name": { "type": "string" @@ -2871,20 +2871,13 @@ }, "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 @@ -2892,12 +2885,12 @@ "externalmetricstatus": { "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 @@ -2938,7 +2931,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "autoscaling/v2beta2", + "default": "autoscaling/v1", "required": true }, "kind": { @@ -2951,12 +2944,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HorizontalPodAutoscalerSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerSpec" + "$ref": "#/definitions/kubernetes_autoscaling_v1_HorizontalPodAutoscalerSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerSpec" }, "status": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HorizontalPodAutoscalerStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v1_HorizontalPodAutoscalerStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscalerStatus" } }, "additionalProperties": true @@ -2964,12 +2957,12 @@ "horizontalpodautoscalerbehavior": { "properties": { "scaleDown": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingRules", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingRules" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HPAScalingRules", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HPAScalingRules" }, "scaleUp": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingRules", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingRules" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HPAScalingRules", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HPAScalingRules" } }, "additionalProperties": true @@ -2999,14 +2992,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "autoscaling/v2", + "default": "autoscaling/v2beta2", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscaler", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscaler" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HorizontalPodAutoscaler", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscaler" } }, "kind": { @@ -3023,10 +3016,6 @@ }, "horizontalpodautoscalerspec": { "properties": { - "behavior": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscalerBehavior", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerBehavior" - }, "maxReplicas": { "type": "integer" }, @@ -3034,16 +3023,16 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricSpec" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_MetricSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.MetricSpec" } }, "minReplicas": { "type": "integer" }, "scaleTargetRef": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_CrossVersionObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.CrossVersionObjectReference" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.CrossVersionObjectReference" } }, "additionalProperties": true @@ -3101,8 +3090,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HPAScalingPolicy", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HPAScalingPolicy" + "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingPolicy", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingPolicy" } }, "selectPolicy": { @@ -3318,24 +3307,24 @@ "metricspec": { "properties": { "containerResource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ContainerResourceMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ContainerResourceMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2_ContainerResourceMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ContainerResourceMetricSource" }, "external": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ExternalMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ExternalMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2_ExternalMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ExternalMetricSource" }, "object": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ObjectMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ObjectMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2_ObjectMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ObjectMetricSource" }, "pods": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_PodsMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.PodsMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2_PodsMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.PodsMetricSource" }, "resource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ResourceMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ResourceMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2_ResourceMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ResourceMetricSource" }, "type": { "type": "string" @@ -3346,24 +3335,24 @@ "metricstatus": { "properties": { "containerResource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ContainerResourceMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ContainerResourceMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ContainerResourceMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ContainerResourceMetricStatus" }, "external": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ExternalMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ExternalMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ExternalMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ExternalMetricStatus" }, "object": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ObjectMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ObjectMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ObjectMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ObjectMetricStatus" }, "pods": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_PodsMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.PodsMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_PodsMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.PodsMetricStatus" }, "resource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ResourceMetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ResourceMetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ResourceMetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ResourceMetricStatus" }, "type": { "type": "string" @@ -3487,33 +3476,40 @@ "objectmetricsource": { "properties": { "describedObject": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_CrossVersionObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.CrossVersionObjectReference" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.CrossVersionObjectReference" }, "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" }, "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 }, "objectmetricstatus": { "properties": { - "current": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricValueStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricValueStatus" + "averageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "describedObject": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_CrossVersionObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.CrossVersionObjectReference" + "currentValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "metric": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricIdentifier", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricIdentifier" + "metricName": { + "type": "string" + }, + "selector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + }, + "target": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.CrossVersionObjectReference" } }, "additionalProperties": true @@ -3593,13 +3589,16 @@ }, "podsmetricstatus": { "properties": { - "current": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricValueStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricValueStatus" + "currentAverageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "metric": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricIdentifier", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricIdentifier" + "metricName": { + "type": "string" + }, + "selector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" } }, "additionalProperties": true @@ -3632,8 +3631,8 @@ "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 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 7d6c46269e0..1a9da26e27e 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 @@ -1337,7 +1337,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "certificates.k8s.io/v1beta1", + "default": "certificates.k8s.io/v1", "required": true }, "kind": { @@ -1350,12 +1350,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_certificates_v1beta1_CertificateSigningRequestSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestSpec" + "$ref": "#/definitions/kubernetes_certificates_v1_CertificateSigningRequestSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestSpec" }, "status": { - "$ref": "#/definitions/kubernetes_certificates_v1beta1_CertificateSigningRequestStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatus" + "$ref": "#/definitions/kubernetes_certificates_v1_CertificateSigningRequestStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestStatus" } }, "additionalProperties": true @@ -1389,14 +1389,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "certificates.k8s.io/v1", + "default": "certificates.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_certificates_v1_CertificateSigningRequest", - "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequest" + "$ref": "#/definitions/kubernetes_certificates_v1beta1_CertificateSigningRequest", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest" } }, "kind": { 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 22f86fa9989..4475268973d 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 @@ -1473,14 +1473,14 @@ }, "apiVersion": { "type": "string", - "default": "discovery.k8s.io/v1beta1", + "default": "discovery.k8s.io/v1", "required": true }, "endpoints": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_discovery_v1beta1_Endpoint", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.Endpoint" + "$ref": "#/definitions/kubernetes_discovery_v1_Endpoint", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.Endpoint" } }, "kind": { @@ -1495,8 +1495,8 @@ "ports": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_discovery_v1beta1_EndpointPort", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointPort" + "$ref": "#/definitions/kubernetes_discovery_v1_EndpointPort", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointPort" } } }, @@ -1506,14 +1506,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "discovery.k8s.io/v1", + "default": "discovery.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_discovery_v1_EndpointSlice", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice" + "$ref": "#/definitions/kubernetes_discovery_v1beta1_EndpointSlice", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice" } }, "kind": { 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 0f8c704fbb8..ae3eed97814 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 @@ -1351,14 +1351,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "events.k8s.io/v1beta1", + "default": "events.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_events_v1beta1_Event", - "existingJavaType": "io.fabric8.kubernetes.api.model.events.v1beta1.Event" + "$ref": "#/definitions/kubernetes_events_v1_Event", + "existingJavaType": "io.fabric8.kubernetes.api.model.events.v1.Event" } }, "kind": { 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 1d40ac13909..477ef19465d 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 @@ -2578,7 +2578,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1alpha1", + "default": "flowcontrol.apiserver.k8s.io/v1beta3", "required": true }, "kind": { @@ -2591,12 +2591,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_FlowSchemaSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchemaSpec" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_FlowSchemaSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaSpec" }, "status": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_FlowSchemaStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchemaStatus" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_FlowSchemaStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaStatus" } }, "additionalProperties": true @@ -2626,14 +2626,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1alpha1", + "default": "flowcontrol.apiserver.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_FlowSchema", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchema" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowSchema", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchema" } }, "kind": { @@ -2651,22 +2651,22 @@ "flowschemaspec": { "properties": { "distinguisherMethod": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowDistinguisherMethod", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowDistinguisherMethod" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_FlowDistinguisherMethod", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowDistinguisherMethod" }, "matchingPrecedence": { "type": "integer" }, "priorityLevelConfiguration": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PriorityLevelConfigurationReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationReference" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_PriorityLevelConfigurationReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.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_v1beta3_PolicyRulesWithSubjects", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PolicyRulesWithSubjects" } } }, @@ -2678,8 +2678,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowSchemaCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaCondition" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_FlowSchemaCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.FlowSchemaCondition" } } }, @@ -2705,8 +2705,8 @@ "type": "integer" }, "limitResponse": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_LimitResponse", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitResponse" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_LimitResponse", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.LimitResponse" } }, "additionalProperties": true @@ -2714,8 +2714,8 @@ "limitresponse": { "properties": { "queuing": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_QueuingConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.QueuingConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_QueuingConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.QueuingConfiguration" }, "type": { "type": "string" @@ -2893,23 +2893,23 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_NonResourcePolicyRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.NonResourcePolicyRule" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_NonResourcePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.NonResourcePolicyRule" } }, "resourceRules": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_ResourcePolicyRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.ResourcePolicyRule" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_ResourcePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.ResourcePolicyRule" } }, "subjects": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_Subject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.Subject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_Subject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.Subject" } } }, @@ -3000,12 +3000,12 @@ "prioritylevelconfigurationspec": { "properties": { "exempt": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_ExemptPriorityLevelConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.ExemptPriorityLevelConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_ExemptPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.ExemptPriorityLevelConfiguration" }, "limited": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_LimitedPriorityLevelConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.LimitedPriorityLevelConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_LimitedPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.LimitedPriorityLevelConfiguration" }, "type": { "type": "string" @@ -3019,8 +3019,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_PriorityLevelConfigurationCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.PriorityLevelConfigurationCondition" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationCondition" } } }, @@ -3216,19 +3216,19 @@ "subject": { "properties": { "group": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_GroupSubject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.GroupSubject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_GroupSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.GroupSubject" }, "kind": { "type": "string" }, "serviceAccount": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_ServiceAccountSubject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.ServiceAccountSubject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_ServiceAccountSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.ServiceAccountSubject" }, "user": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_UserSubject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.UserSubject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_UserSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.UserSubject" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/validation-schema.json index 7a3112d61a6..a01161de9a2 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 @@ -2598,7 +2598,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1beta1", + "default": "gateway.networking.k8s.io/v1alpha2", "required": true }, "kind": { @@ -3159,7 +3159,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1alpha2", + "default": "gateway.networking.k8s.io/v1beta1", "required": true }, "kind": { @@ -3642,7 +3642,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1beta1", + "default": "gateway.networking.k8s.io/v1alpha2", "required": true }, "kind": { 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 4a8aceb6fa3..503e1df6fde 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 @@ -2543,7 +2543,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "networking.k8s.io/v1", + "default": "networking.k8s.io/v1beta1", "required": true }, "kind": { @@ -2556,12 +2556,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressSpec" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressSpec" }, "status": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressStatus" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressStatus" } }, "additionalProperties": true @@ -2572,9 +2572,12 @@ "$ref": "#/definitions/kubernetes_core_TypedLocalObjectReference", "existingJavaType": "io.fabric8.kubernetes.api.model.TypedLocalObjectReference" }, - "service": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressServiceBackend", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressServiceBackend" + "serviceName": { + "type": "string" + }, + "servicePort": { + "$ref": "#/definitions/kubernetes_apimachinery_pkg_util_intstr_IntOrString", + "existingJavaType": "io.fabric8.kubernetes.api.model.IntOrString" } }, "additionalProperties": true @@ -2664,14 +2667,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "networking.k8s.io/v1", + "default": "networking.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_networking_v1_Ingress", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.Ingress" + "$ref": "#/definitions/kubernetes_networking_v1beta1_Ingress", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress" } }, "kind": { @@ -2698,8 +2701,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressPortStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressPortStatus" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressPortStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressPortStatus" } } }, @@ -2711,8 +2714,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressLoadBalancerIngress", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressLoadBalancerIngress" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressLoadBalancerIngress", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressLoadBalancerIngress" } } }, @@ -2738,8 +2741,8 @@ "type": "string" }, "http": { - "$ref": "#/definitions/kubernetes_networking_v1beta1_HTTPIngressRuleValue", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.HTTPIngressRuleValue" + "$ref": "#/definitions/kubernetes_networking_v1_HTTPIngressRuleValue", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.HTTPIngressRuleValue" } }, "additionalProperties": true @@ -2796,8 +2799,8 @@ "ingressstatus": { "properties": { "loadBalancer": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressLoadBalancerStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressLoadBalancerStatus" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressLoadBalancerStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressLoadBalancerStatus" } }, "additionalProperties": true 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 998e53fe0bf..e346b7da3ba 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 @@ -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/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/schema/validation-schema.json index 919fcac676c..097818135b4 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 @@ -2393,14 +2393,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/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/schema/validation-schema.json index 4d6b05d3910..c7722ee5b0e 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 @@ -1491,7 +1491,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "scheduling.k8s.io/v1", + "default": "scheduling.k8s.io/v1beta1", "required": true }, "description": { @@ -1522,14 +1522,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "scheduling.k8s.io/v1beta1", + "default": "scheduling.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_scheduling_v1beta1_PriorityClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClass" + "$ref": "#/definitions/kubernetes_scheduling_v1_PriorityClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClass" } }, "kind": { 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 7c78c14be5f..6cb4761de21 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 @@ -3039,8 +3039,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": { @@ -3057,7 +3057,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1beta1", + "default": "storage.k8s.io/v1", "required": true }, "kind": { @@ -3070,8 +3070,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSINodeSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSINodeSpec" + "$ref": "#/definitions/kubernetes_storageclass_CSINodeSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSINodeSpec" } }, "additionalProperties": true @@ -3128,8 +3128,8 @@ "drivers": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSINodeDriver", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSINodeDriver" + "$ref": "#/definitions/kubernetes_storageclass_CSINodeDriver", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSINodeDriver" } } }, 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 1262a4be8e8..d6ca283ef26 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 @@ -12157,19 +12157,19 @@ }, "machinepool": { "properties": { + "cpu": { + "$ref": "#/definitions/os_hive_ovirt_v1_CPU", + "existingJavaType": "io.fabric8.openshift.api.model.hive.ovirt.v1.CPU" + }, + "memoryMB": { + "type": "integer" + }, "osDisk": { - "$ref": "#/definitions/os_hive_azure_v1_OSDisk", - "existingJavaType": "io.fabric8.openshift.api.model.hive.azure.v1.OSDisk" + "$ref": "#/definitions/os_hive_ovirt_v1_Disk", + "existingJavaType": "io.fabric8.openshift.api.model.hive.ovirt.v1.Disk" }, - "type": { + "vmType": { "type": "string" - }, - "zones": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } } }, "additionalProperties": true @@ -12913,12 +12913,19 @@ }, "platform": { "properties": { - "credentialsSecretRef": { + "certificatesSecretRef": { "$ref": "#/definitions/kubernetes_core_LocalObjectReference", "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" }, - "region": { + "cloud": { "type": "string" + }, + "credentialsSecretRef": { + "$ref": "#/definitions/kubernetes_core_LocalObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" + }, + "trunkSupport": { + "type": "boolean" } }, "additionalProperties": true 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 05965a2c7c8..3716920ce27 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 @@ -3134,17 +3134,20 @@ }, "failuredomain": { "properties": { - "computeAvailabilityZone": { + "name": { "type": "string" }, - "portTargets": { - "type": "array", - "items": { - "$ref": "#/definitions/os_installer_openstack_v1_NamedPortTarget", - "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.NamedPortTarget" - } + "region": { + "type": "string" }, - "storageAvailabilityZone": { + "server": { + "type": "string" + }, + "topology": { + "$ref": "#/definitions/os_installer_vsphere_v1_Topology", + "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.Topology" + }, + "zone": { "type": "string" } }, @@ -3398,44 +3401,22 @@ }, "machinepool": { "properties": { - "additionalNetworkIDs": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } - }, - "additionalSecurityGroupIDs": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } - }, - "failureDomains": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "$ref": "#/definitions/os_installer_openstack_v1_FailureDomain", - "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.FailureDomain" - } - }, - "rootVolume": { - "$ref": "#/definitions/os_installer_openstack_v1_RootVolume", - "existingJavaType": "io.fabric8.openshift.api.model.installer.openstack.v1.RootVolume" + "architecture": { + "type": "string" }, - "serverGroupPolicy": { + "hyperthreading": { "type": "string" }, - "type": { + "name": { "type": "string" }, - "zones": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } + "platform": { + "$ref": "#/definitions/os_installer_v1_MachinePoolPlatform", + "existingJavaType": "io.fabric8.openshift.api.model.installer.v1.MachinePoolPlatform" + }, + "replicas": { + "type": "integer", + "existingJavaType": "Long" } }, "additionalProperties": true @@ -3803,49 +3784,82 @@ }, "platform": { "properties": { - "armEndpoint": { + "apiVIP": { "type": "string" }, - "baseDomainResourceGroupName": { - "type": "string" + "apiVIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } }, - "cloudName": { + "cluster": { "type": "string" }, "clusterOSImage": { "type": "string" }, - "computeSubnet": { + "datacenter": { "type": "string" }, - "controlPlaneSubnet": { + "defaultDatastore": { "type": "string" }, "defaultMachinePlatform": { - "$ref": "#/definitions/os_installer_azure_v1_MachinePool", - "existingJavaType": "io.fabric8.openshift.api.model.installer.azure.v1.MachinePool" + "$ref": "#/definitions/os_installer_vsphere_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.MachinePool" }, - "networkResourceGroupName": { + "diskType": { "type": "string" }, - "outboundType": { - "type": "string" + "failureDomains": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_installer_vsphere_v1_FailureDomain", + "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.FailureDomain" + } }, - "region": { + "folder": { "type": "string" }, - "resourceGroupName": { + "ingressVIP": { "type": "string" }, - "userTags": { - "type": "object", - "additionalProperties": { + "ingressVIPs": { + "type": "array", + "javaOmitEmpty": true, + "items": { "type": "string" - }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + } }, - "virtualNetwork": { + "loadBalancer": { + "$ref": "#/definitions/os_config_v1_VSpherePlatformLoadBalancer", + "existingJavaType": "io.fabric8.openshift.api.model.config.v1.VSpherePlatformLoadBalancer" + }, + "network": { "type": "string" + }, + "password": { + "type": "string" + }, + "resourcePool": { + "type": "string" + }, + "username": { + "type": "string" + }, + "vCenter": { + "type": "string" + }, + "vcenters": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "$ref": "#/definitions/os_installer_vsphere_v1_VCenter", + "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.VCenter" + } } }, "additionalProperties": true 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 e3fa3df43bc..d4745647ae4 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 @@ -2113,32 +2113,9 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "creationTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" - }, - "deletionGracePeriodSeconds": { - "type": "integer", - "existingJavaType": "Long" - }, - "deletionTimestamp": { - "$ref": "#/definitions/kubernetes_apimachinery_Time", - "existingJavaType": "String" - }, - "finalizers": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } - }, "generateName": { "type": "string" }, - "generation": { - "type": "integer", - "existingJavaType": "Long" - }, "labels": { "type": "object", "additionalProperties": { @@ -2146,14 +2123,6 @@ }, "existingJavaType": "java.util.Map\u003cString, String\u003e" }, - "managedFields": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "$ref": "#/definitions/kubernetes_apimachinery_ManagedFieldsEntry", - "existingJavaType": "io.fabric8.kubernetes.api.model.ManagedFieldsEntry" - } - }, "name": { "type": "string" }, @@ -2169,15 +2138,6 @@ "$ref": "#/definitions/kubernetes_apimachinery_OwnerReference", "existingJavaType": "io.fabric8.kubernetes.api.model.OwnerReference" } - }, - "resourceVersion": { - "type": "string" - }, - "selfLink": { - "type": "string" - }, - "uid": { - "type": "string" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/pkg/schemagen/generate.go b/kubernetes-model-generator/pkg/schemagen/generate.go index 3037c9ce569..d75ea4ff7a0 100644 --- a/kubernetes-model-generator/pkg/schemagen/generate.go +++ b/kubernetes-model-generator/pkg/schemagen/generate.go @@ -581,9 +581,9 @@ func (g *schemaGenerator) isClusterScopedResource(t reflect.Type) bool { "k8s.io/api/authentication/v1/SelfSubjectReview", "k8s.io/api/admissionregistration/v1beta1/MutatingWebhookConfiguration", "k8s.io/api/admissionregistration/v1alpha1/ValidatingAdmissionPolicy", - "k8s.io/api/admissionregistration/v1beta1/ValidationAdmissionPolicy", + "k8s.io/api/admissionregistration/v1beta1/ValidatingAdmissionPolicy", "k8s.io/api/admissionregistration/v1alpha1/ValidatingAdmissionPolicyBinding", - "k8s.io/api/admissionregistration/v1beta1/ValidationAdmissionPolicyBinding", + "k8s.io/api/admissionregistration/v1beta1/ValidatingAdmissionPolicyBinding", "k8s.io/api/authorization/v1/SelfSubjectRulesReview", "k8s.io/api/authorization/v1beta1/SubjectAccessReview", "k8s.io/api/admissionregistration/v1beta1/ValidatingWebhookConfiguration",