From 9dbc07e1d257a5a6ccbebc7711e74b9480c9900f Mon Sep 17 00:00:00 2001 From: Steven Hawkins Date: Tue, 6 Jan 2026 11:01:56 -0500 Subject: [PATCH] fix: correcting termination test on openshift (#44181) (#44297) closes: #44179 (cherry picked from commit f96765c4b49fd6a6ae392054def7ccd61e59d6fa) Signed-off-by: Steve Hawkins --- .../operator/testsuite/integration/BaseOperatorTest.java | 2 +- .../testsuite/integration/KeycloakIngressTest.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/BaseOperatorTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/BaseOperatorTest.java index 78fa8dc9c9b..068c5c2e4fa 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/BaseOperatorTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/BaseOperatorTest.java @@ -346,7 +346,7 @@ public enum OperatorDeployment {local_apiserver,local,remote} // to just a timed foreground deletion var roots = List.of(Keycloak.class, KeycloakRealmImport.class); roots.forEach(c -> k8sclient.resources(c).delete()); - // enforce that at least the statefulset / pods are gone + // enforce that at least the statefulset are gone try { k8sclient .apps() diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakIngressTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakIngressTest.java index 76822bfbeac..5ede0f4ee25 100644 --- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakIngressTest.java +++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakIngressTest.java @@ -116,14 +116,17 @@ public class KeycloakIngressTest extends BaseOperatorTest { var hostnameSpecBuilder = new HostnameSpecBuilder() .withStrict(false) .withStrictBackchannel(false); + IngressSpec ingressSpec = new IngressSpec(); + ingressSpec.setIngressEnabled(true); + kc.getSpec().setIngressSpec(ingressSpec); if (isOpenShift) { - kc.getSpec().setIngressSpec(new IngressSpecBuilder().withIngressClassName(KeycloakController.OPENSHIFT_DEFAULT).build()); + ingressSpec.setIngressClassName(KeycloakController.OPENSHIFT_DEFAULT); } kc.getSpec().setHostnameSpec(hostnameSpecBuilder.build()); String secret = kc.getSpec().getHttpSpec().getTlsSecret(); kc.getSpec().getHttpSpec().setHttpEnabled(true); kc.getSpec().getHttpSpec().setTlsSecret(null); - kc.getSpec().setIngressSpec(new IngressSpecBuilder().withTlsSecret(secret).build()); + ingressSpec.setTlsSecret(secret); K8sUtils.deployKeycloak(k8sclient, kc, true);