Merge pull request #1191 from yue9944882/shared-informer-generic-constructor

Refactor: Add informer constructor for generic api

Author: k8s-ci-robot

spring/src/main/java/io/kubernetes/client/spring/extended/controller/KubernetesInformerFactoryProcessor.java

@@ -12,22 +12,15 @@
 */
 package io.kubernetes.client.spring.extended.controller;
 
-import io.kubernetes.client.common.KubernetesListObject;
-import io.kubernetes.client.informer.ListerWatcher;
 import io.kubernetes.client.informer.SharedIndexInformer;
 import io.kubernetes.client.informer.SharedInformer;
 import io.kubernetes.client.informer.SharedInformerFactory;
 import io.kubernetes.client.informer.cache.Lister;
 import io.kubernetes.client.openapi.ApiClient;
-import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.spring.extended.controller.annotation.KubernetesInformer;
 import io.kubernetes.client.spring.extended.controller.annotation.KubernetesInformers;
-import io.kubernetes.client.util.CallGeneratorParams;
 import io.kubernetes.client.util.ClientBuilder;
-import io.kubernetes.client.util.Watchable;
 import io.kubernetes.client.util.generic.GenericKubernetesApi;
-import io.kubernetes.client.util.generic.KubernetesApiResponse;
-import io.kubernetes.client.util.generic.options.ListOptions;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.Map;
@@ -120,29 +113,7 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
               apiClient);
       SharedIndexInformer sharedIndexInformer =
           sharedInformerFactory.sharedIndexInformerFor(
-              new ListerWatcher() {
-                public KubernetesListObject list(CallGeneratorParams params) throws ApiException {
-                  KubernetesApiResponse<KubernetesListObject> resp =
-                      api.list(
-                          new ListOptions() {
-                            {
-                              setResourceVersion(params.resourceVersion);
-                              setTimeoutSeconds(params.timeoutSeconds);
-                            }
-                          });
-                  if (!resp.isSuccess()) {
-                    throw new ApiException(resp.getHttpStatusCode(), resp.getStatus().getMessage());
-                  }
-                  return resp.getObject();
-                }
-
-                public Watchable watch(CallGeneratorParams params) throws ApiException {
-                  return api.watch();
-                }
-              },
-              kubernetesInformer.apiTypeClass(),
-              kubernetesInformer.resyncPeriodMillis());
-
+              api, kubernetesInformer.apiTypeClass(), kubernetesInformer.resyncPeriodMillis());
       ResolvableType informerType =
           ResolvableType.forClassWithGenerics(
               SharedInformer.class, kubernetesInformer.apiTypeClass());

util/src/main/java/io/kubernetes/client/informer/SharedInformerFactory.java

@@ -22,6 +22,10 @@
 import io.kubernetes.client.util.CallGenerator;
 import io.kubernetes.client.util.CallGeneratorParams;
 import io.kubernetes.client.util.Watch;
+import io.kubernetes.client.util.Watchable;
+import io.kubernetes.client.util.generic.GenericKubernetesApi;
+import io.kubernetes.client.util.generic.KubernetesApiResponse;
+import io.kubernetes.client.util.generic.options.ListOptions;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.Map;
@@ -135,12 +139,32 @@ SharedIndexInformer<ApiType> sharedIndexInformerFor(
           Class<ApiType> apiTypeClass,
           long resyncPeriodInMillis) {
     SharedIndexInformer<ApiType> informer =
-        new DefaultSharedIndexInformer<ApiType, ApiListType>(
-            apiTypeClass, listerWatcher, resyncPeriodInMillis);
+        new DefaultSharedIndexInformer<>(apiTypeClass, listerWatcher, resyncPeriodInMillis);
     this.informers.putIfAbsent(TypeToken.get(apiTypeClass).getType(), informer);
     return informer;
   }
 
+  /**
+   * Constructs and returns a shared index informer by specifying a generic api instance. But the
+   * informer cache will not be overwritten on multiple call w/ the the same apiTypeClass i.e. only
+   * the first registered informer will be kept.
+   *
+   * @param <ApiType> the type parameter
+   * @param <ApiListType> the type parameter
+   * @param genericKubernetesApi the generic kubernetes api
+   * @param apiTypeClass the api type class
+   * @param resyncPeriodInMillis the resync period in millis
+   * @return the shared index informer
+   */
+  public synchronized <ApiType extends KubernetesObject, ApiListType extends KubernetesListObject>
+      SharedIndexInformer<ApiType> sharedIndexInformerFor(
+          GenericKubernetesApi<ApiType, ApiListType> genericKubernetesApi,
+          Class<ApiType> apiTypeClass,
+          long resyncPeriodInMillis) {
+    ListerWatcher<ApiType, ApiListType> listerWatcher = listerWatcherFor(genericKubernetesApi);
+    return sharedIndexInformerFor(listerWatcher, apiTypeClass, resyncPeriodInMillis);
+  }
+
   private <ApiType extends KubernetesObject, ApiListType extends KubernetesListObject>
       ListerWatcher<ApiType, ApiListType> listerWatcherFor(
           CallGenerator callGenerator,
@@ -170,6 +194,37 @@ public Watch<ApiType> watch(CallGeneratorParams params) throws ApiException {
     };
   }
 
+  private <ApiType extends KubernetesObject, ApiListType extends KubernetesListObject>
+      ListerWatcher<ApiType, ApiListType> listerWatcherFor(
+          GenericKubernetesApi<ApiType, ApiListType> genericKubernetesApi) {
+    if (apiClient.getHttpClient().readTimeoutMillis() > 0) {
+      // set read timeout zero to ensure client doesn't time out
+      OkHttpClient httpClient =
+          apiClient.getHttpClient().newBuilder().readTimeout(0, TimeUnit.MILLISECONDS).build();
+      apiClient.setHttpClient(httpClient);
+    }
+    return new ListerWatcher<ApiType, ApiListType>() {
+      public ApiListType list(CallGeneratorParams params) throws ApiException {
+        KubernetesApiResponse<ApiListType> resp =
+            genericKubernetesApi.list(
+                new ListOptions() {
+                  {
+                    setResourceVersion(params.resourceVersion);
+                    setTimeoutSeconds(params.timeoutSeconds);
+                  }
+                });
+        if (!resp.isSuccess()) {
+          throw new ApiException(resp.getHttpStatusCode(), resp.getStatus().getMessage());
+        }
+        return resp.getObject();
+      }
+
+      public Watchable<ApiType> watch(CallGeneratorParams params) throws ApiException {
+        return genericKubernetesApi.watch();
+      }
+    };
+  }
+
   /**
    * Gets existing shared index informer, return null if the requesting informer is never
    * constructed.