diff --git a/CHANGELOG.md b/CHANGELOG.md index c0a31e67b39..cd291534f25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ * Fix #4350: SchemaSwap's fieldName parameter now expects a field name only, not a method or a constructor. * Module `io.fabric8:tekton-model-triggers` which contained Tekton triggers v1alpha1 model has been removed. We have introduced separate modules `io.fabric8:tekton-model-v1alpha1` and `io.fabric8:tekton-model-v1beta1` for Tekton triggers v1alpha1 and v1beta1 apigroups respectively. Users who are using `io.fabric8:tekton-client` dependency directly should be unaffected by this change. * Fix #4384: javax.validation.* annotations are no longer added by the Java generator. +* Fix #3906: removed BaseKubernetesList, use KubernetesList instead * Fix #3864: Now it's compulsory to provide `etc/io.fabric8.openshift.client.cfg` file in order to load ManagedOpenShiftClient in OSGi environment. ### 5.12.4 (2022-09-30) diff --git a/kubernetes-model-generator/kubernetes-model-core/cmd/generate/generate.go b/kubernetes-model-generator/kubernetes-model-core/cmd/generate/generate.go index dc27dda2aef..b0224a9e585 100644 --- a/kubernetes-model-generator/kubernetes-model-core/cmd/generate/generate.go +++ b/kubernetes-model-generator/kubernetes-model-core/cmd/generate/generate.go @@ -43,7 +43,7 @@ type Schema struct { APIGroupList metav1.APIGroupList APIResource metav1.APIResource APIResourceList metav1.APIResourceList - BaseKubernetesList metav1.List + KubernetesList metav1.List ObjectMeta metav1.ObjectMeta TypeMeta metav1.TypeMeta Status metav1.Status diff --git a/kubernetes-model-generator/kubernetes-model-core/pom.xml b/kubernetes-model-generator/kubernetes-model-core/pom.xml index 716c879e427..f1386e45391 100644 --- a/kubernetes-model-generator/kubernetes-model-core/pom.xml +++ b/kubernetes-model-generator/kubernetes-model-core/pom.xml @@ -180,6 +180,9 @@ + diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/BaseKubernetesList.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/BaseKubernetesList.java deleted file mode 100644 index 6f3e8aaea71..00000000000 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/BaseKubernetesList.java +++ /dev/null @@ -1,153 +0,0 @@ - -package io.fabric8.kubernetes.api.model; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import io.sundr.builder.annotations.Buildable; -import lombok.EqualsAndHashCode; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -@JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class) -@JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "apiVersion", - "kind", - "metadata", - "items" -}) -@ToString -@EqualsAndHashCode -@Setter -@Accessors(prefix = { - "_", - "" -}) -@Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = true, lazyCollectionInitEnabled = false, builderPackage = "io.fabric8.kubernetes.api.builder") -public class BaseKubernetesList implements KubernetesResource, KubernetesResourceList -{ - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - private String apiVersion = "v1"; - @JsonProperty("items") - private List items = new ArrayList(); - /** - * - * (Required) - * - */ - @JsonProperty("kind") - private String kind = "List"; - @JsonProperty("metadata") - private ListMeta metadata; - @JsonIgnore - private Map additionalProperties = new HashMap(); - - /** - * No args constructor for use in serialization - * - */ - public BaseKubernetesList() { - } - - /** - * - * @param metadata - * @param apiVersion - * @param kind - * @param items - */ - public BaseKubernetesList(String apiVersion, List items, String kind, ListMeta metadata) { - super(); - this.apiVersion = apiVersion; - this.items = items; - this.kind = kind; - this.metadata = metadata; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public String getApiVersion() { - return apiVersion; - } - - /** - * - * (Required) - * - */ - @JsonProperty("apiVersion") - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; - } - - @JsonProperty("items") - public List getItems() { - return items; - } - - @JsonProperty("items") - public void setItems(List items) { - this.items = items; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public String getKind() { - return kind; - } - - /** - * - * (Required) - * - */ - @JsonProperty("kind") - public void setKind(String kind) { - this.kind = kind; - } - - @JsonProperty("metadata") - public ListMeta getMetadata() { - return metadata; - } - - @JsonProperty("metadata") - public void setMetadata(ListMeta metadata) { - this.metadata = metadata; - } - - @JsonAnyGetter - public Map getAdditionalProperties() { - return this.additionalProperties; - } - - @JsonAnySetter - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - -} 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 0b7814ec435..10a0081c573 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 @@ -29,7 +29,6 @@ "APIResourceList", "APIService", "APIServiceList", - "BaseKubernetesList", "Binding", "ComponentStatus", "ComponentStatusList", @@ -53,6 +52,7 @@ "GroupVersionKind", "GroupVersionResource", "Info", + "KubernetesList", "LimitRangeList", "ListOptions", "MicroTime", @@ -110,8 +110,6 @@ public class KubeSchema { private APIService aPIService; @JsonProperty("APIServiceList") private APIServiceList aPIServiceList; - @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; @JsonProperty("Binding") private Binding binding; @JsonProperty("ComponentStatus") @@ -158,6 +156,8 @@ public class KubeSchema { private GroupVersionResource groupVersionResource; @JsonProperty("Info") private Info info; + @JsonProperty("KubernetesList") + private KubernetesList kubernetesList; @JsonProperty("LimitRangeList") private LimitRangeList limitRangeList; @JsonProperty("ListOptions") @@ -268,7 +268,6 @@ public KubeSchema() { * @param status * @param replicationControllerList * @param eventSource - * @param baseKubernetesList * @param updateOptions * @param componentStatus * @param podList @@ -288,6 +287,7 @@ public KubeSchema() { * @param podExecOptions * @param serviceAccount * @param aPIResource + * @param kubernetesList * @param resourceQuotaList * @param topologySelectorTerm * @param createOptions @@ -303,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, 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, 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, KubernetesList kubernetesList, 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; @@ -311,7 +311,6 @@ public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIResource aPIR this.aPIResourceList = aPIResourceList; this.aPIService = aPIService; this.aPIServiceList = aPIServiceList; - this.baseKubernetesList = baseKubernetesList; this.binding = binding; this.componentStatus = componentStatus; this.componentStatusList = componentStatusList; @@ -335,6 +334,7 @@ public KubeSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIResource aPIR this.groupVersionKind = groupVersionKind; this.groupVersionResource = groupVersionResource; this.info = info; + this.kubernetesList = kubernetesList; this.limitRangeList = limitRangeList; this.listOptions = listOptions; this.microTime = microTime; @@ -431,16 +431,6 @@ public void setAPIServiceList(APIServiceList aPIServiceList) { this.aPIServiceList = aPIServiceList; } - @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { - return baseKubernetesList; - } - - @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { - this.baseKubernetesList = baseKubernetesList; - } - @JsonProperty("Binding") public Binding getBinding() { return binding; @@ -671,6 +661,16 @@ public void setInfo(Info info) { this.info = info; } + @JsonProperty("KubernetesList") + public KubernetesList getKubernetesList() { + return kubernetesList; + } + + @JsonProperty("KubernetesList") + public void setKubernetesList(KubernetesList kubernetesList) { + this.kubernetesList = kubernetesList; + } + @JsonProperty("LimitRangeList") public LimitRangeList getLimitRangeList() { return limitRangeList; diff --git a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java index fe67bb5a905..874ef6e84e2 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java @@ -29,7 +29,6 @@ "APIResourceList", "APIService", "APIServiceList", - "BaseKubernetesList", "Binding", "ComponentStatus", "ComponentStatusList", @@ -53,6 +52,7 @@ "GroupVersionKind", "GroupVersionResource", "Info", + "KubernetesList", "LimitRangeList", "ListOptions", "MicroTime", @@ -110,8 +110,6 @@ public class ValidationSchema { private APIService aPIService; @JsonProperty("APIServiceList") private APIServiceList aPIServiceList; - @JsonProperty("BaseKubernetesList") - private BaseKubernetesList baseKubernetesList; @JsonProperty("Binding") private Binding binding; @JsonProperty("ComponentStatus") @@ -158,6 +156,8 @@ public class ValidationSchema { private GroupVersionResource groupVersionResource; @JsonProperty("Info") private Info info; + @JsonProperty("KubernetesList") + private KubernetesList kubernetesList; @JsonProperty("LimitRangeList") private LimitRangeList limitRangeList; @JsonProperty("ListOptions") @@ -268,7 +268,6 @@ public ValidationSchema() { * @param status * @param replicationControllerList * @param eventSource - * @param baseKubernetesList * @param updateOptions * @param componentStatus * @param podList @@ -288,6 +287,7 @@ public ValidationSchema() { * @param podExecOptions * @param serviceAccount * @param aPIResource + * @param kubernetesList * @param resourceQuotaList * @param topologySelectorTerm * @param createOptions @@ -303,7 +303,7 @@ public ValidationSchema() { * @param endpointPort * @param config */ - public ValidationSchema(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) { + public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIResource aPIResource, APIResourceList aPIResourceList, APIService aPIService, APIServiceList aPIServiceList, 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, KubernetesList kubernetesList, 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; @@ -311,7 +311,6 @@ public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIResourc this.aPIResourceList = aPIResourceList; this.aPIService = aPIService; this.aPIServiceList = aPIServiceList; - this.baseKubernetesList = baseKubernetesList; this.binding = binding; this.componentStatus = componentStatus; this.componentStatusList = componentStatusList; @@ -335,6 +334,7 @@ public ValidationSchema(APIGroup aPIGroup, APIGroupList aPIGroupList, APIResourc this.groupVersionKind = groupVersionKind; this.groupVersionResource = groupVersionResource; this.info = info; + this.kubernetesList = kubernetesList; this.limitRangeList = limitRangeList; this.listOptions = listOptions; this.microTime = microTime; @@ -431,16 +431,6 @@ public void setAPIServiceList(APIServiceList aPIServiceList) { this.aPIServiceList = aPIServiceList; } - @JsonProperty("BaseKubernetesList") - public BaseKubernetesList getBaseKubernetesList() { - return baseKubernetesList; - } - - @JsonProperty("BaseKubernetesList") - public void setBaseKubernetesList(BaseKubernetesList baseKubernetesList) { - this.baseKubernetesList = baseKubernetesList; - } - @JsonProperty("Binding") public Binding getBinding() { return binding; @@ -671,6 +661,16 @@ public void setInfo(Info info) { this.info = info; } + @JsonProperty("KubernetesList") + public KubernetesList getKubernetesList() { + return kubernetesList; + } + + @JsonProperty("KubernetesList") + public void setKubernetesList(KubernetesList kubernetesList) { + this.kubernetesList = kubernetesList; + } + @JsonProperty("LimitRangeList") public LimitRangeList getLimitRangeList() { return limitRangeList; diff --git a/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java b/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java index e5429024308..4a3290c4db2 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java +++ b/kubernetes-model-generator/kubernetes-model-core/src/main/java/io/fabric8/kubernetes/api/model/KubernetesList.java @@ -42,35 +42,24 @@ }) @JsonDeserialize(using = JsonDeserializer.None.class) @Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage=true, builderPackage = "io.fabric8.kubernetes.api.builder") -public class KubernetesList extends BaseKubernetesList implements KubernetesResource { +public class KubernetesList extends DefaultKubernetesResourceList implements KubernetesResource { /** * No args constructor for use in serialization */ public KubernetesList() { - super(); + this("v1", new ArrayList<>(), "List", null); } public KubernetesList(String apiVersion, List items, String kind, ListMeta metadata) { - super(apiVersion, items, kind, metadata); - } - - //Let's just override those, cause some IDEs can't handle extending a generated class and can't see those and get crazy. - @Override - public String getKind() { - return super.getKind(); - } - - @Override - public String getApiVersion() { - return super.getApiVersion(); + super(); + this.setMetadata(metadata); + this.setApiVersion(apiVersion); + this.setKind(kind); + this.setItems(items); } - @Override - public List getItems() { - return super.getItems(); - } } diff --git a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json index 41efae75637..143ef878497 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json +++ b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/kube-schema.json @@ -591,7 +591,7 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "javaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.HasMetadata\u003e" @@ -7607,10 +7607,6 @@ "$ref": "#/definitions/kubernetes_aggregator_APIServiceList", "existingJavaType": "io.fabric8.kubernetes.api.model.APIServiceList" }, - "BaseKubernetesList": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" - }, "Binding": { "$ref": "#/definitions/kubernetes_core_Binding", "existingJavaType": "io.fabric8.kubernetes.api.model.Binding" @@ -7703,6 +7699,10 @@ "$ref": "#/definitions/kubernetes_apimachinery_pkg_version_Info", "existingJavaType": "io.fabric8.kubernetes.api.model.version.Info" }, + "KubernetesList": { + "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_List", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" + }, "LimitRangeList": { "$ref": "#/definitions/kubernetes_core_LimitRangeList", "existingJavaType": "io.fabric8.kubernetes.api.model.LimitRangeList" diff --git a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json index 9b9129a8902..b5ae75a8a66 100644 --- a/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model-generator/kubernetes-model-core/src/main/resources/schema/validation-schema.json @@ -591,7 +591,7 @@ } }, "additionalProperties": true, - "javaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList", + "javaType": "io.fabric8.kubernetes.api.model.KubernetesList", "javaInterfaces": [ "io.fabric8.kubernetes.api.model.KubernetesResource", "io.fabric8.kubernetes.api.model.KubernetesResourceList\u003cio.fabric8.kubernetes.api.model.HasMetadata\u003e" @@ -7607,10 +7607,6 @@ "$ref": "#/definitions/kubernetes_aggregator_APIServiceList", "existingJavaType": "io.fabric8.kubernetes.api.model.APIServiceList" }, - "BaseKubernetesList": { - "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_List", - "existingJavaType": "io.fabric8.kubernetes.api.model.BaseKubernetesList" - }, "Binding": { "$ref": "#/definitions/kubernetes_core_Binding", "existingJavaType": "io.fabric8.kubernetes.api.model.Binding" @@ -7703,6 +7699,10 @@ "$ref": "#/definitions/kubernetes_apimachinery_pkg_version_Info", "existingJavaType": "io.fabric8.kubernetes.api.model.version.Info" }, + "KubernetesList": { + "$ref": "#/definitions/kubernetes_apimachinery_pkg_apis_List", + "existingJavaType": "io.fabric8.kubernetes.api.model.KubernetesList" + }, "LimitRangeList": { "$ref": "#/definitions/kubernetes_core_LimitRangeList", "existingJavaType": "io.fabric8.kubernetes.api.model.LimitRangeList" diff --git a/kubernetes-model-generator/pkg/schemagen/generate.go b/kubernetes-model-generator/pkg/schemagen/generate.go index 7ec27df6c47..4adcc49d83a 100644 --- a/kubernetes-model-generator/pkg/schemagen/generate.go +++ b/kubernetes-model-generator/pkg/schemagen/generate.go @@ -180,7 +180,7 @@ func (g *schemaGenerator) javaType(t reflect.Type) string { case "RawExtension": return "io.fabric8.kubernetes.api.model.KubernetesResource" case "List": - return pkgDesc.JavaPackage + ".BaseKubernetesList" + return pkgDesc.JavaPackage + ".KubernetesList" default: return pkgDesc.JavaPackage + "." + t.Name() }