Add support for k8s 1.32 (#358)

* Add support for k8s 1.32 to `K3sContainer` (#353)

* Add support for k8s 1.32 to `K3sContainer`

* Fix negative cert serials for test CA

* Add support for k8s 1.32 to `ApiServerContainer` (#343)

* Add support for k8s 1.32 to `KindContainer` (#337)

* Add support for k8s 1.32 to `KindContainer`

* Build on all pull requests

.github/workflows/build.yaml

@@ -4,7 +4,6 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ master ]
 
 jobs:
   matrix:

k8s-versions.json

@@ -47,6 +47,9 @@
       },
       {
         "k8s": "1.31.0"
+      },
+      {
+        "k8s": "1.32.0"
       }
     ]
   },
@@ -92,6 +95,9 @@
       },
       {
         "k8s": "1.31.0"
+      },
+      {
+        "k8s": "1.32.0"
       }
     ]
   },
@@ -140,6 +146,9 @@
       },
       {
         "k8s": "1.31.0"
+      },
+      {
+        "k8s": "1.32.0"
       }
     ]
   }

src/main/java/com/dajudge/kindcontainer/pki/CertAuthority.java

@@ -147,7 +147,7 @@ public static X509Certificate sign(
 
             final X509v3CertificateBuilder certGenerator = new X509v3CertificateBuilder(
                     new X500Name(issuerDn),
-                    BigInteger.valueOf(SECURE_RANDOM.nextInt()),
+                    BigInteger.valueOf(Math.abs(SECURE_RANDOM.nextInt())),
                     notBefore,
                     notAfter,
                     new X500Name(ownerDn),

src/test/java/com/dajudge/kindcontainer/webhook/WebhookTest.java

@@ -24,8 +24,7 @@
 import static io.fabric8.kubernetes.client.Config.fromKubeconfig;
 import static java.time.Duration.ofSeconds;
 import static java.util.Collections.emptyMap;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
 
 public class WebhookTest {
@@ -63,19 +62,19 @@ private static void assertObeysObjectSelector(NamespacedKubernetesClient client)
     }
 
     private static void awaitWebhooks(NamespacedKubernetesClient client) {
-        await().ignoreExceptions()
-                .timeout(ofSeconds(30))
+        await().timeout(ofSeconds(30))
                 .untilAsserted(() -> assertValidates(client.inNamespace("default")));
-        await().ignoreExceptions()
-                .timeout(ofSeconds(30))
+        await().timeout(ofSeconds(30))
                 .untilAsserted(() -> assertMutates(client.inNamespace("default")));
     }
 
     private static void assertValidates(NamespacedKubernetesClient client) {
         try {
             client.configMaps().create(buildConfigMap(false, true));
+            fail("ConfigMap should not have been accepted");
         } catch (final KubernetesClientException e) {
-            if (e.getCode() == 400) {
+            if (e.getStatus().getCode() == 400) {
+                // This is what we expect: the validating webhook failed our request
                 return;
             }
             throw e;