fix fabric8io#3906: removing BaseKubernetesList

shawkins · Oct 19, 2022 · 491ec18 · 491ec18
1 parent c033a82
commit 491ec18
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 232 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,6 +41,7 @@
 * Fix #3864: Now it's compulsory to provide `etc/io.fabric8.openshift.client.cfg` file in order to load ManagedOpenShiftClient in OSGi environment.
 * Fix #3924: Extension Mock modules have been removed
 * Fix #4384: javax.validation.* annotations are no longer added by the Java generator.
+* Fix #3906: removed BaseKubernetesList, use KubernetesList instead
 
 ### 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
@@ -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
@@ -180,6 +180,9 @@
                     <delete
                       file="${generate.targetDirectory}/io/fabric8/kubernetes/api/model/KubernetesResource.java"
                       verbose="true" />
+                    <delete
+                      file="${generate.targetDirectory}/io/fabric8/kubernetes/api/model/KubernetesList.java"
+                      verbose="true" />
                     <delete verbose="true">
                       <fileset dir="${generate.targetDirectory}">
                         <include name="*.java" />

diff --git a/...tes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/BaseKubernetesList.java b/...tes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/BaseKubernetesList.java
diff --git a/.../kubernetes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/KubeSchema.java b/.../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,15 +303,14 @@ 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;
         this.aPIResource = aPIResource;
         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/...netes-model-core/src/generated/java/io/fabric8/kubernetes/api/model/ValidationSchema.java b/...netes-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,15 +303,14 @@ 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;
         this.aPIResource = aPIResource;
         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;