From 818ca2d8a92e464ae1b2f645e72c561946778512 Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Wed, 5 Oct 2022 08:46:04 +0200 Subject: [PATCH] fix (osgi): Remove ExtensionAdapter reference from ManagedKubernetesClient Remove ExtensionAdapter reference from ManagedKubernetesClient, no provider is exposed for ExtensionAdapter interface in kubernetes-client module. bindExtensionAdapter and unbindExtensionAdapter are throwing NullPointerException during startup. --- .../client/osgi/ManagedKubernetesClient.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/osgi/ManagedKubernetesClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/osgi/ManagedKubernetesClient.java index 257c3762433..deb86418146 100644 --- a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/osgi/ManagedKubernetesClient.java +++ b/kubernetes-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 { @@ -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; }