fix #3875 refinements based upon initial review

fabric8io · Mar 24, 2022 · 1034e6c · 1034e6c
1 parent 75a6e2b
commit 1034e6c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 24 deletions.
diff --git a/kubernetes-client/pom.xml b/kubernetes-client/pom.xml
@@ -251,8 +251,7 @@
                 <Bundle-Activator>${osgi.activator}</Bundle-Activator>
                 <Export-Service>${osgi.export.service}</Export-Service>
                 <Include-Resource>
-                  /META-INF/services/io.fabric8.kubernetes.client.ServiceToURLProvider=target/classes/META-INF/services/io.fabric8.kubernetes.client.ServiceToURLProvider,
-                  /META-INF/services/io.fabric8.kubernetes.client.extension.ExtensionAdapter=target/classes/META-INF/services/io.fabric8.kubernetes.client.extension.ExtensionAdapter
+                  /META-INF/services/io.fabric8.kubernetes.client.ServiceToURLProvider=target/classes/META-INF/services/io.fabric8.kubernetes.client.ServiceToURLProvider
                 </Include-Resource>
               </instructions>
               <classifier>bundle</classifier>

diff --git a/.../main/resources/META-INF/services/io.fabric8.kubernetes.client.extension.ExtensionAdapter b/.../main/resources/META-INF/services/io.fabric8.kubernetes.client.extension.ExtensionAdapter
diff --git a/...ver-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServer.java b/...ver-mock/src/main/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServer.java
@@ -129,7 +129,7 @@ public NamespacedKubernetesClient createClient() {
    *
    * @param unsupported apiGroup patterns
    */
-  public void unsupported(String... unsupported) {
+  public void setUnsupported(String... unsupported) {
     this.unsupportedPatterns = new ArrayList<>(unsupported.length);
     for (int i = 0; i < unsupported.length; i++) {
       String asRegex = unsupported[i].replace(".", "\\.").replace("*", ".*");

diff --git a/...netes-tests/src/test/java/io/fabric8/kubernetes/client/mock/KubernetesMockServerTest.java b/...netes-tests/src/test/java/io/fabric8/kubernetes/client/mock/KubernetesMockServerTest.java
@@ -52,7 +52,7 @@ void testReset() {
 
   @Test
   void testOpenShiftSupport() {
-    server.unsupported("openshift.io");
+    server.setUnsupported("openshift.io");
     assertFalse(client.isAdaptable(OpenShiftClient.class));
     assertFalse(client.adapt(OpenShiftClient.class).isSupported());
     assertFalse(client.supports(Route.class));

diff --git a/...client/src/main/java/io/fabric8/openshift/client/NamespacedOpenShiftExtensionAdapter.java b/...client/src/main/java/io/fabric8/openshift/client/NamespacedOpenShiftExtensionAdapter.java
@@ -21,6 +21,10 @@
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Service;
 
+/**
+ * This class is necessary because the extension logic checks for an exact class match,
+ * even though an {@link DefaultOpenShiftClient} is already known via the {@link OpenShiftExtensionAdapter}
+ */
 @Component
 @Service
 public class NamespacedOpenShiftExtensionAdapter implements ExtensionAdapter<NamespacedOpenShiftClient> {

diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/osgi/ManagedOpenShiftClient.java b/openshift-client/src/main/java/io/fabric8/openshift/client/osgi/ManagedOpenShiftClient.java
@@ -64,10 +64,10 @@
 import io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClass;
 import io.fabric8.kubernetes.api.model.node.v1beta1.RuntimeClassList;
 import io.fabric8.kubernetes.client.AdmissionRegistrationAPIGroupDSL;
-import io.fabric8.kubernetes.client.BaseClient;
 import io.fabric8.kubernetes.client.Client;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.CustomResource;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
 import io.fabric8.kubernetes.client.RequestConfig;
 import io.fabric8.kubernetes.client.VersionInfo;
 import io.fabric8.kubernetes.client.dsl.ApiextensionsAPIGroupDSL;
@@ -107,7 +107,6 @@
 import io.fabric8.kubernetes.client.dsl.base.ResourceDefinitionContext;
 import io.fabric8.kubernetes.client.extended.leaderelection.LeaderElectorBuilder;
 import io.fabric8.kubernetes.client.extended.run.RunOperations;
-import io.fabric8.kubernetes.client.extension.ClientAdapter;
 import io.fabric8.kubernetes.client.http.HttpClient;
 import io.fabric8.kubernetes.client.informers.SharedInformerFactory;
 import io.fabric8.kubernetes.client.utils.URLUtils;
@@ -267,7 +266,7 @@
 @Service({ OpenShiftClient.class, NamespacedOpenShiftClient.class })
 public class ManagedOpenShiftClient implements NamespacedOpenShiftClient {
 
-  private DefaultOpenShiftClient delegate;
+  private NamespacedOpenShiftClient delegate;
 
   @Activate
   public void activate(Map<String, Object> properties) {
@@ -354,7 +353,7 @@ public void activate(Map<String, Object> properties) {
           Long.parseLong((String) properties.get(KUBERNETES_WEBSOCKET_PING_INTERVAL_SYSTEM_PROPERTY)));
     }
 
-    delegate = new DefaultOpenShiftClient(builder.build());
+    delegate = new KubernetesClientBuilder().withConfig(builder.build()).build().adapt(NamespacedOpenShiftClient.class);
   }
 
   @Deactivate
@@ -589,7 +588,7 @@ public MixedOperation<ClusterRoleBinding, ClusterRoleBindingList, Resource<Clust
 
   @Override
   public MixedOperation<RoleBindingRestriction, RoleBindingRestrictionList, Resource<RoleBindingRestriction>> roleBindingRestrictions() {
-    return null;
+    return delegate.roleBindingRestrictions();
   }
 
   @Override