From 90de01f7d94a51f68e2645e1e17885d50f2a036f Mon Sep 17 00:00:00 2001 From: Bryton Hall Date: Thu, 11 Aug 2022 23:18:44 -0400 Subject: [PATCH] add new k8s version check --- CONTRIBUTING.md | 2 ++ flake.nix | 1 + modules/k8s.nix | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 81348e7..bfa68a8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,6 +19,8 @@ Then build and copy all specs to [`modules/generated/`](./modules/generated/): nix build '.#jobs.x86_64-linux.generators.k8s' cp ./result/* modules/generated/ +Now add the version in [`./modules/k8s.nix`](./modules/k8s.nix) under `options.kubernetes.version.type` as well as a new check in [`./flake.nix`](./flake.nix) (e.g., `tests-k8s-1_23`). + ## Tests Tests are executed through GitHub actions; see the [workflow definition](../kubenix/.github/workflows/ci.yml) for commands. diff --git a/flake.nix b/flake.nix index cb6a8db..0ecf8a8 100644 --- a/flake.nix +++ b/flake.nix @@ -95,6 +95,7 @@ tests-k8s-1_20 = wasSuccess (mkK8STests {k8sVersion = "1.20";}); tests-k8s-1_21 = wasSuccess (mkK8STests {k8sVersion = "1.21";}); tests-k8s-1_23 = wasSuccess (mkK8STests {k8sVersion = "1.23";}); + tests-k8s-1_24 = wasSuccess (mkK8STests {k8sVersion = "1.24";}); }; } )) diff --git a/modules/k8s.nix b/modules/k8s.nix index c456a88..bc4e01f 100644 --- a/modules/k8s.nix +++ b/modules/k8s.nix @@ -272,8 +272,8 @@ in { options.kubernetes = { version = mkOption { description = "Kubernetes version to use"; - type = types.enum ["1.19" "1.20" "1.21" "1.23"]; - default = "1.23"; + type = types.enum ["1.19" "1.20" "1.21" "1.23" "1.24"]; + default = "1.24"; }; namespace = mkOption {