chore: update to josdk 4.4 and related fixes (#81)

operator-framework · Jul 19, 2023 · 15e85b1 · 15e85b1
1 parent 26fd68e
commit 15e85b1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 36 deletions.
diff --git a/pom.xml b/pom.xml
@@ -47,7 +47,7 @@
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.release>17</maven.compiler.release>
         <spring-boot.version>3.1.1</spring-boot.version>
-        <josdk.version>4.3.5</josdk.version>
+        <josdk.version>4.4.0</josdk.version>
         <surefire.version>3.1.2</surefire.version>
         <fabric8-client.version>6.7.2</fabric8-client.version>
         <jenvtest.version>0.9.1</jenvtest.version>

diff --git a/...java/io/javaoperatorsdk/operator/springboot/starter/AutoConfigurationIntegrationTest.java b/...java/io/javaoperatorsdk/operator/springboot/starter/AutoConfigurationIntegrationTest.java
@@ -1,6 +1,5 @@
 package io.javaoperatorsdk.operator.springboot.starter;
 
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -11,7 +10,6 @@
 import io.fabric8.kubernetes.api.model.ListOptionsBuilder;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.jenvtest.junit.EnableKubeAPIServer;
-import io.javaoperatorsdk.operator.api.config.ConfigurationServiceProvider;
 import io.javaoperatorsdk.operator.springboot.starter.CRDApplier.CRDTransformer;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -23,11 +21,6 @@ public class AutoConfigurationIntegrationTest {
   @Autowired
   private KubernetesClient kubernetesClient;
 
-  @BeforeAll
-  static void beforeAll() {
-    ConfigurationServiceProvider.reset();
-  }
-
   @Test
   void crdsUploadedAndTransformersApplied() {
     var list = kubernetesClient.apiextensions().v1()

diff --git a/...r/src/test/java/io/javaoperatorsdk/operator/springboot/starter/AutoConfigurationTest.java b/...r/src/test/java/io/javaoperatorsdk/operator/springboot/starter/AutoConfigurationTest.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import java.util.function.Consumer;
 
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,16 +19,13 @@
 import io.javaoperatorsdk.operator.ReconcilerUtils;
 import io.javaoperatorsdk.operator.api.config.Cloner;
 import io.javaoperatorsdk.operator.api.config.ConfigurationServiceOverrider;
-import io.javaoperatorsdk.operator.api.config.ConfigurationServiceProvider;
 import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
 import io.javaoperatorsdk.operator.processing.retry.GenericRetry;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.atIndex;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.doNothing;
 
 @SpringBootTest(properties = {
@@ -60,11 +56,6 @@ public class AutoConfigurationTest {
   @MockBean
   private Cloner cloner;
 
-  @BeforeAll
-  static void beforeAll() {
-    ConfigurationServiceProvider.reset();
-  }
-
   @Test
   public void loadsKubernetesClientPropertiesProperly() {
     final var operatorProperties = config.getClient();
@@ -90,24 +81,6 @@ public void beansCreated() {
     assertNotNull(compositeConfigurationServiceOverrider);
   }
 
-  @Test
-  public void configServiceOverridesAppliedInCorrectOrder() {
-    var configService = ConfigurationServiceProvider.instance();
-
-    assertThat(config.getConcurrentReconciliationThreads())
-        .isEqualTo(60).isNotEqualTo(CUSTOM_RECONCILE_THREADS);
-    assertThat(configService.concurrentReconciliationThreads())
-        .isEqualTo(CUSTOM_RECONCILE_THREADS);
-    assertEquals(configService.getResourceCloner(), cloner);
-    assertThat(configService.cacheSyncTimeout()).isEqualTo(Duration.ofDays(17));
-    assertThat(configService.closeClientOnStop()).isFalse();
-    assertThat(configService.stopOnInformerErrorDuringStartup()).isFalse();
-    assertThat(configService.checkCRDAndValidateLocalModel()).isFalse();
-    assertThat(configService.minConcurrentReconciliationThreads()).isEqualTo(22);
-    assertThat(configService.concurrentWorkflowExecutorThreads()).isEqualTo(32);
-    assertThat(configService.minConcurrentWorkflowExecutorThreads()).isEqualTo(12);
-  }
-
   @Test
   public void reconcilersAreDiscovered() {
     assertEquals(1, reconcilers.size());