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

Improve Operator tests stability

Browse source
This commit is contained in:
andreaTP 2022-02-23 10:11:57 +00:00 committed by Bruno Oliveira da Silva
parent 91a51d276f
commit df8bddd0af
2 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
operator/src/test/java/org/keycloak/operator/ClusterOperatorTest.java
View file

@ -15,8 +15,10 @@ import io.quarkus.logging.Log;
import org.awaitility.Awaitility;
import org.eclipse.microprofile.config.ConfigProvider;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.keycloak.operator.v2alpha1.crds.Keycloak;
import javax.enterprise.inject.Instance;
import javax.enterprise.inject.spi.CDI;
@ -28,6 +30,7 @@ import java.io.FileWriter;
import java.time.Duration;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import static org.assertj.core.api.Assertions.assertThat;
@ -61,10 +64,10 @@ public abstract class ClusterOperatorTest {
setDefaultAwaitilityTimings();
calculateNamespace();
createK8sClient();
createCRDs();
createNamespace();
if (operatorDeployment == OperatorDeployment.remote) {
createCRDs();
createRBACresourcesAndOperatorDeployment();
} else {
createOperator();
@ -107,8 +110,17 @@ public abstract class ClusterOperatorTest {
}
private static void createCRDs() throws FileNotFoundException {
Log.info("Creating CRDs");
k8sclient.load(new FileInputStream(TARGET_KUBERNETES_GENERATED_YML_FOLDER + "keycloaks.keycloak.org-v1.yml")).createOrReplace();
k8sclient.load(new FileInputStream(TARGET_KUBERNETES_GENERATED_YML_FOLDER + "keycloakrealmimports.keycloak.org-v1.yml")).createOrReplace();
try {
var deploymentCRD = k8sclient.load(new FileInputStream(TARGET_KUBERNETES_GENERATED_YML_FOLDER + "keycloaks.keycloak.org-v1.yml"));
deploymentCRD.createOrReplace();
deploymentCRD.waitUntilReady(5, TimeUnit.SECONDS);
var realmImportCRD = k8sclient.load(new FileInputStream(TARGET_KUBERNETES_GENERATED_YML_FOLDER + "keycloakrealmimports.keycloak.org-v1.yml"));
realmImportCRD.createOrReplace();
realmImportCRD.waitUntilReady(5, TimeUnit.SECONDS);
} catch (Exception e) {
Log.warn("Failed to create Keycloak CRD, retrying", e);
createCRDs();
}
}
private static void registerReconcilers() {
@ -172,6 +184,23 @@ public abstract class ClusterOperatorTest {
Awaitility.setDefaultTimeout(Duration.ofSeconds(180));
}
@AfterEach
public void cleanup() {
Log.info("Deleting Keycloak CR");
k8sclient.resources(Keycloak.class).delete();
Awaitility.await()
.untilAsserted(() -> {
var kcDeployments = k8sclient
.apps()
.deployments()
.inNamespace(namespace)
.withLabels(Constants.DEFAULT_LABELS)
.list()
.getItems();
assertThat(kcDeployments.size()).isEqualTo(0);
});
}
@AfterAll
public static void after() throws FileNotFoundException {

7
operator/src/test/java/org/keycloak/operator/KeycloakDeploymentE2EIT.java
View file

@ -5,7 +5,6 @@ import io.fabric8.kubernetes.api.model.apps.DeploymentSpecBuilder;
import io.quarkus.logging.Log;
import io.quarkus.test.junit.QuarkusTest;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.keycloak.operator.v2alpha1.crds.Keycloak;
@ -113,10 +112,4 @@ public class KeycloakDeploymentE2EIT extends ClusterOperatorTest {
}
}
@AfterEach
public void cleanup() {
Log.info("Deleting Keycloak CR");
k8sclient.resources(Keycloak.class).delete(getDefaultKeycloakDeployment());
}
}