Stabilize tests

Author: LEDfan

.github/workflows/workflows.yaml

@@ -30,9 +30,9 @@ jobs:
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
       - name: Setup Minikube
-        uses: manusa/actions-setup-minikube@v2.13.1
+        uses: manusa/actions-setup-minikube@v2.14.0
         with:
-          minikube version: 'v1.33.0'
+          minikube version: 'v1.37.0'
           kubernetes version:  ${{ matrix.kubernetes }}
           github token: ${{ secrets.GITHUB_TOKEN }}
           container runtime: containerd

src/test/kotlin/eu/openanalytics/shinyproxyoperator/impl/kubernetes/MainIntegrationTest.kt

@@ -166,7 +166,7 @@ class MainIntegrationTest : IntegrationTestBase() {
             // 4. assert correctness
             spTestInstance.assertInstanceIsCorrect()
 
-            // wait for additionale reconcile to complete
+            // wait for additional reconcile to complete
             eventController.waitForNextReconcile(spTestInstance.hash)
 
             // 5. Delete Replicaset -> reconcile -> assert it is still ok
@@ -178,23 +178,17 @@ class MainIntegrationTest : IntegrationTestBase() {
                 }
             }
             logger.info { "ReplicaSet was deleted" }
-            eventController.waitForNextReconcile(spTestInstance.hash)
+            waitForNextReconcileAndReady(stableClient, sp, spTestInstance, eventController)
             logger.info { "Reconciled after deleting RS" }
 
-            withTimeout(10_000) {
-                while (stableClient.apps().replicaSets().withName(replicaSetName)?.get()?.status?.readyReplicas != 1) {
-                    delay(100)
-                }
-            }
-
             spTestInstance.assertInstanceIsCorrect()
 
             // 6. Delete ConfigMap -> reconcile -> assert it is still ok
             executeAsyncAfter100ms {
                 getAndDelete(stableClient.configMaps().withName("sp-${sp.name}-cm-${spTestInstance.hash}".take(63)))
                 logger.info { "Deleted ConfigMap" }
             }
-            eventController.waitForNextReconcile(spTestInstance.hash)
+            waitForNextReconcileAndReady(stableClient, sp, spTestInstance, eventController)
             logger.info { "Reconciled after deleting CM" }
             spTestInstance.assertInstanceIsCorrect()
 
@@ -203,7 +197,7 @@ class MainIntegrationTest : IntegrationTestBase() {
                 getAndDelete(stableClient.services().withName("sp-${sp.name}-svc".take(63)))
                 logger.info { "Deleted Service" }
             }
-            eventController.waitForNextReconcile(spTestInstance.hash)
+            waitForNextReconcileAndReady(stableClient, sp, spTestInstance, eventController)
             logger.info { "Reconciled after deleting SVC" }
             spTestInstance.assertInstanceIsCorrect()
 
@@ -212,7 +206,7 @@ class MainIntegrationTest : IntegrationTestBase() {
                 getAndDelete(stableClient.network().v1().ingresses().withName("sp-${sp.name}-ing".take(63)))
                 logger.info { "Deleted Ingress" }
             }
-            eventController.waitForNextReconcile(spTestInstance.hash)
+            waitForNextReconcileAndReady(stableClient, sp, spTestInstance, eventController)
             spTestInstance.assertInstanceIsCorrect()
             logger.info { "Reconciled after deleting Ingress" }
         }

src/test/kotlin/eu/openanalytics/shinyproxyoperator/impl/kubernetes/helpers/IntegrationTestBase.kt

@@ -234,4 +234,18 @@ abstract class IntegrationTestBase {
         resource.delete()
     }
 
+    protected suspend fun waitForNextReconcileAndReady(stableClient: NamespacedKubernetesClient, sp: ShinyProxy, spTestInstance: ShinyProxyTestInstance, eventController: AwaitableEvenController) {
+        eventController.waitForNextReconcile(spTestInstance.hash)
+        for (i in 0..2) {
+            val replicaSetName = "sp-${sp.name}-rs-0-${spTestInstance.hash}".take(63)
+            if (stableClient.apps().replicaSets().withName(replicaSetName)?.get()?.status?.readyReplicas == 1
+                && stableClient.configMaps().withName("sp-${sp.name}-cm-${spTestInstance.hash}".take(63)).get() != null
+                && stableClient.services().withName("sp-${sp.name}-svc".take(63)) != null
+                && stableClient.network().v1().ingresses().withName("sp-${sp.name}-ing".take(63)).get() != null) {
+                return
+            }
+            eventController.waitForNextReconcile(spTestInstance.hash)
+        }
+    }
+
 }