From 60230428cb90b4e632913e85925536f9537b1280 Mon Sep 17 00:00:00 2001 From: AustinRedenbaugh <43683341+AustinRedenbaugh@users.noreply.github.com> Date: Fri, 20 Jan 2023 01:22:34 -0500 Subject: [PATCH] update json-schema draft http://json-schema.org/draft-05/schema# is a 404... updating to latest version of schema. --- CHANGELOG.md | 1 + .../resources/schema/camel-k-schema-v1.json | 2 +- .../schema/camel-k-schema-v1alpha1.json | 2 +- .../resources/schema/certmanager-schema.json | 2 +- .../resources/schema/certmanager-schema.json | 2 +- .../resources/schema/certmanager-schema.json | 2 +- .../resources/schema/certmanager-schema.json | 2 +- .../resources/schema/chaosmesh-schema.json | 2 +- .../main/resources/schema/istio-schema.json | 2 +- .../main/resources/schema/istio-schema.json | 2 +- .../main/resources/schema/knative-schema.json | 2 +- .../open-cluster-management-agent-schema.json | 2 +- .../open-cluster-management-apps-schema.json | 2 +- ...pen-cluster-management-cluster-schema.json | 2 +- ...n-cluster-management-discovery-schema.json | 2 +- ...uster-management-observability-schema.json | 2 +- ...en-cluster-management-operator-schema.json | 2 +- ...r-management-placementruleapps-schema.json | 2 +- ...open-cluster-management-policy-schema.json | 2 +- ...open-cluster-management-search-schema.json | 2 +- .../schema/servicecatalog-schema.json | 2 +- .../schema/tekton-schema-triggers.json | 2 +- .../schema/tekton-schema-triggers.json | 2 +- .../schema/tekton-schema-v1alpha1.json | 2 +- .../schema/tekton-schema-v1beta1.json | 2 +- .../schema/verticalpodautoscaler-schema.json | 2 +- .../main/resources/schema/volcano-schema.json | 2 +- .../schema/volumesnapshot-schema.json | 2 +- generator/pkg/schemagen/generate.go | 2 +- .../core/src/test/resources/kamelet-crd.yml | 4 +- .../test/resources/camel-k.crds.1.8.1.yaml | 10 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 57 +++--- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 98 ++++----- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 2 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 190 ++++++++---------- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 18 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 12 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 2 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 2 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 29 +-- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 14 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 2 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 76 +++---- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 32 +-- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 2 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 49 +++-- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 23 +-- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 2 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 2 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 2 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 8 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 24 +-- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 2 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 2 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 2 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 45 +++-- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 69 ++++++- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 2 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 2 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 2 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 2 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 2 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 10 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 2 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 2 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 2 +- .../main/resources/schema/kube-schema.json | 2 +- .../resources/schema/validation-schema.json | 2 +- .../pkg/schemagen/generate.go | 2 +- 104 files changed, 484 insertions(+), 455 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f28d64573b..f19985569d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ### 6.5-SNAPSHOT #### Bugs +* Fix #4784: json-schema draft-05 is a (404). Updating to draft-07 (`http://json-schema.org/draft-07/schema#`) * Fix #4791: handle the `NullPointerException` in `Thread.currentThread().getContextClassLoader()` * Fix #4832: NO_PROXY can match cidr with bit suffix <10 * Fix #4851: adding buffer cloning to ensure buffers cannot be modified after sending diff --git a/extensions/camel-k/model-v1/src/main/resources/schema/camel-k-schema-v1.json b/extensions/camel-k/model-v1/src/main/resources/schema/camel-k-schema-v1.json index 714b7d0a180..9a404283438 100644 --- a/extensions/camel-k/model-v1/src/main/resources/schema/camel-k-schema-v1.json +++ b/extensions/camel-k/model-v1/src/main/resources/schema/camel-k-schema-v1.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/camel-k/v1/CamelKSchema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "github_com_apache_camel-k_pkg_apis_camel_v1_Artifact": { "type": "object", diff --git a/extensions/camel-k/model-v1alpha1/src/main/resources/schema/camel-k-schema-v1alpha1.json b/extensions/camel-k/model-v1alpha1/src/main/resources/schema/camel-k-schema-v1alpha1.json index 637b82d10d3..981e2caa8df 100644 --- a/extensions/camel-k/model-v1alpha1/src/main/resources/schema/camel-k-schema-v1alpha1.json +++ b/extensions/camel-k/model-v1alpha1/src/main/resources/schema/camel-k-schema-v1alpha1.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/camel-k/v1alpha1/CamelKSchema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "github_com_apache_camel-k_pkg_apis_camel_v1alpha1_AuthorizationSpec": { "type": "object", diff --git a/extensions/certmanager/model-v1/src/main/resources/schema/certmanager-schema.json b/extensions/certmanager/model-v1/src/main/resources/schema/certmanager-schema.json index 9ec44fe46a5..1df70ccc9bc 100644 --- a/extensions/certmanager/model-v1/src/main/resources/schema/certmanager-schema.json +++ b/extensions/certmanager/model-v1/src/main/resources/schema/certmanager-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/jetstack/CertManagerSchema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "github_com_cert-manager_cert-manager_pkg_apis_acme_v1_ACMEAuthorization": { "type": "object", diff --git a/extensions/certmanager/model-v1alpha2/src/main/resources/schema/certmanager-schema.json b/extensions/certmanager/model-v1alpha2/src/main/resources/schema/certmanager-schema.json index c4e65882b05..239b06c35ce 100644 --- a/extensions/certmanager/model-v1alpha2/src/main/resources/schema/certmanager-schema.json +++ b/extensions/certmanager/model-v1alpha2/src/main/resources/schema/certmanager-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/jetstack/CertManagerSchema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "github_com_jetstack_cert-manager_pkg_apis_acme_v1alpha2_ACMEAuthorization": { "type": "object", diff --git a/extensions/certmanager/model-v1alpha3/src/main/resources/schema/certmanager-schema.json b/extensions/certmanager/model-v1alpha3/src/main/resources/schema/certmanager-schema.json index 87c516f5dc9..239ec8f9933 100644 --- a/extensions/certmanager/model-v1alpha3/src/main/resources/schema/certmanager-schema.json +++ b/extensions/certmanager/model-v1alpha3/src/main/resources/schema/certmanager-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/jetstack/CertManagerSchema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "github_com_jetstack_cert-manager_pkg_apis_acme_v1alpha3_ACMEAuthorization": { "type": "object", diff --git a/extensions/certmanager/model-v1beta1/src/main/resources/schema/certmanager-schema.json b/extensions/certmanager/model-v1beta1/src/main/resources/schema/certmanager-schema.json index e6c83fdceae..8b063f2ef27 100644 --- a/extensions/certmanager/model-v1beta1/src/main/resources/schema/certmanager-schema.json +++ b/extensions/certmanager/model-v1beta1/src/main/resources/schema/certmanager-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/jetstack/CertManagerSchema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "github_com_jetstack_cert-manager_pkg_apis_acme_v1beta1_ACMEAuthorization": { "type": "object", diff --git a/extensions/chaosmesh/model/src/main/resources/schema/chaosmesh-schema.json b/extensions/chaosmesh/model/src/main/resources/schema/chaosmesh-schema.json index 8d9d3528b40..ed24e4c21f9 100644 --- a/extensions/chaosmesh/model/src/main/resources/schema/chaosmesh-schema.json +++ b/extensions/chaosmesh/model/src/main/resources/schema/chaosmesh-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/csi/ChaosMeshSchema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "github_com_chaos-mesh_chaos-mesh_api_v1alpha1_AWSChaos": { "type": "object", diff --git a/extensions/istio/model-v1alpha3/src/main/resources/schema/istio-schema.json b/extensions/istio/model-v1alpha3/src/main/resources/schema/istio-schema.json index 172d4ddee73..2ab752d497b 100644 --- a/extensions/istio/model-v1alpha3/src/main/resources/schema/istio-schema.json +++ b/extensions/istio/model-v1alpha3/src/main/resources/schema/istio-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/istio/IstioSchema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "github_com_gogo_protobuf_types_ListValue": { "type": "object", diff --git a/extensions/istio/model-v1beta1/src/main/resources/schema/istio-schema.json b/extensions/istio/model-v1beta1/src/main/resources/schema/istio-schema.json index f4e22cce42f..43cebfd3df9 100644 --- a/extensions/istio/model-v1beta1/src/main/resources/schema/istio-schema.json +++ b/extensions/istio/model-v1beta1/src/main/resources/schema/istio-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/istio/IstioSchema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "istio_io_api_analysis_v1alpha1_AnalysisMessageBase": { "type": "object", diff --git a/extensions/knative/model/src/main/resources/schema/knative-schema.json b/extensions/knative/model/src/main/resources/schema/knative-schema.json index 70def2573fe..4feaed2ca1f 100644 --- a/extensions/knative/model/src/main/resources/schema/knative-schema.json +++ b/extensions/knative/model/src/main/resources/schema/knative-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/knative/KnativeSchema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "knative_dev_eventing-awssqs_pkg_apis_sources_v1alpha1_AwsSqsSource": { "type": "object", diff --git a/extensions/open-cluster-management/model-agent/src/main/resources/schema/open-cluster-management-agent-schema.json b/extensions/open-cluster-management/model-agent/src/main/resources/schema/open-cluster-management-agent-schema.json index 9897661756b..c248eb74a96 100644 --- a/extensions/open-cluster-management/model-agent/src/main/resources/schema/open-cluster-management-agent-schema.json +++ b/extensions/open-cluster-management/model-agent/src/main/resources/schema/open-cluster-management-agent-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/OpenClusterManagement#Agent", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "github_com_open-cluster-management_klusterlet-addon-controller_pkg_apis_agent_v1_KlusterletAddonAgentConfigSpec": { "type": "object", diff --git a/extensions/open-cluster-management/model-apps/src/main/resources/schema/open-cluster-management-apps-schema.json b/extensions/open-cluster-management/model-apps/src/main/resources/schema/open-cluster-management-apps-schema.json index acf373906f0..03bf6c380e8 100644 --- a/extensions/open-cluster-management/model-apps/src/main/resources/schema/open-cluster-management-apps-schema.json +++ b/extensions/open-cluster-management/model-apps/src/main/resources/schema/open-cluster-management-apps-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/OpenClusterManagement#Apps", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "open-cluster-management_io_multicloud-operators-channel_pkg_apis_apps_v1_Channel": { "type": "object", diff --git a/extensions/open-cluster-management/model-cluster/src/main/resources/schema/open-cluster-management-cluster-schema.json b/extensions/open-cluster-management/model-cluster/src/main/resources/schema/open-cluster-management-cluster-schema.json index 0b9e510e5ca..9c48f033873 100644 --- a/extensions/open-cluster-management/model-cluster/src/main/resources/schema/open-cluster-management-cluster-schema.json +++ b/extensions/open-cluster-management/model-cluster/src/main/resources/schema/open-cluster-management-cluster-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/OpenClusterManagement#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "open-cluster-management_io_api_cluster_v1_ClientConfig": { "type": "object", diff --git a/extensions/open-cluster-management/model-discovery/src/main/resources/schema/open-cluster-management-discovery-schema.json b/extensions/open-cluster-management/model-discovery/src/main/resources/schema/open-cluster-management-discovery-schema.json index b33f1bb5596..5c90090f8fb 100644 --- a/extensions/open-cluster-management/model-discovery/src/main/resources/schema/open-cluster-management-discovery-schema.json +++ b/extensions/open-cluster-management/model-discovery/src/main/resources/schema/open-cluster-management-discovery-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/OpenClusterManagement#Discovery", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "github_com_open-cluster-management_discovery_api_v1alpha1_DiscoveredCluster": { "type": "object", diff --git a/extensions/open-cluster-management/model-observability/src/main/resources/schema/open-cluster-management-observability-schema.json b/extensions/open-cluster-management/model-observability/src/main/resources/schema/open-cluster-management-observability-schema.json index f8abd76aa94..dda2ef93181 100644 --- a/extensions/open-cluster-management/model-observability/src/main/resources/schema/open-cluster-management-observability-schema.json +++ b/extensions/open-cluster-management/model-observability/src/main/resources/schema/open-cluster-management-observability-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/OpenClusterManagement#PlacementRuleApps", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "github_com_open-cluster-management_multicluster-observability-operator_operators_multiclusterobservability_api_shared_Condition": { "type": "object", diff --git a/extensions/open-cluster-management/model-operator/src/main/resources/schema/open-cluster-management-operator-schema.json b/extensions/open-cluster-management/model-operator/src/main/resources/schema/open-cluster-management-operator-schema.json index 74bcf4f4eb1..ffb04beaef9 100644 --- a/extensions/open-cluster-management/model-operator/src/main/resources/schema/open-cluster-management-operator-schema.json +++ b/extensions/open-cluster-management/model-operator/src/main/resources/schema/open-cluster-management-operator-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/OpenClusterManagement#PlacementRuleApps", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "github_com_open-cluster-management_multiclusterhub-operator_api_v1_BackupConfig": { "type": "object", diff --git a/extensions/open-cluster-management/model-placementruleapps/src/main/resources/schema/open-cluster-management-placementruleapps-schema.json b/extensions/open-cluster-management/model-placementruleapps/src/main/resources/schema/open-cluster-management-placementruleapps-schema.json index 1b452dcaec7..5478870a160 100644 --- a/extensions/open-cluster-management/model-placementruleapps/src/main/resources/schema/open-cluster-management-placementruleapps-schema.json +++ b/extensions/open-cluster-management/model-placementruleapps/src/main/resources/schema/open-cluster-management-placementruleapps-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/OpenClusterManagement#PlacementRuleApps", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "github_com_open-cluster-management_multicloud-integrations_pkg_apis_apps_v1beta1_ArgoServerSpec": { "type": "object", diff --git a/extensions/open-cluster-management/model-policy/src/main/resources/schema/open-cluster-management-policy-schema.json b/extensions/open-cluster-management/model-policy/src/main/resources/schema/open-cluster-management-policy-schema.json index c60955181e2..b89f3964b9d 100644 --- a/extensions/open-cluster-management/model-policy/src/main/resources/schema/open-cluster-management-policy-schema.json +++ b/extensions/open-cluster-management/model-policy/src/main/resources/schema/open-cluster-management-policy-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/OpenClusterManagement#Policy", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "github_com_open-cluster-management_governance-policy-propagator_api_v1_ComplianceHistory": { "type": "object", diff --git a/extensions/open-cluster-management/model-search/src/main/resources/schema/open-cluster-management-search-schema.json b/extensions/open-cluster-management/model-search/src/main/resources/schema/open-cluster-management-search-schema.json index b6d065c85f7..4bca0fef99f 100644 --- a/extensions/open-cluster-management/model-search/src/main/resources/schema/open-cluster-management-search-schema.json +++ b/extensions/open-cluster-management/model-search/src/main/resources/schema/open-cluster-management-search-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/OpenClusterManagement#PlacementRuleApps", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "github_com_open-cluster-management_search-operator_api_v1alpha1_ImageOverrides": { "type": "object", diff --git a/extensions/service-catalog/model/src/main/resources/schema/servicecatalog-schema.json b/extensions/service-catalog/model/src/main/resources/schema/servicecatalog-schema.json index ac52a4ab5d0..e6b2ea96dc4 100644 --- a/extensions/service-catalog/model/src/main/resources/schema/servicecatalog-schema.json +++ b/extensions/service-catalog/model/src/main/resources/schema/servicecatalog-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/knative/ServiceCatalogSchema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "github_com_kubernetes-sigs_service-catalog_pkg_apis_servicecatalog_v1beta1_AddKeyTransform": { "type": "object", diff --git a/extensions/tekton/model-triggers-v1alpha1/src/main/resources/schema/tekton-schema-triggers.json b/extensions/tekton/model-triggers-v1alpha1/src/main/resources/schema/tekton-schema-triggers.json index d44893f2fd7..3272dba7682 100644 --- a/extensions/tekton/model-triggers-v1alpha1/src/main/resources/schema/tekton-schema-triggers.json +++ b/extensions/tekton/model-triggers-v1alpha1/src/main/resources/schema/tekton-schema-triggers.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/tekton/triggers/TektonSchema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "github_com_tektoncd_triggers_pkg_apis_triggers_v1alpha1_BitbucketInterceptor": { "type": "object", diff --git a/extensions/tekton/model-triggers-v1beta1/src/main/resources/schema/tekton-schema-triggers.json b/extensions/tekton/model-triggers-v1beta1/src/main/resources/schema/tekton-schema-triggers.json index b30a37703f1..c9fcecdd8af 100644 --- a/extensions/tekton/model-triggers-v1beta1/src/main/resources/schema/tekton-schema-triggers.json +++ b/extensions/tekton/model-triggers-v1beta1/src/main/resources/schema/tekton-schema-triggers.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/tekton/triggers/TektonSchema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "github_com_tektoncd_triggers_pkg_apis_triggers_v1beta1_ClusterTriggerBinding": { "type": "object", diff --git a/extensions/tekton/model-v1alpha1/src/main/resources/schema/tekton-schema-v1alpha1.json b/extensions/tekton/model-v1alpha1/src/main/resources/schema/tekton-schema-v1alpha1.json index 886a6ee8979..472a553c455 100644 --- a/extensions/tekton/model-v1alpha1/src/main/resources/schema/tekton-schema-v1alpha1.json +++ b/extensions/tekton/model-v1alpha1/src/main/resources/schema/tekton-schema-v1alpha1.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/tekton/v1alpha1/TektonSchema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "github_com_tektoncd_pipeline_pkg_apis_pipeline_pod_Template": { "type": "object", diff --git a/extensions/tekton/model-v1beta1/src/main/resources/schema/tekton-schema-v1beta1.json b/extensions/tekton/model-v1beta1/src/main/resources/schema/tekton-schema-v1beta1.json index 74e58cc39aa..0706d37355b 100644 --- a/extensions/tekton/model-v1beta1/src/main/resources/schema/tekton-schema-v1beta1.json +++ b/extensions/tekton/model-v1beta1/src/main/resources/schema/tekton-schema-v1beta1.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/tekton/v1beta1/TektonSchema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "github_com_tektoncd_pipeline_pkg_apis_pipeline_pod_Template": { "type": "object", diff --git a/extensions/verticalpodautoscaler/model-v1/src/main/resources/schema/verticalpodautoscaler-schema.json b/extensions/verticalpodautoscaler/model-v1/src/main/resources/schema/verticalpodautoscaler-schema.json index d67b2e8684b..180ed0aba40 100644 --- a/extensions/verticalpodautoscaler/model-v1/src/main/resources/schema/verticalpodautoscaler-schema.json +++ b/extensions/verticalpodautoscaler/model-v1/src/main/resources/schema/verticalpodautoscaler-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/autoscaler/VerticalPodAutoscalerSchema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "k8s_io_autoscaler_vertical-pod-autoscaler_pkg_apis_autoscaling_k8s_io_v1_ContainerResourcePolicy": { "type": "object", diff --git a/extensions/volcano/model-v1beta1/src/main/resources/schema/volcano-schema.json b/extensions/volcano/model-v1beta1/src/main/resources/schema/volcano-schema.json index 2ce234e7de7..32f9edba701 100644 --- a/extensions/volcano/model-v1beta1/src/main/resources/schema/volcano-schema.json +++ b/extensions/volcano/model-v1beta1/src/main/resources/schema/volcano-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/volcano.sh/VolcanoSchema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "volcano_sh_apis_pkg_apis_scheduling_v1beta1_PodGroup": { "type": "object", diff --git a/extensions/volumesnapshot/model/src/main/resources/schema/volumesnapshot-schema.json b/extensions/volumesnapshot/model/src/main/resources/schema/volumesnapshot-schema.json index 819af56d087..d9454c20494 100644 --- a/extensions/volumesnapshot/model/src/main/resources/schema/volumesnapshot-schema.json +++ b/extensions/volumesnapshot/model/src/main/resources/schema/volumesnapshot-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/csi/VolumeSnapshotSchema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "definitions": { "github_com_kubernetes-csi_external-snapshotter_client_v4_apis_volumesnapshot_v1_VolumeSnapshot": { "type": "object", diff --git a/generator/pkg/schemagen/generate.go b/generator/pkg/schemagen/generate.go index 027f5fd8bb4..94ebd89dd54 100644 --- a/generator/pkg/schemagen/generate.go +++ b/generator/pkg/schemagen/generate.go @@ -329,7 +329,7 @@ func (g *schemaGenerator) generate(schemaId string, crdLists map[reflect.Type]Cr s := JSONSchema{ ID: schemaId, - Schema: "http://json-schema.org/draft-05/schema#", + Schema: "http://json-schema.org/draft-07/schema#", JSONDescriptor: JSONDescriptor{ Type: "object", }, diff --git a/java-generator/core/src/test/resources/kamelet-crd.yml b/java-generator/core/src/test/resources/kamelet-crd.yml index 0c9513e58e7..cde411000cf 100644 --- a/java-generator/core/src/test/resources/kamelet-crd.yml +++ b/java-generator/core/src/test/resources/kamelet-crd.yml @@ -67,7 +67,7 @@ spec: type: object definition: description: JSONSchemaProps is a JSON-Schema following Specification - Draft 4 (http://json-schema.org/). + Draft 7 (http://json-schema.org/). properties: $schema: description: JSONSchemaURL represents a schema url. @@ -274,7 +274,7 @@ spec: type: string schema: description: JSONSchemaProps is a JSON-Schema following Specification - Draft 4 (http://json-schema.org/). + Draft 7 (http://json-schema.org/). properties: $schema: description: JSONSchemaURL represents a schema url. diff --git a/java-generator/it/src/it/extensions/src/test/resources/camel-k.crds.1.8.1.yaml b/java-generator/it/src/it/extensions/src/test/resources/camel-k.crds.1.8.1.yaml index 225d1afdae5..a1dd5c7b523 100644 --- a/java-generator/it/src/it/extensions/src/test/resources/camel-k.crds.1.8.1.yaml +++ b/java-generator/it/src/it/extensions/src/test/resources/camel-k.crds.1.8.1.yaml @@ -12958,7 +12958,7 @@ spec: type: string schema: description: JSONSchemaProps is a JSON-Schema following - Specification Draft 4 (http://json-schema.org/). + Specification Draft 7 (http://json-schema.org/). properties: $schema: description: JSONSchemaURL represents a schema url. @@ -13173,7 +13173,7 @@ spec: type: string schema: description: JSONSchemaProps is a JSON-Schema following - Specification Draft 4 (http://json-schema.org/). + Specification Draft 7 (http://json-schema.org/). properties: $schema: description: JSONSchemaURL represents a schema url. @@ -13391,7 +13391,7 @@ spec: type: string schema: description: JSONSchemaProps is a JSON-Schema following - Specification Draft 4 (http://json-schema.org/). + Specification Draft 7 (http://json-schema.org/). properties: $schema: description: JSONSchemaURL represents a schema url. @@ -13667,7 +13667,7 @@ spec: type: object definition: description: JSONSchemaProps is a JSON-Schema following Specification - Draft 4 (http://json-schema.org/). + Draft 7 (http://json-schema.org/). properties: $schema: description: JSONSchemaURL represents a schema url. @@ -13874,7 +13874,7 @@ spec: type: string schema: description: JSONSchemaProps is a JSON-Schema following Specification - Draft 4 (http://json-schema.org/). + Draft 7 (http://json-schema.org/). properties: $schema: description: JSONSchemaURL represents a schema url. 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 20e39aaad5d..75b402cdbed 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "admissionregistration", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { 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 d56214cbed0..de87077f547 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "admissionregistration", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { @@ -3220,7 +3220,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admission.k8s.io/v1", + "default": "admission.k8s.io/v1beta1", "required": true }, "kind": { @@ -3229,12 +3229,12 @@ "required": true }, "request": { - "$ref": "#/definitions/kubernetes_admission_v1_AdmissionRequest", - "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1.AdmissionRequest" + "$ref": "#/definitions/kubernetes_admission_v1beta1_AdmissionRequest", + "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionRequest" }, "response": { - "$ref": "#/definitions/kubernetes_admission_v1_AdmissionResponse", - "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1.AdmissionResponse" + "$ref": "#/definitions/kubernetes_admission_v1beta1_AdmissionResponse", + "existingJavaType": "io.fabric8.kubernetes.api.model.admission.v1beta1.AdmissionResponse" } }, "additionalProperties": true @@ -4159,7 +4159,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1beta1", + "default": "authorization.k8s.io/v1", "required": true }, "kind": { @@ -4172,12 +4172,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SelfSubjectAccessReviewSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectAccessReviewSpec" + "$ref": "#/definitions/kubernetes_authorization_v1_SelfSubjectAccessReviewSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectAccessReviewSpec" }, "status": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewStatus" + "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewStatus" } }, "additionalProperties": true @@ -4185,12 +4185,12 @@ "selfsubjectaccessreviewspec": { "properties": { "nonResourceAttributes": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_NonResourceAttributes", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.NonResourceAttributes" + "$ref": "#/definitions/kubernetes_authorization_v1_NonResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.NonResourceAttributes" }, "resourceAttributes": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_ResourceAttributes", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.ResourceAttributes" + "$ref": "#/definitions/kubernetes_authorization_v1_ResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes" } }, "additionalProperties": true @@ -4231,7 +4231,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1", + "default": "authorization.k8s.io/v1beta1", "required": true }, "kind": { @@ -4244,12 +4244,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 @@ -4754,14 +4754,13 @@ "properties": { "admissionReviewVersions": { "type": "array", - "javaOmitEmpty": true, "items": { "type": "string" } }, "clientConfig": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_WebhookClientConfig", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.WebhookClientConfig" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_WebhookClientConfig", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.WebhookClientConfig" }, "failurePolicy": { "type": "string" @@ -4801,7 +4800,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1beta1", + "default": "admissionregistration.k8s.io/v1", "required": true }, "kind": { @@ -4817,8 +4816,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" } } }, @@ -4828,14 +4827,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/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/kube-schema.json index 538250b5677..98a1c741a48 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "apiextensions", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { 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 0106318a264..a7f5273e007 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "apiextensions", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { @@ -2611,7 +2611,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "apiextensions.k8s.io/v1", + "default": "apiextensions.k8s.io/v1beta1", "required": true }, "kind": { @@ -2624,12 +2624,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionSpec" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionSpec" }, "status": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionStatus" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionStatus" } }, "additionalProperties": true @@ -2744,14 +2744,14 @@ "customresourcedefinitionstatus": { "properties": { "acceptedNames": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionNames", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionNames" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionNames", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionNames" }, "conditions": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinitionCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinitionCondition" + "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinitionCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinitionCondition" } }, "storedVersions": { @@ -2966,48 +2966,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" @@ -3016,12 +3016,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": { @@ -3031,8 +3031,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" @@ -3041,8 +3041,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", @@ -3078,8 +3078,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" @@ -3088,8 +3088,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": { @@ -3098,18 +3098,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", @@ -3153,8 +3153,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" } } }, @@ -3165,13 +3165,13 @@ "JSONSchemas": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" } }, "Schema": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" } }, "additionalProperties": true @@ -3182,8 +3182,8 @@ "type": "boolean" }, "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 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 b7b660259a1..27f56f024b0 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "apps", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { 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 f6141c8329a..ae3d2ea29f4 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "apps", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { 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 801246ee12b..85bfde278a9 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "autoscaling", "definitions": { "kubernetes_apimachinery_APIGroup": { 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 3f604437d8f..b72ba7d6ece 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "autoscaling", "definitions": { "kubernetes_apimachinery_APIGroup": { @@ -2763,12 +2763,9 @@ "name": { "type": "string" }, - "targetAverageUtilization": { - "type": "integer" - }, - "targetAverageValue": { - "$ref": "#/definitions/kubernetes_resource_Quantity", - "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + "target": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricTarget" } }, "additionalProperties": true @@ -2778,9 +2775,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,20 +2868,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 @@ -2935,7 +2928,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "autoscaling/v2", + "default": "autoscaling/v2beta1", "required": true }, "kind": { @@ -2948,12 +2941,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscalerSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerSpec" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_HorizontalPodAutoscalerSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerSpec" }, "status": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscalerStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_HorizontalPodAutoscalerStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscalerStatus" } }, "additionalProperties": true @@ -2961,12 +2954,12 @@ "horizontalpodautoscalerbehavior": { "properties": { "scaleDown": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HPAScalingRules", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HPAScalingRules" + "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingRules", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingRules" }, "scaleUp": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HPAScalingRules", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HPAScalingRules" + "$ref": "#/definitions/kubernetes_autoscaling_v2_HPAScalingRules", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HPAScalingRules" } }, "additionalProperties": true @@ -2996,14 +2989,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "autoscaling/v1", + "default": "autoscaling/v2beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v1_HorizontalPodAutoscaler", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v1.HorizontalPodAutoscaler" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_HorizontalPodAutoscaler", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.HorizontalPodAutoscaler" } }, "kind": { @@ -3020,6 +3013,10 @@ }, "horizontalpodautoscalerspec": { "properties": { + "behavior": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HorizontalPodAutoscalerBehavior", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerBehavior" + }, "maxReplicas": { "type": "integer" }, @@ -3027,16 +3024,16 @@ "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 @@ -3045,16 +3042,17 @@ "properties": { "conditions": { "type": "array", + "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HorizontalPodAutoscalerCondition", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerCondition" + "$ref": "#/definitions/kubernetes_autoscaling_v2_HorizontalPodAutoscalerCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.HorizontalPodAutoscalerCondition" } }, "currentMetrics": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricStatus" + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricStatus" } }, "currentReplicas": { @@ -3308,24 +3306,24 @@ "metricspec": { "properties": { "containerResource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ContainerResourceMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ContainerResourceMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ContainerResourceMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ContainerResourceMetricSource" }, "external": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ExternalMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ExternalMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ExternalMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ExternalMetricSource" }, "object": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ObjectMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ObjectMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ObjectMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ObjectMetricSource" }, "pods": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_PodsMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.PodsMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_PodsMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.PodsMetricSource" }, "resource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2_ResourceMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.ResourceMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ResourceMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ResourceMetricSource" }, "type": { "type": "string" @@ -3336,24 +3334,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" @@ -3493,24 +3491,17 @@ }, "objectmetricstatus": { "properties": { - "averageValue": { - "$ref": "#/definitions/kubernetes_resource_Quantity", - "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" - }, - "currentValue": { - "$ref": "#/definitions/kubernetes_resource_Quantity", - "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" - }, - "metricName": { - "type": "string" + "current": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricValueStatus" }, - "selector": { - "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", - "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + "describedObject": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.CrossVersionObjectReference" }, - "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_CrossVersionObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.CrossVersionObjectReference" + "metric": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricIdentifier" } }, "additionalProperties": true @@ -3574,16 +3565,13 @@ }, "podsmetricsource": { "properties": { - "metricName": { - "type": "string" - }, - "selector": { - "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", - "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" + "metric": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricIdentifier" }, - "targetAverageValue": { - "$ref": "#/definitions/kubernetes_resource_Quantity", - "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + "target": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricTarget" } }, "additionalProperties": true @@ -3591,12 +3579,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 @@ -3628,21 +3616,21 @@ "name": { "type": "string" }, - "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricTarget", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricTarget" + "targetAverageUtilization": { + "type": "integer" + }, + "targetAverageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" } }, "additionalProperties": true }, "resourcemetricstatus": { "properties": { - "currentAverageUtilization": { - "type": "integer" - }, - "currentAverageValue": { - "$ref": "#/definitions/kubernetes_resource_Quantity", - "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + "current": { + "$ref": "#/definitions/kubernetes_autoscaling_v2_MetricValueStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2.MetricValueStatus" }, "name": { "type": "string" 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 f07c673cc7a..ab46046b9c7 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "batch", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { 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 8128a5a515d..ff1d93e28ad 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "batch", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { @@ -4924,7 +4924,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "batch/v1beta1", + "default": "batch/v1", "required": true }, "kind": { @@ -4937,12 +4937,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_batch_v1beta1_CronJobSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobSpec" + "$ref": "#/definitions/kubernetes_batch_v1_CronJobSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJobSpec" }, "status": { - "$ref": "#/definitions/kubernetes_batch_v1beta1_CronJobStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobStatus" + "$ref": "#/definitions/kubernetes_batch_v1_CronJobStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJobStatus" } }, "additionalProperties": true @@ -4951,14 +4951,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": { 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 47509c7291f..eb59d54772e 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "certificates", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { 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 5fb247ffe7f..958f1d5997b 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "certificates", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { @@ -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/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-coordination/src/main/resources/schema/kube-schema.json index 72874114aff..ada7150e110 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "coordination", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { 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 aeb5ecd95c0..ff69854b56e 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "coordination", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { diff --git a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json index e774c9f903b..9d8a5819c59 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "core", "definitions": { "kubernetes_aggregator_APIService": { diff --git a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json index 73d957f8951..30e0fab1796 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "core", "definitions": { "kubernetes_aggregator_APIService": { 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 66cf5abe406..865061c51a7 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "discovery", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { 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 d88ec5cd4cf..b6af4844651 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "discovery", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { @@ -1387,12 +1387,19 @@ } }, "conditions": { - "$ref": "#/definitions/kubernetes_discovery_v1beta1_EndpointConditions", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointConditions" + "$ref": "#/definitions/kubernetes_discovery_v1_EndpointConditions", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointConditions" + }, + "deprecatedTopology": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" }, "hints": { - "$ref": "#/definitions/kubernetes_discovery_v1beta1_EndpointHints", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointHints" + "$ref": "#/definitions/kubernetes_discovery_v1_EndpointHints", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointHints" }, "hostname": { "type": "string" @@ -1404,12 +1411,8 @@ "$ref": "#/definitions/kubernetes_core_ObjectReference", "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectReference" }, - "topology": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" + "zone": { + "type": "string" } }, "additionalProperties": true @@ -1434,8 +1437,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_discovery_v1_ForZone", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.ForZone" + "$ref": "#/definitions/kubernetes_discovery_v1beta1_ForZone", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.ForZone" } } }, 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 797554e9b1b..82a2ffc32c0 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "events", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { 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 9c97414bb4d..256d6b93f3f 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "events", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { @@ -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" @@ -1348,14 +1348,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "events.k8s.io/v1", + "default": "events.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_events_v1_Event", - "existingJavaType": "io.fabric8.kubernetes.api.model.events.v1.Event" + "$ref": "#/definitions/kubernetes_events_v1beta1_Event", + "existingJavaType": "io.fabric8.kubernetes.api.model.events.v1beta1.Event" } }, "kind": { 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 6456fa4292e..f0dd799f413 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "extensions", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { 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 63f52b6712b..cde7865d911 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "extensions", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/kube-schema.json index c0fa0be67ac..edd3b0e5d90 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/main/resources/schema/kube-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "flowcontrol", "definitions": { "kubernetes_apimachinery_FieldsV1": { 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 7f685796248..708f4aabb37 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "flowcontrol", "definitions": { "kubernetes_apimachinery_FieldsV1": { @@ -2318,7 +2318,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1alpha1", + "default": "flowcontrol.apiserver.k8s.io/v1beta1", "required": true }, "kind": { @@ -2331,12 +2331,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_v1beta1_FlowSchemaSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaSpec" }, "status": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_FlowSchemaStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchemaStatus" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_FlowSchemaStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.FlowSchemaStatus" } }, "additionalProperties": true @@ -2366,14 +2366,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1beta2", + "default": "flowcontrol.apiserver.k8s.io/v1alpha1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowSchema", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowSchema" + "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_FlowSchema", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowSchema" } }, "kind": { @@ -2391,22 +2391,22 @@ "flowschemaspec": { "properties": { "distinguisherMethod": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_FlowDistinguisherMethod", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.FlowDistinguisherMethod" + "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_FlowDistinguisherMethod", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.FlowDistinguisherMethod" }, "matchingPrecedence": { "type": "integer" }, "priorityLevelConfiguration": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PriorityLevelConfigurationReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PriorityLevelConfigurationReference" + "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_PriorityLevelConfigurationReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.PriorityLevelConfigurationReference" }, "rules": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_PolicyRulesWithSubjects", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.PolicyRulesWithSubjects" + "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_PolicyRulesWithSubjects", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.PolicyRulesWithSubjects" } } }, @@ -2445,8 +2445,8 @@ "type": "integer" }, "limitResponse": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_LimitResponse", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.LimitResponse" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_LimitResponse", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitResponse" } }, "additionalProperties": true @@ -2454,8 +2454,8 @@ "limitresponse": { "properties": { "queuing": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_QueuingConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.QueuingConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta1_QueuingConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta1.QueuingConfiguration" }, "type": { "type": "string" @@ -2633,23 +2633,23 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_NonResourcePolicyRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.NonResourcePolicyRule" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_NonResourcePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.NonResourcePolicyRule" } }, "resourceRules": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_ResourcePolicyRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.ResourcePolicyRule" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_ResourcePolicyRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ResourcePolicyRule" } }, "subjects": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_Subject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.Subject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_Subject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.Subject" } } }, @@ -2707,14 +2707,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "flowcontrol.apiserver.k8s.io/v1beta3", + "default": "flowcontrol.apiserver.k8s.io/v1alpha1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_PriorityLevelConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.PriorityLevelConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_PriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.PriorityLevelConfiguration" } }, "kind": { @@ -2740,8 +2740,8 @@ "prioritylevelconfigurationspec": { "properties": { "limited": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_LimitedPriorityLevelConfiguration", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.LimitedPriorityLevelConfiguration" + "$ref": "#/definitions/kubernetes_flowcontrol_v1alpha1_LimitedPriorityLevelConfiguration", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1alpha1.LimitedPriorityLevelConfiguration" }, "type": { "type": "string" @@ -2755,8 +2755,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" } } }, @@ -2822,19 +2822,19 @@ "subject": { "properties": { "group": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_GroupSubject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.GroupSubject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_GroupSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.GroupSubject" }, "kind": { "type": "string" }, "serviceAccount": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_ServiceAccountSubject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.ServiceAccountSubject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_ServiceAccountSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.ServiceAccountSubject" }, "user": { - "$ref": "#/definitions/kubernetes_flowcontrol_v1beta3_UserSubject", - "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta3.UserSubject" + "$ref": "#/definitions/kubernetes_flowcontrol_v1beta2_UserSubject", + "existingJavaType": "io.fabric8.kubernetes.api.model.flowcontrol.v1beta2.UserSubject" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/kube-schema.json index 17d12779ee7..99a81e41b90 100644 --- a/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-gatewayapi/src/main/resources/schema/kube-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "gatewayapi", "definitions": { "kubernetes_apimachinery_Condition": { 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 ac57cff0a67..e4be69ec0f2 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "gatewayapi", "definitions": { "kubernetes_apimachinery_Condition": { @@ -2598,7 +2598,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1beta1", + "default": "gateway.networking.k8s.io/v1alpha2", "required": true }, "kind": { @@ -2625,14 +2625,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_GatewayClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.GatewayClass" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_GatewayClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.GatewayClass" } }, "kind": { @@ -2679,14 +2679,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": { @@ -3159,7 +3159,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1alpha2", + "default": "gateway.networking.k8s.io/v1beta1", "required": true }, "kind": { @@ -3218,14 +3218,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": { @@ -3642,7 +3642,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1alpha2", + "default": "gateway.networking.k8s.io/v1beta1", "required": true }, "kind": { @@ -3679,14 +3679,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "gateway.networking.k8s.io/v1alpha2", + "default": "gateway.networking.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1alpha2_ReferenceGrant", - "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1alpha2.ReferenceGrant" + "$ref": "#/definitions/kubernetes_sigs_gatewayapi_v1beta1_ReferenceGrant", + "existingJavaType": "io.fabric8.kubernetes.api.model.gatewayapi.v1beta1.ReferenceGrant" } }, "kind": { diff --git a/kubernetes-model-generator/kubernetes-model-metrics/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-metrics/src/main/resources/schema/kube-schema.json index 284025f1958..c7d399fa68a 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "metrics", "definitions": { "kubernetes_apimachinery_APIGroup": { 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 fd2cf8a5e3c..7d5b7de9dee 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "metrics", "definitions": { "kubernetes_apimachinery_APIGroup": { 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 3b1680ad6b1..cecfee19fac 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "networking", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { 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 4e12d149d6d..5a23c3ddf9d 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "networking", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { @@ -2451,8 +2451,8 @@ "httpingresspath": { "properties": { "backend": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressBackend", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressBackend" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressBackend", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressBackend" }, "path": { "type": "string" @@ -2468,8 +2468,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" } } }, @@ -2511,7 +2511,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "networking.k8s.io/v1beta1", + "default": "networking.k8s.io/v1", "required": true }, "kind": { @@ -2524,12 +2524,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressSpec" + "$ref": "#/definitions/kubernetes_networking_v1_IngressSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressSpec" }, "status": { - "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressStatus" + "$ref": "#/definitions/kubernetes_networking_v1_IngressStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressStatus" } }, "additionalProperties": true @@ -2540,12 +2540,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 @@ -2577,14 +2574,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": { @@ -2635,14 +2632,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "networking.k8s.io/v1beta1", + "default": "networking.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_networking_v1beta1_Ingress", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.Ingress" + "$ref": "#/definitions/kubernetes_networking_v1_Ingress", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.Ingress" } }, "kind": { @@ -2682,8 +2679,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" } } }, @@ -2709,8 +2706,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 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 a511f9fc55b..38b34eff390 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "node", "definitions": { "k8s_io_apimachinery_pkg_runtime_RawExtension": { 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 816cce54a47..6d0a562243c 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "node", "definitions": { "k8s_io_apimachinery_pkg_runtime_RawExtension": { @@ -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/v1alpha1", + "default": "node.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_node_v1alpha_RuntimeClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClass" + "$ref": "#/definitions/kubernetes_node_v1beta1_RuntimeClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClass" } }, "kind": { 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 0cb00682e8a..4e4dfad5577 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "policy", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { 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 660840bc82c..be6ce22442e 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "policy", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { diff --git a/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/kube-schema.json index abfe6594348..831ec4e9b11 100644 --- a/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/kube-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "rbac", "definitions": { "kubernetes_apimachinery_FieldsV1": { diff --git a/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/validation-schema.json index 0032e06ae05..13e379a5116 100644 --- a/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/schema/validation-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "rbac", "definitions": { "kubernetes_apimachinery_FieldsV1": { diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-resource/src/main/resources/schema/kube-schema.json index 83614e4a4ce..2e35491600a 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-resource/src/main/resources/schema/kube-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "resource", "definitions": { "kubernetes_apimachinery_FieldsV1": { diff --git a/kubernetes-model-generator/kubernetes-model-resource/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-resource/src/main/resources/schema/validation-schema.json index 89ac9e9acb6..062d6d00421 100644 --- a/kubernetes-model-generator/kubernetes-model-resource/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-resource/src/main/resources/schema/validation-schema.json @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "resource", "definitions": { "kubernetes_apimachinery_FieldsV1": { 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 5270e882e70..161d7bdc58f 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "scheduling", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { 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 41eaabfe1b6..318cfbade93 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "scheduling", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { @@ -1516,14 +1516,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "scheduling.k8s.io/v1", + "default": "scheduling.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_scheduling_v1_PriorityClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClass" + "$ref": "#/definitions/kubernetes_scheduling_v1beta1_PriorityClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClass" } }, "kind": { 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 f265673092b..e2b81606325 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "storage", "definitions": { "kubernetes_apimachinery_APIGroup": { 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 dfe1204d366..f16118ea7b8 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "storage", "definitions": { "kubernetes_apimachinery_APIGroup": { @@ -2990,14 +2990,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_CSIDriver", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSIDriver" + "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSIDriver", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriver" } }, "kind": { @@ -3036,8 +3036,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_storageclass_TokenRequest", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.TokenRequest" + "$ref": "#/definitions/kubernetes_storageclass_v1beta1_TokenRequest", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.TokenRequest" } }, "volumeLifecycleModes": { @@ -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/v1beta1", + "default": "storage.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSINode", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSINode" + "$ref": "#/definitions/kubernetes_storageclass_CSINode", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSINode" } }, "kind": { @@ -3180,7 +3180,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1beta1", + "default": "storage.k8s.io/v1", "required": true }, "capacity": { 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 2fb4bd601dc..84a00cab060 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "clusterautoscaling", "definitions": { "kubernetes_apimachinery_APIGroup": { 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 bde92abf732..7613cdb91e9 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "clusterautoscaling", "definitions": { "kubernetes_apimachinery_APIGroup": { 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 91926b2d47e..aede0e4e269 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "config", "definitions": { "kubernetes_apimachinery_APIGroup": { 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 e6ec7278f41..2d835f2d540 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "config", "definitions": { "kubernetes_apimachinery_APIGroup": { 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 e7a0f200230..b1f08e963b7 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "console", "definitions": { "kubernetes_apimachinery_APIGroup": { 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 0bd22f25bcd..d798c4cf781 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "console", "definitions": { "kubernetes_apimachinery_APIGroup": { 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 f633e177c63..55f070afe48 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "hive", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { 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 a7bf3438069..ca2a328be15 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "hive", "definitions": { "k8s_io_apimachinery_pkg_api_resource_Quantity": { @@ -11855,19 +11855,19 @@ }, "machinepool": { "properties": { - "coresPerSocket": { - "type": "integer" - }, - "cpus": { - "type": "integer" + "osDisk": { + "$ref": "#/definitions/os_hive_azure_v1_OSDisk", + "existingJavaType": "io.fabric8.openshift.api.model.hive.azure.v1.OSDisk" }, - "memoryMB": { - "type": "integer", - "existingJavaType": "Long" + "type": { + "type": "string" }, - "osDisk": { - "$ref": "#/definitions/os_hive_vsphere_v1_OSDisk", - "existingJavaType": "io.fabric8.openshift.api.model.hive.vsphere.v1.OSDisk" + "zones": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } } }, "additionalProperties": true @@ -12478,15 +12478,7 @@ "osdisk": { "properties": { "diskSizeGB": { - "type": "integer", - "existingJavaType": "Long" - }, - "diskType": { - "type": "string" - }, - "encryptionKey": { - "$ref": "#/definitions/os_hive_gcp_v1_EncryptionKeyReference", - "existingJavaType": "io.fabric8.openshift.api.model.hive.gcp.v1.EncryptionKeyReference" + "type": "integer" } }, "additionalProperties": true @@ -12607,9 +12599,18 @@ }, "platform": { "properties": { - "libvirtSSHPrivateKeySecretRef": { + "baseDomainResourceGroupName": { + "type": "string" + }, + "cloudName": { + "type": "string" + }, + "credentialsSecretRef": { "$ref": "#/definitions/kubernetes_core_LocalObjectReference", "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" + }, + "region": { + "type": "string" } }, "additionalProperties": true 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 c104a60bfb3..2b25fd26e7f 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "installer", "definitions": { "k8s_io_apimachinery_pkg_runtime_RawExtension": { 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 15edf002453..08754454f5b 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "installer", "definitions": { "k8s_io_apimachinery_pkg_runtime_RawExtension": { @@ -2368,6 +2368,37 @@ "additionalProperties": true }, "machinepool": { + "properties": { + "affinityGroupsNames": { + "type": "array", + "items": { + "type": "string" + } + }, + "autoPinningPolicy": { + "type": "string" + }, + "cpu": { + "$ref": "#/definitions/os_installer_ovirt_v1_CPU", + "existingJavaType": "io.fabric8.openshift.api.model.installer.ovirt.v1.CPU" + }, + "hugepages": { + "type": "integer" + }, + "instanceTypeID": { + "type": "string" + }, + "memoryMB": { + "type": "integer" + }, + "osDisk": { + "$ref": "#/definitions/os_installer_ovirt_v1_Disk", + "existingJavaType": "io.fabric8.openshift.api.model.installer.ovirt.v1.Disk" + }, + "vmType": { + "type": "string" + } + }, "additionalProperties": true }, "machinepoolplatform": { @@ -2589,9 +2620,6 @@ "properties": { "diskSizeGB": { "type": "integer" - }, - "diskType": { - "type": "string" } }, "additionalProperties": true @@ -2624,16 +2652,35 @@ }, "platform": { "properties": { - "URI": { + "defaultMachinePlatform": { + "$ref": "#/definitions/os_installer_alibabacloud_v1_MachinePool", + "existingJavaType": "io.fabric8.openshift.api.model.installer.alibabacloud.v1.MachinePool" + }, + "privateZoneID": { "type": "string" }, - "defaultMachinePlatform": { - "$ref": "#/definitions/os_installer_libvirt_v1_MachinePool", - "existingJavaType": "io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool" + "region": { + "type": "string" }, - "network": { - "$ref": "#/definitions/os_installer_libvirt_v1_Network", - "existingJavaType": "io.fabric8.openshift.api.model.installer.libvirt.v1.Network" + "resourceGroupID": { + "type": "string" + }, + "tags": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" + }, + "vpcID": { + "type": "string" + }, + "vswitchIDs": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } } }, "additionalProperties": true 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 6056f63db2e..8b87528ac6a 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "machine", "definitions": { "kubernetes_apimachinery_APIGroup": { 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 a853c9e773b..90726af89a3 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "machine", "definitions": { "kubernetes_apimachinery_APIGroup": { 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 df5f483721a..4db72291dbc 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "machineconfig", "definitions": { "kubernetes_apimachinery_APIGroup": { 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 4e37414cee3..834cd51a325 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "machineconfig", "definitions": { "kubernetes_apimachinery_APIGroup": { 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 6d7345c6b47..d59d5fa5fb1 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "miscellaneous", "definitions": { "github_com_openshift_api_operator_v1_GenerationStatus": { 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 37ab7391f92..692ec37209d 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "miscellaneous", "definitions": { "github_com_openshift_api_operator_v1_GenerationStatus": { 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 d7db8000ee1..06c20c1392a 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "monitoring", "definitions": { "k8s_io_apiextensions_apiserver_pkg_apis_apiextensions_v1_JSON": { 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 b61106b546e..bd7c46fa161 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "monitoring", "definitions": { "k8s_io_apiextensions_apiserver_pkg_apis_apiextensions_v1_JSON": { 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 4a9957f7d91..870255649da 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "operator", "definitions": { "kubernetes_apimachinery_APIGroup": { 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 4a9f04937c9..3b88f32aa2e 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "operator", "definitions": { "kubernetes_apimachinery_APIGroup": { 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 a7284eb1949..f944251010f 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "operatorhub", "definitions": { "kubernetes_admissionregistration_v1_Rule": { 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 f5374edbd06..b2eb1c28c06 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "operatorhub", "definitions": { "kubernetes_admissionregistration_v1_Rule": { @@ -7293,13 +7293,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/main/resources/schema/kube-schema.json b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/main/resources/schema/kube-schema.json index b00669a3e52..92cd09ac9b1 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "storageversionmigrator", "definitions": { "kubernetes_apimachinery_APIGroup": { 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 ec814152af1..4c26e074c4d 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "storageversionmigrator", "definitions": { "kubernetes_apimachinery_APIGroup": { 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 0adcf2ea718..1a84aa06444 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "tuned", "definitions": { "kubernetes_apimachinery_APIGroup": { 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 0d989782b46..099ce15b978 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "tuned", "definitions": { "kubernetes_apimachinery_APIGroup": { 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 fddd77262ec..f770bdf6a52 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "whereabouts", "definitions": { "kubernetes_apimachinery_APIGroup": { 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 cdc6b0280c5..03da14df468 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "whereabouts", "definitions": { "kubernetes_apimachinery_APIGroup": { 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 ecaa64e02f9..2d9b29e70fc 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "openshift", "definitions": { "kubernetes_apimachinery_APIGroup": { 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 716095ee8aa..b2c1cf47f7a 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 @@ -1,6 +1,6 @@ { "id": "http://fabric8.io/fabric8/v2/Schema#", - "$schema": "http://json-schema.org/draft-05/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "$module": "openshift", "definitions": { "kubernetes_apimachinery_APIGroup": { diff --git a/kubernetes-model-generator/pkg/schemagen/generate.go b/kubernetes-model-generator/pkg/schemagen/generate.go index 2ddbbcafff0..58d608feab3 100644 --- a/kubernetes-model-generator/pkg/schemagen/generate.go +++ b/kubernetes-model-generator/pkg/schemagen/generate.go @@ -268,7 +268,7 @@ func (g *schemaGenerator) generate(t reflect.Type, moduleName string) (*JSONSche s := JSONSchema{ ID: "http://fabric8.io/fabric8/v2/" + t.Name() + "#", - Schema: "http://json-schema.org/draft-05/schema#", + Schema: "http://json-schema.org/draft-07/schema#", Module: moduleName, JSONDescriptor: JSONDescriptor{ Type: "object",