Remove KubernetesInformers and related infrastructure

Signed-off-by: Dave Syer <[email protected]>

Author: Dave Syer

examples/examples-release-13/src/main/java/io/kubernetes/client/examples/SpringControllerExample.java

@@ -12,33 +12,35 @@
 */
 package io.kubernetes.client.examples;
 
+import java.time.Duration;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+
 import io.kubernetes.client.extended.controller.Controller;
 import io.kubernetes.client.extended.controller.builder.ControllerBuilder;
 import io.kubernetes.client.extended.controller.builder.DefaultControllerBuilder;
 import io.kubernetes.client.extended.controller.reconciler.Reconciler;
 import io.kubernetes.client.extended.controller.reconciler.Request;
 import io.kubernetes.client.extended.controller.reconciler.Result;
+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.models.V1Endpoints;
 import io.kubernetes.client.openapi.models.V1EndpointsList;
 import io.kubernetes.client.openapi.models.V1Node;
 import io.kubernetes.client.openapi.models.V1NodeList;
 import io.kubernetes.client.openapi.models.V1Pod;
 import io.kubernetes.client.openapi.models.V1PodList;
-import io.kubernetes.client.spring.extended.controller.annotation.GroupVersionResource;
-import io.kubernetes.client.spring.extended.controller.annotation.KubernetesInformer;
-import io.kubernetes.client.spring.extended.controller.annotation.KubernetesInformers;
-import java.time.Duration;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
+import io.kubernetes.client.util.generic.GenericKubernetesApi;
 
 @SpringBootApplication
 public class SpringControllerExample {
@@ -51,8 +53,8 @@ public static void main(String[] args) {
   public static class AppConfig {
 
     @Bean
-    public CommandLineRunner commandLineRunner(
-        SharedInformerFactory sharedInformerFactory, Controller nodePrintingController) {
+    public CommandLineRunner commandLineRunner(SharedInformerFactory sharedInformerFactory,
+        Controller nodePrintingController) {
       return args -> {
         System.out.println("starting informers..");
         sharedInformerFactory.startAllRegisteredInformers();
@@ -63,53 +65,62 @@ public CommandLineRunner commandLineRunner(
     }
 
     @Bean
-    public Controller nodePrintingController(
-        SharedInformerFactory sharedInformerFactory, NodePrintingReconciler reconciler) {
+    public Controller nodePrintingController(SharedInformerFactory sharedInformerFactory,
+        NodePrintingReconciler reconciler) {
       DefaultControllerBuilder builder = ControllerBuilder.defaultBuilder(sharedInformerFactory);
-      builder =
-          builder.watch(
-              (q) -> {
-                return ControllerBuilder.controllerWatchBuilder(V1Node.class, q)
-                    .withResyncPeriod(Duration.ofMinutes(1))
-                    .build();
-              });
+      builder = builder.watch((q) -> {
+        return ControllerBuilder.controllerWatchBuilder(V1Node.class, q).withResyncPeriod(Duration.ofMinutes(1))
+            .build();
+      });
       builder.withWorkerCount(2);
       builder.withReadyFunc(reconciler::informerReady);
       return builder.withReconciler(reconciler).withName("nodePrintingController").build();
     }
-  }
 
-  @KubernetesInformers({ // Defining what resources is the informer-factory actually watching.
-    @KubernetesInformer(
-        apiTypeClass = V1Endpoints.class,
-        apiListTypeClass = V1EndpointsList.class,
-        groupVersionResource =
-            @GroupVersionResource(apiGroup = "", apiVersion = "v1", resourcePlural = "endpoints")),
-    @KubernetesInformer(
-        apiTypeClass = V1Node.class,
-        apiListTypeClass = V1NodeList.class,
-        groupVersionResource =
-            @GroupVersionResource(apiGroup = "", apiVersion = "v1", resourcePlural = "nodes"),
-        resyncPeriodMillis = 60 * 1000L),
-    @KubernetesInformer(
-        apiTypeClass = V1Pod.class,
-        apiListTypeClass = V1PodList.class,
-        groupVersionResource =
-            @GroupVersionResource(apiGroup = "", apiVersion = "v1", resourcePlural = "pods")),
-  })
-  @Component
-  public static class MySharedInformerFactory extends SharedInformerFactory {}
+    @Bean
+    public SharedIndexInformer<V1Endpoints> endpointsInformer(ApiClient apiClient,
+        SharedInformerFactory sharedInformerFactory) {
+      GenericKubernetesApi<V1Endpoints, V1EndpointsList>  genericApi  = new GenericKubernetesApi<>(V1Endpoints.class,
+          V1EndpointsList.class, "", "v1", "endpoints", apiClient);
+      return sharedInformerFactory.sharedIndexInformerFor( genericApi , V1Endpoints.class, 0);
+    }
+
+    @Bean
+    public SharedIndexInformer<V1Node> nodeInformer(ApiClient apiClient, SharedInformerFactory sharedInformerFactory) {
+      GenericKubernetesApi<V1Node, V1NodeList>  genericApi  = new GenericKubernetesApi<>(V1Node.class,
+          V1NodeList.class, "", "v1", "nodes", apiClient);
+      return sharedInformerFactory.sharedIndexInformerFor( genericApi , V1Node.class, 60 * 1000L);
+    }
+
+    @Bean
+    public SharedIndexInformer<V1Pod> podInformer(ApiClient apiClient, SharedInformerFactory sharedInformerFactory) {
+      GenericKubernetesApi<V1Pod, V1PodList>  genericApi  = new GenericKubernetesApi<>(V1Pod.class, V1PodList.class,
+          "", "v1", "pods", apiClient);
+      return sharedInformerFactory.sharedIndexInformerFor( genericApi , V1Pod.class, 0);
+    }
+
+  }
 
   @Component
   public static class NodePrintingReconciler implements Reconciler {
 
     @Value("${namespace}")
     private String namespace;
 
-    @Autowired private SharedInformer<V1Node> nodeInformer;
-    @Autowired private SharedInformer<V1Pod> podInformer;
-    @Autowired private Lister<V1Node> nodeLister;
-    @Autowired private Lister<V1Pod> podLister;
+    private SharedInformer<V1Node> nodeInformer;
+
+    private SharedInformer<V1Pod> podInformer;
+
+    private Lister<V1Node> nodeLister;
+
+    private Lister<V1Pod> podLister;
+
+    public NodePrintingReconciler(SharedIndexInformer<V1Node> nodeInformer, SharedIndexInformer<V1Pod> podInformer) {
+      this.nodeInformer = nodeInformer;
+      this.podInformer = podInformer;
+      this.nodeLister = new Lister<>(nodeInformer.getIndexer(), namespace);
+      this.podLister = new Lister<>(podInformer.getIndexer(), namespace);
+    }
 
     // *OPTIONAL*
     // If you want to hold the controller from running util some condition..
@@ -122,8 +133,7 @@ public Result reconcile(Request request) {
       V1Node node = nodeLister.get(request.getName());
 
       System.out.println("get all pods in namespace " + namespace);
-      podLister.namespace(namespace).list().stream()
-          .map(pod -> pod.getMetadata().getName())
+      podLister.namespace(namespace).list().stream().map(pod -> pod.getMetadata().getName())
           .forEach(System.out::println);
 
       System.out.println("triggered reconciling " + node.getMetadata().getName());

examples/examples-release-13/src/main/java/io/kubernetes/client/examples/SpringLoadBalancerExample.java

@@ -15,6 +15,7 @@
 import io.kubernetes.client.extended.network.EndpointsLoadBalancer;
 import io.kubernetes.client.extended.network.LoadBalancer;
 import io.kubernetes.client.extended.network.RoundRobinLoadBalanceStrategy;
+import io.kubernetes.client.informer.SharedIndexInformer;
 import io.kubernetes.client.informer.SharedInformerFactory;
 import io.kubernetes.client.informer.cache.Lister;
 import io.kubernetes.client.openapi.models.V1Endpoints;
@@ -48,8 +49,8 @@ public CommandLineRunner loadBalancerCommandLineRunner(
     }
 
     @Bean
-    public MyService myService(Lister<V1Endpoints> lister) {
-      return new MyService(lister);
+    public MyService myService(SharedIndexInformer<V1Endpoints> lister) {
+      return new MyService(new Lister<>(lister.getIndexer()));
     }
   }