libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Improvements on Operator Integration Tests to make sure that Config set in CR takes precedence.

Browse source 
Closes #13114
This commit is contained in:
Andre Nascimento 2023-01-20 15:39:36 +01:00 committed by Václav Muzikář
parent 82423f38a1
commit aa422484e2
1 changed files with 48 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakDeploymentTest.java
View file

@ -46,7 +46,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
import static java.util.concurrent.TimeUnit.MINUTES; import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.concurrent.TimeUnit.SECONDS;
@ -125,25 +124,60 @@ public class KeycloakDeploymentTest extends BaseOperatorTest {
@Test @Test
public void testConfigInCRTakesPrecedence() { public void testConfigInCRTakesPrecedence() {
try { try {
var kc = getDefaultKeycloakDeployment(); var defaultKCDeploy = getDefaultKeycloakDeployment();
var health = new ValueOrSecret("health-enabled", "false");
var e = new EnvVarBuilder()
.withName(KeycloakDistConfigurator.getKeycloakOptionEnvVarName(health.getName()))
.withValue(health.getValue())
.build();
kc.getSpec().getAdditionalOptions().add(health);
deployKeycloak(k8sclient, kc, false);
assertThat(Constants.DEFAULT_DIST_CONFIG.get(health.getName())).isEqualTo("true"); // just a sanity check default values did not change var valueSecretHealthProp = new ValueOrSecret("health-enabled", "false");
var valueSecretProxyProp = new ValueOrSecret("proxy", "reencrypt");
var healthEnvVar = new EnvVarBuilder()
.withName(KeycloakDistConfigurator.getKeycloakOptionEnvVarName(valueSecretHealthProp.getName()))
.withValue(valueSecretHealthProp.getValue())
.build();
var proxyEnvVar = new EnvVarBuilder()
.withName(KeycloakDistConfigurator.getKeycloakOptionEnvVarName(valueSecretProxyProp.getName()))
.withValue(valueSecretProxyProp.getValue())
.build();
defaultKCDeploy.getSpec().getAdditionalOptions().add(valueSecretHealthProp);
defaultKCDeploy.getSpec().getAdditionalOptions().add(valueSecretProxyProp);
deployKeycloak(k8sclient, defaultKCDeploy, false);
assertThat(
Constants.DEFAULT_DIST_CONFIG.get(valueSecretHealthProp.getName())
).isEqualTo("true"); // just a sanity check default values did not change
assertThat(
Constants.DEFAULT_DIST_CONFIG.get(valueSecretProxyProp.getName())
).isEqualTo("passthrough"); // just a sanity check default values did not change
Awaitility.await() Awaitility.await()
.ignoreExceptions() .ignoreExceptions()
.untilAsserted(() -> { .untilAsserted(() -> {
Log.info("Asserting default value was overwritten by CR value");
var c = k8sclient.apps().statefulSets().inNamespace(namespace).withName(kc.getMetadata().getName()).get()
.getSpec().getTemplate().getSpec().getContainers().get(0);
assertThat(c.getEnv()).contains(e); Log.info("Asserting default value was overwritten by CR value");
var deployedKCStatefullSet = k8sclient.apps()
.statefulSets()
.inNamespace(namespace)
.withName(defaultKCDeploy.getMetadata().getName());
var firstKCContainer = deployedKCStatefullSet.get()
.getSpec()
.getTemplate()
.getSpec()
.getContainers()
.get(0);
assertThat(firstKCContainer.getEnv().stream()
.filter(oneEnvVar -> oneEnvVar.getName().equalsIgnoreCase(healthEnvVar.getName())))
.containsExactly(healthEnvVar);
assertThat(firstKCContainer.getEnv().stream()
.filter(oneEnvVar -> oneEnvVar.getName().equalsIgnoreCase(proxyEnvVar.getName())))
.containsExactly(proxyEnvVar);
}); });
} catch (Exception e) { } catch (Exception e) {
savePodLogs(); savePodLogs();