Merge branch 'v2' of github.com:java-operator-sdk/java-operator-sdk into v2

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceEventSource.java

@@ -6,8 +6,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.fabric8.kubernetes.api.model.KubernetesResourceList;
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.KubernetesClientException;
+import io.fabric8.kubernetes.client.dsl.FilterWatchListDeletable;
 import io.fabric8.kubernetes.client.informers.ResourceEventHandler;
 import io.fabric8.kubernetes.client.informers.SharedIndexInformer;
 import io.fabric8.kubernetes.client.informers.cache.Cache;
@@ -23,7 +25,6 @@
 import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getName;
 import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getUID;
 import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getVersion;
-import static io.javaoperatorsdk.operator.processing.event.internal.LabelSelectorParser.parseSimpleLabelSelector;
 
 /**
  * This is a special case since is not bound to a single custom resource
@@ -74,16 +75,16 @@ public void start() {
 
     try {
       if (ControllerConfiguration.allNamespacesWatched(targetNamespaces)) {
-        var informer = client.inAnyNamespace()
-            .withLabels(parseSimpleLabelSelector(labelSelector)).inform(this);
-        sharedIndexInformers.put(ANY_NAMESPACE_MAP_KEY, informer);
+        final var filteredBySelectorClient = client.inAnyNamespace()
+            .withLabelSelector(labelSelector);
+        final var informer =
+            createAndRunInformerFor(filteredBySelectorClient, ANY_NAMESPACE_MAP_KEY);
         log.debug("Registered {} -> {} for any namespace", controller, informer);
       } else {
         targetNamespaces.forEach(
             ns -> {
-              var informer = client.inNamespace(ns)
-                  .withLabels(parseSimpleLabelSelector(labelSelector)).inform(this);
-              sharedIndexInformers.put(ns, informer);
+              final var informer = createAndRunInformerFor(
+                  client.inNamespace(ns).withLabelSelector(labelSelector), ns);
               log.debug("Registered {} -> {} for namespace: {}", controller, informer,
                   ns);
             });
@@ -103,6 +104,15 @@ public void start() {
     }
   }
 
+  private SharedIndexInformer<T> createAndRunInformerFor(
+      FilterWatchListDeletable<T, KubernetesResourceList<T>> filteredBySelectorClient, String key) {
+    var informer = filteredBySelectorClient.runnableInformer(0);
+    informer.addEventHandler(this);
+    sharedIndexInformers.put(key, informer);
+    informer.run();
+    return informer;
+  }
+
   @Override
   public void stop() {
     for (SharedIndexInformer<T> informer : sharedIndexInformers.values()) {

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceSelectorTest.java

@@ -1,8 +1,5 @@
 package io.javaoperatorsdk.operator.processing.event.internal;
 
-import java.text.ParseException;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -18,7 +15,6 @@
 
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.VersionInfo;
 import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
 import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
 import io.javaoperatorsdk.operator.Operator;
@@ -51,24 +47,7 @@ public class CustomResourceSelectorTest {
 
   @SuppressWarnings("unchecked")
   @BeforeEach
-  void setUpResources() throws ParseException {
-    String buildDate =
-        DateTimeFormatter.ofPattern(VersionInfo.VersionKeys.BUILD_DATE_FORMAT)
-            .format(LocalDateTime.now());
-
-    server
-        .expect()
-        .get()
-        .withPath("/version")
-        .andReturn(
-            200,
-            new VersionInfo.Builder()
-                .withBuildDate(buildDate)
-                .withMajor("1")
-                .withMinor("21")
-                .build())
-        .always();
-
+  void setUpResources() {
     configurationService = spy(ConfigurationService.class);
     when(configurationService.checkCRDAndValidateLocalModel()).thenReturn(false);
     when(configurationService.getVersion()).thenReturn(new Version("1", "1", new Date()));

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/internal/LabelSelectorParserTest.java

@@ -106,7 +106,7 @@ public String getNamespace() {
   }
 
   @SuppressWarnings({"rawtypes"})
-  public List<Reconciler> getControllers() {
+  public List<Reconciler> getReconcilers() {
     return operator.getControllers().stream()
         .map(Controller::getReconciler)
         .collect(Collectors.toUnmodifiableList());

operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/OperatorExtension.java

@@ -58,6 +58,6 @@ public static void waitXms(int x) {
   }
 
   public static int getNumberOfExecutions(OperatorExtension extension) {
-    return ((TestExecutionInfoProvider) extension.getControllers().get(0)).getNumberOfExecutions();
+    return ((TestExecutionInfoProvider) extension.getReconcilers().get(0)).getNumberOfExecutions();
   }
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/support/TestUtils.java

@@ -41,7 +41,7 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
 
         <junit.version>5.8.1</junit.version>
-        <fabric8-client.version>5.8.0</fabric8-client.version>
+        <fabric8-client.version>5.10.1</fabric8-client.version>
         <slf4j.version>1.7.32</slf4j.version>
         <log4j.version>2.14.1</log4j.version>
         <mokito.version>4.0.0</mokito.version>