ACC-2065 Added null checks to make sure we drop out when a deployment/statfulset/replicaset does not exist yet, also fixes #23

Author: thijslemmens

contentgrid-junit-jupiter-k8s/src/main/java/com/contentgrid/junit/jupiter/k8s/K8sTestUtils.java

@@ -51,9 +51,14 @@ public static void waitUntilDeploymentsReady(int timeout, List<String> deploymen
                 .atMost(timeout, SECONDS)
                 .until(() -> deployments.stream()
                                 .map(name -> client.withName(name).get())
-                                .filter(deployment -> deployment.getStatus().getReplicas() -
-                                        Objects.requireNonNullElse(deployment.getStatus().getReadyReplicas(), 0)
-                                        > 0)
+                                .filter(deployment -> {
+                                    if (deployment == null || deployment.getStatus() == null || deployment.getStatus().getReplicas() == null) {
+                                        return true;
+                                    }
+                                    return deployment.getStatus().getReplicas() -
+                                            Objects.requireNonNullElse(deployment.getStatus().getReadyReplicas(), 0)
+                                            > 0;
+                                })
                                 .collect(Collectors.toSet()),
                         Matchers.empty()
                 );
@@ -82,9 +87,14 @@ public static void waitUntilReplicaSetsReady(int timeout, List<String> replicaSe
                 .atMost(timeout, SECONDS)
                 .until(() -> replicaSets.stream()
                                 .map(name -> client.withName(name).get())
-                                .filter(replicaset -> replicaset.getStatus().getReplicas() -
-                                        Objects.requireNonNullElse(replicaset.getStatus().getReadyReplicas(), 0)
-                                        > 0)
+                                .filter(replicaset -> {
+                                    if (replicaset == null || replicaset.getStatus() == null || replicaset.getStatus().getReplicas() == null) {
+                                        return true;
+                                    }
+                                    return replicaset.getStatus().getReplicas() -
+                                            Objects.requireNonNullElse(replicaset.getStatus().getReadyReplicas(), 0)
+                                            > 0;
+                                })
                                 .collect(Collectors.toSet()),
                         Matchers.empty()
                 );
@@ -105,9 +115,14 @@ public static void waitUntilStatefulSetsReady(int timeout, List<String> stateful
                 .atMost(timeout, SECONDS)
                 .until(() -> statefulSets.stream()
                                 .map(name -> client.withName(name).get())
-                                .filter(statefulSet -> statefulSet.getStatus().getReplicas() -
-                                        Objects.requireNonNullElse(statefulSet.getStatus().getReadyReplicas(), 0)
-                                        > 0)
+                                .filter(statefulSet -> {
+                                    if (statefulSet == null || statefulSet.getStatus() == null || statefulSet.getStatus().getReplicas() == null) {
+                                        return true;
+                                    }
+                                    return statefulSet.getStatus().getReplicas() -
+                                            Objects.requireNonNullElse(statefulSet.getStatus().getReadyReplicas(), 0)
+                                            > 0;
+                                })
                                 .collect(Collectors.toSet()),
                         Matchers.empty()
                 );

contentgrid-junit-jupiter-k8s/src/test/java/com/contentgrid/junit/jupiter/k8s/K8sTestUtilsTest.java

@@ -99,7 +99,7 @@ void testWaitUntilDeploymentsReady() {
         kubernetesClient.apps().deployments().resource(deployment).create();
 
         // Wait until the Deployment is ready
-        K8sTestUtils.waitUntilDeploymentsReady(60, List.of("nginx-deployment"), kubernetesClient);
+        K8sTestUtils.waitUntilDeploymentsReady(60, List.of("nginx-deployment", "bla"), kubernetesClient);
         assertEquals(2, kubernetesClient.apps().deployments().withName("nginx-deployment").get().getStatus().getReadyReplicas());
         System.out.println("Deployment is ready");
     }