Improve github workflows

Author: LEDfan

.github/workflows/workflows.yaml

@@ -9,7 +9,11 @@ jobs:
       fail-fast: false
       matrix:
         java: [ 11 ]
-        kubernetes: [ 'v1.21.6', 'v1.20.12', 'v1.19.16', 'v1.18.20', 'v1.17.17', 'v1.16.15']
+        kubernetes:
+          - 'v1.22.17'
+          - 'v1.23.15'
+          - 'v1.24.9'
+          - 'v1.25.5'
 
     steps:
       - uses: actions/checkout@v2
@@ -24,10 +28,16 @@ jobs:
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
       - name: Setup Minikube
-        uses: manusa/actions-setup-minikube@v2.4.2
+        uses: manusa/actions-setup-minikube@v2.7.2
         with:
-          minikube version: 'v1.16.0'
+          minikube version: 'v1.28.0'
           kubernetes version:  ${{ matrix.kubernetes }}
+          github token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Pull images
+        run: |
+          minikube image pull ledfan/shinyproxy:3.0.0-SNAPSHOT-20230116.114943
+          minikube image pull openanalytics/shinyproxy-demo
+          minikube image pull curlimages/curl:latest
       - name: Build with Maven
         run: mvn -B -U clean install -DskipTests
       - name: Run Tests

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

@@ -38,6 +38,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
+import java.util.concurrent.RejectedExecutionException
 
 
 abstract class IntegrationTestBase {
@@ -60,7 +61,7 @@ abstract class IntegrationTestBase {
             Runtime.getRuntime().addShutdownHook(Thread {
                 runBlocking {
                     deleteNamespaces()
-                    deleteCRD(stableClient)
+                    deleteCRD()
                 }
             })
 
@@ -126,20 +127,24 @@ abstract class IntegrationTestBase {
     }
 
     private suspend fun deleteNamespaces() {
-        for (managedNamespace in managedNamespaces) {
-            val ns = stableClient.namespaces().withName(managedNamespace).get() ?: continue
-            try {
-                stableClient.namespaces().delete(ns)
-            } catch (e: KubernetesClientException) {
-                // this namespace is probably all being deleted
-            }
-            while (stableClient.namespaces().withName(managedNamespace).get() != null) {
+        do {
+            for (managedNamespace in managedNamespaces) {
+                val ns = stableClient.namespaces().withName(managedNamespace).get() ?: continue
+                try {
+                    stableClient.namespaces().resource(ns).delete()
+                } catch (_: KubernetesClientException) {
+                    // this namespace is probably all being deleted
+                } catch (_: RejectedExecutionException) {
+                    // ignore error as long as ns get deleted
+                } catch (_: InterruptedException) {
+                    // ignore error as long as ns get deleted
+                }
                 delay(1000)
             }
-        }
+        } while (managedNamespaces.any { stableClient.namespaces().withName(it).get() != null })
     }
 
-    private suspend fun deleteCRD(client: DefaultKubernetesClient) {
+    private suspend fun deleteCRD() {
         val crd = stableClient.apiextensions().v1().customResourceDefinitions().load(this.javaClass.getResource("/crd.yaml")).get()
         stableClient.apiextensions().v1().customResourceDefinitions().delete(crd)
         delay(2000)