diff --git a/pom.xml b/pom.xml
index 9364c11..d540e54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
17
17
3.1.1
- 4.3.5
+ 4.4.0
3.1.2
6.7.2
0.9.1
diff --git a/starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/AutoConfigurationIntegrationTest.java b/starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/AutoConfigurationIntegrationTest.java
index 6d19553..ca6fba2 100644
--- a/starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/AutoConfigurationIntegrationTest.java
+++ b/starter/src/test/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/starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/AutoConfigurationTest.java b/starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/AutoConfigurationTest.java
index 86977aa..1ee3f71 100644
--- a/starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/AutoConfigurationTest.java
+++ b/starter/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());