Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Register ControllerFactory bean definition as opposite to bean instance
With this change KubernetesReconcilerProcessor conforms to BeanFactoryPostProcessor contract to register BeanDefinitions and not to manipulate bean instances. As a result Reconciler beans are: 1) not created at all by postProcessBeanFactory (which was the core issue) 2) participate in Spring container management hooks, and hence autowired
- Loading branch information
Showing
2 changed files
with
143 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
107 changes: 107 additions & 0 deletions
107
...va/io/kubernetes/client/spring/extended/controller/KubernetesReconcilerProcessorTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| /* | ||
| Copyright 2020 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
| package io.kubernetes.client.spring.extended.controller; | ||
|
|
||
| import static org.junit.Assert.assertNotNull; | ||
|
|
||
| import io.kubernetes.client.extended.controller.Controller; | ||
| 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.SharedInformer; | ||
| import io.kubernetes.client.informer.SharedInformerFactory; | ||
| 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 io.kubernetes.client.spring.extended.controller.annotation.KubernetesReconciler; | ||
| import io.kubernetes.client.spring.extended.controller.annotation.KubernetesReconcilerWatches; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.beans.factory.annotation.Qualifier; | ||
| import org.springframework.boot.autoconfigure.SpringBootApplication; | ||
| import org.springframework.boot.test.context.SpringBootTest; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.test.context.junit4.SpringRunner; | ||
|
|
||
| @RunWith(SpringRunner.class) | ||
| @SpringBootTest(classes = KubernetesReconcilerProcessorTest.App.class) | ||
| public class KubernetesReconcilerProcessorTest { | ||
|
|
||
| @SpringBootApplication | ||
| static class App { | ||
|
|
||
| @Bean | ||
| KubernetesReconcilerProcessor reconcilerProcessorUnderTesting() { | ||
| return new KubernetesReconcilerProcessor(); | ||
| } | ||
|
|
||
| @Bean | ||
| SharedInformerFactory sharedInformerFactory() { | ||
| return new TestSharedInformerFactory(); | ||
| } | ||
|
|
||
| @KubernetesInformers({ | ||
| @KubernetesInformer( | ||
| apiTypeClass = V1Pod.class, | ||
| apiListTypeClass = V1PodList.class, | ||
| groupVersionResource = @GroupVersionResource(resourcePlural = "pods")) | ||
| }) | ||
| static class TestSharedInformerFactory extends SharedInformerFactory {} | ||
|
|
||
| @Bean("testReconciler1") | ||
| TestReconciler testReconciler1ToBeInjected() { | ||
| return new TestReconciler(); | ||
| } | ||
|
|
||
| @Bean("testReconciler2") | ||
| TestReconciler testReconciler2ToBeInjected() { | ||
| return new TestReconciler(); | ||
| } | ||
| } | ||
|
|
||
| @KubernetesReconciler(watches = @KubernetesReconcilerWatches()) | ||
| static class TestReconciler implements Reconciler { | ||
|
|
||
| @Autowired private SharedInformer<V1Pod> informerToBeInjected; | ||
|
|
||
| @Override | ||
| public Result reconcile(Request request) { | ||
| return new Result(false); | ||
| } | ||
| } | ||
|
|
||
| @Autowired | ||
| @Qualifier("testReconciler1Controller") | ||
| private Controller controller1CreatedByReconcilerProcessor; | ||
|
|
||
| @Autowired | ||
| @Qualifier("testReconciler2Controller") | ||
| private Controller controller2CreatedByReconcilerProcessor; | ||
|
|
||
| @Autowired | ||
| @Qualifier("testReconciler1") | ||
| private TestReconciler testReconciler1ToBeInjected; | ||
|
|
||
| @Autowired | ||
| @Qualifier("testReconciler2") | ||
| private TestReconciler testReconciler2ToBeInjected; | ||
|
|
||
| @Test | ||
| public void testAutowiredFieldsOfReconcilerBeansAreSet() { | ||
| assertNotNull(testReconciler1ToBeInjected.informerToBeInjected); | ||
| assertNotNull(testReconciler2ToBeInjected.informerToBeInjected); | ||
| } | ||
| } |