[Upgrade Fabric8 Kubernetes Client to 6.8.1] - Update Keycloak RealMi…

…mport Operator CRDs, bumping the supported version to 22.0.1
Intersmash · Aug 31, 2023 · a7cae1a · a7cae1a
1 parent 8d586af
commit a7cae1a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/tools/intersmash-tools-provisioners/pom.xml b/tools/intersmash-tools-provisioners/pom.xml
@@ -203,8 +203,8 @@
                         <url>https://raw.githubusercontent.com/artemiscloud/activemq-artemis-operator/${version.intersmash.activemq.operators}/bundle/manifests/broker.amq.io_activemqartemisaddresses.yaml</url>
                         <url>https://raw.githubusercontent.com/artemiscloud/activemq-artemis-operator/${version.intersmash.activemq.operators}/bundle/manifests/broker.amq.io_activemqartemisscaledowns.yaml</url>
                         <!-- Keycloak Operator -->
-                        <url>https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/21.1.1/kubernetes/keycloaks.k8s.keycloak.org-v1.yml</url>
-                        <url>https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/21.1.1/kubernetes/keycloakrealmimports.k8s.keycloak.org-v1.yml</url>
+                        <url>https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/22.0.1/kubernetes/keycloaks.k8s.keycloak.org-v1.yml</url>
+                        <url>https://raw.githubusercontent.com/keycloak/keycloak-k8s-resources/22.0.1/kubernetes/keycloakrealmimports.k8s.keycloak.org-v1.yml</url>
                     </urls>
                 </configuration>
             </plugin>

diff --git a/...rg/jboss/intersmash/tools/provision/openshift/KeycloakRealmImportOperatorProvisioner.java b/...rg/jboss/intersmash/tools/provision/openshift/KeycloakRealmImportOperatorProvisioner.java
@@ -218,13 +218,13 @@ public void waitFor(KeycloakRealmImport realmImport) {
 					&& Objects.nonNull(res.get().getStatus())) {
 				KeycloakRealmImport imp = res.get();
 				return imp.getStatus().getConditions().stream().filter(
-						cond -> cond.getStatus()
+						cond -> cond.getStatus() != null
 								&& "Done".equalsIgnoreCase(cond.getType())
 								&& com.google.common.base.Strings.isNullOrEmpty(cond.getMessage()))
 						.count() == 1
 						&&
 						imp.getStatus().getConditions().stream().filter(
-								cond -> !cond.getStatus()
+								cond -> cond.getStatus() == null
 										&& "HasErrors".equalsIgnoreCase(cond.getType())
 										&& com.google.common.base.Strings.isNullOrEmpty(cond.getMessage()))
 								.count() == 1;
@@ -237,13 +237,13 @@ private void waitForKeycloakResourceReadiness() {
 		new SimpleWaiter(
 				() -> keycloak().get().getStatus().getConditions().stream().anyMatch(
 						condition -> "Ready".equalsIgnoreCase(condition.getType())
-								&& condition.getStatus()))
+								&& condition.getStatus() != null))
 				.reason("Wait for Keycloak resource to be ready").level(Level.DEBUG).waitFor();
 		if (getApplication().getKeycloakRealmImports().size() > 0)
 			new SimpleWaiter(() -> keycloakRealmImports().stream().allMatch(
 					realmImport -> realmImport.getStatus().getConditions().stream().anyMatch(
 							condition -> "Done".equalsIgnoreCase(condition.getType())
-									&& condition.getStatus())))
+									&& condition.getStatus() != null)))
 					.reason("Wait for KeycloakRealmImports to be done.").level(Level.DEBUG).waitFor();
 	}
 
@@ -320,7 +320,7 @@ public void scale(int replicas, boolean wait) {
 		new SimpleWaiter(
 				() -> keycloak().get().getStatus().getConditions().stream().anyMatch(
 						condition -> "Ready".equalsIgnoreCase(condition.getType())
-								&& condition.getStatus()))
+								&& condition.getStatus() != null))
 				.reason("Wait for Keycloak resource to be ready").level(Level.DEBUG).waitFor();
 		// check that route is up
 		if (originalReplicas == 0 && replicas > 0) {