From 587791d8557c3390058948c6bd7e8a4285957dc0 Mon Sep 17 00:00:00 2001 From: Steve Hawkins Date: Wed, 25 May 2022 09:31:47 -0400 Subject: [PATCH] fix #3625: removing default objectmeta --- CHANGELOG.md | 1 + doc/MIGRATION-v6.md | 19 ++- .../kubernetes/client/CustomResource.java | 1 - .../kubernetes/api/model/KubeSchema.java | 3 +- .../v1/MutatingWebhookConfiguration.java | 3 +- .../v1/ValidatingWebhookConfiguration.java | 3 +- .../v1beta1/MutatingWebhookConfiguration.java | 3 +- .../ValidatingWebhookConfiguration.java | 3 +- .../api/model/authentication/TokenReview.java | 3 +- .../v1/LocalSubjectAccessReview.java | 3 +- .../v1/SelfSubjectAccessReview.java | 3 +- .../v1/SelfSubjectRulesReview.java | 3 +- .../authorization/v1/SubjectAccessReview.java | 3 +- .../v1beta1/LocalSubjectAccessReview.java | 3 +- .../v1beta1/SelfSubjectAccessReview.java | 3 +- .../v1beta1/SelfSubjectRulesReview.java | 3 +- .../v1beta1/SubjectAccessReview.java | 3 +- .../resources/schema/validation-schema.json | 78 +++++------ .../kubernetes/api/model/KubeSchema.java | 3 +- .../v1/CustomResourceDefinition.java | 3 +- .../v1beta1/CustomResourceDefinition.java | 3 +- .../resources/schema/validation-schema.json | 130 +++++++++--------- .../kubernetes/api/model/KubeSchema.java | 3 +- .../api/model/apps/ControllerRevision.java | 3 +- .../kubernetes/api/model/apps/DaemonSet.java | 3 +- .../kubernetes/api/model/apps/Deployment.java | 3 +- .../kubernetes/api/model/apps/ReplicaSet.java | 3 +- .../api/model/apps/StatefulSet.java | 3 +- .../kubernetes/api/model/KubeSchema.java | 3 +- .../v1/HorizontalPodAutoscaler.java | 3 +- .../api/model/autoscaling/v1/Scale.java | 3 +- .../v2beta1/HorizontalPodAutoscaler.java | 3 +- .../v2beta2/HorizontalPodAutoscaler.java | 3 +- .../resources/schema/validation-schema.json | 119 ++++++++-------- .../kubernetes/api/model/KubeSchema.java | 3 +- .../api/model/batch/v1/CronJob.java | 3 +- .../kubernetes/api/model/batch/v1/Job.java | 3 +- .../api/model/batch/v1/JobTemplateSpec.java | 3 +- .../api/model/batch/v1beta1/CronJob.java | 3 +- .../model/batch/v1beta1/JobTemplateSpec.java | 3 +- .../resources/schema/validation-schema.json | 16 +-- .../kubernetes/api/model/KubeSchema.java | 3 +- .../v1/CertificateSigningRequest.java | 3 +- .../v1beta1/CertificateSigningRequest.java | 3 +- .../resources/schema/validation-schema.json | 16 +-- .../kubernetes/api/model/KubeSchema.java | 3 +- .../api/model/coordination/v1/Lease.java | 3 +- .../kubernetes/api/model/APIService.java | 9 +- .../fabric8/kubernetes/api/model/Binding.java | 9 +- .../kubernetes/api/model/ComponentStatus.java | 9 +- .../kubernetes/api/model/ConfigMap.java | 9 +- .../kubernetes/api/model/Endpoints.java | 9 +- .../fabric8/kubernetes/api/model/Event.java | 9 +- .../kubernetes/api/model/KubeSchema.java | 9 +- .../kubernetes/api/model/LimitRange.java | 9 +- .../kubernetes/api/model/Namespace.java | 9 +- .../io/fabric8/kubernetes/api/model/Node.java | 9 +- .../api/model/PersistentVolume.java | 9 +- .../api/model/PersistentVolumeClaim.java | 9 +- .../model/PersistentVolumeClaimTemplate.java | 9 +- .../io/fabric8/kubernetes/api/model/Pod.java | 9 +- .../kubernetes/api/model/PodTemplate.java | 9 +- .../kubernetes/api/model/PodTemplateSpec.java | 9 +- .../api/model/ReplicationController.java | 9 +- .../kubernetes/api/model/ResourceQuota.java | 9 +- .../fabric8/kubernetes/api/model/Secret.java | 9 +- .../fabric8/kubernetes/api/model/Service.java | 9 +- .../kubernetes/api/model/ServiceAccount.java | 9 +- .../api/model/GenericKubernetesResource.java | 4 +- .../kubernetes/api/model/KubeSchema.java | 3 +- .../api/model/discovery/v1/EndpointSlice.java | 3 +- .../discovery/v1beta1/EndpointSlice.java | 3 +- .../resources/schema/validation-schema.json | 39 +++--- .../kubernetes/api/model/KubeSchema.java | 3 +- .../kubernetes/api/model/events/v1/Event.java | 3 +- .../api/model/events/v1beta1/Event.java | 3 +- .../kubernetes/api/model/KubeSchema.java | 3 +- .../api/model/extensions/DaemonSet.java | 3 +- .../api/model/extensions/Deployment.java | 3 +- .../api/model/extensions/Ingress.java | 3 +- .../api/model/extensions/NetworkPolicy.java | 3 +- .../api/model/extensions/ReplicaSet.java | 3 +- .../model/flowcontrol/v1beta1/FlowSchema.java | 3 +- .../v1beta1/PriorityLevelConfiguration.java | 3 +- .../jsonschema2pojo/Fabric8DefaultRule.java | 30 ++-- .../kubernetes/api/model/KubeSchema.java | 3 +- .../model/metrics/v1beta1/NodeMetrics.java | 3 +- .../api/model/metrics/v1beta1/PodMetrics.java | 3 +- .../kubernetes/api/model/KubeSchema.java | 3 +- .../api/model/networking/v1/Ingress.java | 3 +- .../api/model/networking/v1/IngressClass.java | 3 +- .../model/networking/v1/NetworkPolicy.java | 3 +- .../api/model/networking/v1beta1/Ingress.java | 3 +- .../networking/v1beta1/IngressClass.java | 3 +- .../resources/schema/validation-schema.json | 57 ++++---- .../kubernetes/api/model/KubeSchema.java | 3 +- .../api/model/node/v1/RuntimeClass.java | 3 +- .../api/model/node/v1alpha1/RuntimeClass.java | 3 +- .../api/model/node/v1beta1/RuntimeClass.java | 3 +- .../resources/schema/validation-schema.json | 15 +- .../kubernetes/api/model/KubeSchema.java | 3 +- .../api/model/policy/v1/Eviction.java | 3 +- .../model/policy/v1/PodDisruptionBudget.java | 3 +- .../api/model/policy/v1beta1/Eviction.java | 3 +- .../policy/v1beta1/PodDisruptionBudget.java | 3 +- .../policy/v1beta1/PodSecurityPolicy.java | 3 +- .../resources/schema/validation-schema.json | 12 +- .../api/model/rbac/ClusterRole.java | 3 +- .../api/model/rbac/ClusterRoleBinding.java | 3 +- .../kubernetes/api/model/rbac/Role.java | 3 +- .../api/model/rbac/RoleBinding.java | 3 +- .../kubernetes/api/model/KubeSchema.java | 3 +- .../model/scheduling/v1/PriorityClass.java | 3 +- .../scheduling/v1beta1/PriorityClass.java | 3 +- .../resources/schema/validation-schema.json | 8 +- .../kubernetes/api/model/KubeSchema.java | 3 +- .../api/model/storage/CSIDriver.java | 3 +- .../kubernetes/api/model/storage/CSINode.java | 3 +- .../api/model/storage/CSIStorageCapacity.java | 3 +- .../api/model/storage/StorageClass.java | 3 +- .../api/model/storage/VolumeAttachment.java | 3 +- .../api/model/storage/v1beta1/CSIDriver.java | 3 +- .../api/model/storage/v1beta1/CSINode.java | 3 +- .../storage/v1beta1/CSIStorageCapacity.java | 3 +- .../resources/schema/validation-schema.json | 34 ++--- .../kubernetes/api/model/KubeSchema.java | 3 +- .../v1/ClusterAutoscaler.java | 3 +- .../v1beta1/MachineAutoscaler.java | 3 +- .../kubernetes/api/model/KubeSchema.java | 3 +- .../model/console/v1/ConsoleCLIDownload.java | 3 +- .../console/v1/ConsoleExternalLogLink.java | 3 +- .../api/model/console/v1/ConsoleLink.java | 3 +- .../model/console/v1/ConsoleNotification.java | 3 +- .../model/console/v1/ConsoleQuickStart.java | 3 +- .../model/console/v1/ConsoleYAMLSample.java | 3 +- .../model/console/v1alpha1/ConsolePlugin.java | 3 +- .../kubernetes/api/model/KubeSchema.java | 3 +- .../api/model/hive/v1/Checkpoint.java | 3 +- .../api/model/hive/v1/ClusterClaim.java | 3 +- .../api/model/hive/v1/ClusterDeployment.java | 3 +- .../api/model/hive/v1/ClusterDeprovision.java | 3 +- .../api/model/hive/v1/ClusterImageSet.java | 3 +- .../api/model/hive/v1/ClusterPool.java | 3 +- .../api/model/hive/v1/ClusterProvision.java | 3 +- .../api/model/hive/v1/ClusterRelocate.java | 3 +- .../api/model/hive/v1/ClusterState.java | 3 +- .../openshift/api/model/hive/v1/DNSZone.java | 3 +- .../api/model/hive/v1/HiveConfig.java | 3 +- .../api/model/hive/v1/MachinePool.java | 3 +- .../model/hive/v1/MachinePoolNameLease.java | 3 +- .../hive/v1/SelectorSyncIdentityProvider.java | 3 +- .../api/model/hive/v1/SelectorSyncSet.java | 3 +- .../model/hive/v1/SyncIdentityProvider.java | 3 +- .../openshift/api/model/hive/v1/SyncSet.java | 3 +- .../resources/schema/validation-schema.json | 82 +++++------ .../kubernetes/api/model/KubeSchema.java | 3 +- .../api/model/installer/v1/InstallConfig.java | 3 +- .../resources/schema/validation-schema.json | 74 ++-------- .../kubernetes/api/model/KubeSchema.java | 3 +- .../api/model/machine/v1beta1/Machine.java | 3 +- .../machine/v1beta1/MachineHealthCheck.java | 3 +- .../api/model/machine/v1beta1/MachineSet.java | 3 +- .../kubernetes/api/model/KubeSchema.java | 3 +- .../v1/ContainerRuntimeConfig.java | 3 +- .../machineconfig/v1/ControllerConfig.java | 3 +- .../model/machineconfig/v1/KubeletConfig.java | 3 +- .../model/machineconfig/v1/MachineConfig.java | 3 +- .../machineconfig/v1/MachineConfigPool.java | 3 +- .../kubernetes/api/model/KubeSchema.java | 3 +- .../apiserver/v1/APIRequestCount.java | 3 +- .../v1/CredentialsRequest.java | 3 +- .../cni/v1/NetworkAttachmentDefinition.java | 3 +- .../imageregistry/operator/v1/Config.java | 3 +- .../metal3/v1alpha1/BareMetalHost.java | 3 +- .../network/operator/v1/EgressRouter.java | 3 +- .../network/operator/v1/OperatorPKI.java | 3 +- .../kubernetes/api/model/KubeSchema.java | 3 +- .../api/model/monitoring/v1/Alertmanager.java | 3 +- .../api/model/monitoring/v1/PodMonitor.java | 3 +- .../api/model/monitoring/v1/Probe.java | 3 +- .../api/model/monitoring/v1/Prometheus.java | 3 +- .../model/monitoring/v1/PrometheusRule.java | 3 +- .../model/monitoring/v1/ServiceMonitor.java | 3 +- .../api/model/monitoring/v1/ThanosRuler.java | 3 +- .../v1alpha1/AlertmanagerConfig.java | 3 +- .../kubernetes/api/model/KubeSchema.java | 3 +- .../v1alpha1/PodNetworkConnectivityCheck.java | 3 +- .../api/model/operator/v1/Authentication.java | 3 +- .../operator/v1/CSISnapshotController.java | 3 +- .../model/operator/v1/CloudCredential.java | 3 +- .../model/operator/v1/ClusterCSIDriver.java | 3 +- .../api/model/operator/v1/Config.java | 3 +- .../api/model/operator/v1/Console.java | 3 +- .../openshift/api/model/operator/v1/DNS.java | 3 +- .../api/model/operator/v1/DNSRecord.java | 3 +- .../openshift/api/model/operator/v1/Etcd.java | 3 +- .../api/model/operator/v1/ImagePruner.java | 3 +- .../model/operator/v1/IngressController.java | 3 +- .../api/model/operator/v1/KubeAPIServer.java | 3 +- .../operator/v1/KubeControllerManager.java | 3 +- .../api/model/operator/v1/KubeScheduler.java | 3 +- .../v1/KubeStorageVersionMigrator.java | 3 +- .../api/model/operator/v1/Network.java | 3 +- .../model/operator/v1/OpenShiftAPIServer.java | 3 +- .../v1/OpenShiftControllerManager.java | 3 +- .../api/model/operator/v1/ServiceCA.java | 3 +- .../operator/v1/ServiceCatalogAPIServer.java | 3 +- .../v1/ServiceCatalogControllerManager.java | 3 +- .../api/model/operator/v1/Storage.java | 3 +- .../v1alpha1/ImageContentSourcePolicy.java | 3 +- .../kubernetes/api/model/KubeSchema.java | 3 +- .../lifecyclemanager/v1/PackageManifest.java | 3 +- .../api/model/operatorhub/v1/Operator.java | 3 +- .../operatorhub/v1/OperatorCondition.java | 3 +- .../model/operatorhub/v1/OperatorGroup.java | 3 +- .../operatorhub/v1alpha1/CatalogSource.java | 3 +- .../v1alpha1/ClusterServiceVersion.java | 3 +- .../operatorhub/v1alpha1/InstallPlan.java | 3 +- .../operatorhub/v1alpha1/Subscription.java | 3 +- .../resources/schema/validation-schema.json | 8 +- .../kubernetes/api/model/KubeSchema.java | 3 +- .../v1alpha1/StorageState.java | 3 +- .../v1alpha1/StorageVersionMigration.java | 3 +- .../kubernetes/api/model/KubeSchema.java | 3 +- .../openshift/api/model/tuned/v1/Profile.java | 3 +- .../openshift/api/model/tuned/v1/Tuned.java | 3 +- .../kubernetes/api/model/KubeSchema.java | 3 +- .../model/whereabouts/v1alpha1/IPPool.java | 3 +- .../OverlappingRangeIPReservation.java | 3 +- .../kubernetes/api/model/KubeSchema.java | 3 +- .../openshift/api/model/APIServer.java | 3 +- .../model/AppliedClusterResourceQuota.java | 3 +- .../openshift/api/model/Authentication.java | 3 +- .../api/model/BrokerTemplateInstance.java | 3 +- .../io/fabric8/openshift/api/model/Build.java | 3 +- .../openshift/api/model/BuildConfig.java | 3 +- .../openshift/api/model/BuildRequest.java | 3 +- .../openshift/api/model/ClusterNetwork.java | 3 +- .../openshift/api/model/ClusterOperator.java | 3 +- .../api/model/ClusterResourceQuota.java | 3 +- .../openshift/api/model/ClusterRole.java | 3 +- .../api/model/ClusterRoleBinding.java | 3 +- .../openshift/api/model/ClusterVersion.java | 3 +- .../fabric8/openshift/api/model/Console.java | 3 +- .../io/fabric8/openshift/api/model/DNS.java | 3 +- .../openshift/api/model/DeploymentConfig.java | 3 +- .../api/model/EgressNetworkPolicy.java | 3 +- .../openshift/api/model/FeatureGate.java | 3 +- .../io/fabric8/openshift/api/model/Group.java | 3 +- .../api/model/HelmChartRepository.java | 3 +- .../openshift/api/model/HostSubnet.java | 3 +- .../fabric8/openshift/api/model/Identity.java | 3 +- .../io/fabric8/openshift/api/model/Image.java | 3 +- .../openshift/api/model/ImageSignature.java | 3 +- .../openshift/api/model/ImageStream.java | 3 +- .../openshift/api/model/ImageStreamImage.java | 3 +- .../api/model/ImageStreamImport.java | 3 +- .../api/model/ImageStreamMapping.java | 3 +- .../openshift/api/model/ImageStreamTag.java | 3 +- .../fabric8/openshift/api/model/ImageTag.java | 3 +- .../openshift/api/model/Infrastructure.java | 3 +- .../fabric8/openshift/api/model/Ingress.java | 3 +- .../openshift/api/model/NetNamespace.java | 3 +- .../fabric8/openshift/api/model/Network.java | 3 +- .../io/fabric8/openshift/api/model/OAuth.java | 3 +- .../openshift/api/model/OAuthAccessToken.java | 3 +- .../api/model/OAuthAuthorizeToken.java | 3 +- .../openshift/api/model/OAuthClient.java | 3 +- .../api/model/OAuthClientAuthorization.java | 3 +- .../openshift/api/model/OperatorHub.java | 3 +- .../fabric8/openshift/api/model/Project.java | 3 +- .../openshift/api/model/ProjectRequest.java | 3 +- .../io/fabric8/openshift/api/model/Proxy.java | 3 +- .../openshift/api/model/RangeAllocation.java | 3 +- .../io/fabric8/openshift/api/model/Role.java | 3 +- .../openshift/api/model/RoleBinding.java | 3 +- .../api/model/RoleBindingRestriction.java | 3 +- .../io/fabric8/openshift/api/model/Route.java | 3 +- .../openshift/api/model/Scheduler.java | 3 +- .../api/model/SecurityContextConstraints.java | 3 +- .../fabric8/openshift/api/model/Template.java | 3 +- .../openshift/api/model/TemplateInstance.java | 3 +- .../io/fabric8/openshift/api/model/User.java | 3 +- .../api/model/UserIdentityMapping.java | 3 +- .../api/model/UserOAuthAccessToken.java | 3 +- .../resources/schema/validation-schema.json | 13 +- .../client/mock/SecretCrudTest.java | 2 +- .../server/mock/OpenshiftRoleBindingTest.java | 12 +- 288 files changed, 677 insertions(+), 1017 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce43a8ac9a1..fe581de064a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ And Store.getKey can be used rather than directly referencing static Cache funct * Fix #4142: Added patch() and patch(PatchContext) methods for use with resource and load * Fix #4146: ManagedKubernetesClient and ManagedOpenShiftClient as delayed OSGi services * Fix #4093: adding a possibility to get a log as an `InputStream` from the `Loggable` resources +* Fix #3625: adds default maps to mostly prevent the need for null checks on things like annotations and labels. #### Dependency Upgrade * Fix #3788: Point CamelK Extension model to latest released version v1.8.0 diff --git a/doc/MIGRATION-v6.md b/doc/MIGRATION-v6.md index 20f41d1e611..95646b0cd6f 100644 --- a/doc/MIGRATION-v6.md +++ b/doc/MIGRATION-v6.md @@ -1,7 +1,7 @@ # Migration from 5.x to 6.x ## Contents: -- [ObjectMetadata](#objectmetadata) +- [Default Maps](#default-maps) - [Backwards Compatibility Interceptor](#backwards-compatibility-interceptor) - [Namespace Changes](#namespace-changes) - [API/Impl split](#api-impl-split) @@ -20,14 +20,21 @@ - [Delete Behavior](#delete-behavior) - [Stream Changes](#stream-changes) -## ObjectMetadata +## Default Maps -ObjectMetadata will default to a non-null value. All Maps in the generated object models, including ObjectMetadata.annotations and labels will also be non-null by default. A small behavioral difference is that the default value will be omitted from serialization, previously if you did something like +All Maps in the generated object models, including ObjectMetadata.annotations and labels will also be non-null by default. A small behavioral difference is that the default value will be omitted from serialization, previously if you did something like: + +``` +Pod p = new PodBuilder().withNewMetadata().withLabels(new HashMap()).endMetadata().build(); ``` -Pod p = new Pod(); -p.setMetadata(new ObjectMetadata()); +p would serialize with + ``` -p would serialize with "metadata: {}" - that will now be omitted. +metadata: + labels: {} +``` + +That empty map will now be omitted - which is the same as the existing behavior for arrays. ## Backwards Compatibility Interceptor diff --git a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/CustomResource.java b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/CustomResource.java index 74edd3a5536..8145015d889 100644 --- a/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/CustomResource.java +++ b/kubernetes-client-api/src/main/java/io/fabric8/kubernetes/client/CustomResource.java @@ -75,7 +75,6 @@ public abstract class CustomResource implements HasMetadata { private static final Logger LOG = LoggerFactory.getLogger(CustomResource.class); - @JsonInclude(value = Include.CUSTOM, valueFilter = ObjectMeta.class) private ObjectMeta metadata = new ObjectMeta(); @JsonProperty("spec") diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index e87667eb641..6afbf8a5e08 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -129,8 +129,7 @@ public class KubeSchema { @JsonProperty("MutatingWebhookConfigurationList") private io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhookConfigurationList mutatingWebhookConfigurationList; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("Patch") private Patch patch; @JsonProperty("PatchOptions") diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/MutatingWebhookConfiguration.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/MutatingWebhookConfiguration.java index 16b15d0b8ba..26e7660ffcb 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/MutatingWebhookConfiguration.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/MutatingWebhookConfiguration.java @@ -81,8 +81,7 @@ public class MutatingWebhookConfiguration implements HasMetadata @JsonProperty("kind") private String kind = "MutatingWebhookConfiguration"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("webhooks") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List webhooks = new ArrayList(); diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/ValidatingWebhookConfiguration.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/ValidatingWebhookConfiguration.java index 0d6d80a9eca..a816ec85911 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/ValidatingWebhookConfiguration.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1/ValidatingWebhookConfiguration.java @@ -81,8 +81,7 @@ public class ValidatingWebhookConfiguration implements HasMetadata @JsonProperty("kind") private String kind = "ValidatingWebhookConfiguration"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("webhooks") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List webhooks = new ArrayList(); diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/MutatingWebhookConfiguration.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/MutatingWebhookConfiguration.java index 0305800ecf6..b837f348651 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/MutatingWebhookConfiguration.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/MutatingWebhookConfiguration.java @@ -81,8 +81,7 @@ public class MutatingWebhookConfiguration implements HasMetadata @JsonProperty("kind") private String kind = "MutatingWebhookConfiguration"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("webhooks") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List webhooks = new ArrayList(); diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingWebhookConfiguration.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingWebhookConfiguration.java index f04c6ec6101..c1bf36de181 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingWebhookConfiguration.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/admissionregistration/v1beta1/ValidatingWebhookConfiguration.java @@ -81,8 +81,7 @@ public class ValidatingWebhookConfiguration implements HasMetadata @JsonProperty("kind") private String kind = "ValidatingWebhookConfiguration"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("webhooks") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List webhooks = new ArrayList(); diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/TokenReview.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/TokenReview.java index 2bde70aab56..354e7ba4a84 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/TokenReview.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authentication/TokenReview.java @@ -75,8 +75,7 @@ public class TokenReview implements HasMetadata @JsonProperty("kind") private String kind = "TokenReview"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private TokenReviewSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/LocalSubjectAccessReview.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/LocalSubjectAccessReview.java index 3e163d8ec67..f0cabacd33a 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/LocalSubjectAccessReview.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/LocalSubjectAccessReview.java @@ -76,8 +76,7 @@ public class LocalSubjectAccessReview implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "LocalSubjectAccessReview"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private SubjectAccessReviewSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/SelfSubjectAccessReview.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/SelfSubjectAccessReview.java index 73c745a3503..a9ddf90e220 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/SelfSubjectAccessReview.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/SelfSubjectAccessReview.java @@ -75,8 +75,7 @@ public class SelfSubjectAccessReview implements HasMetadata @JsonProperty("kind") private String kind = "SelfSubjectAccessReview"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private SelfSubjectAccessReviewSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/SelfSubjectRulesReview.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/SelfSubjectRulesReview.java index 49c59d73bbb..3232df8d6a5 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/SelfSubjectRulesReview.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/SelfSubjectRulesReview.java @@ -75,8 +75,7 @@ public class SelfSubjectRulesReview implements HasMetadata @JsonProperty("kind") private String kind = "SelfSubjectRulesReview"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private SelfSubjectRulesReviewSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/SubjectAccessReview.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/SubjectAccessReview.java index 1b3633464b5..45e866f319a 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/SubjectAccessReview.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1/SubjectAccessReview.java @@ -75,8 +75,7 @@ public class SubjectAccessReview implements HasMetadata @JsonProperty("kind") private String kind = "SubjectAccessReview"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private SubjectAccessReviewSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/LocalSubjectAccessReview.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/LocalSubjectAccessReview.java index 51e0de67a1f..c66c4bfb398 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/LocalSubjectAccessReview.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/LocalSubjectAccessReview.java @@ -76,8 +76,7 @@ public class LocalSubjectAccessReview implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "LocalSubjectAccessReview"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private SubjectAccessReviewSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SelfSubjectAccessReview.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SelfSubjectAccessReview.java index a501792e590..f259fa67f6f 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SelfSubjectAccessReview.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SelfSubjectAccessReview.java @@ -75,8 +75,7 @@ public class SelfSubjectAccessReview implements HasMetadata @JsonProperty("kind") private String kind = "SelfSubjectAccessReview"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private SelfSubjectAccessReviewSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SelfSubjectRulesReview.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SelfSubjectRulesReview.java index 5257b76eb7a..5f42e14ce45 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SelfSubjectRulesReview.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SelfSubjectRulesReview.java @@ -75,8 +75,7 @@ public class SelfSubjectRulesReview implements HasMetadata @JsonProperty("kind") private String kind = "SelfSubjectRulesReview"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private SelfSubjectRulesReviewSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SubjectAccessReview.java b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SubjectAccessReview.java index ddbaf19a398..ffab3a539c1 100644 --- a/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SubjectAccessReview.java +++ b/kubernetes-model-generator/kubernetes-model-admissionregistration/src/generated/java/io/fabric8/kubernetes/api/model/authorization/v1beta1/SubjectAccessReview.java @@ -75,8 +75,7 @@ public class SubjectAccessReview implements HasMetadata @JsonProperty("kind") private String kind = "SubjectAccessReview"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private SubjectAccessReviewSpec spec; @JsonProperty("status") 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 ea7b3bb73ac..264b27b8003 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 @@ -3304,7 +3304,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1", + "default": "authorization.k8s.io/v1beta1", "required": true }, "kind": { @@ -3317,12 +3317,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewSpec" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewSpec" }, "status": { - "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewStatus" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewStatus" } }, "additionalProperties": true @@ -3359,14 +3359,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" @@ -3392,8 +3391,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_RuleWithOperations", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.RuleWithOperations" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_RuleWithOperations", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.RuleWithOperations" } }, "sideEffects": { @@ -3409,7 +3408,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1", + "default": "admissionregistration.k8s.io/v1beta1", "required": true }, "kind": { @@ -3425,8 +3424,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_MutatingWebhook", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.MutatingWebhook" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_MutatingWebhook", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.MutatingWebhook" } } }, @@ -3811,12 +3810,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 @@ -3825,7 +3824,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1beta1", + "default": "authorization.k8s.io/v1", "required": true }, "kind": { @@ -3838,12 +3837,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SelfSubjectRulesReviewSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SelfSubjectRulesReviewSpec" + "$ref": "#/definitions/kubernetes_authorization_v1_SelfSubjectRulesReviewSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SelfSubjectRulesReviewSpec" }, "status": { - "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectRulesReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectRulesReviewStatus" + "$ref": "#/definitions/kubernetes_authorization_v1_SubjectRulesReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectRulesReviewStatus" } }, "additionalProperties": true @@ -3965,7 +3964,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "authorization.k8s.io/v1", + "default": "authorization.k8s.io/v1beta1", "required": true }, "kind": { @@ -3978,12 +3977,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewSpec" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewSpec" }, "status": { - "$ref": "#/definitions/kubernetes_authorization_v1_SubjectAccessReviewStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewStatus" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_SubjectAccessReviewStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.SubjectAccessReviewStatus" } }, "additionalProperties": true @@ -4000,7 +3999,7 @@ }, "existingJavaType": "java.util.Map\u003cString, java.util.ArrayList\u003cString\u003e\u003e" }, - "groups": { + "group": { "type": "array", "javaOmitEmpty": true, "items": { @@ -4008,12 +4007,12 @@ } }, "nonResourceAttributes": { - "$ref": "#/definitions/kubernetes_authorization_v1_NonResourceAttributes", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.NonResourceAttributes" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_NonResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.NonResourceAttributes" }, "resourceAttributes": { - "$ref": "#/definitions/kubernetes_authorization_v1_ResourceAttributes", - "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1.ResourceAttributes" + "$ref": "#/definitions/kubernetes_authorization_v1beta1_ResourceAttributes", + "existingJavaType": "io.fabric8.kubernetes.api.model.authorization.v1beta1.ResourceAttributes" }, "uid": { "type": "string" @@ -4209,14 +4208,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" @@ -4239,8 +4237,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_RuleWithOperations", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.RuleWithOperations" + "$ref": "#/definitions/kubernetes_admissionregistration_v1_RuleWithOperations", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.RuleWithOperations" } }, "sideEffects": { @@ -4256,7 +4254,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "admissionregistration.k8s.io/v1", + "default": "admissionregistration.k8s.io/v1beta1", "required": true }, "kind": { @@ -4272,8 +4270,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_admissionregistration_v1_ValidatingWebhook", - "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1.ValidatingWebhook" + "$ref": "#/definitions/kubernetes_admissionregistration_v1beta1_ValidatingWebhook", + "existingJavaType": "io.fabric8.kubernetes.api.model.admissionregistration.v1beta1.ValidatingWebhook" } } }, diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index f57df006d3b..a32a54b83fa 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -117,8 +117,7 @@ public class KubeSchema { @JsonProperty("ListOptions") private ListOptions listOptions; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("ObjectReference") private io.fabric8.kubernetes.api.model.ObjectReference objectReference; @JsonProperty("Patch") diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/CustomResourceDefinition.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/CustomResourceDefinition.java index 60b8d63c4f2..683ac7fc25c 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/CustomResourceDefinition.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1/CustomResourceDefinition.java @@ -80,8 +80,7 @@ public class CustomResourceDefinition implements HasMetadata @JsonProperty("kind") private String kind = "CustomResourceDefinition"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private CustomResourceDefinitionSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/CustomResourceDefinition.java b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/CustomResourceDefinition.java index 6fff2c8ad5e..b0e7868a71f 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/CustomResourceDefinition.java +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/generated/java/io/fabric8/kubernetes/api/model/apiextensions/v1beta1/CustomResourceDefinition.java @@ -80,8 +80,7 @@ public class CustomResourceDefinition implements HasMetadata @JsonProperty("kind") private String kind = "CustomResourceDefinition"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private CustomResourceDefinitionSpec spec; @JsonProperty("status") 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 49ac58e9d66..aac22881540 100644 --- a/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-apiextensions/src/main/resources/schema/validation-schema.json @@ -2578,13 +2578,13 @@ }, "customresourcecolumndefinition": { "properties": { - "description": { + "JSONPath": { "type": "string" }, - "format": { + "description": { "type": "string" }, - "jsonPath": { + "format": { "type": "string" }, "name": { @@ -2670,14 +2670,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "apiextensions.k8s.io/v1", + "default": "apiextensions.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceDefinition", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceDefinition" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceDefinition", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition" } }, "kind": { @@ -2775,14 +2775,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": { @@ -2800,8 +2800,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceColumnDefinition", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceColumnDefinition" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceColumnDefinition", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceColumnDefinition" } }, "deprecated": { @@ -2814,8 +2814,8 @@ "type": "string" }, "schema": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceValidation", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceValidation" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceValidation", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceValidation" }, "served": { "type": "boolean" @@ -2824,8 +2824,8 @@ "type": "boolean" }, "subresources": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceSubresources", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceSubresources" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresources", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresources" } }, "additionalProperties": true @@ -2833,12 +2833,12 @@ "customresourcesubresources": { "properties": { "scale": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceSubresourceScale", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceSubresourceScale" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresourceScale", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresourceScale" }, "status": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_CustomResourceSubresourceStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.CustomResourceSubresourceStatus" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_CustomResourceSubresourceStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceSubresourceStatus" } }, "additionalProperties": true @@ -2863,8 +2863,8 @@ "customresourcevalidation": { "properties": { "openAPIV3Schema": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" } }, "additionalProperties": true @@ -3000,48 +3000,48 @@ "type": "string" }, "additionalItems": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrBool", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrBool" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrBool", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrBool" }, "additionalProperties": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrBool", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrBool" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrBool", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrBool" }, "allOf": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" } }, "anyOf": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" } }, "default": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSON", + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSON", "existingJavaType": "com.fasterxml.jackson.databind.JsonNode" }, "definitions": { "type": "object", "additionalProperties": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" }, "dependencies": { "type": "object", "additionalProperties": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrStringArray", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrStringArray", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrStringArray\u003e" + "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrStringArray\u003e" }, "description": { "type": "string" @@ -3050,12 +3050,12 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSON", + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSON", "existingJavaType": "com.fasterxml.jackson.databind.JsonNode" } }, "example": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSON", + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSON", "existingJavaType": "com.fasterxml.jackson.databind.JsonNode" }, "exclusiveMaximum": { @@ -3065,8 +3065,8 @@ "type": "boolean" }, "externalDocs": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_ExternalDocumentation", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.ExternalDocumentation" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_ExternalDocumentation", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.ExternalDocumentation" }, "format": { "type": "string" @@ -3075,8 +3075,8 @@ "type": "string" }, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaPropsOrArray", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaPropsOrArray" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaPropsOrArray", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaPropsOrArray" }, "maxItems": { "type": "integer", @@ -3112,8 +3112,8 @@ "type": "number" }, "not": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" }, "nullable": { "type": "boolean" @@ -3122,8 +3122,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" } }, "pattern": { @@ -3132,18 +3132,18 @@ "patternProperties": { "type": "object", "additionalProperties": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" }, "properties": { "type": "object", "additionalProperties": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" }, - "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps\u003e" + "existingJavaType": "java.util.Map\u003cString, io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps\u003e" }, "required": { "type": "array", @@ -3187,8 +3187,8 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_ValidationRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.ValidationRule" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_ValidationRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.ValidationRule" } } }, @@ -3199,13 +3199,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 @@ -3216,8 +3216,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 @@ -3231,8 +3231,8 @@ } }, "Schema": { - "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_JSONSchemaProps", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.JSONSchemaProps" + "$ref": "#/definitions/kubernetes_apiextensions_v1_JSONSchemaProps", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.JSONSchemaProps" } }, "additionalProperties": true @@ -3719,8 +3719,8 @@ "type": "string" }, "service": { - "$ref": "#/definitions/kubernetes_apiextensions_v1_ServiceReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1.ServiceReference" + "$ref": "#/definitions/kubernetes_apiextensions_v1beta1_ServiceReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.apiextensions.v1beta1.ServiceReference" }, "url": { "type": "string" diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 4094beb10d4..9ee35eaa97f 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -175,8 +175,7 @@ public class KubeSchema { @JsonProperty("NodeList") private NodeList nodeList; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("Patch") private Patch patch; @JsonProperty("PatchOptions") diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ControllerRevision.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ControllerRevision.java index 033d279afae..258a3055b90 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ControllerRevision.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ControllerRevision.java @@ -83,8 +83,7 @@ public class ControllerRevision implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "ControllerRevision"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("revision") private Long revision; @JsonIgnore diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DaemonSet.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DaemonSet.java index e82e48fb1db..1c89c6b60bc 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DaemonSet.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/DaemonSet.java @@ -81,8 +81,7 @@ public class DaemonSet implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "DaemonSet"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private DaemonSetSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/Deployment.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/Deployment.java index f9dccc19d47..b8e058dbd95 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/Deployment.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/Deployment.java @@ -81,8 +81,7 @@ public class Deployment implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Deployment"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private DeploymentSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ReplicaSet.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ReplicaSet.java index 153b75be0c3..a7407e737fc 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ReplicaSet.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/ReplicaSet.java @@ -81,8 +81,7 @@ public class ReplicaSet implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "ReplicaSet"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ReplicaSetSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/StatefulSet.java b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/StatefulSet.java index dbcad2d2259..b220fe315f1 100644 --- a/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/StatefulSet.java +++ b/kubernetes-model-generator/kubernetes-model-apps/src/generated/java/io/fabric8/kubernetes/api/model/apps/StatefulSet.java @@ -81,8 +81,7 @@ public class StatefulSet implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "StatefulSet"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private StatefulSetSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 84820b6973a..6185d5b8ba2 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -95,8 +95,7 @@ public class KubeSchema { @JsonProperty("ListOptions") private ListOptions listOptions; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("Patch") private Patch patch; @JsonProperty("PatchOptions") diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v1/HorizontalPodAutoscaler.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v1/HorizontalPodAutoscaler.java index 5c674874903..496e1a8d176 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v1/HorizontalPodAutoscaler.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v1/HorizontalPodAutoscaler.java @@ -81,8 +81,7 @@ public class HorizontalPodAutoscaler implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "HorizontalPodAutoscaler"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private HorizontalPodAutoscalerSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v1/Scale.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v1/Scale.java index a2601f71871..bccd644758a 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v1/Scale.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v1/Scale.java @@ -76,8 +76,7 @@ public class Scale implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Scale"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ScaleSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/HorizontalPodAutoscaler.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/HorizontalPodAutoscaler.java index 661247f9122..1951877ab31 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/HorizontalPodAutoscaler.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta1/HorizontalPodAutoscaler.java @@ -81,8 +81,7 @@ public class HorizontalPodAutoscaler implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "HorizontalPodAutoscaler"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private HorizontalPodAutoscalerSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta2/HorizontalPodAutoscaler.java b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta2/HorizontalPodAutoscaler.java index 59bcc563bec..bb9c715127b 100644 --- a/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta2/HorizontalPodAutoscaler.java +++ b/kubernetes-model-generator/kubernetes-model-autoscaling/src/generated/java/io/fabric8/kubernetes/api/model/autoscaling/v2beta2/HorizontalPodAutoscaler.java @@ -81,8 +81,7 @@ public class HorizontalPodAutoscaler implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "HorizontalPodAutoscaler"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private HorizontalPodAutoscalerSpec spec; @JsonProperty("status") 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 c8c42a38d7c..585c0dc9a3c 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 @@ -2334,13 +2334,20 @@ }, "externalmetricstatus": { "properties": { - "current": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricValueStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricValueStatus" + "currentAverageValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" }, - "metric": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricIdentifier", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricIdentifier" + "currentValue": { + "$ref": "#/definitions/kubernetes_resource_Quantity", + "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + }, + "metricName": { + "type": "string" + }, + "metricSelector": { + "$ref": "#/definitions/kubernetes_apimachinery_LabelSelector", + "existingJavaType": "io.fabric8.kubernetes.api.model.LabelSelector" } }, "additionalProperties": true @@ -2466,6 +2473,10 @@ }, "horizontalpodautoscalerspec": { "properties": { + "behavior": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HorizontalPodAutoscalerBehavior", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerBehavior" + }, "maxReplicas": { "type": "integer" }, @@ -2473,24 +2484,35 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_MetricSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.MetricSpec" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricSpec" } }, "minReplicas": { "type": "integer" }, "scaleTargetRef": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_CrossVersionObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.CrossVersionObjectReference" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.CrossVersionObjectReference" } }, "additionalProperties": true }, "horizontalpodautoscalerstatus": { "properties": { - "currentCPUUtilizationPercentage": { - "type": "integer" + "conditions": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_HorizontalPodAutoscalerCondition", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.HorizontalPodAutoscalerCondition" + } + }, + "currentMetrics": { + "type": "array", + "items": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricStatus" + } }, "currentReplicas": { "type": "integer" @@ -2746,24 +2768,24 @@ "metricspec": { "properties": { "containerResource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ContainerResourceMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ContainerResourceMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ContainerResourceMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ContainerResourceMetricSource" }, "external": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ExternalMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ExternalMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ExternalMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ExternalMetricSource" }, "object": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ObjectMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ObjectMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ObjectMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ObjectMetricSource" }, "pods": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_PodsMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.PodsMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_PodsMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.PodsMetricSource" }, "resource": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_ResourceMetricSource", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.ResourceMetricSource" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_ResourceMetricSource", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.ResourceMetricSource" }, "type": { "type": "string" @@ -2917,24 +2939,17 @@ }, "objectmetricsource": { "properties": { - "averageValue": { - "$ref": "#/definitions/kubernetes_resource_Quantity", - "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" - }, - "metricName": { - "type": "string" + "describedObject": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_CrossVersionObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.CrossVersionObjectReference" }, - "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" }, "target": { - "$ref": "#/definitions/kubernetes_autoscaling_v2beta1_CrossVersionObjectReference", - "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta1.CrossVersionObjectReference" - }, - "targetValue": { - "$ref": "#/definitions/kubernetes_resource_Quantity", - "existingJavaType": "io.fabric8.kubernetes.api.model.Quantity" + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricTarget", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricTarget" } }, "additionalProperties": true @@ -3022,32 +3037,26 @@ }, "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 }, "podsmetricstatus": { "properties": { - "currentAverageValue": { - "$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" + "metric": { + "$ref": "#/definitions/kubernetes_autoscaling_v2beta2_MetricIdentifier", + "existingJavaType": "io.fabric8.kubernetes.api.model.autoscaling.v2beta2.MetricIdentifier" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 6881cf3eaed..81f6d6f9a61 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -104,8 +104,7 @@ public class KubeSchema { @JsonProperty("ListOptions") private ListOptions listOptions; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("Patch") private Patch patch; @JsonProperty("PatchOptions") diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/CronJob.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/CronJob.java index f71eb6438fb..3498a450c5f 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/CronJob.java +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/CronJob.java @@ -81,8 +81,7 @@ public class CronJob implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "CronJob"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private CronJobSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/Job.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/Job.java index 73f09d6598f..003959be2c1 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/Job.java +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/Job.java @@ -81,8 +81,7 @@ public class Job implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Job"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private JobSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobTemplateSpec.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobTemplateSpec.java index aac88cbae8f..a34fda6c042 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobTemplateSpec.java +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1/JobTemplateSpec.java @@ -56,8 +56,7 @@ public class JobTemplateSpec implements KubernetesResource { @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private JobSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1beta1/CronJob.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1beta1/CronJob.java index 21ee2dfb300..392a88296df 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1beta1/CronJob.java +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1beta1/CronJob.java @@ -81,8 +81,7 @@ public class CronJob implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "CronJob"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private CronJobSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1beta1/JobTemplateSpec.java b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1beta1/JobTemplateSpec.java index ae76f2fcaab..3a15d24037b 100644 --- a/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1beta1/JobTemplateSpec.java +++ b/kubernetes-model-generator/kubernetes-model-batch/src/generated/java/io/fabric8/kubernetes/api/model/batch/v1beta1/JobTemplateSpec.java @@ -57,8 +57,7 @@ public class JobTemplateSpec implements KubernetesResource { @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private JobSpec spec; @JsonIgnore 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 d0d0f8e2729..2fed829550a 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 @@ -4720,7 +4720,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "batch/v1", + "default": "batch/v1beta1", "required": true }, "kind": { @@ -4733,12 +4733,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_batch_v1_CronJobSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJobSpec" + "$ref": "#/definitions/kubernetes_batch_v1beta1_CronJobSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobSpec" }, "status": { - "$ref": "#/definitions/kubernetes_batch_v1_CronJobStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJobStatus" + "$ref": "#/definitions/kubernetes_batch_v1beta1_CronJobStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJobStatus" } }, "additionalProperties": true @@ -4747,14 +4747,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "batch/v1beta1", + "default": "batch/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_batch_v1beta1_CronJob", - "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1beta1.CronJob" + "$ref": "#/definitions/kubernetes_batch_v1_CronJob", + "existingJavaType": "io.fabric8.kubernetes.api.model.batch.v1.CronJob" } }, "kind": { diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 07a90b3a424..52a513710eb 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -107,8 +107,7 @@ public class KubeSchema { @JsonProperty("ListOptions") private ListOptions listOptions; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("Patch") private Patch patch; @JsonProperty("PatchOptions") diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1/CertificateSigningRequest.java b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1/CertificateSigningRequest.java index dab595b9a6a..0dda5c37767 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1/CertificateSigningRequest.java +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1/CertificateSigningRequest.java @@ -80,8 +80,7 @@ public class CertificateSigningRequest implements HasMetadata @JsonProperty("kind") private String kind = "CertificateSigningRequest"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private CertificateSigningRequestSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1beta1/CertificateSigningRequest.java b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1beta1/CertificateSigningRequest.java index 550a0012c15..9a69239e8e4 100644 --- a/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1beta1/CertificateSigningRequest.java +++ b/kubernetes-model-generator/kubernetes-model-certificates/src/generated/java/io/fabric8/kubernetes/api/model/certificates/v1beta1/CertificateSigningRequest.java @@ -80,8 +80,7 @@ public class CertificateSigningRequest implements HasMetadata @JsonProperty("kind") private String kind = "CertificateSigningRequest"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private CertificateSigningRequestSpec spec; @JsonProperty("status") 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 c580f885cda..f13bf1ba3bb 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 @@ -1261,7 +1261,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "certificates.k8s.io/v1beta1", + "default": "certificates.k8s.io/v1", "required": true }, "kind": { @@ -1274,12 +1274,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_certificates_v1beta1_CertificateSigningRequestSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestSpec" + "$ref": "#/definitions/kubernetes_certificates_v1_CertificateSigningRequestSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestSpec" }, "status": { - "$ref": "#/definitions/kubernetes_certificates_v1beta1_CertificateSigningRequestStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequestStatus" + "$ref": "#/definitions/kubernetes_certificates_v1_CertificateSigningRequestStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequestStatus" } }, "additionalProperties": true @@ -1313,14 +1313,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "certificates.k8s.io/v1", + "default": "certificates.k8s.io/v1beta1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_certificates_v1_CertificateSigningRequest", - "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1.CertificateSigningRequest" + "$ref": "#/definitions/kubernetes_certificates_v1beta1_CertificateSigningRequest", + "existingJavaType": "io.fabric8.kubernetes.api.model.certificates.v1beta1.CertificateSigningRequest" } }, "kind": { diff --git a/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index bfa887cf0df..6306287d295 100644 --- a/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -95,8 +95,7 @@ public class KubeSchema { @JsonProperty("ListOptions") private ListOptions listOptions; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("Patch") private Patch patch; @JsonProperty("PatchOptions") diff --git a/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/coordination/v1/Lease.java b/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/coordination/v1/Lease.java index b0d94252aea..508b99c4e27 100644 --- a/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/coordination/v1/Lease.java +++ b/kubernetes-model-generator/kubernetes-model-coordination/src/generated/java/io/fabric8/kubernetes/api/model/coordination/v1/Lease.java @@ -80,8 +80,7 @@ public class Lease implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Lease"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private LeaseSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/APIService.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/APIService.java index f96faf6c515..b7756a9c0fb 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/APIService.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/APIService.java @@ -60,8 +60,7 @@ public class APIService implements HasMetadata @JsonProperty("kind") private String kind = "APIService"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private ObjectMeta metadata; @JsonProperty("spec") private APIServiceSpec spec; @JsonProperty("status") @@ -84,7 +83,7 @@ public APIService() { * @param spec * @param status */ - public APIService(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, APIServiceSpec spec, APIServiceStatus status) { + public APIService(String apiVersion, String kind, ObjectMeta metadata, APIServiceSpec spec, APIServiceStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -134,12 +133,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Binding.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Binding.java index 5a4b8c00a89..f6bf7bcfba3 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Binding.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Binding.java @@ -54,8 +54,7 @@ public class Binding implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Binding"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private ObjectMeta metadata; @JsonProperty("target") private ObjectReference target; @JsonIgnore @@ -75,7 +74,7 @@ public Binding() { * @param kind * @param target */ - public Binding(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, ObjectReference target) { + public Binding(String apiVersion, String kind, ObjectMeta metadata, ObjectReference target) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -124,12 +123,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ComponentStatus.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ComponentStatus.java index 9aa269f5782..4223126b85f 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ComponentStatus.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ComponentStatus.java @@ -64,8 +64,7 @@ public class ComponentStatus implements HasMetadata @JsonProperty("kind") private String kind = "ComponentStatus"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private ObjectMeta metadata; @JsonIgnore private Map additionalProperties = new HashMap(); @@ -83,7 +82,7 @@ public ComponentStatus() { * @param kind * @param conditions */ - public ComponentStatus(String apiVersion, List conditions, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public ComponentStatus(String apiVersion, List conditions, String kind, ObjectMeta metadata) { super(); this.apiVersion = apiVersion; this.conditions = conditions; @@ -142,12 +141,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ConfigMap.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ConfigMap.java index 13ca4df7f60..6872a806e37 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ConfigMap.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ConfigMap.java @@ -70,8 +70,7 @@ public class ConfigMap implements HasMetadata, Namespaced @JsonProperty("kind") private java.lang.String kind = "ConfigMap"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private ObjectMeta metadata; @JsonIgnore private Map additionalProperties = new HashMap(); @@ -91,7 +90,7 @@ public ConfigMap() { * @param binaryData * @param kind */ - public ConfigMap(java.lang.String apiVersion, Map binaryData, Map data, Boolean immutable, java.lang.String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public ConfigMap(java.lang.String apiVersion, Map binaryData, Map data, Boolean immutable, java.lang.String kind, ObjectMeta metadata) { super(); this.apiVersion = apiVersion; this.binaryData = binaryData; @@ -172,12 +171,12 @@ public void setKind(java.lang.String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Endpoints.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Endpoints.java index 7e716ff4ee6..fef9bdcf512 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Endpoints.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Endpoints.java @@ -61,8 +61,7 @@ public class Endpoints implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Endpoints"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private ObjectMeta metadata; @JsonProperty("subsets") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List subsets = new ArrayList(); @@ -83,7 +82,7 @@ public Endpoints() { * @param kind * @param subsets */ - public Endpoints(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, List subsets) { + public Endpoints(String apiVersion, String kind, ObjectMeta metadata, List subsets) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -132,12 +131,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Event.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Event.java index 5d15e8f9623..60818774792 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Event.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Event.java @@ -86,8 +86,7 @@ public class Event implements HasMetadata, Namespaced @JsonProperty("message") private java.lang.String message; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private ObjectMeta metadata; @JsonProperty("reason") private java.lang.String reason; @JsonProperty("related") @@ -132,7 +131,7 @@ public Event() { * @param eventTime * @param action */ - public Event(java.lang.String action, java.lang.String apiVersion, Integer count, MicroTime eventTime, String firstTimestamp, ObjectReference involvedObject, java.lang.String kind, String lastTimestamp, java.lang.String message, io.fabric8.kubernetes.api.model.ObjectMeta metadata, java.lang.String reason, ObjectReference related, java.lang.String reportingComponent, java.lang.String reportingInstance, EventSeries series, EventSource source, java.lang.String type) { + public Event(java.lang.String action, java.lang.String apiVersion, Integer count, MicroTime eventTime, String firstTimestamp, ObjectReference involvedObject, java.lang.String kind, String lastTimestamp, java.lang.String message, ObjectMeta metadata, java.lang.String reason, ObjectReference related, java.lang.String reportingComponent, java.lang.String reportingInstance, EventSeries series, EventSource source, java.lang.String type) { super(); this.action = action; this.apiVersion = apiVersion; @@ -264,12 +263,12 @@ public void setMessage(java.lang.String message) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 6a4732dc6c6..0b7814ec435 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -173,8 +173,7 @@ public class KubeSchema { @JsonProperty("NodeList") private NodeList nodeList; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private ObjectMeta objectMeta; @JsonProperty("Patch") private Patch patch; @JsonProperty("PatchOptions") @@ -304,7 +303,7 @@ public KubeSchema() { * @param endpointPort * @param config */ - public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIResource aPIResource, APIResourceList aPIResourceList, APIService aPIService, APIServiceList aPIServiceList, BaseKubernetesList baseKubernetesList, Binding binding, ComponentStatus componentStatus, ComponentStatusList componentStatusList, Condition condition, Config config, ConfigMap configMap, ConfigMapList configMapList, ContainerStatus containerStatus, CreateOptions createOptions, DeleteOptions deleteOptions, EndpointPort endpointPort, Endpoints endpoints, EndpointsList endpointsList, EnvVar envVar, Event event, EventList eventList, EventSeries eventSeries, EventSource eventSource, GetOptions getOptions, GroupKind groupKind, GroupVersionKind groupVersionKind, GroupVersionResource groupVersionResource, Info info, LimitRangeList limitRangeList, ListOptions listOptions, MicroTime microTime, Namespace namespace, NamespaceList namespaceList, Node node, NodeList nodeList, io.fabric8.kubernetes.api.model.ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, PersistentVolume persistentVolume, PersistentVolumeClaim persistentVolumeClaim, PersistentVolumeClaimList persistentVolumeClaimList, PersistentVolumeList persistentVolumeList, PodExecOptions podExecOptions, PodList podList, PodTemplateList podTemplateList, Quantity quantity, ReplicationControllerList replicationControllerList, ResourceQuota resourceQuota, ResourceQuotaList resourceQuotaList, RootPaths rootPaths, Secret secret, SecretList secretList, ServiceAccount serviceAccount, ServiceAccountList serviceAccountList, ServiceList serviceList, Status status, String time, Toleration toleration, TopologySelectorTerm topologySelectorTerm, TypeMeta typeMeta, UpdateOptions updateOptions, WatchEvent watchEvent) { + public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIResource aPIResource, APIResourceList aPIResourceList, APIService aPIService, APIServiceList aPIServiceList, BaseKubernetesList baseKubernetesList, Binding binding, ComponentStatus componentStatus, ComponentStatusList componentStatusList, Condition condition, Config config, ConfigMap configMap, ConfigMapList configMapList, ContainerStatus containerStatus, CreateOptions createOptions, DeleteOptions deleteOptions, EndpointPort endpointPort, Endpoints endpoints, EndpointsList endpointsList, EnvVar envVar, Event event, EventList eventList, EventSeries eventSeries, EventSource eventSource, GetOptions getOptions, GroupKind groupKind, GroupVersionKind groupVersionKind, GroupVersionResource groupVersionResource, Info info, LimitRangeList limitRangeList, ListOptions listOptions, MicroTime microTime, Namespace namespace, NamespaceList namespaceList, Node node, NodeList nodeList, ObjectMeta objectMeta, Patch patch, PatchOptions patchOptions, PersistentVolume persistentVolume, PersistentVolumeClaim persistentVolumeClaim, PersistentVolumeClaimList persistentVolumeClaimList, PersistentVolumeList persistentVolumeList, PodExecOptions podExecOptions, PodList podList, PodTemplateList podTemplateList, Quantity quantity, ReplicationControllerList replicationControllerList, ResourceQuota resourceQuota, ResourceQuotaList resourceQuotaList, RootPaths rootPaths, Secret secret, SecretList secretList, ServiceAccount serviceAccount, ServiceAccountList serviceAccountList, ServiceList serviceList, Status status, String time, Toleration toleration, TopologySelectorTerm topologySelectorTerm, TypeMeta typeMeta, UpdateOptions updateOptions, WatchEvent watchEvent) { super(); this.aPIGroup = aPIGroup; this.aPIGroupList = aPIGroupList; @@ -743,12 +742,12 @@ public void setNodeList(NodeList nodeList) { } @JsonProperty("ObjectMeta") - public io.fabric8.kubernetes.api.model.ObjectMeta getObjectMeta() { + public ObjectMeta getObjectMeta() { return objectMeta; } @JsonProperty("ObjectMeta") - public void setObjectMeta(io.fabric8.kubernetes.api.model.ObjectMeta objectMeta) { + public void setObjectMeta(ObjectMeta objectMeta) { this.objectMeta = objectMeta; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/LimitRange.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/LimitRange.java index 2bd6cd9ece3..a6400e888c0 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/LimitRange.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/LimitRange.java @@ -59,8 +59,7 @@ public class LimitRange implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "LimitRange"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private ObjectMeta metadata; @JsonProperty("spec") private LimitRangeSpec spec; @JsonIgnore @@ -80,7 +79,7 @@ public LimitRange() { * @param kind * @param spec */ - public LimitRange(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, LimitRangeSpec spec) { + public LimitRange(String apiVersion, String kind, ObjectMeta metadata, LimitRangeSpec spec) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -129,12 +128,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Namespace.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Namespace.java index 00187b86bec..acd54163aac 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Namespace.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Namespace.java @@ -60,8 +60,7 @@ public class Namespace implements HasMetadata @JsonProperty("kind") private String kind = "Namespace"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private ObjectMeta metadata; @JsonProperty("spec") private NamespaceSpec spec; @JsonProperty("status") @@ -84,7 +83,7 @@ public Namespace() { * @param spec * @param status */ - public Namespace(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, NamespaceSpec spec, NamespaceStatus status) { + public Namespace(String apiVersion, String kind, ObjectMeta metadata, NamespaceSpec spec, NamespaceStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -134,12 +133,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Node.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Node.java index efb0cf4a262..58a649bec79 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Node.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Node.java @@ -60,8 +60,7 @@ public class Node implements HasMetadata @JsonProperty("kind") private String kind = "Node"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private ObjectMeta metadata; @JsonProperty("spec") private NodeSpec spec; @JsonProperty("status") @@ -84,7 +83,7 @@ public Node() { * @param spec * @param status */ - public Node(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, NodeSpec spec, NodeStatus status) { + public Node(String apiVersion, String kind, ObjectMeta metadata, NodeSpec spec, NodeStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -134,12 +133,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolume.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolume.java index cecdf70e133..d26a213b353 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolume.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolume.java @@ -60,8 +60,7 @@ public class PersistentVolume implements HasMetadata @JsonProperty("kind") private String kind = "PersistentVolume"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private ObjectMeta metadata; @JsonProperty("spec") private PersistentVolumeSpec spec; @JsonProperty("status") @@ -84,7 +83,7 @@ public PersistentVolume() { * @param spec * @param status */ - public PersistentVolume(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, PersistentVolumeSpec spec, PersistentVolumeStatus status) { + public PersistentVolume(String apiVersion, String kind, ObjectMeta metadata, PersistentVolumeSpec spec, PersistentVolumeStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -134,12 +133,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaim.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaim.java index 26e0bbdce4e..25a73ba7dbf 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaim.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaim.java @@ -60,8 +60,7 @@ public class PersistentVolumeClaim implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "PersistentVolumeClaim"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private ObjectMeta metadata; @JsonProperty("spec") private PersistentVolumeClaimSpec spec; @JsonProperty("status") @@ -84,7 +83,7 @@ public PersistentVolumeClaim() { * @param spec * @param status */ - public PersistentVolumeClaim(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, PersistentVolumeClaimSpec spec, PersistentVolumeClaimStatus status) { + public PersistentVolumeClaim(String apiVersion, String kind, ObjectMeta metadata, PersistentVolumeClaimSpec spec, PersistentVolumeClaimStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -134,12 +133,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaimTemplate.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaimTemplate.java index 9a3eac62bde..214e8bef85d 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaimTemplate.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PersistentVolumeClaimTemplate.java @@ -36,8 +36,7 @@ public class PersistentVolumeClaimTemplate implements KubernetesResource { @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private ObjectMeta metadata; @JsonProperty("spec") private PersistentVolumeClaimSpec spec; @JsonIgnore @@ -55,19 +54,19 @@ public PersistentVolumeClaimTemplate() { * @param metadata * @param spec */ - public PersistentVolumeClaimTemplate(io.fabric8.kubernetes.api.model.ObjectMeta metadata, PersistentVolumeClaimSpec spec) { + public PersistentVolumeClaimTemplate(ObjectMeta metadata, PersistentVolumeClaimSpec spec) { super(); this.metadata = metadata; this.spec = spec; } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Pod.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Pod.java index 0ef841214c1..eea486b5a23 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Pod.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Pod.java @@ -60,8 +60,7 @@ public class Pod implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Pod"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private ObjectMeta metadata; @JsonProperty("spec") private PodSpec spec; @JsonProperty("status") @@ -84,7 +83,7 @@ public Pod() { * @param spec * @param status */ - public Pod(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, PodSpec spec, PodStatus status) { + public Pod(String apiVersion, String kind, ObjectMeta metadata, PodSpec spec, PodStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -134,12 +133,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodTemplate.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodTemplate.java index 8b33872dcca..ba1c7d6a83d 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodTemplate.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodTemplate.java @@ -59,8 +59,7 @@ public class PodTemplate implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "PodTemplate"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private ObjectMeta metadata; @JsonProperty("template") private PodTemplateSpec template; @JsonIgnore @@ -80,7 +79,7 @@ public PodTemplate() { * @param apiVersion * @param kind */ - public PodTemplate(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, PodTemplateSpec template) { + public PodTemplate(String apiVersion, String kind, ObjectMeta metadata, PodTemplateSpec template) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -129,12 +128,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodTemplateSpec.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodTemplateSpec.java index f53e4af694f..51f2c08b207 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodTemplateSpec.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/PodTemplateSpec.java @@ -36,8 +36,7 @@ public class PodTemplateSpec implements KubernetesResource { @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private ObjectMeta metadata; @JsonProperty("spec") private PodSpec spec; @JsonIgnore @@ -55,19 +54,19 @@ public PodTemplateSpec() { * @param metadata * @param spec */ - public PodTemplateSpec(io.fabric8.kubernetes.api.model.ObjectMeta metadata, PodSpec spec) { + public PodTemplateSpec(ObjectMeta metadata, PodSpec spec) { super(); this.metadata = metadata; this.spec = spec; } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ReplicationController.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ReplicationController.java index 295d62413bf..cecff5aa114 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ReplicationController.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ReplicationController.java @@ -60,8 +60,7 @@ public class ReplicationController implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "ReplicationController"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private ObjectMeta metadata; @JsonProperty("spec") private ReplicationControllerSpec spec; @JsonProperty("status") @@ -84,7 +83,7 @@ public ReplicationController() { * @param spec * @param status */ - public ReplicationController(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, ReplicationControllerSpec spec, ReplicationControllerStatus status) { + public ReplicationController(String apiVersion, String kind, ObjectMeta metadata, ReplicationControllerSpec spec, ReplicationControllerStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -134,12 +133,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ResourceQuota.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ResourceQuota.java index 5f2308a94f1..2440a9c1f0d 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ResourceQuota.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ResourceQuota.java @@ -60,8 +60,7 @@ public class ResourceQuota implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "ResourceQuota"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private ObjectMeta metadata; @JsonProperty("spec") private ResourceQuotaSpec spec; @JsonProperty("status") @@ -84,7 +83,7 @@ public ResourceQuota() { * @param spec * @param status */ - public ResourceQuota(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, ResourceQuotaSpec spec, ResourceQuotaStatus status) { + public ResourceQuota(String apiVersion, String kind, ObjectMeta metadata, ResourceQuotaSpec spec, ResourceQuotaStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -134,12 +133,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Secret.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Secret.java index 9fabc728132..785e9f92f73 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Secret.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Secret.java @@ -68,8 +68,7 @@ public class Secret implements HasMetadata, Namespaced @JsonProperty("kind") private java.lang.String kind = "Secret"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private ObjectMeta metadata; @JsonProperty("stringData") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map stringData = new LinkedHashMap(); @@ -95,7 +94,7 @@ public Secret() { * @param type * @param stringData */ - public Secret(java.lang.String apiVersion, Map data, Boolean immutable, java.lang.String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, Map stringData, java.lang.String type) { + public Secret(java.lang.String apiVersion, Map data, Boolean immutable, java.lang.String kind, ObjectMeta metadata, Map stringData, java.lang.String type) { super(); this.apiVersion = apiVersion; this.data = data; @@ -167,12 +166,12 @@ public void setKind(java.lang.String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Service.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Service.java index edade20ec2e..1f399a86f76 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Service.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/Service.java @@ -60,8 +60,7 @@ public class Service implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Service"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private ObjectMeta metadata; @JsonProperty("spec") private ServiceSpec spec; @JsonProperty("status") @@ -84,7 +83,7 @@ public Service() { * @param spec * @param status */ - public Service(String apiVersion, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, ServiceSpec spec, ServiceStatus status) { + public Service(String apiVersion, String kind, ObjectMeta metadata, ServiceSpec spec, ServiceStatus status) { super(); this.apiVersion = apiVersion; this.kind = kind; @@ -134,12 +133,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ServiceAccount.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ServiceAccount.java index 97a200d09f4..e88f1bd0a0d 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ServiceAccount.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ServiceAccount.java @@ -68,8 +68,7 @@ public class ServiceAccount implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "ServiceAccount"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private ObjectMeta metadata; @JsonProperty("secrets") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List secrets = new ArrayList(); @@ -92,7 +91,7 @@ public ServiceAccount() { * @param imagePullSecrets * @param secrets */ - public ServiceAccount(String apiVersion, Boolean automountServiceAccountToken, List imagePullSecrets, String kind, io.fabric8.kubernetes.api.model.ObjectMeta metadata, List secrets) { + public ServiceAccount(String apiVersion, Boolean automountServiceAccountToken, List imagePullSecrets, String kind, ObjectMeta metadata, List secrets) { super(); this.apiVersion = apiVersion; this.automountServiceAccountToken = automountServiceAccountToken; @@ -163,12 +162,12 @@ public void setKind(String kind) { } @JsonProperty("metadata") - public io.fabric8.kubernetes.api.model.ObjectMeta getMetadata() { + public ObjectMeta getMetadata() { return metadata; } @JsonProperty("metadata") - public void setMetadata(io.fabric8.kubernetes.api.model.ObjectMeta metadata) { + public void setMetadata(ObjectMeta metadata) { this.metadata = metadata; } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/GenericKubernetesResource.java b/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/GenericKubernetesResource.java index baffd30232c..293be7fcd43 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/GenericKubernetesResource.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/GenericKubernetesResource.java @@ -19,7 +19,6 @@ import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.databind.JsonNode; @@ -57,8 +56,7 @@ public class GenericKubernetesResource implements HasMetadata { @JsonProperty("kind") private String kind; @JsonProperty("metadata") - @JsonInclude(value = Include.CUSTOM, valueFilter = ObjectMeta.class) - private ObjectMeta metadata = new ObjectMeta(); + private ObjectMeta metadata; @JsonIgnore private Map additionalProperties = new LinkedHashMap<>(); diff --git a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 9b273d07d76..4e134365e88 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -99,8 +99,7 @@ public class KubeSchema { @JsonProperty("ListOptions") private ListOptions listOptions; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("ObjectReference") private io.fabric8.kubernetes.api.model.ObjectReference objectReference; @JsonProperty("Patch") diff --git a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1/EndpointSlice.java b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1/EndpointSlice.java index 2d65a313da3..b8bf9f2fc58 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1/EndpointSlice.java +++ b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1/EndpointSlice.java @@ -88,8 +88,7 @@ public class EndpointSlice implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "EndpointSlice"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("ports") private List ports = new ArrayList(); @JsonIgnore diff --git a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1beta1/EndpointSlice.java b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1beta1/EndpointSlice.java index 1f4e25caeeb..07f6c71b3c7 100644 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1beta1/EndpointSlice.java +++ b/kubernetes-model-generator/kubernetes-model-discovery/src/generated/java/io/fabric8/kubernetes/api/model/discovery/v1beta1/EndpointSlice.java @@ -88,8 +88,7 @@ public class EndpointSlice implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "EndpointSlice"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("ports") private List ports = new ArrayList(); @JsonIgnore 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 b56b3a01ef8..6af17d7e1e0 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 @@ -1398,19 +1398,12 @@ } }, "conditions": { - "$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" + "$ref": "#/definitions/kubernetes_discovery_v1beta1_EndpointConditions", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointConditions" }, "hints": { - "$ref": "#/definitions/kubernetes_discovery_v1_EndpointHints", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointHints" + "$ref": "#/definitions/kubernetes_discovery_v1beta1_EndpointHints", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointHints" }, "hostname": { "type": "string" @@ -1422,8 +1415,12 @@ "$ref": "#/definitions/kubernetes_core_ObjectReference", "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectReference" }, - "zone": { - "type": "string" + "topology": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "existingJavaType": "java.util.Map\u003cString, String\u003e" } }, "additionalProperties": true @@ -1481,14 +1478,14 @@ }, "apiVersion": { "type": "string", - "default": "discovery.k8s.io/v1beta1", + "default": "discovery.k8s.io/v1", "required": true }, "endpoints": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_discovery_v1beta1_Endpoint", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.Endpoint" + "$ref": "#/definitions/kubernetes_discovery_v1_Endpoint", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.Endpoint" } }, "kind": { @@ -1503,8 +1500,8 @@ "ports": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_discovery_v1beta1_EndpointPort", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointPort" + "$ref": "#/definitions/kubernetes_discovery_v1_EndpointPort", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointPort" } } }, @@ -1514,14 +1511,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "discovery.k8s.io/v1beta1", + "default": "discovery.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_discovery_v1beta1_EndpointSlice", - "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1beta1.EndpointSlice" + "$ref": "#/definitions/kubernetes_discovery_v1_EndpointSlice", + "existingJavaType": "io.fabric8.kubernetes.api.model.discovery.v1.EndpointSlice" } }, "kind": { diff --git a/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 4160dc07047..e65a1fa7bcb 100644 --- a/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -93,8 +93,7 @@ public class KubeSchema { @JsonProperty("ListOptions") private ListOptions listOptions; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("ObjectReference") private io.fabric8.kubernetes.api.model.ObjectReference objectReference; @JsonProperty("Patch") diff --git a/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1/Event.java b/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1/Event.java index 086503eefa7..9f53778e7fb 100644 --- a/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1/Event.java +++ b/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1/Event.java @@ -106,8 +106,7 @@ public class Event implements HasMetadata, Namespaced @JsonProperty("kind") private java.lang.String kind = "Event"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("note") private java.lang.String note; @JsonProperty("reason") diff --git a/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1beta1/Event.java b/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1beta1/Event.java index 125bd4d0d50..4fbca652965 100644 --- a/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1beta1/Event.java +++ b/kubernetes-model-generator/kubernetes-model-events/src/generated/java/io/fabric8/kubernetes/api/model/events/v1beta1/Event.java @@ -106,8 +106,7 @@ public class Event implements HasMetadata, Namespaced @JsonProperty("kind") private java.lang.String kind = "Event"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("note") private java.lang.String note; @JsonProperty("reason") diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index f77dc5a0b1e..80bf16a11bb 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -127,8 +127,7 @@ public class KubeSchema { @JsonProperty("NetworkPolicyList") private NetworkPolicyList networkPolicyList; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("ObjectReference") private io.fabric8.kubernetes.api.model.ObjectReference objectReference; @JsonProperty("Patch") diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/DaemonSet.java b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/DaemonSet.java index f6d1778bcc8..8e16d1be9b0 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/DaemonSet.java +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/DaemonSet.java @@ -81,8 +81,7 @@ public class DaemonSet implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "DaemonSet"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private DaemonSetSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/Deployment.java b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/Deployment.java index 510c1fef2e1..12f63e43d02 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/Deployment.java +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/Deployment.java @@ -81,8 +81,7 @@ public class Deployment implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Deployment"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private DeploymentSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/Ingress.java b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/Ingress.java index 1f651a3c994..b8c73c1ea8e 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/Ingress.java +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/Ingress.java @@ -81,8 +81,7 @@ public class Ingress implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Ingress"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private IngressSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/NetworkPolicy.java b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/NetworkPolicy.java index dcf1eb1d84d..67b75fb0d31 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/NetworkPolicy.java +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/NetworkPolicy.java @@ -81,8 +81,7 @@ public class NetworkPolicy implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "NetworkPolicy"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private NetworkPolicySpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/ReplicaSet.java b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/ReplicaSet.java index 4a0aaabe416..81d65877a49 100644 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/ReplicaSet.java +++ b/kubernetes-model-generator/kubernetes-model-extensions/src/generated/java/io/fabric8/kubernetes/api/model/extensions/ReplicaSet.java @@ -81,8 +81,7 @@ public class ReplicaSet implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "ReplicaSet"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ReplicaSetSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/FlowSchema.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/FlowSchema.java index bd62b5c3219..11e92a21a2b 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/FlowSchema.java +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/FlowSchema.java @@ -80,8 +80,7 @@ public class FlowSchema implements HasMetadata @JsonProperty("kind") private String kind = "FlowSchema"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private FlowSchemaSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/PriorityLevelConfiguration.java b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/PriorityLevelConfiguration.java index 8616c0c8e68..304688949fa 100644 --- a/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/PriorityLevelConfiguration.java +++ b/kubernetes-model-generator/kubernetes-model-flowcontrol/src/generated/java/io/fabric8/kubernetes/api/model/flowcontrol/v1beta1/PriorityLevelConfiguration.java @@ -80,8 +80,7 @@ public class PriorityLevelConfiguration implements HasMetadata @JsonProperty("kind") private String kind = "PriorityLevelConfiguration"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private PriorityLevelConfigurationSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-jsonschema2pojo/src/main/java/io/fabric8/kubernetes/jsonschema2pojo/Fabric8DefaultRule.java b/kubernetes-model-generator/kubernetes-model-jsonschema2pojo/src/main/java/io/fabric8/kubernetes/jsonschema2pojo/Fabric8DefaultRule.java index 96904a97dfe..bc00f806602 100644 --- a/kubernetes-model-generator/kubernetes-model-jsonschema2pojo/src/main/java/io/fabric8/kubernetes/jsonschema2pojo/Fabric8DefaultRule.java +++ b/kubernetes-model-generator/kubernetes-model-jsonschema2pojo/src/main/java/io/fabric8/kubernetes/jsonschema2pojo/Fabric8DefaultRule.java @@ -30,7 +30,7 @@ import java.util.Map; /** - * Adds default map and objectmeta handling + * Adds default map handling */ public class Fabric8DefaultRule extends DefaultRule { @@ -49,26 +49,16 @@ public JFieldVar apply(String nodeName, JsonNode node, JsonNode parent, JFieldVa JType fieldType = field.type(); String fieldTypeName = fieldType.fullName(); - if (node == null || node.asText() == null || node.asText().isEmpty()) { - if (ruleFactory.getGenerationConfig().isInitializeCollections() && fieldTypeName.startsWith(Map.class.getName())) { - JClass keyGenericType = ((JClass) fieldType).getTypeParameters().get(0); - JClass valueGenericType = ((JClass) fieldType).getTypeParameters().get(1); - - JClass mapImplClass = fieldType.owner().ref(LinkedHashMap.class); - mapImplClass = mapImplClass.narrow(keyGenericType, valueGenericType); - // maps are not marked as omitJavaEmpty - it's simplest to just add the annotation here, rather than updating the generator - field.annotate(JsonInclude.class).param(KubernetesCoreTypeAnnotator.ANNOTATION_VALUE, JsonInclude.Include.NON_EMPTY); - field.init(JExpr._new(mapImplClass)); - } - - if (fieldTypeName.equals(OBJECTMETA)) { - JClass implClass = fieldType.owner().ref(fieldTypeName); - // annotate to omit the default - field.annotate(JsonInclude.class).param(KubernetesCoreTypeAnnotator.ANNOTATION_VALUE, JsonInclude.Include.CUSTOM) - .param(ANNOTATION_VALUE_FILTER, implClass); - field.init(JExpr._new(implClass)); - } + if (ruleFactory.getGenerationConfig().isInitializeCollections() && fieldTypeName.startsWith(Map.class.getName()) + && (node == null || node.asText() == null || node.asText().isEmpty())) { + JClass keyGenericType = ((JClass) fieldType).getTypeParameters().get(0); + JClass valueGenericType = ((JClass) fieldType).getTypeParameters().get(1); + JClass mapImplClass = fieldType.owner().ref(LinkedHashMap.class); + mapImplClass = mapImplClass.narrow(keyGenericType, valueGenericType); + // maps are not marked as omitJavaEmpty - it's simplest to just add the annotation here, rather than updating the generator + field.annotate(JsonInclude.class).param(KubernetesCoreTypeAnnotator.ANNOTATION_VALUE, JsonInclude.Include.NON_EMPTY); + field.init(JExpr._new(mapImplClass)); } return super.apply(nodeName, node, parent, field, currentSchema); diff --git a/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index e3c717ab277..6b304f79623 100644 --- a/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -99,8 +99,7 @@ public class KubeSchema { @JsonProperty("NodeMetricsList") private NodeMetricsList nodeMetricsList; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("ObjectReference") private io.fabric8.kubernetes.api.model.ObjectReference objectReference; @JsonProperty("Patch") diff --git a/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/NodeMetrics.java b/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/NodeMetrics.java index 83d50ae76e0..e192c8d569f 100644 --- a/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/NodeMetrics.java +++ b/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/NodeMetrics.java @@ -84,8 +84,7 @@ public class NodeMetrics implements HasMetadata @JsonProperty("kind") private java.lang.String kind = "NodeMetrics"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("timestamp") private String timestamp; @JsonProperty("usage") diff --git a/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/PodMetrics.java b/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/PodMetrics.java index 95d1eff01dd..cf571b89e7b 100644 --- a/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/PodMetrics.java +++ b/kubernetes-model-generator/kubernetes-model-metrics/src/generated/java/io/fabric8/kubernetes/api/model/metrics/v1beta1/PodMetrics.java @@ -87,8 +87,7 @@ public class PodMetrics implements HasMetadata, Namespaced @JsonProperty("kind") private java.lang.String kind = "PodMetrics"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("timestamp") private String timestamp; @JsonProperty("window") diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 583d0f17a9c..e37961ee2b1 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -111,8 +111,7 @@ public class KubeSchema { @JsonProperty("NetworkPolicyList") private NetworkPolicyList networkPolicyList; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("ObjectReference") private io.fabric8.kubernetes.api.model.ObjectReference objectReference; @JsonProperty("Patch") diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/Ingress.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/Ingress.java index dcdca2f0426..ce18107eb02 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/Ingress.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/Ingress.java @@ -81,8 +81,7 @@ public class Ingress implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Ingress"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private IngressSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/IngressClass.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/IngressClass.java index d89c175c055..2adbd6ba844 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/IngressClass.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/IngressClass.java @@ -79,8 +79,7 @@ public class IngressClass implements HasMetadata @JsonProperty("kind") private String kind = "IngressClass"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private IngressClassSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicy.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicy.java index 5230467cb45..c4e08c2f72e 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicy.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1/NetworkPolicy.java @@ -81,8 +81,7 @@ public class NetworkPolicy implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "NetworkPolicy"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private NetworkPolicySpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/Ingress.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/Ingress.java index 8882b207c56..c1395e43f6e 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/Ingress.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/Ingress.java @@ -81,8 +81,7 @@ public class Ingress implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Ingress"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private IngressSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressClass.java b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressClass.java index 7a02a8ee447..1565f3c74fa 100644 --- a/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressClass.java +++ b/kubernetes-model-generator/kubernetes-model-networking/src/generated/java/io/fabric8/kubernetes/api/model/networking/v1beta1/IngressClass.java @@ -79,8 +79,7 @@ public class IngressClass implements HasMetadata @JsonProperty("kind") private String kind = "IngressClass"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private IngressClassSpec spec; @JsonIgnore 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 2236f31371c..14e6d9967f6 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 @@ -2176,8 +2176,8 @@ "httpingresspath": { "properties": { "backend": { - "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressBackend", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressBackend" + "$ref": "#/definitions/kubernetes_networking_v1_IngressBackend", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressBackend" }, "path": { "type": "string" @@ -2193,8 +2193,8 @@ "paths": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_networking_v1beta1_HTTPIngressPath", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.HTTPIngressPath" + "$ref": "#/definitions/kubernetes_networking_v1_HTTPIngressPath", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.HTTPIngressPath" } } }, @@ -2239,7 +2239,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "networking.k8s.io/v1", + "default": "networking.k8s.io/v1beta1", "required": true }, "kind": { @@ -2252,12 +2252,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressSpec" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressSpec" }, "status": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressStatus" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressStatus" } }, "additionalProperties": true @@ -2268,12 +2268,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 @@ -2282,7 +2279,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "networking.k8s.io/v1", + "default": "networking.k8s.io/v1beta1", "required": true }, "kind": { @@ -2295,8 +2292,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressClassSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressClassSpec" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressClassSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressClassSpec" } }, "additionalProperties": true @@ -2305,14 +2302,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": { @@ -2400,8 +2397,8 @@ "ingressrulevalue": { "properties": { "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 @@ -2420,9 +2417,9 @@ }, "ingressspec": { "properties": { - "defaultBackend": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressBackend", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressBackend" + "backend": { + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressBackend", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressBackend" }, "ingressClassName": { "type": "string" @@ -2431,16 +2428,16 @@ "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressRule", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressRule" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressRule", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressRule" } }, "tls": { "type": "array", "javaOmitEmpty": true, "items": { - "$ref": "#/definitions/kubernetes_networking_v1_IngressTLS", - "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1.IngressTLS" + "$ref": "#/definitions/kubernetes_networking_v1beta1_IngressTLS", + "existingJavaType": "io.fabric8.kubernetes.api.model.networking.v1beta1.IngressTLS" } } }, diff --git a/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index f68a5e53625..922ec6f0a56 100644 --- a/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -70,8 +70,7 @@ public class KubeSchema { @JsonProperty("Info") private Info info; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("ObjectReference") private io.fabric8.kubernetes.api.model.ObjectReference objectReference; @JsonProperty("Quantity") diff --git a/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1/RuntimeClass.java b/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1/RuntimeClass.java index f0a04fca042..44cd24f9b60 100644 --- a/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1/RuntimeClass.java +++ b/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1/RuntimeClass.java @@ -83,8 +83,7 @@ public class RuntimeClass implements HasMetadata @JsonProperty("kind") private String kind = "RuntimeClass"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("overhead") private Overhead overhead; @JsonProperty("scheduling") diff --git a/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1alpha1/RuntimeClass.java b/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1alpha1/RuntimeClass.java index 30d6ddefa6a..b0a175855fd 100644 --- a/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1alpha1/RuntimeClass.java +++ b/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1alpha1/RuntimeClass.java @@ -79,8 +79,7 @@ public class RuntimeClass implements HasMetadata @JsonProperty("kind") private String kind = "RuntimeClass"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private RuntimeClassSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1beta1/RuntimeClass.java b/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1beta1/RuntimeClass.java index 8a4903419cf..df1861043f0 100644 --- a/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1beta1/RuntimeClass.java +++ b/kubernetes-model-generator/kubernetes-model-node/src/generated/java/io/fabric8/kubernetes/api/model/node/v1beta1/RuntimeClass.java @@ -83,8 +83,7 @@ public class RuntimeClass implements HasMetadata @JsonProperty("kind") private String kind = "RuntimeClass"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("overhead") private Overhead overhead; @JsonProperty("scheduling") 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 9fce45f031b..184eadb768f 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 @@ -1116,9 +1116,12 @@ "properties": { "apiVersion": { "type": "string", - "default": "node.k8s.io/v1alpha1", + "default": "node.k8s.io/v1", "required": true }, + "handler": { + "type": "string" + }, "kind": { "type": "string", "default": "RuntimeClass", @@ -1128,9 +1131,13 @@ "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, - "spec": { - "$ref": "#/definitions/kubernetes_node_v1alpha_RuntimeClassSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.node.v1alpha1.RuntimeClassSpec" + "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" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index bb2d3dee342..f43fe6df6d0 100644 --- a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -103,8 +103,7 @@ public class KubeSchema { @JsonProperty("ListOptions") private ListOptions listOptions; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("ObjectReference") private io.fabric8.kubernetes.api.model.ObjectReference objectReference; @JsonProperty("Patch") diff --git a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1/Eviction.java b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1/Eviction.java index 6a94fc0dca8..324d2944da4 100644 --- a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1/Eviction.java +++ b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1/Eviction.java @@ -78,8 +78,7 @@ public class Eviction implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Eviction"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonIgnore private Map additionalProperties = new HashMap(); diff --git a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1/PodDisruptionBudget.java b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1/PodDisruptionBudget.java index db6f5ff824a..b06971f2193 100644 --- a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1/PodDisruptionBudget.java +++ b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1/PodDisruptionBudget.java @@ -81,8 +81,7 @@ public class PodDisruptionBudget implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "PodDisruptionBudget"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private PodDisruptionBudgetSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1beta1/Eviction.java b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1beta1/Eviction.java index a7246eb261c..a4c294d0cd5 100644 --- a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1beta1/Eviction.java +++ b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1beta1/Eviction.java @@ -78,8 +78,7 @@ public class Eviction implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Eviction"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonIgnore private Map additionalProperties = new HashMap(); diff --git a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1beta1/PodDisruptionBudget.java b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1beta1/PodDisruptionBudget.java index cb8a33ec2ca..d08e365e54f 100644 --- a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1beta1/PodDisruptionBudget.java +++ b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1beta1/PodDisruptionBudget.java @@ -81,8 +81,7 @@ public class PodDisruptionBudget implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "PodDisruptionBudget"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private PodDisruptionBudgetSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1beta1/PodSecurityPolicy.java b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1beta1/PodSecurityPolicy.java index 59930233554..376d7e158e1 100644 --- a/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1beta1/PodSecurityPolicy.java +++ b/kubernetes-model-generator/kubernetes-model-policy/src/generated/java/io/fabric8/kubernetes/api/model/policy/v1beta1/PodSecurityPolicy.java @@ -79,8 +79,7 @@ public class PodSecurityPolicy implements HasMetadata @JsonProperty("kind") private String kind = "PodSecurityPolicy"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private PodSecurityPolicySpec spec; @JsonIgnore 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 f10c3e9d1e3..1ca008137d0 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 @@ -1908,7 +1908,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "policy/v1", + "default": "policy/v1beta1", "required": true }, "deleteOptions": { @@ -2371,7 +2371,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "policy/v1beta1", + "default": "policy/v1", "required": true }, "kind": { @@ -2384,12 +2384,12 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudgetSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetSpec" + "$ref": "#/definitions/kubernetes_policy_v1_PodDisruptionBudgetSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetSpec" }, "status": { - "$ref": "#/definitions/kubernetes_policy_v1beta1_PodDisruptionBudgetStatus", - "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1beta1.PodDisruptionBudgetStatus" + "$ref": "#/definitions/kubernetes_policy_v1_PodDisruptionBudgetStatus", + "existingJavaType": "io.fabric8.kubernetes.api.model.policy.v1.PodDisruptionBudgetStatus" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/ClusterRole.java b/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/ClusterRole.java index 07de9e4c312..d3921758ce2 100644 --- a/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/ClusterRole.java +++ b/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/ClusterRole.java @@ -84,8 +84,7 @@ public class ClusterRole implements HasMetadata @JsonProperty("kind") private String kind = "ClusterRole"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("rules") private List rules = new ArrayList(); @JsonIgnore diff --git a/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/ClusterRoleBinding.java b/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/ClusterRoleBinding.java index dd44fcbd45b..92be108f621 100644 --- a/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/ClusterRoleBinding.java +++ b/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/ClusterRoleBinding.java @@ -82,8 +82,7 @@ public class ClusterRoleBinding implements HasMetadata @JsonProperty("kind") private String kind = "ClusterRoleBinding"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("roleRef") private RoleRef roleRef; @JsonProperty("subjects") diff --git a/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/Role.java b/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/Role.java index 7fcd3bf9f5f..1364fcfb1b0 100644 --- a/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/Role.java +++ b/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/Role.java @@ -82,8 +82,7 @@ public class Role implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Role"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("rules") private List rules = new ArrayList(); @JsonIgnore diff --git a/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/RoleBinding.java b/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/RoleBinding.java index dbb695938ef..2a0beed4a33 100644 --- a/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/RoleBinding.java +++ b/kubernetes-model-generator/kubernetes-model-rbac/src/generated/java/io/fabric8/kubernetes/api/model/rbac/RoleBinding.java @@ -83,8 +83,7 @@ public class RoleBinding implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "RoleBinding"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("roleRef") private RoleRef roleRef; @JsonProperty("subjects") diff --git a/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 6c55917e7d7..d73bc0291b3 100644 --- a/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -91,8 +91,7 @@ public class KubeSchema { @JsonProperty("ListOptions") private ListOptions listOptions; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("ObjectReference") private io.fabric8.kubernetes.api.model.ObjectReference objectReference; @JsonProperty("Patch") diff --git a/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/scheduling/v1/PriorityClass.java b/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/scheduling/v1/PriorityClass.java index 906e58748b4..86da417ece6 100644 --- a/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/scheduling/v1/PriorityClass.java +++ b/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/scheduling/v1/PriorityClass.java @@ -86,8 +86,7 @@ public class PriorityClass implements HasMetadata @JsonProperty("kind") private String kind = "PriorityClass"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("preemptionPolicy") private String preemptionPolicy; @JsonProperty("value") diff --git a/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/scheduling/v1beta1/PriorityClass.java b/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/scheduling/v1beta1/PriorityClass.java index 4cc0684fa61..7ebab79b70a 100644 --- a/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/scheduling/v1beta1/PriorityClass.java +++ b/kubernetes-model-generator/kubernetes-model-scheduling/src/generated/java/io/fabric8/kubernetes/api/model/scheduling/v1beta1/PriorityClass.java @@ -86,8 +86,7 @@ public class PriorityClass implements HasMetadata @JsonProperty("kind") private String kind = "PriorityClass"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("preemptionPolicy") private String preemptionPolicy; @JsonProperty("value") 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 3cbab988896..f6504d466ef 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 @@ -1502,7 +1502,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "scheduling.k8s.io/v1", + "default": "scheduling.k8s.io/v1beta1", "required": true }, "description": { @@ -1533,14 +1533,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "scheduling.k8s.io/v1beta1", + "default": "scheduling.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_scheduling_v1beta1_PriorityClass", - "existingJavaType": "io.fabric8.kubernetes.api.model.scheduling.v1beta1.PriorityClass" + "$ref": "#/definitions/kubernetes_scheduling_v1_PriorityClass", + "existingJavaType": "io.fabric8.kubernetes.api.model.scheduling.v1.PriorityClass" } }, "kind": { diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 67f35add8f4..c8004fbb82c 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -119,8 +119,7 @@ public class KubeSchema { @JsonProperty("ListOptions") private ListOptions listOptions; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("ObjectReference") private io.fabric8.kubernetes.api.model.ObjectReference objectReference; @JsonProperty("Patch") diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSIDriver.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSIDriver.java index 9dc359cda8f..b2106392cfb 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSIDriver.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSIDriver.java @@ -79,8 +79,7 @@ public class CSIDriver implements HasMetadata @JsonProperty("kind") private String kind = "CSIDriver"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private CSIDriverSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSINode.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSINode.java index 50d86416442..b488d31eedc 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSINode.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSINode.java @@ -79,8 +79,7 @@ public class CSINode implements HasMetadata @JsonProperty("kind") private String kind = "CSINode"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private CSINodeSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSIStorageCapacity.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSIStorageCapacity.java index abe6d57671d..de8d16fe815 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSIStorageCapacity.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/CSIStorageCapacity.java @@ -87,8 +87,7 @@ public class CSIStorageCapacity implements HasMetadata, Namespaced @JsonProperty("maximumVolumeSize") private Quantity maximumVolumeSize; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("nodeTopology") private io.fabric8.kubernetes.api.model.LabelSelector nodeTopology; @JsonProperty("storageClassName") diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/StorageClass.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/StorageClass.java index 7dbd09a5e30..d8f5925e5ef 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/StorageClass.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/StorageClass.java @@ -94,8 +94,7 @@ public class StorageClass implements HasMetadata @JsonProperty("kind") private java.lang.String kind = "StorageClass"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("mountOptions") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List mountOptions = new ArrayList(); diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/VolumeAttachment.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/VolumeAttachment.java index c8029f15df1..7160de8b036 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/VolumeAttachment.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/VolumeAttachment.java @@ -80,8 +80,7 @@ public class VolumeAttachment implements HasMetadata @JsonProperty("kind") private String kind = "VolumeAttachment"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private VolumeAttachmentSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSIDriver.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSIDriver.java index 876e9f9e725..5d97a6156b6 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSIDriver.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSIDriver.java @@ -79,8 +79,7 @@ public class CSIDriver implements HasMetadata @JsonProperty("kind") private String kind = "CSIDriver"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private CSIDriverSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSINode.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSINode.java index b215139c7bd..df71fd38aea 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSINode.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSINode.java @@ -79,8 +79,7 @@ public class CSINode implements HasMetadata @JsonProperty("kind") private String kind = "CSINode"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private CSINodeSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSIStorageCapacity.java b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSIStorageCapacity.java index c90911c34b2..427de14e320 100644 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSIStorageCapacity.java +++ b/kubernetes-model-generator/kubernetes-model-storageclass/src/generated/java/io/fabric8/kubernetes/api/model/storage/v1beta1/CSIStorageCapacity.java @@ -87,8 +87,7 @@ public class CSIStorageCapacity implements HasMetadata, Namespaced @JsonProperty("maximumVolumeSize") private Quantity maximumVolumeSize; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("nodeTopology") private io.fabric8.kubernetes.api.model.LabelSelector nodeTopology; @JsonProperty("storageClassName") 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 2b2f9fc4c3d..711df8d01a2 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 @@ -2968,7 +2968,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1beta1", + "default": "storage.k8s.io/v1", "required": true }, "kind": { @@ -2981,8 +2981,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSIDriverSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSIDriverSpec" + "$ref": "#/definitions/kubernetes_storageclass_CSIDriverSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSIDriverSpec" } }, "additionalProperties": true @@ -3034,8 +3034,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": { @@ -3052,7 +3052,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1beta1", + "default": "storage.k8s.io/v1", "required": true }, "kind": { @@ -3065,8 +3065,8 @@ "existingJavaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "spec": { - "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSINodeSpec", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSINodeSpec" + "$ref": "#/definitions/kubernetes_storageclass_CSINodeSpec", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSINodeSpec" } }, "additionalProperties": true @@ -3074,8 +3074,8 @@ "csinodedriver": { "properties": { "allocatable": { - "$ref": "#/definitions/kubernetes_storageclass_v1beta1_VolumeNodeResources", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.VolumeNodeResources" + "$ref": "#/definitions/kubernetes_storageclass_VolumeNodeResources", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.VolumeNodeResources" }, "name": { "type": "string" @@ -3096,14 +3096,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": { @@ -3174,7 +3174,7 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1", + "default": "storage.k8s.io/v1beta1", "required": true }, "capacity": { @@ -3208,14 +3208,14 @@ "properties": { "apiVersion": { "type": "string", - "default": "storage.k8s.io/v1beta1", + "default": "storage.k8s.io/v1", "required": true }, "items": { "type": "array", "items": { - "$ref": "#/definitions/kubernetes_storageclass_v1beta1_CSIStorageCapacity", - "existingJavaType": "io.fabric8.kubernetes.api.model.storage.v1beta1.CSIStorageCapacity" + "$ref": "#/definitions/kubernetes_storageclass_CSIStorageCapacity", + "existingJavaType": "io.fabric8.kubernetes.api.model.storage.CSIStorageCapacity" } }, "kind": { diff --git a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index a8abb212e55..bc8e2ae8ccd 100644 --- a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -83,8 +83,7 @@ public class KubeSchema { @JsonProperty("Info") private Info info; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("Patch") private Patch patch; @JsonProperty("Status") diff --git a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/openshift/api/model/clusterautoscaling/v1/ClusterAutoscaler.java b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/openshift/api/model/clusterautoscaling/v1/ClusterAutoscaler.java index 7d71db3df82..9f99e94cf08 100644 --- a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/openshift/api/model/clusterautoscaling/v1/ClusterAutoscaler.java +++ b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/openshift/api/model/clusterautoscaling/v1/ClusterAutoscaler.java @@ -80,8 +80,7 @@ public class ClusterAutoscaler implements HasMetadata @JsonProperty("kind") private String kind = "ClusterAutoscaler"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ClusterAutoscalerSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/openshift/api/model/clusterautoscaling/v1beta1/MachineAutoscaler.java b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/openshift/api/model/clusterautoscaling/v1beta1/MachineAutoscaler.java index 3ea835be967..338a6c24825 100644 --- a/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/openshift/api/model/clusterautoscaling/v1beta1/MachineAutoscaler.java +++ b/kubernetes-model-generator/openshift-model-clusterautoscaling/src/generated/java/io/fabric8/openshift/api/model/clusterautoscaling/v1beta1/MachineAutoscaler.java @@ -81,8 +81,7 @@ public class MachineAutoscaler implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "MachineAutoscaler"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private MachineAutoscalerSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 2ac4b1c3ded..7f69d40630f 100644 --- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -128,8 +128,7 @@ public class KubeSchema { @JsonProperty("Info") private Info info; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("Patch") private Patch patch; @JsonProperty("ResourceAttributes") diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleCLIDownload.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleCLIDownload.java index 98ce7e9b69d..dbaf903bbff 100644 --- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleCLIDownload.java +++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleCLIDownload.java @@ -79,8 +79,7 @@ public class ConsoleCLIDownload implements HasMetadata @JsonProperty("kind") private String kind = "ConsoleCLIDownload"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ConsoleCLIDownloadSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleExternalLogLink.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleExternalLogLink.java index 4eb01aa018e..57c38147e61 100644 --- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleExternalLogLink.java +++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleExternalLogLink.java @@ -79,8 +79,7 @@ public class ConsoleExternalLogLink implements HasMetadata @JsonProperty("kind") private String kind = "ConsoleExternalLogLink"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ConsoleExternalLogLinkSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleLink.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleLink.java index c16fab8d34d..01295f433b7 100644 --- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleLink.java +++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleLink.java @@ -79,8 +79,7 @@ public class ConsoleLink implements HasMetadata @JsonProperty("kind") private String kind = "ConsoleLink"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ConsoleLinkSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleNotification.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleNotification.java index faf1b7921c0..f4c9ce2f156 100644 --- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleNotification.java +++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleNotification.java @@ -79,8 +79,7 @@ public class ConsoleNotification implements HasMetadata @JsonProperty("kind") private String kind = "ConsoleNotification"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ConsoleNotificationSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStart.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStart.java index 2ea6c18bcc6..fd3274a11a5 100644 --- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStart.java +++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleQuickStart.java @@ -79,8 +79,7 @@ public class ConsoleQuickStart implements HasMetadata @JsonProperty("kind") private String kind = "ConsoleQuickStart"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ConsoleQuickStartSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleYAMLSample.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleYAMLSample.java index 9a9247a4503..1eccd8a3a71 100644 --- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleYAMLSample.java +++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1/ConsoleYAMLSample.java @@ -79,8 +79,7 @@ public class ConsoleYAMLSample implements HasMetadata @JsonProperty("kind") private String kind = "ConsoleYAMLSample"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ConsoleYAMLSampleSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePlugin.java b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePlugin.java index a1b30023fab..40068b4fbe2 100644 --- a/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePlugin.java +++ b/kubernetes-model-generator/openshift-model-console/src/generated/java/io/fabric8/openshift/api/model/console/v1alpha1/ConsolePlugin.java @@ -79,8 +79,7 @@ public class ConsolePlugin implements HasMetadata @JsonProperty("kind") private String kind = "ConsolePlugin"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ConsolePluginSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 5d53fb048ff..de7be1fd730 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -200,8 +200,7 @@ public class KubeSchema { @JsonProperty("MachinePoolNameLeaseList") private MachinePoolNameLeaseList machinePoolNameLeaseList; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("Patch") private Patch patch; @JsonProperty("SelectorSyncIdentityProvider") diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/Checkpoint.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/Checkpoint.java index 6b41a7cafaa..4ce6396b728 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/Checkpoint.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/Checkpoint.java @@ -81,8 +81,7 @@ public class Checkpoint implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Checkpoint"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private CheckpointSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterClaim.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterClaim.java index cbc83acacfc..9314ab6acc5 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterClaim.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterClaim.java @@ -81,8 +81,7 @@ public class ClusterClaim implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "ClusterClaim"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ClusterClaimSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeployment.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeployment.java index f16e282ba40..70491a69df3 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeployment.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeployment.java @@ -81,8 +81,7 @@ public class ClusterDeployment implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "ClusterDeployment"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ClusterDeploymentSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeprovision.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeprovision.java index 55845b2398e..41f02a4118b 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeprovision.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterDeprovision.java @@ -81,8 +81,7 @@ public class ClusterDeprovision implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "ClusterDeprovision"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ClusterDeprovisionSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterImageSet.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterImageSet.java index 53a753f86d3..56269629d01 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterImageSet.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterImageSet.java @@ -80,8 +80,7 @@ public class ClusterImageSet implements HasMetadata @JsonProperty("kind") private String kind = "ClusterImageSet"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ClusterImageSetSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterPool.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterPool.java index 1e539db7d27..7996c189700 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterPool.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterPool.java @@ -81,8 +81,7 @@ public class ClusterPool implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "ClusterPool"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ClusterPoolSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterProvision.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterProvision.java index 2eb626c9859..8b2b66ad352 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterProvision.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterProvision.java @@ -81,8 +81,7 @@ public class ClusterProvision implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "ClusterProvision"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ClusterProvisionSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterRelocate.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterRelocate.java index 839cfc33cd5..b5433b510e2 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterRelocate.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterRelocate.java @@ -81,8 +81,7 @@ public class ClusterRelocate implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "ClusterRelocate"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ClusterRelocateSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterState.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterState.java index c81061cd582..1bcd1689241 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterState.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/ClusterState.java @@ -81,8 +81,7 @@ public class ClusterState implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "ClusterState"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ClusterStateSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/DNSZone.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/DNSZone.java index 846720501a5..4eaa4c4ce6a 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/DNSZone.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/DNSZone.java @@ -81,8 +81,7 @@ public class DNSZone implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "DNSZone"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private DNSZoneSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/HiveConfig.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/HiveConfig.java index 258638fa8ff..cef91cf3f5f 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/HiveConfig.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/HiveConfig.java @@ -80,8 +80,7 @@ public class HiveConfig implements HasMetadata @JsonProperty("kind") private String kind = "HiveConfig"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private HiveConfigSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/MachinePool.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/MachinePool.java index 9d39a5a7a38..7b279eb3d4f 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/MachinePool.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/MachinePool.java @@ -81,8 +81,7 @@ public class MachinePool implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "MachinePool"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private MachinePoolSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/MachinePoolNameLease.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/MachinePoolNameLease.java index 43a766c36e4..aa3d7b12bab 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/MachinePoolNameLease.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/MachinePoolNameLease.java @@ -81,8 +81,7 @@ public class MachinePoolNameLease implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "MachinePoolNameLease"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private MachinePoolNameLeaseSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SelectorSyncIdentityProvider.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SelectorSyncIdentityProvider.java index f04d2415079..f4d348b62e0 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SelectorSyncIdentityProvider.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SelectorSyncIdentityProvider.java @@ -80,8 +80,7 @@ public class SelectorSyncIdentityProvider implements HasMetadata @JsonProperty("kind") private String kind = "SelectorSyncIdentityProvider"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private SelectorSyncIdentityProviderSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SelectorSyncSet.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SelectorSyncSet.java index 8c2bec845d4..097612558e6 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SelectorSyncSet.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SelectorSyncSet.java @@ -80,8 +80,7 @@ public class SelectorSyncSet implements HasMetadata @JsonProperty("kind") private String kind = "SelectorSyncSet"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private SelectorSyncSetSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SyncIdentityProvider.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SyncIdentityProvider.java index f08163dea17..34cf69d7e18 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SyncIdentityProvider.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SyncIdentityProvider.java @@ -81,8 +81,7 @@ public class SyncIdentityProvider implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "SyncIdentityProvider"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private SyncIdentityProviderSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SyncSet.java b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SyncSet.java index 4f9053db6af..068a3f63ca6 100644 --- a/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SyncSet.java +++ b/kubernetes-model-generator/openshift-model-hive/src/generated/java/io/fabric8/openshift/api/model/hive/v1/SyncSet.java @@ -81,8 +81,7 @@ public class SyncSet implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "SyncSet"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private SyncSetSpec spec; @JsonProperty("status") 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 7d92167e9d5..e0e6c1cfbb2 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 @@ -11866,29 +11866,30 @@ }, "machinepoolplatform": { "properties": { - "aws": { - "$ref": "#/definitions/os_hive_aws_v1_MachinePoolPlatform", - "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.MachinePoolPlatform" - }, - "azure": { - "$ref": "#/definitions/os_hive_azure_v1_MachinePool", - "existingJavaType": "io.fabric8.openshift.api.model.hive.azure.v1.MachinePool" + "rootVolume": { + "$ref": "#/definitions/os_hive_aws_v1_EC2RootVolume", + "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.EC2RootVolume" }, - "gcp": { - "$ref": "#/definitions/os_hive_gcp_v1_MachinePool", - "existingJavaType": "io.fabric8.openshift.api.model.hive.gcp.v1.MachinePool" + "spotMarketOptions": { + "$ref": "#/definitions/os_hive_aws_v1_SpotMarketOptions", + "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.SpotMarketOptions" }, - "openstack": { - "$ref": "#/definitions/os_hive_openstack_v1_MachinePool", - "existingJavaType": "io.fabric8.openshift.api.model.hive.openstack.v1.MachinePool" + "subnets": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } }, - "ovirt": { - "$ref": "#/definitions/os_hive_ovirt_v1_MachinePool", - "existingJavaType": "io.fabric8.openshift.api.model.hive.ovirt.v1.MachinePool" + "type": { + "type": "string" }, - "vsphere": { - "$ref": "#/definitions/os_hive_vsphere_v1_MachinePool", - "existingJavaType": "io.fabric8.openshift.api.model.hive.vsphere.v1.MachinePool" + "zones": { + "type": "array", + "javaOmitEmpty": true, + "items": { + "type": "string" + } } }, "additionalProperties": true @@ -12481,46 +12482,27 @@ }, "platform": { "properties": { - "agentBareMetal": { - "$ref": "#/definitions/os_hive_agent_v1_BareMetalPlatform", - "existingJavaType": "io.fabric8.openshift.api.model.hive.agent.v1.BareMetalPlatform" - }, - "aws": { - "$ref": "#/definitions/os_hive_aws_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.Platform" - }, - "azure": { - "$ref": "#/definitions/os_hive_azure_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.hive.azure.v1.Platform" - }, - "baremetal": { - "$ref": "#/definitions/os_hive_baremetal_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.hive.baremetal.v1.Platform" - }, - "gcp": { - "$ref": "#/definitions/os_hive_gcp_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.hive.gcp.v1.Platform" + "baseDomainResourceGroupName": { + "type": "string" }, - "openstack": { - "$ref": "#/definitions/os_hive_openstack_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.hive.openstack.v1.Platform" + "cloudName": { + "type": "string" }, - "ovirt": { - "$ref": "#/definitions/os_hive_ovirt_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.hive.ovirt.v1.Platform" + "credentialsSecretRef": { + "$ref": "#/definitions/kubernetes_core_LocalObjectReference", + "existingJavaType": "io.fabric8.kubernetes.api.model.LocalObjectReference" }, - "vsphere": { - "$ref": "#/definitions/os_hive_vsphere_v1_Platform", - "existingJavaType": "io.fabric8.openshift.api.model.hive.vsphere.v1.Platform" + "region": { + "type": "string" } }, "additionalProperties": true }, "platformstatus": { "properties": { - "aws": { - "$ref": "#/definitions/os_hive_aws_v1_PlatformStatus", - "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.PlatformStatus" + "privateLink": { + "$ref": "#/definitions/os_hive_aws_v1_PrivateLinkAccessStatus", + "existingJavaType": "io.fabric8.openshift.api.model.hive.aws.v1.PrivateLinkAccessStatus" } }, "additionalProperties": true diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index ca5b6d5307b..5d1a0342f1d 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -95,8 +95,7 @@ public class KubeSchema { @JsonProperty("LibvirtMachinePool") private io.fabric8.openshift.api.model.installer.libvirt.v1.MachinePool libvirtMachinePool; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("OpenStackMachinePool") private io.fabric8.openshift.api.model.installer.openstack.v1.MachinePool openStackMachinePool; @JsonProperty("OvirtMachinePool") diff --git a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/InstallConfig.java b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/InstallConfig.java index 4c19fa55ee9..358cc3d6446 100644 --- a/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/InstallConfig.java +++ b/kubernetes-model-generator/openshift-model-installer/src/generated/java/io/fabric8/openshift/api/model/installer/v1/InstallConfig.java @@ -108,8 +108,7 @@ public class InstallConfig implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "InstallConfig"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("networking") private Networking networking; @JsonProperty("platform") 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 bd6d0dc1a1b..7192d96dd35 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 @@ -2372,19 +2372,19 @@ }, "machinepool": { "properties": { - "osDisk": { - "$ref": "#/definitions/os_installer_gcp_v1_OSDisk", - "existingJavaType": "io.fabric8.openshift.api.model.installer.gcp.v1.OSDisk" + "coresPerSocket": { + "type": "integer" }, - "type": { - "type": "string" + "cpus": { + "type": "integer" }, - "zones": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } + "memoryMB": { + "type": "integer", + "existingJavaType": "Long" + }, + "osDisk": { + "$ref": "#/definitions/os_installer_vsphere_v1_OSDisk", + "existingJavaType": "io.fabric8.openshift.api.model.installer.vsphere.v1.OSDisk" } }, "additionalProperties": true @@ -2609,16 +2609,8 @@ }, "osdisk": { "properties": { - "DiskSizeGB": { - "type": "integer", - "existingJavaType": "Long" - }, - "DiskType": { - "type": "string" - }, - "encryptionKey": { - "$ref": "#/definitions/os_installer_gcp_v1_EncryptionKeyReference", - "existingJavaType": "io.fabric8.openshift.api.model.installer.gcp.v1.EncryptionKeyReference" + "diskSizeGB": { + "type": "integer" } }, "additionalProperties": true @@ -2650,46 +2642,6 @@ "additionalProperties": true }, "platform": { - "properties": { - "amiID": { - "type": "string" - }, - "defaultMachinePlatform": { - "$ref": "#/definitions/os_installer_aws_v1_MachinePool", - "existingJavaType": "io.fabric8.openshift.api.model.installer.aws.v1.MachinePool" - }, - "experimentalPropagateUserTags": { - "type": "boolean" - }, - "hostedZone": { - "type": "string" - }, - "region": { - "type": "string" - }, - "serviceEndpoints": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "$ref": "#/definitions/os_installer_aws_v1_ServiceEndpoint", - "existingJavaType": "io.fabric8.openshift.api.model.installer.aws.v1.ServiceEndpoint" - } - }, - "subnets": { - "type": "array", - "javaOmitEmpty": true, - "items": { - "type": "string" - } - }, - "userTags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "existingJavaType": "java.util.Map\u003cString, String\u003e" - } - }, "additionalProperties": true }, "proxy": { diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 1b9886b6f88..01e03c6424d 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -95,8 +95,7 @@ public class KubeSchema { @JsonProperty("MachineSetList") private MachineSetList machineSetList; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("Patch") private Patch patch; @JsonProperty("Status") diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/Machine.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/Machine.java index 995e709bd5a..3608f5bf08c 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/Machine.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/Machine.java @@ -81,8 +81,7 @@ public class Machine implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Machine"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private MachineSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheck.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheck.java index fb4bb0c12a9..a377465d96f 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheck.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineHealthCheck.java @@ -81,8 +81,7 @@ public class MachineHealthCheck implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "MachineHealthCheck"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private MachineHealthCheckSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSet.java b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSet.java index 04e26a0b3f7..881e79f45dd 100644 --- a/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSet.java +++ b/kubernetes-model-generator/openshift-model-machine/src/generated/java/io/fabric8/openshift/api/model/machine/v1beta1/MachineSet.java @@ -81,8 +81,7 @@ public class MachineSet implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "MachineSet"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private MachineSetSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 8560b582811..00cc1d674e2 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -111,8 +111,7 @@ public class KubeSchema { @JsonProperty("MachineConfigPoolList") private MachineConfigPoolList machineConfigPoolList; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("Patch") private Patch patch; @JsonProperty("Status") diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfig.java b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfig.java index ef4727b81f9..410ef9f1bad 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfig.java +++ b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ContainerRuntimeConfig.java @@ -80,8 +80,7 @@ public class ContainerRuntimeConfig implements HasMetadata @JsonProperty("kind") private String kind = "ContainerRuntimeConfig"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ContainerRuntimeConfigSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfig.java b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfig.java index 273955d0cb7..d4402eb59d4 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfig.java +++ b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/ControllerConfig.java @@ -80,8 +80,7 @@ public class ControllerConfig implements HasMetadata @JsonProperty("kind") private String kind = "ControllerConfig"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ControllerConfigSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfig.java b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfig.java index 240df655eab..f7092d5ef74 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfig.java +++ b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/KubeletConfig.java @@ -80,8 +80,7 @@ public class KubeletConfig implements HasMetadata @JsonProperty("kind") private String kind = "KubeletConfig"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private KubeletConfigSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfig.java b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfig.java index 4f95f0c7275..7bf7ed3fb9e 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfig.java +++ b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfig.java @@ -79,8 +79,7 @@ public class MachineConfig implements HasMetadata @JsonProperty("kind") private String kind = "MachineConfig"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private MachineConfigSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPool.java b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPool.java index 9d339c574e9..f22134de277 100644 --- a/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPool.java +++ b/kubernetes-model-generator/openshift-model-machineconfig/src/generated/java/io/fabric8/openshift/api/model/machineconfig/v1/MachineConfigPool.java @@ -80,8 +80,7 @@ public class MachineConfigPool implements HasMetadata @JsonProperty("kind") private String kind = "MachineConfigPool"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private MachineConfigPoolSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 4114c8c079c..8646fb01acd 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -123,8 +123,7 @@ public class KubeSchema { @JsonProperty("NetworkAttachmentDefinitionList") private NetworkAttachmentDefinitionList networkAttachmentDefinitionList; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("OperatorPKI") private OperatorPKI operatorPKI; @JsonProperty("OperatorPKIList") diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCount.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCount.java index 12d2fd2a1df..bfd6957af23 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCount.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/apiserver/v1/APIRequestCount.java @@ -80,8 +80,7 @@ public class APIRequestCount implements HasMetadata @JsonProperty("kind") private String kind = "APIRequestCount"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private APIRequestCountSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequest.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequest.java index e0431a47f80..9d8a299694f 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequest.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cloudcredential/v1/CredentialsRequest.java @@ -81,8 +81,7 @@ public class CredentialsRequest implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "CredentialsRequest"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private CredentialsRequestSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cncf/cni/v1/NetworkAttachmentDefinition.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cncf/cni/v1/NetworkAttachmentDefinition.java index cdcba8a6477..c08d0ee63d3 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cncf/cni/v1/NetworkAttachmentDefinition.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/cncf/cni/v1/NetworkAttachmentDefinition.java @@ -80,8 +80,7 @@ public class NetworkAttachmentDefinition implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "NetworkAttachmentDefinition"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private NetworkAttachmentDefinitionSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/Config.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/Config.java index 578e13dc37c..ed857776d68 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/Config.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/imageregistry/operator/v1/Config.java @@ -80,8 +80,7 @@ public class Config implements HasMetadata @JsonProperty("kind") private String kind = "Config"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ImageRegistrySpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHost.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHost.java index cc38616863f..650ce69b86e 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHost.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/metal3/v1alpha1/BareMetalHost.java @@ -81,8 +81,7 @@ public class BareMetalHost implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "BareMetalHost"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private BareMetalHostSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouter.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouter.java index 2f96d135328..d1a4ade5473 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouter.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/EgressRouter.java @@ -81,8 +81,7 @@ public class EgressRouter implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "EgressRouter"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private EgressRouterSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/OperatorPKI.java b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/OperatorPKI.java index e7410032a63..01974422fa3 100644 --- a/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/OperatorPKI.java +++ b/kubernetes-model-generator/openshift-model-miscellaneous/src/generated/java/io/fabric8/openshift/api/model/miscellaneous/network/operator/v1/OperatorPKI.java @@ -81,8 +81,7 @@ public class OperatorPKI implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "OperatorPKI"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private OperatorPKISpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index be7b812137d..e40fb195f8b 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -111,8 +111,7 @@ public class KubeSchema { @JsonProperty("Info") private Info info; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("Patch") private Patch patch; @JsonProperty("PodMonitor") diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Alertmanager.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Alertmanager.java index 7d62b8f9835..40b105def6b 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Alertmanager.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Alertmanager.java @@ -81,8 +81,7 @@ public class Alertmanager implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Alertmanager"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private AlertmanagerSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMonitor.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMonitor.java index 01143d60f7a..74601f2ad53 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMonitor.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PodMonitor.java @@ -80,8 +80,7 @@ public class PodMonitor implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "PodMonitor"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private PodMonitorSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Probe.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Probe.java index 1d174b1ab3d..401ce83f1d6 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Probe.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Probe.java @@ -80,8 +80,7 @@ public class Probe implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Probe"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ProbeSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Prometheus.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Prometheus.java index efe774e8590..233563be093 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Prometheus.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/Prometheus.java @@ -81,8 +81,7 @@ public class Prometheus implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Prometheus"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private PrometheusSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusRule.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusRule.java index 2fdb2f5eda7..c2183f510a8 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusRule.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/PrometheusRule.java @@ -80,8 +80,7 @@ public class PrometheusRule implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "PrometheusRule"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private PrometheusRuleSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ServiceMonitor.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ServiceMonitor.java index 36c59dd390a..32dc17a8ec9 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ServiceMonitor.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ServiceMonitor.java @@ -80,8 +80,7 @@ public class ServiceMonitor implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "ServiceMonitor"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ServiceMonitorSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ThanosRuler.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ThanosRuler.java index 88e631daccd..ba2abc1f495 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ThanosRuler.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1/ThanosRuler.java @@ -81,8 +81,7 @@ public class ThanosRuler implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "ThanosRuler"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ThanosRulerSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/AlertmanagerConfig.java b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/AlertmanagerConfig.java index b99524ac176..1e515b34f26 100644 --- a/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/AlertmanagerConfig.java +++ b/kubernetes-model-generator/openshift-model-monitoring/src/generated/java/io/fabric8/openshift/api/model/monitoring/v1alpha1/AlertmanagerConfig.java @@ -80,8 +80,7 @@ public class AlertmanagerConfig implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "AlertmanagerConfig"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private AlertmanagerConfigSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index f97021ecdf1..69c3125213f 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -242,8 +242,7 @@ public class KubeSchema { @JsonProperty("NetworkList") private NetworkList networkList; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("OpenShiftAPIServer") private OpenShiftAPIServer openShiftAPIServer; @JsonProperty("OpenShiftAPIServerList") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheck.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheck.java index 9097b82bc99..ad9de4b83e4 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheck.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/controlplane/v1alpha1/PodNetworkConnectivityCheck.java @@ -81,8 +81,7 @@ public class PodNetworkConnectivityCheck implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "PodNetworkConnectivityCheck"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private PodNetworkConnectivityCheckSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Authentication.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Authentication.java index 5954e204290..b12a297ad0e 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Authentication.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Authentication.java @@ -80,8 +80,7 @@ public class Authentication implements HasMetadata @JsonProperty("kind") private String kind = "Authentication"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private AuthenticationSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CSISnapshotController.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CSISnapshotController.java index 804f5dbd940..6b91d7da6fa 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CSISnapshotController.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CSISnapshotController.java @@ -80,8 +80,7 @@ public class CSISnapshotController implements HasMetadata @JsonProperty("kind") private String kind = "CSISnapshotController"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private CSISnapshotControllerSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CloudCredential.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CloudCredential.java index feabc560b43..c55feafada2 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CloudCredential.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/CloudCredential.java @@ -80,8 +80,7 @@ public class CloudCredential implements HasMetadata @JsonProperty("kind") private String kind = "CloudCredential"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private CloudCredentialSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriver.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriver.java index 95c1dc50259..2d338ee1b0a 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriver.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ClusterCSIDriver.java @@ -80,8 +80,7 @@ public class ClusterCSIDriver implements HasMetadata @JsonProperty("kind") private String kind = "ClusterCSIDriver"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ClusterCSIDriverSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Config.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Config.java index c6562f64d35..da5b9bc3085 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Config.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Config.java @@ -80,8 +80,7 @@ public class Config implements HasMetadata @JsonProperty("kind") private String kind = "Config"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ConfigSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Console.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Console.java index 6cdf9388f4d..c50d0d1c3ae 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Console.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Console.java @@ -80,8 +80,7 @@ public class Console implements HasMetadata @JsonProperty("kind") private String kind = "Console"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ConsoleSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNS.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNS.java index d0756901c4e..3525476af37 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNS.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNS.java @@ -80,8 +80,7 @@ public class DNS implements HasMetadata @JsonProperty("kind") private String kind = "DNS"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private DNSSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSRecord.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSRecord.java index b1ad8e7ce1c..820f66b3859 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSRecord.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/DNSRecord.java @@ -81,8 +81,7 @@ public class DNSRecord implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "DNSRecord"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private DNSRecordSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Etcd.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Etcd.java index e65c879f982..3586ce9a22c 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Etcd.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Etcd.java @@ -80,8 +80,7 @@ public class Etcd implements HasMetadata @JsonProperty("kind") private String kind = "Etcd"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private EtcdSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ImagePruner.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ImagePruner.java index 8d5aec48a0a..d0d3c3205cf 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ImagePruner.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ImagePruner.java @@ -80,8 +80,7 @@ public class ImagePruner implements HasMetadata @JsonProperty("kind") private String kind = "ImagePruner"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ImagePrunerSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressController.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressController.java index 93529bc0f75..5b16b35167c 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressController.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/IngressController.java @@ -81,8 +81,7 @@ public class IngressController implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "IngressController"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private IngressControllerSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServer.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServer.java index f22487417d1..68515b69f6d 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServer.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeAPIServer.java @@ -80,8 +80,7 @@ public class KubeAPIServer implements HasMetadata @JsonProperty("kind") private String kind = "KubeAPIServer"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private KubeAPIServerSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeControllerManager.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeControllerManager.java index 4ca8ae5ccd5..d1d73c257ce 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeControllerManager.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeControllerManager.java @@ -80,8 +80,7 @@ public class KubeControllerManager implements HasMetadata @JsonProperty("kind") private String kind = "KubeControllerManager"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private KubeControllerManagerSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeScheduler.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeScheduler.java index e66fffb0709..5f7e2764cab 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeScheduler.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeScheduler.java @@ -80,8 +80,7 @@ public class KubeScheduler implements HasMetadata @JsonProperty("kind") private String kind = "KubeScheduler"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private KubeSchedulerSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeStorageVersionMigrator.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeStorageVersionMigrator.java index 01097c8feca..9ee6a7c75d1 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeStorageVersionMigrator.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/KubeStorageVersionMigrator.java @@ -80,8 +80,7 @@ public class KubeStorageVersionMigrator implements HasMetadata @JsonProperty("kind") private String kind = "KubeStorageVersionMigrator"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private KubeStorageVersionMigratorSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Network.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Network.java index fb7c30e4c00..482c5d5c637 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Network.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Network.java @@ -80,8 +80,7 @@ public class Network implements HasMetadata @JsonProperty("kind") private String kind = "Network"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private NetworkSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftAPIServer.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftAPIServer.java index a33b2f374d7..5e401637f5e 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftAPIServer.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftAPIServer.java @@ -80,8 +80,7 @@ public class OpenShiftAPIServer implements HasMetadata @JsonProperty("kind") private String kind = "OpenShiftAPIServer"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private OpenShiftAPIServerSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftControllerManager.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftControllerManager.java index fbf448dcf2a..71066f7cb92 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftControllerManager.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/OpenShiftControllerManager.java @@ -80,8 +80,7 @@ public class OpenShiftControllerManager implements HasMetadata @JsonProperty("kind") private String kind = "OpenShiftControllerManager"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private OpenShiftControllerManagerSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCA.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCA.java index 51396c4e00c..d5ea71cc7cd 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCA.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCA.java @@ -80,8 +80,7 @@ public class ServiceCA implements HasMetadata @JsonProperty("kind") private String kind = "ServiceCA"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ServiceCASpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogAPIServer.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogAPIServer.java index f2c088aff72..3f493414b5f 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogAPIServer.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogAPIServer.java @@ -80,8 +80,7 @@ public class ServiceCatalogAPIServer implements HasMetadata @JsonProperty("kind") private String kind = "ServiceCatalogAPIServer"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ServiceCatalogAPIServerSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogControllerManager.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogControllerManager.java index 719e21a4aee..12c89674750 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogControllerManager.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/ServiceCatalogControllerManager.java @@ -80,8 +80,7 @@ public class ServiceCatalogControllerManager implements HasMetadata @JsonProperty("kind") private String kind = "ServiceCatalogControllerManager"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ServiceCatalogControllerManagerSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Storage.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Storage.java index 642031aabca..00d12011d2e 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Storage.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1/Storage.java @@ -80,8 +80,7 @@ public class Storage implements HasMetadata @JsonProperty("kind") private String kind = "Storage"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private StorageSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/ImageContentSourcePolicy.java b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/ImageContentSourcePolicy.java index 22eb68676ab..121d23ef098 100644 --- a/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/ImageContentSourcePolicy.java +++ b/kubernetes-model-generator/openshift-model-operator/src/generated/java/io/fabric8/openshift/api/model/operator/v1alpha1/ImageContentSourcePolicy.java @@ -79,8 +79,7 @@ public class ImageContentSourcePolicy implements HasMetadata @JsonProperty("kind") private String kind = "ImageContentSourcePolicy"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ImageContentSourcePolicySpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 9f37f18a327..ac8d6a100b4 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -124,8 +124,7 @@ public class KubeSchema { @JsonProperty("InstallPlanList") private InstallPlanList installPlanList; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("Operator") private Operator operator; @JsonProperty("OperatorCondition") diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/PackageManifest.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/PackageManifest.java index 28a1d1d1392..4fa1ca6a101 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/PackageManifest.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/lifecyclemanager/v1/PackageManifest.java @@ -81,8 +81,7 @@ public class PackageManifest implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "PackageManifest"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private PackageManifestSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/Operator.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/Operator.java index 0541f3e8b07..54c05449ac0 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/Operator.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/Operator.java @@ -80,8 +80,7 @@ public class Operator implements HasMetadata @JsonProperty("kind") private String kind = "Operator"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private OperatorSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorCondition.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorCondition.java index 4c4fa91c1f6..4a5776aa4d2 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorCondition.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorCondition.java @@ -81,8 +81,7 @@ public class OperatorCondition implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "OperatorCondition"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private OperatorConditionSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroup.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroup.java index e6f873d1fa5..7524c4d42d9 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroup.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1/OperatorGroup.java @@ -81,8 +81,7 @@ public class OperatorGroup implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "OperatorGroup"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private OperatorGroupSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSource.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSource.java index 709fb2356eb..8c0cee0ddd0 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSource.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/CatalogSource.java @@ -81,8 +81,7 @@ public class CatalogSource implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "CatalogSource"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private CatalogSourceSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersion.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersion.java index 34d98333841..f77c9ee90e4 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersion.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/ClusterServiceVersion.java @@ -81,8 +81,7 @@ public class ClusterServiceVersion implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "ClusterServiceVersion"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ClusterServiceVersionSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlan.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlan.java index 9c9f108e993..a145fa646b7 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlan.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/InstallPlan.java @@ -81,8 +81,7 @@ public class InstallPlan implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "InstallPlan"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private InstallPlanSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/Subscription.java b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/Subscription.java index 61737a7fb23..d5e5f364b55 100644 --- a/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/Subscription.java +++ b/kubernetes-model-generator/openshift-model-operatorhub/src/generated/java/io/fabric8/openshift/api/model/operatorhub/v1alpha1/Subscription.java @@ -81,8 +81,7 @@ public class Subscription implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Subscription"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private SubscriptionSpec spec; @JsonProperty("status") 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 ca4991b9f95..f629551c7be 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 @@ -7172,13 +7172,13 @@ "$ref": "#/definitions/kubernetes_apimachinery_Time", "existingJavaType": "String" }, + "lastUpdateTime": { + "$ref": "#/definitions/kubernetes_apimachinery_Time", + "existingJavaType": "String" + }, "message": { "type": "string" }, - "observedGeneration": { - "type": "integer", - "existingJavaType": "Long" - }, "reason": { "type": "string" }, diff --git a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 87a74253568..50b1ad70e32 100644 --- a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -79,8 +79,7 @@ public class KubeSchema { @JsonProperty("Info") private Info info; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("Patch") private Patch patch; @JsonProperty("Status") diff --git a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/StorageState.java b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/StorageState.java index 3cc3774a94f..4db9160d600 100644 --- a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/StorageState.java +++ b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/StorageState.java @@ -80,8 +80,7 @@ public class StorageState implements HasMetadata @JsonProperty("kind") private String kind = "StorageState"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private StorageStateSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/StorageVersionMigration.java b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/StorageVersionMigration.java index a1d642980b4..8221e7b106c 100644 --- a/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/StorageVersionMigration.java +++ b/kubernetes-model-generator/openshift-model-storageversionmigrator/src/generated/java/io/fabric8/openshift/api/model/storageversionmigrator/v1alpha1/StorageVersionMigration.java @@ -80,8 +80,7 @@ public class StorageVersionMigration implements HasMetadata @JsonProperty("kind") private String kind = "StorageVersionMigration"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private StorageVersionMigrationSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index d3b542e6796..ad07a7d9881 100644 --- a/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -79,8 +79,7 @@ public class KubeSchema { @JsonProperty("Info") private Info info; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("Patch") private Patch patch; @JsonProperty("Profile") diff --git a/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/openshift/api/model/tuned/v1/Profile.java b/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/openshift/api/model/tuned/v1/Profile.java index 09a605c695a..fa606f152dc 100644 --- a/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/openshift/api/model/tuned/v1/Profile.java +++ b/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/openshift/api/model/tuned/v1/Profile.java @@ -81,8 +81,7 @@ public class Profile implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Profile"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ProfileSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/openshift/api/model/tuned/v1/Tuned.java b/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/openshift/api/model/tuned/v1/Tuned.java index 87dcaddaed3..a50bc8b5e7a 100644 --- a/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/openshift/api/model/tuned/v1/Tuned.java +++ b/kubernetes-model-generator/openshift-model-tuned/src/generated/java/io/fabric8/openshift/api/model/tuned/v1/Tuned.java @@ -81,8 +81,7 @@ public class Tuned implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Tuned"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private TunedSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index ef2d5445c33..5b5f110dc6b 100644 --- a/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -87,8 +87,7 @@ public class KubeSchema { @JsonProperty("Info") private Info info; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("OverlappingRangeIPReservation") private OverlappingRangeIPReservation overlappingRangeIPReservation; @JsonProperty("OverlappingRangeIPReservationList") diff --git a/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/openshift/api/model/whereabouts/v1alpha1/IPPool.java b/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/openshift/api/model/whereabouts/v1alpha1/IPPool.java index e8d1377c356..8dd2e8229f3 100644 --- a/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/openshift/api/model/whereabouts/v1alpha1/IPPool.java +++ b/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/openshift/api/model/whereabouts/v1alpha1/IPPool.java @@ -80,8 +80,7 @@ public class IPPool implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "IPPool"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private IPPoolSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/openshift/api/model/whereabouts/v1alpha1/OverlappingRangeIPReservation.java b/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/openshift/api/model/whereabouts/v1alpha1/OverlappingRangeIPReservation.java index 3f6636e2756..aaede443650 100644 --- a/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/openshift/api/model/whereabouts/v1alpha1/OverlappingRangeIPReservation.java +++ b/kubernetes-model-generator/openshift-model-whereabouts/src/generated/java/io/fabric8/openshift/api/model/whereabouts/v1alpha1/OverlappingRangeIPReservation.java @@ -80,8 +80,7 @@ public class OverlappingRangeIPReservation implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "OverlappingRangeIPReservation"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private OverlappingRangeIPReservationSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java index 8e42ee50874..819b804b662 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java @@ -464,8 +464,7 @@ public class KubeSchema { @JsonProperty("OAuthList") private OAuthList oAuthList; @JsonProperty("ObjectMeta") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta objectMeta; @JsonProperty("OpenShiftRoleBindingRestrictionList") private RoleBindingRestrictionList openShiftRoleBindingRestrictionList; @JsonProperty("OpenshiftClusterRole") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/APIServer.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/APIServer.java index 074e41c23bc..58a55b0c3e2 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/APIServer.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/APIServer.java @@ -80,8 +80,7 @@ public class APIServer implements HasMetadata @JsonProperty("kind") private String kind = "APIServer"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private APIServerSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/AppliedClusterResourceQuota.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/AppliedClusterResourceQuota.java index 685fc2d27e6..fc0b9e4db6b 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/AppliedClusterResourceQuota.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/AppliedClusterResourceQuota.java @@ -81,8 +81,7 @@ public class AppliedClusterResourceQuota implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "AppliedClusterResourceQuota"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ClusterResourceQuotaSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Authentication.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Authentication.java index f5f3059d0c5..f2ed229bb04 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Authentication.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Authentication.java @@ -80,8 +80,7 @@ public class Authentication implements HasMetadata @JsonProperty("kind") private String kind = "Authentication"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private AuthenticationSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BrokerTemplateInstance.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BrokerTemplateInstance.java index 58960cbc61b..401dd1cb429 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BrokerTemplateInstance.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BrokerTemplateInstance.java @@ -79,8 +79,7 @@ public class BrokerTemplateInstance implements HasMetadata @JsonProperty("kind") private String kind = "BrokerTemplateInstance"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private BrokerTemplateInstanceSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Build.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Build.java index cb11f0377bf..2d7fd1fe5bf 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Build.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Build.java @@ -81,8 +81,7 @@ public class Build implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Build"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private BuildSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildConfig.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildConfig.java index 6c39c8b76fa..6a65cbaab3d 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildConfig.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildConfig.java @@ -81,8 +81,7 @@ public class BuildConfig implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "BuildConfig"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private BuildConfigSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildRequest.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildRequest.java index 7e64a4cf940..533a56678d6 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildRequest.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/BuildRequest.java @@ -96,8 +96,7 @@ public class BuildRequest implements HasMetadata, Namespaced @JsonProperty("lastVersion") private Long lastVersion; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("revision") private SourceRevision revision; @JsonProperty("sourceStrategyOptions") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterNetwork.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterNetwork.java index 181e1466597..bed77eff8e5 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterNetwork.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterNetwork.java @@ -91,8 +91,7 @@ public class ClusterNetwork implements HasMetadata @JsonProperty("kind") private String kind = "ClusterNetwork"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("mtu") private Integer mtu; @JsonProperty("network") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterOperator.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterOperator.java index 38a708358dd..8f498ef98ce 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterOperator.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterOperator.java @@ -80,8 +80,7 @@ public class ClusterOperator implements HasMetadata @JsonProperty("kind") private String kind = "ClusterOperator"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ClusterOperatorSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuota.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuota.java index e844e689d86..1b5bf74e70a 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuota.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterResourceQuota.java @@ -80,8 +80,7 @@ public class ClusterResourceQuota implements HasMetadata @JsonProperty("kind") private String kind = "ClusterResourceQuota"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ClusterResourceQuotaSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRole.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRole.java index 444bb1cec24..e22b2588575 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRole.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRole.java @@ -85,8 +85,7 @@ public class ClusterRole implements HasMetadata @JsonProperty("kind") private String kind = "ClusterRole"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("rules") private List rules = new ArrayList(); @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRoleBinding.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRoleBinding.java index f20f2d715b7..21efca7e5b0 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRoleBinding.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterRoleBinding.java @@ -85,8 +85,7 @@ public class ClusterRoleBinding implements HasMetadata @JsonProperty("kind") private String kind = "ClusterRoleBinding"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("roleRef") private io.fabric8.kubernetes.api.model.ObjectReference roleRef; @JsonProperty("subjects") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterVersion.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterVersion.java index 83270e1274d..259f89ef21b 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterVersion.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ClusterVersion.java @@ -80,8 +80,7 @@ public class ClusterVersion implements HasMetadata @JsonProperty("kind") private String kind = "ClusterVersion"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ClusterVersionSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Console.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Console.java index cb994fcf3e8..222cb4ef762 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Console.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Console.java @@ -80,8 +80,7 @@ public class Console implements HasMetadata @JsonProperty("kind") private String kind = "Console"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ConsoleSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DNS.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DNS.java index 708966efd64..46566ec774f 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DNS.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DNS.java @@ -80,8 +80,7 @@ public class DNS implements HasMetadata @JsonProperty("kind") private String kind = "DNS"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private DNSSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentConfig.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentConfig.java index ca7e4e28a9d..e09d47b8983 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentConfig.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/DeploymentConfig.java @@ -81,8 +81,7 @@ public class DeploymentConfig implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "DeploymentConfig"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private DeploymentConfigSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicy.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicy.java index 51b6d7a86f9..f1a05ff8d81 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicy.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/EgressNetworkPolicy.java @@ -80,8 +80,7 @@ public class EgressNetworkPolicy implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "EgressNetworkPolicy"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private EgressNetworkPolicySpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/FeatureGate.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/FeatureGate.java index 87eca844e7c..afdddc2b826 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/FeatureGate.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/FeatureGate.java @@ -80,8 +80,7 @@ public class FeatureGate implements HasMetadata @JsonProperty("kind") private String kind = "FeatureGate"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private FeatureGateSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Group.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Group.java index 083a1c3e271..dbfe2b6abf9 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Group.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Group.java @@ -80,8 +80,7 @@ public class Group implements HasMetadata @JsonProperty("kind") private String kind = "Group"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("users") private List users = new ArrayList(); @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HelmChartRepository.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HelmChartRepository.java index 0c87f0b8cd0..db856f9da09 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HelmChartRepository.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HelmChartRepository.java @@ -80,8 +80,7 @@ public class HelmChartRepository implements HasMetadata @JsonProperty("kind") private String kind = "HelmChartRepository"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private HelmChartRepositorySpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HostSubnet.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HostSubnet.java index 02220765c1f..7dc949775c9 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HostSubnet.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/HostSubnet.java @@ -95,8 +95,7 @@ public class HostSubnet implements HasMetadata @JsonProperty("kind") private String kind = "HostSubnet"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("subnet") private String subnet; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Identity.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Identity.java index 7e538fc08eb..e2fcb0036d5 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Identity.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Identity.java @@ -85,8 +85,7 @@ public class Identity implements HasMetadata @JsonProperty("kind") private java.lang.String kind = "Identity"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("providerName") private java.lang.String providerName; @JsonProperty("providerUserName") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Image.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Image.java index 70e3d40cfc5..1d2c5c49309 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Image.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Image.java @@ -107,8 +107,7 @@ public class Image implements HasMetadata @JsonProperty("kind") private String kind = "Image"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("signatures") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List signatures = new ArrayList(); diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageSignature.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageSignature.java index 620adecb17f..55c318a2eec 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageSignature.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageSignature.java @@ -97,8 +97,7 @@ public class ImageSignature implements HasMetadata @JsonProperty("kind") private java.lang.String kind = "ImageSignature"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("signedClaims") @JsonInclude(JsonInclude.Include.NON_EMPTY) private Map signedClaims = new LinkedHashMap(); diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStream.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStream.java index e9d16b46f73..f5608514be0 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStream.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStream.java @@ -81,8 +81,7 @@ public class ImageStream implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "ImageStream"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ImageStreamSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamImage.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamImage.java index e9a3510c385..ef5c4d7fa34 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamImage.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamImage.java @@ -77,8 +77,7 @@ public class ImageStreamImage implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "ImageStreamImage"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonIgnore private Map additionalProperties = new HashMap(); diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamImport.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamImport.java index 05a4f1e6e57..83b99aca979 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamImport.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamImport.java @@ -76,8 +76,7 @@ public class ImageStreamImport implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "ImageStreamImport"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ImageStreamImportSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamMapping.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamMapping.java index 2c623fb883e..aef98c56a9a 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamMapping.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamMapping.java @@ -78,8 +78,7 @@ public class ImageStreamMapping implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "ImageStreamMapping"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("tag") private String tag; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamTag.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamTag.java index 0ac64fd01ae..69d63c5f873 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamTag.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageStreamTag.java @@ -95,8 +95,7 @@ public class ImageStreamTag implements HasMetadata, Namespaced @JsonProperty("lookupPolicy") private ImageLookupPolicy lookupPolicy; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("tag") private TagReference tag; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageTag.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageTag.java index 80e0f660927..fc6e078522c 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageTag.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ImageTag.java @@ -84,8 +84,7 @@ public class ImageTag implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "ImageTag"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private TagReference spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Infrastructure.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Infrastructure.java index d8f4b074897..d9ff4b9780e 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Infrastructure.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Infrastructure.java @@ -80,8 +80,7 @@ public class Infrastructure implements HasMetadata @JsonProperty("kind") private String kind = "Infrastructure"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private InfrastructureSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Ingress.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Ingress.java index 561fc2ea2b3..c432675012a 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Ingress.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Ingress.java @@ -80,8 +80,7 @@ public class Ingress implements HasMetadata @JsonProperty("kind") private String kind = "Ingress"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private IngressSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NetNamespace.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NetNamespace.java index 2781ef4daf5..f6749c01f59 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NetNamespace.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/NetNamespace.java @@ -86,8 +86,7 @@ public class NetNamespace implements HasMetadata @JsonProperty("kind") private String kind = "NetNamespace"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("netid") private Integer netid; @JsonProperty("netname") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Network.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Network.java index 444ef629cb1..ff9421ef297 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Network.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Network.java @@ -80,8 +80,7 @@ public class Network implements HasMetadata @JsonProperty("kind") private String kind = "Network"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private NetworkSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuth.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuth.java index 175cee20e80..3c51993c863 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuth.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuth.java @@ -80,8 +80,7 @@ public class OAuth implements HasMetadata @JsonProperty("kind") private String kind = "OAuth"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private OAuthSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAccessToken.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAccessToken.java index c96294fff90..2b5ae5ccdda 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAccessToken.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAccessToken.java @@ -97,8 +97,7 @@ public class OAuthAccessToken implements HasMetadata @JsonProperty("kind") private String kind = "OAuthAccessToken"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("redirectURI") private String redirectURI; @JsonProperty("refreshToken") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAuthorizeToken.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAuthorizeToken.java index f0f97d6e7c6..fe49c1c79fe 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAuthorizeToken.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthAuthorizeToken.java @@ -97,8 +97,7 @@ public class OAuthAuthorizeToken implements HasMetadata @JsonProperty("kind") private String kind = "OAuthAuthorizeToken"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("redirectURI") private String redirectURI; @JsonProperty("scopes") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClient.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClient.java index 9669b4c9db2..58bedd55b33 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClient.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClient.java @@ -97,8 +97,7 @@ public class OAuthClient implements HasMetadata @JsonProperty("kind") private String kind = "OAuthClient"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("redirectURIs") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List redirectURIs = new ArrayList(); diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClientAuthorization.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClientAuthorization.java index 573ce63267a..39ef8ca49b2 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClientAuthorization.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OAuthClientAuthorization.java @@ -86,8 +86,7 @@ public class OAuthClientAuthorization implements HasMetadata @JsonProperty("kind") private String kind = "OAuthClientAuthorization"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("scopes") @JsonInclude(JsonInclude.Include.NON_EMPTY) private List scopes = new ArrayList(); diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OperatorHub.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OperatorHub.java index 81e038de622..c5e3f541d5c 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OperatorHub.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/OperatorHub.java @@ -80,8 +80,7 @@ public class OperatorHub implements HasMetadata @JsonProperty("kind") private String kind = "OperatorHub"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private OperatorHubSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Project.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Project.java index e42d35a1c22..cc786a06d25 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Project.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Project.java @@ -80,8 +80,7 @@ public class Project implements HasMetadata @JsonProperty("kind") private String kind = "Project"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ProjectSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ProjectRequest.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ProjectRequest.java index 7d4c6315acc..29be42551ac 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ProjectRequest.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/ProjectRequest.java @@ -79,8 +79,7 @@ public class ProjectRequest implements HasMetadata @JsonProperty("kind") private String kind = "ProjectRequest"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonIgnore private Map additionalProperties = new HashMap(); diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Proxy.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Proxy.java index 167eabff990..266303ad2c7 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Proxy.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Proxy.java @@ -80,8 +80,7 @@ public class Proxy implements HasMetadata @JsonProperty("kind") private String kind = "Proxy"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private ProxySpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RangeAllocation.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RangeAllocation.java index fa4c87a2f07..c89c0c52c39 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RangeAllocation.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RangeAllocation.java @@ -82,8 +82,7 @@ public class RangeAllocation implements HasMetadata @JsonProperty("kind") private String kind = "RangeAllocation"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("range") private String range; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Role.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Role.java index b6a4d7a8a66..896220ce498 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Role.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Role.java @@ -82,8 +82,7 @@ public class Role implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Role"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("rules") private List rules = new ArrayList(); @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBinding.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBinding.java index c48ba5b2996..f25af1a029c 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBinding.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBinding.java @@ -86,8 +86,7 @@ public class RoleBinding implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "RoleBinding"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("roleRef") private io.fabric8.kubernetes.api.model.ObjectReference roleRef; @JsonProperty("subjects") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBindingRestriction.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBindingRestriction.java index 4d3a45c336b..fd86fe19ff9 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBindingRestriction.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/RoleBindingRestriction.java @@ -80,8 +80,7 @@ public class RoleBindingRestriction implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "RoleBindingRestriction"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private RoleBindingRestrictionSpec spec; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Route.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Route.java index a5f1c7a811e..1521e275e7c 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Route.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Route.java @@ -81,8 +81,7 @@ public class Route implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "Route"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private RouteSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Scheduler.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Scheduler.java index e05820bc48c..0ac1bdb6e15 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Scheduler.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Scheduler.java @@ -80,8 +80,7 @@ public class Scheduler implements HasMetadata @JsonProperty("kind") private String kind = "Scheduler"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private SchedulerSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SecurityContextConstraints.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SecurityContextConstraints.java index 53b52ac7685..d6df50caef1 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SecurityContextConstraints.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/SecurityContextConstraints.java @@ -137,8 +137,7 @@ public class SecurityContextConstraints implements HasMetadata @JsonProperty("kind") private String kind = "SecurityContextConstraints"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("priority") private Integer priority; @JsonProperty("readOnlyRootFilesystem") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Template.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Template.java index 89f9aada093..56f9ae58551 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Template.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/Template.java @@ -91,8 +91,7 @@ public class Template implements HasMetadata, Namespaced @JsonProperty("message") private java.lang.String message; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("objects") private List objects = new ArrayList(); @JsonProperty("parameters") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstance.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstance.java index be990461f5b..1c71a5b6769 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstance.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/TemplateInstance.java @@ -81,8 +81,7 @@ public class TemplateInstance implements HasMetadata, Namespaced @JsonProperty("kind") private String kind = "TemplateInstance"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("spec") private TemplateInstanceSpec spec; @JsonProperty("status") diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/User.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/User.java index 99f76d52d56..01b05607b5c 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/User.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/User.java @@ -90,8 +90,7 @@ public class User implements HasMetadata @JsonProperty("kind") private String kind = "User"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonIgnore private Map additionalProperties = new HashMap(); diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserIdentityMapping.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserIdentityMapping.java index 166cf549cd5..37dd777cc26 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserIdentityMapping.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserIdentityMapping.java @@ -76,8 +76,7 @@ public class UserIdentityMapping implements HasMetadata @JsonProperty("kind") private String kind = "UserIdentityMapping"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("user") private io.fabric8.kubernetes.api.model.ObjectReference user; @JsonIgnore diff --git a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserOAuthAccessToken.java b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserOAuthAccessToken.java index df84e930030..929098f43c0 100644 --- a/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserOAuthAccessToken.java +++ b/kubernetes-model-generator/openshift-model/src/generated/java/io/fabric8/openshift/api/model/UserOAuthAccessToken.java @@ -97,8 +97,7 @@ public class UserOAuthAccessToken implements HasMetadata @JsonProperty("kind") private String kind = "UserOAuthAccessToken"; @JsonProperty("metadata") - @JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = io.fabric8.kubernetes.api.model.ObjectMeta.class) - private io.fabric8.kubernetes.api.model.ObjectMeta metadata = new io.fabric8.kubernetes.api.model.ObjectMeta(); + private io.fabric8.kubernetes.api.model.ObjectMeta metadata; @JsonProperty("redirectURI") private String redirectURI; @JsonProperty("refreshToken") 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 b83c8101731..986ed953e10 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 @@ -21846,13 +21846,7 @@ }, "objectreference": { "properties": { - "apiVersion": { - "type": "string" - }, - "fieldPath": { - "type": "string" - }, - "kind": { + "group": { "type": "string" }, "name": { @@ -21861,10 +21855,7 @@ "namespace": { "type": "string" }, - "resourceVersion": { - "type": "string" - }, - "uid": { + "resource": { "type": "string" } }, diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/SecretCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/SecretCrudTest.java index c150df1f343..cfe5981ff44 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/SecretCrudTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/SecretCrudTest.java @@ -99,7 +99,7 @@ void testSecretWithNoMetadataCreateFails() { assertEquals("Secret is invalid", kubernetesClientException.getStatus().getMessage()); assertEquals(1, kubernetesClientException.getStatus().getDetails().getCauses().size()); assertEquals("ValueRequired", kubernetesClientException.getStatus().getDetails().getCauses().get(0).getReason()); - assertEquals("Required value: name or generateName is required", + assertEquals("Required value: metadata is required", kubernetesClientException.getStatus().getDetails().getCauses().get(0).getMessage()); } } diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenshiftRoleBindingTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenshiftRoleBindingTest.java index a409ca1774c..e392ffb05d4 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenshiftRoleBindingTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenshiftRoleBindingTest.java @@ -16,8 +16,6 @@ package io.fabric8.openshift.client.server.mock; import com.fasterxml.jackson.databind.ObjectMapper; -import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; -import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.RoleBinding; import io.fabric8.openshift.api.model.RoleBindingBuilder; import io.fabric8.openshift.client.OpenShiftClient; @@ -25,10 +23,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -@EnableKubernetesMockClient +@EnableOpenShiftMockClient class OpenshiftRoleBindingTest { - KubernetesMockServer server; + OpenShiftMockServer server; OpenShiftClient client; private RoleBinding expectedRoleBinding = new RoleBindingBuilder() @@ -279,7 +277,7 @@ void testPatchWithOnlySubjects() throws Exception { assertEquals(expectedRoleBinding, response); assertEquals( - "[{\"op\":\"replace\",\"path\":\"/userNames/0\",\"value\":\"testuser1\"},{\"op\":\"add\",\"path\":\"/userNames/1\",\"value\":\"testuser2\"},{\"op\":\"add\",\"path\":\"/userNames/2\",\"value\":\"system:serviceaccount:test:svcacct\"},{\"op\":\"add\",\"path\":\"/groupNames\",\"value\":[\"testgroup\"]},{\"op\":\"add\",\"path\":\"/subjects\",\"value\":[{\"kind\":\"User\",\"name\":\"testuser1\"},{\"kind\":\"User\",\"name\":\"testuser2\"},{\"kind\":\"ServiceAccount\",\"name\":\"svcacct\",\"namespace\":\"test\"},{\"kind\":\"Group\",\"name\":\"testgroup\"}]}]", + "[{\"op\":\"replace\",\"path\":\"/userNames/0\",\"value\":\"testuser1\"},{\"op\":\"add\",\"path\":\"/userNames/1\",\"value\":\"testuser2\"},{\"op\":\"add\",\"path\":\"/userNames/2\",\"value\":\"system:serviceaccount:test:svcacct\"},{\"op\":\"add\",\"path\":\"/metadata\",\"value\":{}},{\"op\":\"add\",\"path\":\"/groupNames\",\"value\":[\"testgroup\"]},{\"op\":\"add\",\"path\":\"/subjects\",\"value\":[{\"kind\":\"User\",\"name\":\"testuser1\"},{\"kind\":\"User\",\"name\":\"testuser2\"},{\"kind\":\"ServiceAccount\",\"name\":\"svcacct\",\"namespace\":\"test\"},{\"kind\":\"Group\",\"name\":\"testgroup\"}]}]", server.getLastRequest().getBody().readUtf8()); } @@ -308,7 +306,7 @@ void testPatchWithUserNamesAndGroupsAndNoSubjects() throws Exception { assertEquals(expectedRoleBinding, response); assertEquals( - "[{\"op\":\"replace\",\"path\":\"/userNames/0\",\"value\":\"testuser1\"},{\"op\":\"add\",\"path\":\"/userNames/1\",\"value\":\"testuser2\"},{\"op\":\"add\",\"path\":\"/userNames/2\",\"value\":\"system:serviceaccount:test:svcacct\"},{\"op\":\"add\",\"path\":\"/groupNames\",\"value\":[\"testgroup\"]},{\"op\":\"add\",\"path\":\"/subjects\",\"value\":[{\"kind\":\"User\",\"name\":\"testuser1\"},{\"kind\":\"User\",\"name\":\"testuser2\"},{\"kind\":\"ServiceAccount\",\"name\":\"svcacct\",\"namespace\":\"test\"},{\"kind\":\"Group\",\"name\":\"testgroup\"}]}]", + "[{\"op\":\"replace\",\"path\":\"/userNames/0\",\"value\":\"testuser1\"},{\"op\":\"add\",\"path\":\"/userNames/1\",\"value\":\"testuser2\"},{\"op\":\"add\",\"path\":\"/userNames/2\",\"value\":\"system:serviceaccount:test:svcacct\"},{\"op\":\"add\",\"path\":\"/metadata\",\"value\":{}},{\"op\":\"add\",\"path\":\"/groupNames\",\"value\":[\"testgroup\"]},{\"op\":\"add\",\"path\":\"/subjects\",\"value\":[{\"kind\":\"User\",\"name\":\"testuser1\"},{\"kind\":\"User\",\"name\":\"testuser2\"},{\"kind\":\"ServiceAccount\",\"name\":\"svcacct\",\"namespace\":\"test\"},{\"kind\":\"Group\",\"name\":\"testgroup\"}]}]", server.getLastRequest().getBody().readUtf8()); } @@ -341,7 +339,7 @@ void testPatchWithUserNamesAndGroupsAndOverwriteSubjects() throws Exception { assertEquals(expectedRoleBinding, response); assertEquals( - "[{\"op\":\"replace\",\"path\":\"/userNames/0\",\"value\":\"testuser1\"},{\"op\":\"add\",\"path\":\"/userNames/1\",\"value\":\"testuser2\"},{\"op\":\"add\",\"path\":\"/userNames/2\",\"value\":\"system:serviceaccount:test:svcacct\"},{\"op\":\"add\",\"path\":\"/groupNames\",\"value\":[\"testgroup\"]},{\"op\":\"add\",\"path\":\"/subjects\",\"value\":[{\"kind\":\"User\",\"name\":\"testuser1\"},{\"kind\":\"User\",\"name\":\"testuser2\"},{\"kind\":\"ServiceAccount\",\"name\":\"svcacct\",\"namespace\":\"test\"},{\"kind\":\"Group\",\"name\":\"testgroup\"}]}]", + "[{\"op\":\"replace\",\"path\":\"/userNames/0\",\"value\":\"testuser1\"},{\"op\":\"add\",\"path\":\"/userNames/1\",\"value\":\"testuser2\"},{\"op\":\"add\",\"path\":\"/userNames/2\",\"value\":\"system:serviceaccount:test:svcacct\"},{\"op\":\"add\",\"path\":\"/metadata\",\"value\":{}},{\"op\":\"add\",\"path\":\"/groupNames\",\"value\":[\"testgroup\"]},{\"op\":\"add\",\"path\":\"/subjects\",\"value\":[{\"kind\":\"User\",\"name\":\"testuser1\"},{\"kind\":\"User\",\"name\":\"testuser2\"},{\"kind\":\"ServiceAccount\",\"name\":\"svcacct\",\"namespace\":\"test\"},{\"kind\":\"Group\",\"name\":\"testgroup\"}]}]", server.getLastRequest().getBody().readUtf8()); }