chore: restore fabric8 5.12 compatibility

Author: metacosm

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/LeaderElectionManager.java

@@ -1,7 +1,7 @@
 package io.javaoperatorsdk.operator;
 
 import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Future;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -10,7 +10,6 @@
 import io.fabric8.kubernetes.client.extended.leaderelection.LeaderCallbacks;
 import io.fabric8.kubernetes.client.extended.leaderelection.LeaderElectionConfig;
 import io.fabric8.kubernetes.client.extended.leaderelection.LeaderElector;
-import io.fabric8.kubernetes.client.extended.leaderelection.LeaderElectorBuilder;
 import io.fabric8.kubernetes.client.extended.leaderelection.resourcelock.LeaseLock;
 import io.fabric8.kubernetes.client.extended.leaderelection.resourcelock.Lock;
 import io.javaoperatorsdk.operator.api.config.ConfigurationServiceProvider;
@@ -23,7 +22,7 @@ public class LeaderElectionManager {
   private LeaderElector leaderElector = null;
   private final ControllerManager controllerManager;
   private String identity;
-  private CompletableFuture<?> leaderElectionFuture;
+  private Future<?> leaderElectionFuture;
 
   public LeaderElectionManager(ControllerManager controllerManager) {
     this.controllerManager = controllerManager;
@@ -33,11 +32,9 @@ public void init(LeaderElectionConfiguration config, KubernetesClient client) {
     this.identity = identity(config);
     Lock lock = new LeaseLock(config.getLeaseNamespace(), config.getLeaseName(), identity);
     // releaseOnCancel is not used in the underlying implementation
-    leaderElector = new LeaderElectorBuilder(client,
-        ConfigurationServiceProvider.instance().getExecutorService())
-        .withConfig(
-            new LeaderElectionConfig(lock, config.getLeaseDuration(), config.getRenewDeadline(),
-                config.getRetryPeriod(), leaderCallbacks(), true, config.getLeaseName()))
+    leaderElector = client.leaderElector().withConfig(
+        new LeaderElectionConfig(lock, config.getLeaseDuration(), config.getRenewDeadline(),
+            config.getRetryPeriod(), leaderCallbacks(), true, config.getLeaseName()))
         .build();
   }
 
@@ -73,7 +70,8 @@ private String identity(LeaderElectionConfiguration config) {
 
   public void start() {
     if (isLeaderElectionEnabled()) {
-      leaderElectionFuture = leaderElector.start();
+      leaderElectionFuture =
+          ConfigurationServiceProvider.instance().getExecutorService().submit(leaderElector::run);
     }
   }
 

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java

@@ -9,8 +9,8 @@
 import org.slf4j.LoggerFactory;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.KubernetesClientBuilder;
 import io.fabric8.kubernetes.client.Version;
 import io.javaoperatorsdk.operator.api.config.*;
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
@@ -59,7 +59,7 @@ public Operator(KubernetesClient client, Consumer<ConfigurationServiceOverrider>
    */
   public Operator(KubernetesClient kubernetesClient, ConfigurationService configurationService) {
     this.kubernetesClient =
-        kubernetesClient != null ? kubernetesClient : new KubernetesClientBuilder().build();
+        kubernetesClient != null ? kubernetesClient : new DefaultKubernetesClient();
     configurationService.getLeaderElectionConfiguration()
         .ifPresent(c -> leaderElectionManager.init(c, this.kubernetesClient));
     ConfigurationServiceProvider.set(configurationService);

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

@@ -1,5 +1,9 @@
 package io.javaoperatorsdk.operator.processing.event;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -10,6 +14,7 @@
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.internal.HasMetadataOperationsImpl;
+import io.fabric8.kubernetes.client.utils.Serialization;
 import io.javaoperatorsdk.operator.OperatorException;
 import io.javaoperatorsdk.operator.api.ObservedGenerationAware;
 import io.javaoperatorsdk.operator.api.config.ConfigurationServiceProvider;
@@ -367,9 +372,9 @@ public R updateResource(R resource) {
           resource.getMetadata().getResourceVersion());
       return resourceOperation
           .inNamespace(resource.getMetadata().getNamespace())
-          .resource(resource)
+          .withName(getName(resource))
           .lockResourceVersion(resource.getMetadata().getResourceVersion())
-          .replace();
+          .replace(resource);
     }
 
     @SuppressWarnings({"rawtypes", "unchecked"})
@@ -388,11 +393,15 @@ public R patchStatus(R resource, R originalResource) {
       // don't do optimistic locking on patch
       originalResource.getMetadata().setResourceVersion(null);
       resource.getMetadata().setResourceVersion(null);
-      try {
+      try (var bis = new ByteArrayInputStream(
+          Serialization.asJson(originalResource).getBytes(StandardCharsets.UTF_8))) {
         return resourceOperation
             .inNamespace(resource.getMetadata().getNamespace())
-            .resource(originalResource)
+            // will be simplified in fabric8 v6
+            .load(bis)
             .editStatus(r -> resource);
+      } catch (IOException e) {
+        throw new IllegalStateException(e);
       } finally {
         // restore initial resource version
         originalResource.getMetadata().setResourceVersion(resourceVersion);

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerManager.java

@@ -94,7 +94,7 @@ public void changeNamespaces(Set<String> namespaces) {
 
 
   private InformerWrapper<T> createEventSource(
-      FilterWatchListDeletable<T, KubernetesResourceList<T>, Resource<T>> filteredBySelectorClient,
+      FilterWatchListDeletable<T, KubernetesResourceList<T>> filteredBySelectorClient,
       ResourceEventHandler<T> eventHandler, String key) {
     var source = new InformerWrapper<>(filteredBySelectorClient.runnableInformer(0));
     source.addEventHandler(eventHandler);

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/MockKubernetesClient.java

@@ -2,9 +2,11 @@
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
+import io.fabric8.kubernetes.client.GenericKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.V1ApiextensionAPIGroupDSL;
 import io.fabric8.kubernetes.client.dsl.*;
+import io.fabric8.kubernetes.client.extended.leaderelection.LeaderElectorBuilder;
 import io.fabric8.kubernetes.client.informers.SharedIndexInformer;
 import io.fabric8.kubernetes.client.informers.cache.Indexer;
 
@@ -18,14 +20,14 @@
 public class MockKubernetesClient {
 
   public static <T extends HasMetadata> KubernetesClient client(Class<T> clazz) {
-    final var client = mock(KubernetesClient.class);
+    final var client = mock(GenericKubernetesClient.class);
     MixedOperation<T, KubernetesResourceList<T>, Resource<T>> resources =
         mock(MixedOperation.class);
     NonNamespaceOperation<T, KubernetesResourceList<T>, Resource<T>> nonNamespaceOperation =
         mock(NonNamespaceOperation.class);
-    AnyNamespaceOperation<T, KubernetesResourceList<T>, Resource<T>> inAnyNamespace = mock(
-        AnyNamespaceOperation.class);
-    FilterWatchListDeletable<T, KubernetesResourceList<T>, Resource<T>> filterable =
+    FilterWatchListMultiDeletable<T, KubernetesResourceList<T>> inAnyNamespace = mock(
+        FilterWatchListMultiDeletable.class);
+    FilterWatchListDeletable<T, KubernetesResourceList<T>> filterable =
         mock(FilterWatchListDeletable.class);
     when(resources.inNamespace(anyString())).thenReturn(nonNamespaceOperation);
     when(nonNamespaceOperation.withLabelSelector(nullable(String.class))).thenReturn(filterable);
@@ -36,6 +38,7 @@ public static <T extends HasMetadata> KubernetesClient client(Class<T> clazz) {
     when(informer.getIndexer()).thenReturn(mockIndexer);
     when(filterable.runnableInformer(anyLong())).thenReturn(informer);
     when(client.resources(clazz)).thenReturn(resources);
+    when(client.leaderElector()).thenReturn(new LeaderElectorBuilder(client));
 
     final var apiGroupDSL = mock(ApiextensionsAPIGroupDSL.class);
     when(client.apiextensions()).thenReturn(apiGroupDSL);

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSourceTest.java

@@ -9,7 +9,8 @@
 import io.fabric8.kubernetes.api.model.ObjectMeta;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.dsl.AnyNamespaceOperation;
+import io.fabric8.kubernetes.client.dsl.FilterWatchListDeletable;
+import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.informers.SharedIndexInformer;
 import io.fabric8.kubernetes.client.informers.cache.Indexer;
@@ -21,7 +22,11 @@
 
 import static io.javaoperatorsdk.operator.api.reconciler.Constants.DEFAULT_NAMESPACES_SET;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 @SuppressWarnings({"rawtypes", "unchecked"})
 class InformerEventSourceTest {
@@ -36,10 +41,10 @@ class InformerEventSourceTest {
       mock(TemporaryResourceCache.class);
   private final EventHandler eventHandlerMock = mock(EventHandler.class);
   private final MixedOperation crClientMock = mock(MixedOperation.class);
-  private final AnyNamespaceOperation specificResourceClientMock =
-      mock(AnyNamespaceOperation.class);
-  private final AnyNamespaceOperation labeledResourceClientMock =
-      mock(AnyNamespaceOperation.class);
+  private final FilterWatchListMultiDeletable specificResourceClientMock =
+      mock(FilterWatchListMultiDeletable.class);
+  private final FilterWatchListDeletable labeledResourceClientMock =
+      mock(FilterWatchListDeletable.class);
   private final SharedIndexInformer informer = mock(SharedIndexInformer.class);
   private final InformerConfiguration<Deployment> informerConfiguration =
       mock(InformerConfiguration.class);

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomReconciler.java

@@ -38,13 +38,13 @@ public TestCustomReconciler(KubernetesClient kubernetesClient, boolean updateSta
   @Override
   public DeleteControl cleanup(
       TestCustomResource resource, Context<TestCustomResource> context) {
-    var statusDetails =
+    var deleted =
         kubernetesClient
             .configMaps()
             .inNamespace(resource.getMetadata().getNamespace())
             .withName(resource.getSpec().getConfigMapName())
             .delete();
-    if (statusDetails.size() == 1 && statusDetails.get(0).getCauses().isEmpty()) {
+    if (deleted) {
       log.info(
           "Deleted ConfigMap {} for resource: {}",
           resource.getSpec().getConfigMapName(),

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

@@ -16,8 +16,9 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
 import io.fabric8.kubernetes.api.model.NamespaceBuilder;
+import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.KubernetesClientBuilder;
+import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.utils.KubernetesResourceUtil;
@@ -52,7 +53,7 @@ protected AbstractOperatorExtension(
       boolean preserveNamespaceOnError,
       boolean waitForNamespaceDeletion) {
 
-    this.kubernetesClient = new KubernetesClientBuilder().build();
+    this.kubernetesClient = new DefaultKubernetesClient();
     this.configurationService = configurationService;
     this.infrastructure = infrastructure;
     this.infrastructureTimeout = infrastructureTimeout;
@@ -101,7 +102,7 @@ public <T extends HasMetadata> T get(Class<T> type, String name) {
   }
 
   public <T extends HasMetadata> T create(T resource) {
-    return kubernetesClient.resource(resource).inNamespace(namespace).create();
+    return (T) kubernetesClient.resources(resource.getClass()).inNamespace(namespace).create();
   }
 
   @Deprecated(forRemoval = true)
@@ -110,7 +111,9 @@ public <T extends HasMetadata> T create(Class<T> type, T resource) {
   }
 
   public <T extends HasMetadata> T replace(T resource) {
-    return kubernetesClient.resource(resource).inNamespace(namespace).replace();
+    final MixedOperation<T, KubernetesResourceList<T>, Resource<T>> resources =
+        kubernetesClient.resources((Class<T>) resource.getClass());
+    return resources.inNamespace(namespace).replace(resource);
   }
 
   @Deprecated(forRemoval = true)
@@ -119,8 +122,7 @@ public <T extends HasMetadata> T replace(Class<T> type, T resource) {
   }
 
   public <T extends HasMetadata> boolean delete(T resource) {
-    var res = kubernetesClient.resource(resource).inNamespace(namespace).delete();
-    return res.size() == 1 && res.get(0).getCauses().isEmpty();
+    return kubernetesClient.resource(resource).inNamespace(namespace).delete();
   }
 
   @Deprecated(forRemoval = true)
@@ -160,9 +162,7 @@ protected void before(ExtensionContext context) {
 
     kubernetesClient
         .namespaces()
-        .resource(
-            new NamespaceBuilder().withNewMetadata().withName(namespace).endMetadata().build())
-        .create();
+        .create(new NamespaceBuilder().withNewMetadata().withName(namespace).endMetadata().build());
 
     kubernetesClient
         .resourceList(infrastructure)

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestReconciler.java

@@ -67,13 +67,13 @@ public DeleteControl cleanup(
       TestCustomResource resource, Context<TestCustomResource> context) {
     numberOfCleanupExecutions.incrementAndGet();
 
-    var statusDetail = kubernetesClient
+    var deleted = kubernetesClient
         .configMaps()
         .inNamespace(resource.getMetadata().getNamespace())
         .withName(resource.getSpec().getConfigMapName())
         .delete();
 
-    if (statusDetail.size() == 1 && statusDetail.get(0).getCauses().isEmpty()) {
+    if (deleted) {
       log.info(
           "Deleted ConfigMap {} for resource: {}",
           resource.getSpec().getConfigMapName(),

pom.xml

@@ -43,7 +43,7 @@
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
 
         <junit.version>5.9.0</junit.version>
-        <fabric8-client.version>6.1.1</fabric8-client.version>
+        <fabric8-client.version>5.12.3</fabric8-client.version>
         <slf4j.version>1.7.36</slf4j.version>
         <log4j.version>2.18.0</log4j.version>
         <mokito.version>4.7.0</mokito.version>

sample-operators/leader-election/src/main/java/io/javaoperatorsdk/operator/sample/LeaderElectionTestOperator.java

@@ -3,7 +3,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import io.fabric8.kubernetes.client.KubernetesClientBuilder;
+import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.javaoperatorsdk.operator.Operator;
 import io.javaoperatorsdk.operator.api.config.LeaderElectionConfiguration;
 
@@ -17,7 +17,7 @@ public static void main(String[] args) {
 
     log.info("Starting operator with identity: {}", identity);
 
-    var client = new KubernetesClientBuilder().build();
+    var client = new DefaultKubernetesClient();
     Operator operator = new Operator(client,
         c -> c.withLeaderElectionConfiguration(
             new LeaderElectionConfiguration("leader-election-test", namespace, identity)));

sample-operators/leader-election/src/test/java/io/javaoperatorsdk/operator/sample/LeaderElectionE2E.java

@@ -23,8 +23,8 @@
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBinding;
 import io.fabric8.kubernetes.client.ConfigBuilder;
+import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.KubernetesClientBuilder;
 
 import static io.javaoperatorsdk.operator.junit.AbstractOperatorExtension.CRD_READY_WAIT;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -107,24 +107,24 @@ private void applyCustomResource() {
         .withName(TEST_RESOURCE_NAME)
         .withNamespace(namespace)
         .build());
-    client.resource(res).create();
+    client.resources(res.getClass()).create();
   }
 
   @BeforeEach
   void setup() {
     namespace = "leader-election-it-" + UUID.randomUUID();
-    client = new KubernetesClientBuilder().withConfig(new ConfigBuilder()
+    client = new DefaultKubernetesClient(new ConfigBuilder()
         .withNamespace(namespace)
-        .build()).build();
+        .build());
     applyCRD();
-    client.namespaces().resource(new NamespaceBuilder().withNewMetadata().withName(namespace)
-        .endMetadata().build()).create();
+    client.namespaces().create(new NamespaceBuilder().withNewMetadata().withName(namespace)
+        .endMetadata().build());
   }
 
   @AfterEach
   void tearDown() {
-    client.namespaces().resource(new NamespaceBuilder().withNewMetadata().withName(namespace)
-        .endMetadata().build()).delete();
+    client.namespaces().delete(new NamespaceBuilder().withNewMetadata().withName(namespace)
+        .endMetadata().build());
     await()
         .atMost(Duration.ofSeconds(60))
         .untilAsserted(() -> assertThat(client.namespaces().withName(namespace).get()).isNull());

sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java

@@ -23,7 +23,7 @@ public class MySQLSchemaOperator {
   public static void main(String[] args) throws IOException {
     log.info("MySQL Schema Operator starting");
 
-    KubernetesClient client = new KubernetesClientBuilder().build();
+    KubernetesClient client = new DefaultKubernetesClient();
     Operator operator = new Operator(client,
         overrider -> overrider.withMetrics(new MicrometerMetrics(new LoggingMeterRegistry())));
 

sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java

@@ -18,7 +18,7 @@ public class TomcatOperator {
 
   public static void main(String[] args) throws IOException {
 
-    KubernetesClient client = new KubernetesClientBuilder().build();
+    KubernetesClient client = new DefaultKubernetesClient();
     Operator operator = new Operator(client);
     operator.register(new TomcatReconciler());
     operator.register(new WebappReconciler(client));

sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageOperator.java

@@ -22,7 +22,7 @@ public class WebPageOperator {
   public static void main(String[] args) throws IOException {
     log.info("WebServer Operator starting!");
 
-    KubernetesClient client = new KubernetesClientBuilder().build();
+    KubernetesClient client = new DefaultKubernetesClient();
     Operator operator = new Operator(client);
     String reconcilerEnvVar = System.getenv(WEBPAGE_RECONCILER_ENV);
     if (WEBPAGE_CLASSIC_RECONCILER_ENV_VALUE.equals(reconcilerEnvVar)) {