diff --git a/k8s-versions.json b/k8s-versions.json index b650c1d..767c3ef 100644 --- a/k8s-versions.json +++ b/k8s-versions.json @@ -92,6 +92,9 @@ }, { "k8s": "1.31.0" + }, + { + "k8s": "1.32.0" } ] }, diff --git a/src/main/java/com/dajudge/kindcontainer/pki/CertAuthority.java b/src/main/java/com/dajudge/kindcontainer/pki/CertAuthority.java index 7755307..e19377a 100644 --- a/src/main/java/com/dajudge/kindcontainer/pki/CertAuthority.java +++ b/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), diff --git a/src/test/java/com/dajudge/kindcontainer/webhook/WebhookTest.java b/src/test/java/com/dajudge/kindcontainer/webhook/WebhookTest.java index cfe9a5c..6958c08 100644 --- a/src/test/java/com/dajudge/kindcontainer/webhook/WebhookTest.java +++ b/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;