Merge pull request #1686 from dsyer/shared-informer

Fix SpringExampleController so it doesn't crash on startup

Author: k8s-ci-robot

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

@@ -73,13 +73,6 @@ public KubernetesControllerFactory kubernetesReconcilerConfigurer(
         SharedInformerFactory sharedInformerFactory, Reconciler reconciler) {
       return new KubernetesControllerFactory(sharedInformerFactory, reconciler);
     }
-
-    // *REQUIRED*
-    // Injecting your SharedInformerFactory class annotated `@KubernetesInformers`
-    @Bean("sharedInformerFactory")
-    public SharedInformerFactory sharedInformerFactory() {
-      return new MySharedInformerFactory();
-    }
   }
 
   @KubernetesInformers({ // Defining what resources is the informer-factory actually watching.
@@ -100,6 +93,7 @@ public SharedInformerFactory sharedInformerFactory() {
         groupVersionResource =
             @GroupVersionResource(apiGroup = "", apiVersion = "v1", resourcePlural = "pods")),
   })
+  @Component
   public static class MySharedInformerFactory extends SharedInformerFactory {}
 
   // As long as a reconciler bean attached `@KubernetesReconciler` detected in the context, we

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

@@ -73,13 +73,6 @@ public KubernetesControllerFactory kubernetesReconcilerConfigurer(
         SharedInformerFactory sharedInformerFactory, Reconciler reconciler) {
       return new KubernetesControllerFactory(sharedInformerFactory, reconciler);
     }
-
-    // *REQUIRED*
-    // Injecting your SharedInformerFactory class annotated `@KubernetesInformers`
-    @Bean("sharedInformerFactory")
-    public SharedInformerFactory sharedInformerFactory() {
-      return new MySharedInformerFactory();
-    }
   }
 
   @KubernetesInformers({ // Defining what resources is the informer-factory actually watching.
@@ -100,6 +93,7 @@ public SharedInformerFactory sharedInformerFactory() {
         groupVersionResource =
             @GroupVersionResource(apiGroup = "", apiVersion = "v1", resourcePlural = "pods")),
   })
+  @Component
   public static class MySharedInformerFactory extends SharedInformerFactory {}
 
   // As long as a reconciler bean attached `@KubernetesReconciler` detected in the context, we