fix: correcting termination test on openshift (#44181)

shawkins · web-flow · commit f96765c4b49f · 2025-11-14T13:25:02.000+01:00
closes: #44179 Signed-off-by: Steve Hawkins <shawkins@redhat.com>
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
@@ -344,7 +344,7 @@ public void cleanup() {
 
       // first graceful scaledown
       k8sclient.resources(Keycloak.class).list().getItems().forEach(
-              k -> k8sclient.resource(new KeycloakBuilder(k).editSpec().withInstances(0).endSpec().build()).update());
+              k -> k8sclient.resource(new KeycloakBuilder(k).editSpec().withInstances(0).endSpec().build()).unlock().patch());
 
       try {
           k8sclient.resources(Keycloak.class).informOnCondition(
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
@@ -116,14 +116,17 @@ public void testIngressTLSTermination() {
         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);
 
