fix (openshift-client) : Fix OSGi startup exceptions while using Kube…

…rnetesClient/OpenShiftClient + Remove ExtensionAdapter reference from ManagedKubernetesClient, no provider is exposed for ExtensionAdapter interface in kubernetes-client module. bindExtensionAdapter and unbindExtensionAdapter are throwing NullPointerException during startup. + Add Provide-Capability field in openshift-client bundle configuration in order to resolve SPIFly related NPE (reported in #3890) Signed-off-by: Rohan Kumar <rohaan@redhat.com>
fabric8io · Oct 4, 2022 · 5370dde · 5370dde
1 parent f1b1eb9
commit 5370dde
Show file tree

Hide file tree

Showing 17 changed files with 73 additions and 10 deletions.
diff --git a/extensions/camel-k/client/pom.xml b/extensions/camel-k/client/pom.xml
@@ -33,6 +33,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)"
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter
+    </osgi.provide-capability>
     <osgi.import>
       io.fabric8.kubernetes.api.builder,
       !io.fabric8.camelk.client.*,

diff --git a/extensions/certmanager/client/pom.xml b/extensions/certmanager/client/pom.xml
@@ -34,6 +34,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)"
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter
+    </osgi.provide-capability>
     <osgi.import>
       io.fabric8.kubernetes.api.builder,
       !io.fabric8.certmanager.client.*,

diff --git a/extensions/chaosmesh/client/pom.xml b/extensions/chaosmesh/client/pom.xml
@@ -35,6 +35,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)"
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter
+    </osgi.provide-capability>
     <osgi.import>
       io.fabric8.kubernetes.api.builder,
       !io.fabric8.chaosmesh.client.*,

diff --git a/extensions/istio/client/pom.xml b/extensions/istio/client/pom.xml
@@ -29,6 +29,14 @@
   <name>Fabric8 :: Istio :: Client</name>
 
   <properties>
+    <osgi.require-capability>
+      osgi.extender;
+      filter:="(osgi.extender=osgi.serviceloader.registrar)"
+    </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter
+    </osgi.provide-capability>
     <osgi.import>
       io.fabric8.kubernetes.api.builder,
       !io.fabric8.istio.client.*,

diff --git a/extensions/knative/client/pom.xml b/extensions/knative/client/pom.xml
@@ -29,6 +29,14 @@
   <name>Fabric8 :: Knative :: Client</name>
 
   <properties>
+    <osgi.require-capability>
+      osgi.extender;
+      filter:="(osgi.extender=osgi.serviceloader.registrar)"
+    </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter
+    </osgi.provide-capability>
     <osgi.import>
       io.fabric8.kubernetes.api.builder,
       !io.fabric8.knative.client.*,

diff --git a/extensions/open-cluster-management/client/pom.xml b/extensions/open-cluster-management/client/pom.xml
@@ -35,6 +35,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)"
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter
+    </osgi.provide-capability>
     <osgi.import>
       io.fabric8.kubernetes.api.builder,
       !io.fabric8.openclustermanagement.client.*,

diff --git a/extensions/service-catalog/client/pom.xml b/extensions/service-catalog/client/pom.xml
@@ -34,6 +34,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)"
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter
+    </osgi.provide-capability>
     <osgi.import>
       io.fabric8.kubernetes.api.builder,
       !io.fabric8.servicecatalog.client.*,

diff --git a/extensions/tekton/client/pom.xml b/extensions/tekton/client/pom.xml
@@ -33,6 +33,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)"
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter
+    </osgi.provide-capability>
     <osgi.import>
       io.fabric8.kubernetes.api.builder,
       !io.fabric8.tekton.client.*,

diff --git a/extensions/verticalpodautoscaler/client/pom.xml b/extensions/verticalpodautoscaler/client/pom.xml
@@ -34,6 +34,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)"
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter
+    </osgi.provide-capability>
     <osgi.import>
       io.fabric8.kubernetes.api.builder,
       !io.fabric8.verticalpodautoscaler.client.*,

