feat: update kube client to 5.0.0-alpha-2

Author: metacosm

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventScheduler.java

@@ -1,18 +1,18 @@
 package io.javaoperatorsdk.operator.processing;
 
 
-import io.javaoperatorsdk.operator.processing.retry.Retry;
-import io.fabric8.kubernetes.client.CustomResource;
-import io.fabric8.kubernetes.client.KubernetesClientException;
-import io.fabric8.kubernetes.client.Watcher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.Optional;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 
+import io.fabric8.kubernetes.client.CustomResource;
+import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.WatcherException;
+import io.javaoperatorsdk.operator.processing.retry.Retry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * Requirements:
  * <ul>
@@ -57,7 +57,7 @@ public void eventReceived(Watcher.Action action, CustomResource resource) {
         CustomResourceEvent event = new CustomResourceEvent(action, resource, retry);
         scheduleEventFromApi(event);
     }
-
+    
     void scheduleEventFromApi(CustomResourceEvent event) {
         try {
             lock.lock();
@@ -137,9 +137,9 @@ private void scheduleNotYetScheduledEventForExecution(String uuid) {
         CustomResourceEvent notScheduledEvent = eventStore.removeEventNotScheduled(uuid);
         scheduleEventForExecution(notScheduledEvent);
     }
-
+    
     @Override
-    public void onClose(KubernetesClientException e) {
+    public void onClose(WatcherException e) {
         log.error("Error: ", e);
         // we will exit the application if there was a watching exception, because of the bug in fabric8 client
         // see https://github.com/fabric8io/kubernetes-client/issues/1318

operator-framework/src/test/java/io/javaoperatorsdk/operator/ConcurrencyIT.java

@@ -34,7 +34,7 @@ public class ConcurrencyIT {
     public void setup() {
         KubernetesClient k8sClient = new DefaultKubernetesClient();
         final TestCustomResourceController controller = new TestCustomResourceController(k8sClient, true);
-        assertThat(HasMetadata.DOMAIN_NAME_MATCHER.reset(ControllerUtils.getDefaultFinalizerIdentifier(controller)).matches()).isTrue();
+        assertThat(HasMetadata.FINALIZER_NAME_MATCHER.reset(ControllerUtils.getDefaultFinalizerIdentifier(controller)).matches()).isTrue();
         integrationTest.initialize(k8sClient, controller, "test-crd.yaml");
     }
 

operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerUtilsTest.java

@@ -22,7 +22,7 @@ public void returnsValuesFromControllerAnnotationFinalizer() {
         final TestCustomResourceController controller = new TestCustomResourceController(null);
         final String finalizer = ControllerUtils.getFinalizer(controller);
         Assertions.assertEquals(TestCustomResourceController.FINALIZER_NAME, finalizer);
-        Assertions.assertTrue(HasMetadata.DOMAIN_NAME_MATCHER.reset(finalizer).matches());
+        Assertions.assertTrue(HasMetadata.FINALIZER_NAME_MATCHER.reset(finalizer).matches());
         assertEquals(TestCustomResource.class, ControllerUtils.getCustomResourceClass(controller));
         Assertions.assertEquals(TestCustomResourceController.CRD_NAME, ControllerUtils.getCrdName(controller));
         assertFalse(ControllerUtils.getGenerationEventProcessing(controller));

operator-framework/src/test/java/io/javaoperatorsdk/operator/SubResourceUpdateIT.java

@@ -26,7 +26,7 @@ public class SubResourceUpdateIT {
 
     @BeforeAll
     void checkFinalizer() {
-        assertThat(HasMetadata.DOMAIN_NAME_MATCHER.reset(ControllerUtils.getDefaultFinalizerIdentifier(new SubResourceTestCustomResourceController())).matches()).isTrue();
+        assertThat(HasMetadata.FINALIZER_NAME_MATCHER.reset(ControllerUtils.getDefaultFinalizerIdentifier(new SubResourceTestCustomResourceController())).matches()).isTrue();
     }
 
     @BeforeEach

pom.xml

@@ -52,7 +52,7 @@
             <dependency>
                 <groupId>io.fabric8</groupId>
                 <artifactId>openshift-client</artifactId>
-                <version>5.0.0-alpha-1</version>
+                <version>5.0.0-alpha-2</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>

samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatController.java

@@ -12,8 +12,8 @@
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.fabric8.kubernetes.client.CustomResourceList;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.fabric8.kubernetes.client.Watcher;
+import io.fabric8.kubernetes.client.WatcherException;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.RollableScalableResource;
@@ -75,9 +75,9 @@ public void eventReceived(Action action, Deployment deployment) {
                         log.error(ex.getMessage());
                     }
                 }
-
+    
                 @Override
-                public void onClose(KubernetesClientException cause) {
+                public void onClose(WatcherException e) {
                 }
             });
             watchedResources.add(WatchedResource.fromResource(deployment));