mirror/keycloak
1
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2025-12-21 06:20:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: correcting termination test on openshift (#44181)

Browse Source 
closes: #44179

Signed-off-by: Steve Hawkins <shawkins@redhat.com>
This commit is contained in:
Steven Hawkins
2025-11-14 07:25:02 -05:00
committed by GitHub
parent f67aea9a00
commit f96765c4b4
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
operator/src/test/java/org/keycloak/operator/testsuite/integration/BaseOperatorTest.java
View File

@@ -344,7 +344,7 @@ public enum OperatorDeployment {local_apiserver,local,remote}
// 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(

7
operator/src/test/java/org/keycloak/operator/testsuite/integration/KeycloakIngressTest.java
View File

@@ -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);