Added informer(ExecutorService executor) method for managed environme…

…nts.
fabric8io · Sep 19, 2019 · 3b24072 · 3b24072
1 parent 8851711
commit 3b24072
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 
 #### New Feature
 * Added Template Instance Support
+* Fix #1384: Initial draft for SharedInformer support.
 
 ### 4.5.2 (14-09-2019)
 #### Bugs

diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/DefaultKubernetesClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/DefaultKubernetesClient.java
@@ -78,6 +78,7 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ForkJoinPool;
 
 public class DefaultKubernetesClient extends BaseClient implements NamespacedKubernetesClient {
@@ -323,4 +324,9 @@ public SharedInformerFactory informers() {
     return new SharedInformerFactory(ForkJoinPool.commonPool(), httpClient, getConfiguration());
   }
 
+  @Override
+  public SharedInformerFactory informers(ExecutorService executorService) {
+    return new SharedInformerFactory(executorService, httpClient, getConfiguration());
+  }
+
 }
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/KubernetesClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/KubernetesClient.java
@@ -74,6 +74,7 @@
 
 import java.io.InputStream;
 import java.util.Collection;
+import java.util.concurrent.ExecutorService;
 
 public interface KubernetesClient extends Client {
 
@@ -169,4 +170,6 @@ public interface KubernetesClient extends Client {
 
   SharedInformerFactory informers();
 
+  SharedInformerFactory informers(ExecutorService executorService);
+
 }
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
@@ -118,6 +118,7 @@
 import java.net.URL;
 import java.util.Collection;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
 
 import static io.fabric8.kubernetes.client.Config.*;
 
@@ -402,6 +403,11 @@ public SharedInformerFactory informers() {
     return delegate.informers();
   }
 
+  @Override
+  public SharedInformerFactory informers(ExecutorService executorService) {
+    return delegate.informers(executorService);
+  }
+
   @Override
   public String getApiVersion() {
     return delegate.getApiVersion();

diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/DefaultOpenShiftClient.java b/openshift-client/src/main/java/io/fabric8/openshift/client/DefaultOpenShiftClient.java
@@ -77,6 +77,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ForkJoinPool;
 
 public class DefaultOpenShiftClient extends BaseClient implements NamespacedOpenShiftClient {
@@ -463,6 +464,9 @@ public AutoscalingAPIGroupDSL autoscaling() {
   @Override
   public SharedInformerFactory informers() { return new SharedInformerFactory(ForkJoinPool.commonPool(), httpClient, getConfiguration()); }
 
+  @Override
+  public SharedInformerFactory informers(ExecutorService executorService) { return new SharedInformerFactory(executorService, httpClient, getConfiguration()); }
+
   @Override
   public FunctionCallable<NamespacedOpenShiftClient> withRequestConfig(RequestConfig requestConfig) {
     return new WithRequestCallable<NamespacedOpenShiftClient>(this, requestConfig);

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
@@ -45,6 +45,7 @@
 import java.net.URL;
 import java.util.Collection;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
 
 import static io.fabric8.kubernetes.client.Config.KUBERNETES_API_VERSION_SYSTEM_PROPERTY;
 import static io.fabric8.kubernetes.client.Config.KUBERNETES_AUTH_BASIC_PASSWORD_SYSTEM_PROPERTY;
@@ -490,6 +491,9 @@ public AutoscalingAPIGroupDSL autoscaling() {
   @Override
   public SharedInformerFactory informers() { return delegate.informers(); }
 
+  @Override
+  public SharedInformerFactory informers(ExecutorService executorService) { return delegate.informers(executorService); }
+
   @Override
   public NamespacedOpenShiftClient inAnyNamespace() {
     return delegate.inAnyNamespace();