From ed06a08a15f3b1b855189ee1f6b8173a7a17a493 Mon Sep 17 00:00:00 2001 From: Rohan Kumar Date: Tue, 29 Sep 2020 22:28:49 +0530 Subject: [PATCH] Fix #2488: Unable to derive module descriptors for Kubernetes Model Jars Remove unused io.fabric8.kubernetes.api.KubernetesResourceMappingProvider from kubernetes model packages --- CHANGELOG.md | 1 + .../io.fabric8.kubernetes.api.KubernetesResourceMappingProvider | 1 - .../io.fabric8.kubernetes.api.KubernetesResourceMappingProvider | 1 - .../io.fabric8.kubernetes.api.KubernetesResourceMappingProvider | 1 - .../io.fabric8.kubernetes.api.KubernetesResourceMappingProvider | 1 - .../io.fabric8.kubernetes.api.KubernetesResourceMappingProvider | 1 - .../io.fabric8.kubernetes.api.KubernetesResourceMappingProvider | 1 - .../io.fabric8.kubernetes.api.KubernetesResourceMappingProvider | 1 - .../io.fabric8.kubernetes.api.KubernetesResourceMappingProvider | 1 - .../io.fabric8.kubernetes.api.KubernetesResourceMappingProvider | 1 - .../io.fabric8.kubernetes.api.KubernetesResourceMappingProvider | 1 - .../io.fabric8.kubernetes.api.KubernetesResourceMappingProvider | 1 - 12 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider delete mode 100644 kubernetes-model-generator/kubernetes-model-events/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider delete mode 100644 kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider delete mode 100644 kubernetes-model-generator/kubernetes-model-metrics/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider delete mode 100644 kubernetes-model-generator/kubernetes-model-networking/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider delete mode 100644 kubernetes-model-generator/kubernetes-model-policy/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider delete mode 100644 kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider delete mode 100644 kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider delete mode 100644 kubernetes-model-generator/kubernetes-model-settings/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider delete mode 100644 kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider delete mode 100644 kubernetes-model-generator/openshift-model/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider diff --git a/CHANGELOG.md b/CHANGELOG.md index 1babb3ed6c9..06bc476f557 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ * Fix #2474: Config.fromKubeconfig throws NullPointerException * Fix #2399: Cannot change the type of the Service from ClusterIP to ExternalName * Fix #2479: KuberentesDeserializer works on OSGi runtime environments +* Fix #2488: Unable to derive module descriptors for kubernetes-model jars #### Improvements * Enable user to select custom address and port for KubernetesMockServer diff --git a/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider b/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider deleted file mode 100644 index ee2125c6841..00000000000 --- a/kubernetes-model-generator/kubernetes-model-discovery/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider +++ /dev/null @@ -1 +0,0 @@ -io.fabric8.kubernetes.internal.InternalResourceMappingProvider \ No newline at end of file diff --git a/kubernetes-model-generator/kubernetes-model-events/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider b/kubernetes-model-generator/kubernetes-model-events/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider deleted file mode 100644 index ee2125c6841..00000000000 --- a/kubernetes-model-generator/kubernetes-model-events/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider +++ /dev/null @@ -1 +0,0 @@ -io.fabric8.kubernetes.internal.InternalResourceMappingProvider \ No newline at end of file diff --git a/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider b/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider deleted file mode 100644 index ee2125c6841..00000000000 --- a/kubernetes-model-generator/kubernetes-model-extensions/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider +++ /dev/null @@ -1 +0,0 @@ -io.fabric8.kubernetes.internal.InternalResourceMappingProvider \ No newline at end of file diff --git a/kubernetes-model-generator/kubernetes-model-metrics/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider b/kubernetes-model-generator/kubernetes-model-metrics/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider deleted file mode 100644 index ee2125c6841..00000000000 --- a/kubernetes-model-generator/kubernetes-model-metrics/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider +++ /dev/null @@ -1 +0,0 @@ -io.fabric8.kubernetes.internal.InternalResourceMappingProvider \ No newline at end of file diff --git a/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider b/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider deleted file mode 100644 index ee2125c6841..00000000000 --- a/kubernetes-model-generator/kubernetes-model-networking/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider +++ /dev/null @@ -1 +0,0 @@ -io.fabric8.kubernetes.internal.InternalResourceMappingProvider \ No newline at end of file diff --git a/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider b/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider deleted file mode 100644 index ee2125c6841..00000000000 --- a/kubernetes-model-generator/kubernetes-model-policy/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider +++ /dev/null @@ -1 +0,0 @@ -io.fabric8.kubernetes.internal.InternalResourceMappingProvider \ No newline at end of file diff --git a/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider b/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider deleted file mode 100644 index ee2125c6841..00000000000 --- a/kubernetes-model-generator/kubernetes-model-rbac/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider +++ /dev/null @@ -1 +0,0 @@ -io.fabric8.kubernetes.internal.InternalResourceMappingProvider \ No newline at end of file diff --git a/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider b/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider deleted file mode 100644 index ee2125c6841..00000000000 --- a/kubernetes-model-generator/kubernetes-model-scheduling/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider +++ /dev/null @@ -1 +0,0 @@ -io.fabric8.kubernetes.internal.InternalResourceMappingProvider \ No newline at end of file diff --git a/kubernetes-model-generator/kubernetes-model-settings/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider b/kubernetes-model-generator/kubernetes-model-settings/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider deleted file mode 100644 index ee2125c6841..00000000000 --- a/kubernetes-model-generator/kubernetes-model-settings/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider +++ /dev/null @@ -1 +0,0 @@ -io.fabric8.kubernetes.internal.InternalResourceMappingProvider \ No newline at end of file diff --git a/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider b/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider deleted file mode 100644 index ee2125c6841..00000000000 --- a/kubernetes-model-generator/kubernetes-model-storageclass/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider +++ /dev/null @@ -1 +0,0 @@ -io.fabric8.kubernetes.internal.InternalResourceMappingProvider \ No newline at end of file diff --git a/kubernetes-model-generator/openshift-model/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider b/kubernetes-model-generator/openshift-model/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider deleted file mode 100644 index ee2125c6841..00000000000 --- a/kubernetes-model-generator/openshift-model/src/main/resources/META-INF/services/io.fabric8.kubernetes.api.KubernetesResourceMappingProvider +++ /dev/null @@ -1 +0,0 @@ -io.fabric8.kubernetes.internal.InternalResourceMappingProvider \ No newline at end of file