From 495669e7a411e206a95028fe5a4035095a658587 Mon Sep 17 00:00:00 2001
From: Steven Hawkins <shawkins@redhat.com>
Date: Thu, 16 Nov 2023 09:39:40 -0500
Subject: [PATCH] fix: removing the hard expectation of setting the restart
 condition (#24796)

closes #24797

Signed-off-by: Steve Hawkins <shawkins@redhat.com>
---
 .../integration/WatchedSecretsTest.java       | 44 -------------------
 1 file changed, 44 deletions(-)

diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/WatchedSecretsTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/WatchedSecretsTest.java
index 46d4505471..2590d75c42 100644
--- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/WatchedSecretsTest.java
+++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/WatchedSecretsTest.java
@@ -29,7 +29,6 @@ import org.junit.jupiter.api.Test;
 import org.keycloak.operator.Constants;
 import org.keycloak.operator.controllers.WatchedSecrets;
 import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak;
-import org.keycloak.operator.crds.v2alpha1.deployment.KeycloakStatusCondition;
 import org.keycloak.operator.crds.v2alpha1.deployment.ValueOrSecret;
 import org.keycloak.operator.crds.v2alpha1.deployment.spec.HostnameSpecBuilder;
 
@@ -37,16 +36,11 @@ import java.util.Base64;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentSkipListSet;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
-import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.keycloak.operator.testsuite.utils.CRAssert.assertKeycloakStatusCondition;
 import static org.keycloak.operator.testsuite.utils.K8sUtils.deployKeycloak;
 
 /**
@@ -172,38 +166,10 @@ public class WatchedSecretsTest extends BaseOperatorTest {
         var toBeRestarted = crsToBeRestarted.stream().collect(Collectors.toMap(Function.identity(), k -> getStatefulSet(k).getStatus().getUpdateRevision()));
         var notToBeRestarted = crsNotToBeRestarted.stream().collect(Collectors.toMap(Function.identity(), k -> getStatefulSet(k).getStatus().getUpdateRevision()));
 
-        CompletableFuture<?> restartsCompleted = null;
-        ConcurrentSkipListSet<String> names = new ConcurrentSkipListSet<>(crsToBeRestarted.stream().map(k -> k.getMetadata().getName()).collect(Collectors.toSet()));
-        if (restartExpected) {
-            restartsCompleted = k8sclient.resources(Keycloak.class).informOnCondition(keycloaks -> {
-                for (Keycloak kc : keycloaks) {
-                    if (!names.contains(kc.getMetadata().getName())) {
-                        continue;
-                    }
-                    try {
-                        assertKeycloakStatusCondition(kc.getStatus(), KeycloakStatusCondition.ROLLING_UPDATE, true, null, null);
-                        names.remove(kc.getMetadata().getName());
-                    } catch (Throwable e) {
-                        // not rolling
-                    }
-                }
-                return names.isEmpty();
-            });
-        }
-
         action.run();
 
-        if (restartsCompleted != null) {
-            try {
-                restartsCompleted.get(5, TimeUnit.MINUTES);
-            } catch (InterruptedException | ExecutionException | TimeoutException e) {
-                throw new RuntimeException(names + " did not restart before an exception occurred", e);
-            }
-        }
-
         Set<Keycloak> allCrs = new HashSet<>(crsToBeRestarted);
         allCrs.addAll(crsNotToBeRestarted);
-        assertRollingUpdate(allCrs, false);
 
         if (restartExpected) {
             Awaitility.await()
@@ -230,16 +196,6 @@ public class WatchedSecretsTest extends BaseOperatorTest {
         }
     }
 
-    private void assertRollingUpdate(Set<Keycloak> crs, boolean expectedStatus) {
-        Awaitility.await()
-                .untilAsserted(() -> {
-                    for (var cr : crs) {
-                        Keycloak kc = k8sclient.resource(cr).get();
-                        assertKeycloakStatusCondition(kc, KeycloakStatusCondition.ROLLING_UPDATE, expectedStatus);
-                    }
-                });
-    }
-
     private Secret getDbSecret() {
 		return new SecretBuilder(k8sclient.secrets().inNamespace(namespace).withName("keycloak-db-secret").get())
 				.editMetadata().withResourceVersion(null).endMetadata().build();