chore: update to josdk v5.0.0-beta1 and fabric8-client v7.0.0 and rel…

…ated fixes (#191)

* chore: update to josdk v5.0.0-beta1 and fabric8 kubernetes-client v7.0.0 and related fixes

* fix: apply spotless plugin to reformat code

* fix: remove dependency jetbrains-annotations from pom files

* fix: remove unnecessary jetbrain-annotation from CRDApplier.java

pom.xml

@@ -59,9 +59,9 @@
     <maven.compiler.release>17</maven.compiler.release>
     <spotless.version>2.43.0</spotless.version>
     <spring-boot.version>3.3.6</spring-boot.version>
-    <josdk.version>4.9.7</josdk.version>
+    <josdk.version>5.0.0-beta1</josdk.version>
     <surefire.version>3.5.2</surefire.version>
-    <fabric8-client.version>6.13.4</fabric8-client.version>
+    <fabric8-client.version>7.0.0</fabric8-client.version>
     <jenvtest.version>0.9.7</jenvtest.version>
     <nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
     <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>

samples/common/src/main/java/io/javaoperatorsdk/operator/springboot/starter/sample/ConfigMapDpendentResource.java → samples/common/src/main/java/io/javaoperatorsdk/operator/springboot/starter/sample/ConfigMapDependentResource.java

@@ -5,14 +5,16 @@
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
+import io.javaoperatorsdk.operator.api.config.informer.Informer;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
 
-@KubernetesDependent(labelSelector = "app.kubernetes.io/managed-by=custom-service-operator")
-public class ConfigMapDpendentResource
+@KubernetesDependent(
+    informer = @Informer(labelSelector = "app.kubernetes.io/managed-by=custom-service-operator"))
+public class ConfigMapDependentResource
     extends CRUDKubernetesDependentResource<ConfigMap, CustomService> {
-  public ConfigMapDpendentResource() {
+  public ConfigMapDependentResource() {
     super(ConfigMap.class);
   }
 

samples/common/src/main/java/io/javaoperatorsdk/operator/springboot/starter/sample/CustomServiceReconciler.java

@@ -15,9 +15,10 @@
 import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
 
 /** A very simple sample controller that creates a service with a label. */
-@ControllerConfiguration(dependents = {
-    @Dependent(name = "config", type = ConfigMapDpendentResource.class)
+@Workflow(dependents = {
+    @Dependent(name = "config", type = ConfigMapDependentResource.class)
 })
+@ControllerConfiguration
 public class CustomServiceReconciler implements Reconciler<CustomService> {
 
   private static final Logger log = LoggerFactory.getLogger(CustomServiceReconciler.class);
@@ -57,6 +58,6 @@ public UpdateControl<CustomService> reconcile(
         .inNamespace(resource.getMetadata().getNamespace())
         .createOrReplace(service);
 
-    return UpdateControl.updateResource(resource);
+    return UpdateControl.patchResource(resource);
   }
 }

starter-test/src/main/java/io/javaoperatorsdk/operator/springboot/starter/test/TestConfiguration.java

@@ -20,10 +20,9 @@
 import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
 import io.fabric8.kubernetes.client.utils.Serialization;
 import io.fabric8.mockwebserver.Context;
+import io.fabric8.mockwebserver.MockWebServer;
 import io.javaoperatorsdk.operator.springboot.starter.OperatorAutoConfiguration;
 
-import okhttp3.mockwebserver.MockWebServer;
-
 @Configuration
 @ImportAutoConfiguration(OperatorAutoConfiguration.class)
 @EnableConfigurationProperties(TestConfigurationProperties.class)

starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/CRDApplier.java

@@ -7,7 +7,6 @@
 import java.util.List;
 import java.util.function.UnaryOperator;
 
-import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
@@ -27,7 +26,7 @@ public interface CRDApplier {
   void apply();
 
   interface CRDTransformer extends UnaryOperator<HasMetadata> {
-    default CRDTransformer thenTransform(@NotNull CRDApplier.CRDTransformer after) {
+    default CRDTransformer thenTransform(CRDApplier.CRDTransformer after) {
       return t -> after.apply(apply(t));
     }
 

starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorAutoConfiguration.java

@@ -26,7 +26,11 @@
 import io.fabric8.openshift.client.OpenShiftClient;
 import io.javaoperatorsdk.operator.Operator;
 import io.javaoperatorsdk.operator.ReconcilerUtils;
-import io.javaoperatorsdk.operator.api.config.*;
+import io.javaoperatorsdk.operator.api.config.Cloner;
+import io.javaoperatorsdk.operator.api.config.ConfigurationServiceOverrider;
+import io.javaoperatorsdk.operator.api.config.ControllerConfigurationOverrider;
+import io.javaoperatorsdk.operator.api.config.DefaultResourceClassResolver;
+import io.javaoperatorsdk.operator.api.config.ResourceClassResolver;
 import io.javaoperatorsdk.operator.api.monitoring.Metrics;
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
 import io.javaoperatorsdk.operator.processing.retry.GenericRetry;
@@ -93,7 +97,7 @@ public Operator operator(
       KubernetesClient kubernetesClient,
       List<Reconciler<?>> reconcilers) {
 
-    var operator = new Operator(kubernetesClient, compositeConfigurationServiceOverrider);
+    var operator = new Operator(compositeConfigurationServiceOverrider);
     reconcilers.forEach(reconciler -> reconcilerRegisterer.accept(operator, reconciler));
 
     return operator;
@@ -122,14 +126,9 @@ public Consumer<ConfigurationServiceOverrider> compositeConfigurationServiceOver
   @Order(0)
   public Consumer<ConfigurationServiceOverrider> defaultConfigServiceOverrider(
       @Autowired(required = false) Cloner cloner,
-      ResourceClassResolver resourceClassResolver,
-      Metrics metrics) {
+      Metrics metrics, KubernetesClient kubernetesClient) {
     return overrider -> {
       doIfPresent(cloner, overrider::withResourceCloner);
-      doIfPresent(configuration.getMinConcurrentWorkflowExecutorThreads(),
-          overrider::withMinConcurrentWorkflowExecutorThreads);
-      doIfPresent(configuration.getMinConcurrentReconciliationThreads(),
-          overrider::withMinConcurrentReconciliationThreads);
       doIfPresent(configuration.getStopOnInformerErrorDuringStartup(),
           overrider::withStopOnInformerErrorDuringStartup);
       doIfPresent(configuration.getConcurrentWorkflowExecutorThreads(),
@@ -139,8 +138,8 @@ public Consumer<ConfigurationServiceOverrider> defaultConfigServiceOverrider(
       overrider
           .withConcurrentReconciliationThreads(configuration.getConcurrentReconciliationThreads())
           .withMetrics(metrics)
-          .withResourceClassResolver(resourceClassResolver)
-          .checkingCRDAndValidateLocalModel(configuration.getCheckCrdAndValidateLocalModel());
+          .checkingCRDAndValidateLocalModel(configuration.getCheckCrdAndValidateLocalModel())
+          .withKubernetesClient(kubernetesClient);
     };
   }
 

starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/AutoConfigurationTest.java

@@ -95,11 +95,13 @@ void appliesConfigPropertiesToControllers() {
         .satisfies(controller -> {
           assertThat((ControllerConfiguration<?>) controller.getConfiguration())
               .satisfies(config -> {
-                assertThat(config.getNamespaces()).containsExactlyInAnyOrder("ns1", "ns2");
+                assertThat(config.getInformerConfig().getNamespaces())
+                    .containsExactlyInAnyOrder("ns1", "ns2");
                 assertThat(config.isGenerationAware()).isTrue();
                 assertThat(config.getName()).isEqualTo("not-a-test-reconciler");
                 assertThat(config.getFinalizerName()).isEqualTo("barton.fink/1991");
-                assertThat(config.getLabelSelector()).isEqualTo("version in (v1)");
+                assertThat(config.getInformerConfig().getLabelSelector())
+                    .isEqualTo("version in (v1)");
                 assertThat(config.maxReconciliationInterval()).hasValue(Duration.ofMinutes(3));
               });
           assertThat(controller.getConfiguration().getRetry())

starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/model/TestResourceList.java

@@ -1,6 +1,6 @@
 package io.javaoperatorsdk.operator.springboot.starter.model;
 
-import io.fabric8.kubernetes.client.CustomResourceList;
+import io.fabric8.kubernetes.api.model.DefaultKubernetesResourceList;
 
-public class TestResourceList extends CustomResourceList<TestResource> {
+public class TestResourceList extends DefaultKubernetesResourceList<TestResource> {
 }