diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/createonlyifnotexistsdependentwithssa/ConfigMapDependentResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/createonlyifnotexistsdependentwithssa/ConfigMapDependentResource.java index 67532ee159..2e37413766 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/createonlyifnotexistsdependentwithssa/ConfigMapDependentResource.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/createonlyifnotexistsdependentwithssa/ConfigMapDependentResource.java @@ -11,6 +11,8 @@ public class ConfigMapDependentResource extends CRUDKubernetesDependentResource< ConfigMap, CreateOnlyIfNotExistingDependentWithSSACustomResource> { + public static final String DRKEY = "drkey"; + @Override protected ConfigMap desired( CreateOnlyIfNotExistingDependentWithSSACustomResource primary, @@ -21,7 +23,7 @@ protected ConfigMap desired( .withName(primary.getMetadata().getName()) .withNamespace(primary.getMetadata().getNamespace()) .build()); - configMap.setData(Map.of("drkey", "v")); + configMap.setData(Map.of(DRKEY, "v")); return configMap; } } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/createonlyifnotexistsdependentwithssa/CreateOnlyIfNotExistingDependentWithSSAIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/createonlyifnotexistsdependentwithssa/CreateOnlyIfNotExistingDependentWithSSAIT.java index 5c1923fa55..3c41bae977 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/createonlyifnotexistsdependentwithssa/CreateOnlyIfNotExistingDependentWithSSAIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/createonlyifnotexistsdependentwithssa/CreateOnlyIfNotExistingDependentWithSSAIT.java @@ -2,6 +2,7 @@ import java.time.Duration; import java.util.Map; +import java.util.Set; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -22,6 +23,9 @@ class CreateOnlyIfNotExistingDependentWithSSAIT { @RegisterExtension LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() + // for the sake of this test, we allow to manage ConfigMaps with SSA + // by removing it from the non SSA resources (it is not managed with SSA by default) + .withConfigurationService(o -> o.withDefaultNonSSAResource(Set.of())) .withReconciler(new CreateOnlyIfNotExistingDependentWithSSAReconciler()) .build(); @@ -41,7 +45,7 @@ void createsResourceOnlyIfNotExisting() { .untilAsserted( () -> { var currentCM = extension.get(ConfigMap.class, TEST_RESOURCE_NAME); - assertThat(currentCM.getData()).containsKey(KEY); + assertThat(currentCM.getData()).containsOnlyKeys(KEY); }); } diff --git a/pom.xml b/pom.xml index 4a91625c2c..21542965c0 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 2.25.1 5.19.0 3.18.0 - 0.21.0 + 0.22.0 1.13.0 3.27.4 4.3.0 diff --git a/sample-operators/mysql-schema/pom.xml b/sample-operators/mysql-schema/pom.xml index cf1be19cbb..79521acd47 100644 --- a/sample-operators/mysql-schema/pom.xml +++ b/sample-operators/mysql-schema/pom.xml @@ -40,9 +40,9 @@ 1.24.6 - mysql - mysql-connector-java - 8.0.33 + com.mysql + mysql-connector-j + 9.4.0 org.apache.logging.log4j