fix: e2e tests (#331)

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

samples/commons/src/main/java/io/javaoperatorsdk/webhook/sample/commons/Utils.java

@@ -9,18 +9,25 @@
 import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.fabric8.kubernetes.api.model.Event;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.api.model.apiextensions.v1.*;
 import io.fabric8.kubernetes.api.model.networking.v1.*;
 import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientTimeoutException;
+import io.fabric8.kubernetes.client.utils.KubernetesSerialization;
 
 import static io.javaoperatorsdk.webhook.sample.commons.AdmissionControllers.VALIDATION_TARGET_LABEL;
 import static io.javaoperatorsdk.webhook.sample.commons.ConversionControllers.CONVERSION_PATH;
 
 public class Utils {
 
-  public static final int SPIN_UP_GRACE_PERIOD = 120;
+  private static final Logger log = LoggerFactory.getLogger(Utils.class);
 
+  public static final int SPIN_UP_GRACE_PERIOD = 180;
 
   public static void applyAndWait(KubernetesClient client, String path) {
     applyAndWait(client, path, null);
@@ -41,11 +48,25 @@ public static void applyAndWait(KubernetesClient client, InputStream is) {
 
   public static void applyAndWait(KubernetesClient client, List<HasMetadata> resources,
       UnaryOperator<HasMetadata> transformer) {
-    if (transformer != null) {
-      resources = resources.stream().map(transformer).collect(Collectors.toList());
+    try {
+      if (transformer != null) {
+        resources = resources.stream().map(transformer).collect(Collectors.toList());
+      }
+      client.resourceList(resources).createOrReplace();
+      client.resourceList(resources).waitUntilReady(5, TimeUnit.MINUTES);
+    } catch (KubernetesClientTimeoutException e) {
+      log.info("Timed out resource list: {}", client.resourceList(resources).get());
+      var deployment = client.resourceList(resources).get().stream()
+          .filter(r -> r.getKind().equals("Deployment")).findFirst().orElseThrow();
+      log.info("Deployment:\n {} \n",
+          new KubernetesSerialization().asYaml(deployment));
+
+      client.v1().events().inNamespace(deployment.getMetadata().getNamespace()).list().getItems()
+          .stream()
+          .map(Event::getMessage)
+          .forEach(ev -> log.info("Event: {}", new KubernetesSerialization().asYaml(ev)));
+      throw e;
     }
-    client.resourceList(resources).createOrReplace();
-    client.resourceList(resources).waitUntilReady(3, TimeUnit.MINUTES);
   }
 
   public static void applyAndWait(KubernetesClient client, InputStream is,

samples/spring-boot/k8s/kubernetes.yml

@@ -6,21 +6,21 @@ metadata:
     app.dekorate.io/vcs-url: <<unknown>>
   labels:
     app.kubernetes.io/name: spring-boot-sample
-    app.kubernetes.io/version: 1.1.7-SNAPSHOT
+    app.kubernetes.io/version: 0.1.0
   name: spring-boot-sample
 spec:
   replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: spring-boot-sample
-      app.kubernetes.io/version: 1.1.7-SNAPSHOT
+      app.kubernetes.io/version: 0.1.0
   template:
     metadata:
       annotations:
         app.dekorate.io/vcs-url: <<unknown>>
       labels:
         app.kubernetes.io/name: spring-boot-sample
-        app.kubernetes.io/version: 1.1.7-SNAPSHOT
+        app.kubernetes.io/version: 0.1.0
     spec:
       containers:
         - env:
@@ -35,7 +35,7 @@ spec:
                 secretKeyRef:
                   key: password
                   name: pkcs12-pass
-          image: test/spring-boot-sample:1.1.7-SNAPSHOT
+          image: test/spring-boot-sample:0.1.0
           imagePullPolicy: IfNotPresent
           name: spring-boot-sample
           ports:
@@ -67,7 +67,7 @@ metadata:
     app.dekorate.io/vcs-url: <<unknown>>
   labels:
     app.kubernetes.io/name: spring-boot-sample
-    app.kubernetes.io/version: 1.1.7-SNAPSHOT
+    app.kubernetes.io/version: 0.1.0
   name: spring-boot-sample
 spec:
   selfSigned: {}
@@ -79,7 +79,7 @@ metadata:
     app.dekorate.io/vcs-url: <<unknown>>
   labels:
     app.kubernetes.io/name: spring-boot-sample
-    app.kubernetes.io/version: 1.1.7-SNAPSHOT
+    app.kubernetes.io/version: 0.1.0
   name: spring-boot-sample
 spec:
   ports:
@@ -89,7 +89,7 @@ spec:
       targetPort: 443
   selector:
     app.kubernetes.io/name: spring-boot-sample
-    app.kubernetes.io/version: 1.1.7-SNAPSHOT
+    app.kubernetes.io/version: 0.1.0
   type: ClusterIP
 ---
 apiVersion: cert-manager.io/v1
@@ -99,7 +99,7 @@ metadata:
     app.dekorate.io/vcs-url: <<unknown>>
   labels:
     app.kubernetes.io/name: spring-boot-sample
-    app.kubernetes.io/version: 1.1.7-SNAPSHOT
+    app.kubernetes.io/version: 0.1.0
   name: spring-boot-sample
 spec:
   dnsNames:

samples/spring-boot/pom.xml

@@ -72,6 +72,11 @@
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
     <dependency>
       <groupId>io.javaoperatorsdk.admissioncontroller.sample</groupId>
       <artifactId>sample-commons</artifactId>
@@ -92,7 +97,7 @@
             <image>eclipse-temurin:17-jre</image>
           </from>
           <to>
-            <image>test/spring-boot-sample:${project.version}</image>
+            <image>test/spring-boot-sample:0.1.0</image>
           </to>
         </configuration>
       </plugin>