From 9ddea81cfb093f1fcbcbd55e58b2f212d4d9df5f Mon Sep 17 00:00:00 2001 From: andreaTP Date: Wed, 8 Jun 2022 18:09:30 +0100 Subject: [PATCH] Fix Ingress creation/deletion loop --- .../operator/controllers/KeycloakIngress.java | 32 ++++--- .../keycloak/operator/IngressLogicTest.java | 83 +++++++++++++++++++ 2 files changed, 102 insertions(+), 13 deletions(-) create mode 100644 operator/app/src/test/java/org/keycloak/operator/IngressLogicTest.java diff --git a/operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakIngress.java b/operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakIngress.java index e1cc894814d0..35a48d90731d 100644 --- a/operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakIngress.java +++ b/operator/app/src/main/java/org/keycloak/operator/controllers/KeycloakIngress.java @@ -29,7 +29,7 @@ public class KeycloakIngress extends OperatorManagedResource implements StatusUpdater { - private Ingress existingIngress; + private final Ingress existingIngress; private final Keycloak keycloak; public KeycloakIngress(KubernetesClient client, Keycloak keycloakCR) { @@ -40,19 +40,21 @@ public KeycloakIngress(KubernetesClient client, Keycloak keycloakCR) { @Override protected Optional getReconciledResource() { - var defaultIngress = newIngress(); - if (keycloak.getSpec().isDisableDefaultIngress() && existingIngress != null) { - client.network().v1().ingresses().inNamespace(getNamespace()).delete(existingIngress); + if (keycloak.getSpec().isDisableDefaultIngress()) { + if (existingIngress != null) { + deleteExistingIngress(); + } return Optional.empty(); - } else if (existingIngress == null) { - return Optional.of(defaultIngress); } else { - if (existingIngress.getMetadata().getAnnotations() == null) { - existingIngress.getMetadata().setAnnotations(new HashMap<>()); + var defaultIngress = newIngress(); + var resultIngress = (existingIngress != null) ? existingIngress : defaultIngress; + + if (resultIngress.getMetadata().getAnnotations() == null) { + resultIngress.getMetadata().setAnnotations(new HashMap<>()); } - existingIngress.getMetadata().getAnnotations().putAll(defaultIngress.getMetadata().getAnnotations()); - existingIngress.setSpec(defaultIngress.getSpec()); - return Optional.of(existingIngress); + resultIngress.getMetadata().getAnnotations().putAll(defaultIngress.getMetadata().getAnnotations()); + resultIngress.setSpec(defaultIngress.getSpec()); + return Optional.of(resultIngress); } } @@ -101,7 +103,11 @@ private Ingress newIngress() { return ingress; } - private Ingress fetchExistingIngress() { + protected void deleteExistingIngress() { + client.network().v1().ingresses().inNamespace(getNamespace()).delete(existingIngress); + } + + protected Ingress fetchExistingIngress() { return client .network() .v1() @@ -112,7 +118,7 @@ private Ingress fetchExistingIngress() { } public void updateStatus(KeycloakStatusBuilder status) { - if (existingIngress == null) { + if (!keycloak.getSpec().isDisableDefaultIngress() && existingIngress == null) { status.addNotReadyMessage("No existing Keycloak Ingress found, waiting for creating a new one"); return; } diff --git a/operator/app/src/test/java/org/keycloak/operator/IngressLogicTest.java b/operator/app/src/test/java/org/keycloak/operator/IngressLogicTest.java new file mode 100644 index 000000000000..a370488bed69 --- /dev/null +++ b/operator/app/src/test/java/org/keycloak/operator/IngressLogicTest.java @@ -0,0 +1,83 @@ +package org.keycloak.operator; + +import io.fabric8.kubernetes.api.model.networking.v1.Ingress; +import io.fabric8.kubernetes.api.model.networking.v1.IngressBuilder; +import org.junit.jupiter.api.Test; +import org.keycloak.operator.controllers.KeycloakIngress; +import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak; +import org.keycloak.operator.utils.K8sUtils; + +import static org.junit.jupiter.api.Assertions.*; + +public class IngressLogicTest { + + static class MockKeycloakIngress extends KeycloakIngress { + + private static Keycloak getKeycloak(boolean defaultIngressDisabled) { + var kc = K8sUtils.getDefaultKeycloakDeployment(); + kc.getSpec().setDisableDefaultIngress(defaultIngressDisabled); + return kc; + } + + public static MockKeycloakIngress build(boolean defaultIngressDisabled, boolean ingressExists) { + MockKeycloakIngress.ingressExists = ingressExists; + return new MockKeycloakIngress(defaultIngressDisabled); + } + + public static boolean ingressExists = false; + private boolean deleted = false; + public MockKeycloakIngress(boolean defaultIngressDisabled) { + super(null, getKeycloak(defaultIngressDisabled)); + } + + public boolean reconciled() { + return getReconciledResource().isPresent(); + } + + public boolean deleted() { + return deleted; + } + + @Override + protected Ingress fetchExistingIngress() { + if (ingressExists) { + return new IngressBuilder().withNewMetadata().endMetadata().build(); + } else { + return null; + } + } + + @Override + protected void deleteExistingIngress() { + deleted = true; + } + } + + @Test + public void testIngressEnabledExisting() { + var kc = MockKeycloakIngress.build(true, true); + assertFalse(kc.reconciled()); + assertTrue(kc.deleted()); + } + + @Test + public void testIngressEnabledNotExisting() { + var kc = MockKeycloakIngress.build(true, false); + assertFalse(kc.reconciled()); + assertFalse(kc.deleted()); + } + + @Test + public void testIngressDisabledExisting() { + var kc = MockKeycloakIngress.build(false, true); + assertTrue(kc.reconciled()); + assertFalse(kc.deleted()); + } + + @Test + public void testIngressDisabledNotExisting() { + var kc = MockKeycloakIngress.build(false, false); + assertTrue(kc.reconciled()); + assertFalse(kc.deleted()); + } +}