diff --git a/extensions/volcano/client/pom.xml b/extensions/volcano/client/pom.xml
@@ -34,6 +34,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)"
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter
+    </osgi.provide-capability>
     <osgi.import>
       io.fabric8.kubernetes.api.builder,
       !io.fabric8.volcano.client.*,

diff --git a/extensions/volumesnapshot/client/pom.xml b/extensions/volumesnapshot/client/pom.xml
@@ -35,6 +35,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)"
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter
+    </osgi.provide-capability>
     <osgi.import>
       io.fabric8.kubernetes.api.builder,
       !io.fabric8.volumesnapshot.client.*,

diff --git a/httpclient-jdk/pom.xml b/httpclient-jdk/pom.xml
@@ -34,6 +34,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)",
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.http.HttpClient$Factory
+    </osgi.provide-capability>
     <osgi.import>
       !android.util*,
       *,

diff --git a/httpclient-jetty/pom.xml b/httpclient-jetty/pom.xml
@@ -34,6 +34,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)",
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.http.HttpClient$Factory
+    </osgi.provide-capability>
     <osgi.import>
       !android.util*,
       *,

diff --git a/httpclient-okhttp/pom.xml b/httpclient-okhttp/pom.xml
@@ -33,6 +33,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)",
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.http.HttpClient$Factory
+    </osgi.provide-capability>
     <osgi.import>
       !android.util*,
       *,

diff --git a/kubernetes-client/pom.xml b/kubernetes-client/pom.xml
@@ -33,6 +33,10 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.processor)",
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.ServiceToURLProvider
+    </osgi.provide-capability>
     <osgi.import>
       !android.util*,
       *,

diff --git a/...netes-client/src/main/java/io/fabric8/kubernetes/client/osgi/ManagedKubernetesClient.java b/...netes-client/src/main/java/io/fabric8/kubernetes/client/osgi/ManagedKubernetesClient.java
@@ -21,7 +21,6 @@
 import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
 import io.fabric8.kubernetes.client.OAuthTokenProvider;
 import io.fabric8.kubernetes.client.ResourceHandler;
-import io.fabric8.kubernetes.client.extension.ExtensionAdapter;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.ConfigurationPolicy;
@@ -66,7 +65,6 @@
 @Service({ KubernetesClient.class, NamespacedKubernetesClient.class })
 @References({
     @Reference(referenceInterface = io.fabric8.kubernetes.client.ResourceHandler.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC, bind = "bindResourceHandler", unbind = "unbindResourceHandler"),
-    @Reference(referenceInterface = ExtensionAdapter.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC, bind = "bindExtensionAdapter", unbind = "unbindExtensionAdapter"),
     @Reference(referenceInterface = OAuthTokenProvider.class, cardinality = ReferenceCardinality.OPTIONAL_UNARY, policyOption = ReferencePolicyOption.GREEDY, bind = "bindOAuthTokenProvider", unbind = "unbindOAuthTokenProvider")
 })
 public class ManagedKubernetesClient extends NamespacedKubernetesClientAdapter<DefaultKubernetesClient> {
@@ -191,14 +189,6 @@ public void unbindResourceHandler(ResourceHandler resourceHandler) {
     // not used
   }
 
-  public void bindExtensionAdapter(ExtensionAdapter adapter) {
-    getClient().getAdapters().register(adapter);
-  }
-
-  public void unbindExtensionAdapter(ExtensionAdapter adapter) {
-    getClient().getAdapters().unregister(adapter);
-  }
-
   public void bindOAuthTokenProvider(OAuthTokenProvider provider) {
     this.provider = provider;
   }

diff --git a/openshift-client/pom.xml b/openshift-client/pom.xml
@@ -33,6 +33,11 @@
       osgi.extender;
       filter:="(osgi.extender=osgi.serviceloader.registrar)"
     </osgi.require-capability>
+    <osgi.provide-capability>
+      osgi.serviceloader;
+      osgi.serviceloader=io.fabric8.kubernetes.client.extension.ExtensionAdapter,
+      io.fabric8.kubernetes.client.ServiceToURLProvider
+    </osgi.provide-capability>
     <osgi.import>
       !org.junit*,
       *