Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix (osgi) : Fix OSGi startup exceptions while using KubernetesClient/OpenShiftClient #4459

Merged
merged 2 commits into from Oct 5, 2022
Merged

fix (osgi) : Fix OSGi startup exceptions while using KubernetesClient/OpenShiftClient #4459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49e8f16
fix (osgi): Add Provide-Capability field in extension bundle configur…
rohanKanojia Sep 28, 2022
818ca2d
fix (osgi): Remove ExtensionAdapter reference from ManagedKubernetesC…
manusa Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions extensions/camel-k/client/pom.xml
View file
Open in desktop
Expand Up @@ -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.*,
Expand Down
4 changes: 4 additions & 0 deletions extensions/certmanager/client/pom.xml
View file
Open in desktop
Expand Up @@ -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.*,
Expand Down
4 changes: 4 additions & 0 deletions extensions/chaosmesh/client/pom.xml
View file
Open in desktop
Expand Up @@ -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.*,
Expand Down
8 changes: 8 additions & 0 deletions extensions/istio/client/pom.xml
View file
Open in desktop
Expand Up @@ -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.*,
Expand Down
8 changes: 8 additions & 0 deletions extensions/knative/client/pom.xml
View file
Open in desktop
Expand Up @@ -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.*,
Expand Down
4 changes: 4 additions & 0 deletions extensions/open-cluster-management/client/pom.xml
View file
Open in desktop
Expand Up @@ -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.*,
Expand Down
4 changes: 4 additions & 0 deletions extensions/service-catalog/client/pom.xml
View file
Open in desktop
Expand Up @@ -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.*,
Expand Down
4 changes: 4 additions & 0 deletions extensions/tekton/client/pom.xml
View file
Open in desktop
Expand Up @@ -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.*,
Expand Down
4 changes: 4 additions & 0 deletions extensions/verticalpodautoscaler/client/pom.xml
View file
Open in desktop
Expand Up @@ -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.*,
Expand Down
4 changes: 4 additions & 0 deletions extensions/volcano/client/pom.xml
View file
Open in desktop
Expand Up @@ -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.*,
Expand Down
4 changes: 4 additions & 0 deletions extensions/volumesnapshot/client/pom.xml
View file
Open in desktop
Expand Up @@ -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.*,
Expand Down
4 changes: 4 additions & 0 deletions httpclient-jdk/pom.xml
View file
Open in desktop
Expand Up @@ -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*,
*,
Expand Down
4 changes: 4 additions & 0 deletions httpclient-jetty/pom.xml
View file
Open in desktop
Expand Up @@ -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*,
*,
Expand Down
4 changes: 4 additions & 0 deletions httpclient-okhttp/pom.xml
View file
Open in desktop
Expand Up @@ -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*,
*,
Expand Down
4 changes: 4 additions & 0 deletions kubernetes-client/pom.xml
View file
Open in desktop
Expand Up @@ -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*,
*,
Expand Down
10 changes: 0 additions & 10 deletions ...netes-client/src/main/java/io/fabric8/kubernetes/client/osgi/ManagedKubernetesClient.java
View file
Open in desktop
Expand Up @@ -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;
Expand Down Expand Up @@ -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> {
Expand Down Expand Up @@ -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;
}
Expand Down
5 changes: 5 additions & 0 deletions openshift-client/pom.xml
View file
Open in desktop
Expand Up @@ -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>
Comment on lines +36 to +40
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might need to be added to any extension that provides SPI capabilities.

<osgi.import>
!org.junit*,
*
Expand Down