Skip to content

Commit 7245f55

Browse files
authored
fix: Check CRD default to false (#1063)
1 parent baf94e7 commit 7245f55

File tree

5 files changed

+7
-22
lines changed

5 files changed

+7
-22
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ default Config getClientConfiguration() {
7777
* @return {@code true} if CRDs should be checked (default), {@code false} otherwise
7878
*/
7979
default boolean checkCRDAndValidateLocalModel() {
80-
return true;
80+
return false;
8181
}
8282

8383
int DEFAULT_RECONCILIATION_THREADS_NUMBER = 5;

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/Utils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static boolean isValidateCustomResourcesEnvVarSet() {
6464
}
6565

6666
public static boolean shouldCheckCRDAndValidateLocalModel() {
67-
return getBooleanFromSystemPropsOrDefault(CHECK_CRD_ENV_KEY, true);
67+
return getBooleanFromSystemPropsOrDefault(CHECK_CRD_ENV_KEY, false);
6868
}
6969

7070
public static boolean debugThreadPool() {

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ConfigurationServiceProviderTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ void shouldProvideTheSetInstanceIfProvided() {
3535
@Test
3636
void shouldBePossibleToOverrideConfigOnce() {
3737
final var config = new AbstractConfigurationService(null);
38-
assertTrue(config.checkCRDAndValidateLocalModel());
38+
assertFalse(config.checkCRDAndValidateLocalModel());
3939

4040
ConfigurationServiceProvider.set(config);
4141
var instance = ConfigurationServiceProvider.instance();
4242
assertEquals(config, instance);
4343

44-
ConfigurationServiceProvider.overrideCurrent(o -> o.checkingCRDAndValidateLocalModel(false));
44+
ConfigurationServiceProvider.overrideCurrent(o -> o.checkingCRDAndValidateLocalModel(true));
4545
instance = ConfigurationServiceProvider.instance();
4646
assertNotEquals(config, instance);
47-
assertFalse(instance.checkCRDAndValidateLocalModel());
47+
assertTrue(instance.checkCRDAndValidateLocalModel());
4848

4949
assertThrows(IllegalStateException.class,
5050
() -> ConfigurationServiceProvider.overrideCurrent(o -> o.withCloseClientOnStop(false)));

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/UtilsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
class UtilsTest {
2121

2222
@Test
23-
void shouldCheckCRDAndValidateLocalModelByDefault() {
24-
assertTrue(Utils.shouldCheckCRDAndValidateLocalModel());
23+
void shouldNotCheckCRDAndValidateLocalModelByDefault() {
24+
assertFalse(Utils.shouldCheckCRDAndValidateLocalModel());
2525
}
2626

2727
@Test

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/ControllerTest.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import org.junit.jupiter.api.Test;
44

55
import io.fabric8.kubernetes.api.model.Secret;
6-
import io.javaoperatorsdk.operator.MissingCRDException;
76
import io.javaoperatorsdk.operator.MockKubernetesClient;
87
import io.javaoperatorsdk.operator.api.config.ConfigurationServiceProvider;
98
import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
@@ -12,7 +11,6 @@
1211
import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
1312

1413
import static org.assertj.core.api.Assertions.assertThat;
15-
import static org.junit.jupiter.api.Assertions.assertThrows;
1614
import static org.mockito.Mockito.*;
1715

1816
@SuppressWarnings("unchecked")
@@ -47,19 +45,6 @@ void crdShouldNotBeCheckedForCustomResourcesIfDisabled() {
4745
}
4846
}
4947

50-
@Test
51-
void crdShouldBeCheckedForCustomResourcesByDefault() {
52-
ConfigurationServiceProvider.reset();
53-
final var client = MockKubernetesClient.client(TestCustomResource.class);
54-
when(configuration.getResourceClass()).thenReturn(TestCustomResource.class);
55-
56-
final var controller = new Controller<TestCustomResource>(reconciler, configuration, client);
57-
// since we're not really connected to a cluster and the CRD wouldn't be deployed anyway, we
58-
// expect a MissingCRDException to be thrown
59-
assertThrows(MissingCRDException.class, controller::start);
60-
verify(client, times(1)).apiextensions();
61-
}
62-
6348
@Test
6449
void usesFinalizerIfThereIfReconcilerImplementsCleaner() {
6550
Reconciler reconciler = mock(Reconciler.class, withSettings().extraInterfaces(Cleaner.class));

0 commit comments

Comments
 (0)