bump: k8s version

README.md

@@ -23,15 +23,15 @@ nix-build release.nix -A test-results --show-trace
 **Building single e2e test**
 
 ```
-nix-build release.nix -A tests.k8s-1_11.testsByName.k8s-crd.test
-nix-build release.nix -A tests.k8s-1_11.testsByName.<test-name>.test
+nix-build release.nix -A tests.k8s-1_21.testsByName.k8s-crd.test
+nix-build release.nix -A tests.k8s-1_21.testsByName.<test-name>.test
 ```
 
 **Debugging e2e test**
 
 ```
-nix-build release.nix -A tests.k8s-1_11.testsByName.k8s-crd.test.driver
-nix-build release.nix -A tests.k8s-1_11.testsByName.<test-name>.test.driver
+nix-build release.nix -A tests.k8s-1_21.testsByName.k8s-crd.test.driver
+nix-build release.nix -A tests.k8s-1_21.testsByName.<test-name>.test.driver
 resut/bin/nixos-test-driver
 testScript;
 ```

generators/k8s/default.nix

@@ -1,7 +1,7 @@
 { name ? "k8s"
 , pkgs ? import <nixpkgs> {}
 , lib ? pkgs.lib
-, spec ? ./specs/1.10/swagger.json
+, spec ? ./specs/1.21/swagger.json
 , ... }:
 
 with lib;

modules/k8s.nix

@@ -201,8 +201,8 @@ in {
   options.kubernetes = {
     version = mkOption {
       description = "Kubernetes version to use";
-      type = types.enum ["1.7" "1.8" "1.9" "1.10" "1.11" "1.12" "1.13" "1.14" "1.15" "1.16" "1.17" "1.18"];
-      default = "1.15";
+      type = types.enum ["1.19" "1.20" "1.21"];
+      default = "1.21";
     };
 
     namespace = mkOption {

release.nix

@@ -34,90 +34,26 @@ in
 rec {
   generate.k8s = pkgs.linkFarm "k8s-generated.nix" [
     {
-      name = "v1.8.nix";
-      path = generateK8S "v1.8" (builtins.fetchurl {
-        url = "https://github.com/kubernetes/kubernetes/raw/v1.8.15/api/openapi-spec/swagger.json";
-        sha256 = "112c64gq6ksskzqscgwj8l30mq80w2ha9skpz5ixgvjjz6amylh8";
+      name = "v1.19.nix";
+      path = generateK8S "v1.19" (builtins.fetchurl {
+        url = "https://github.com/kubernetes/kubernetes/raw/v1.19.10/api/openapi-spec/swagger.json";
+        sha256 = "sha256-ZXxonUAUxRK6rhTgK62ytTdDKCuOoWPwxJmktiKgcJc=";
       });
     }
 
     {
-      name = "v1.9.nix";
-      path = generateK8S "v1.9" (builtins.fetchurl {
-        url = "https://github.com/kubernetes/kubernetes/raw/v1.9.11/api/openapi-spec/swagger.json";
-        sha256 = "0x3ka044ii39ln0f8q2m3w9vwd4vf3bsmbwkc793bkw46w879vvq";
+      name = "v1.20.nix";
+      path = generateK8S "v1.20" (builtins.fetchurl {
+        url = "https://github.com/kubernetes/kubernetes/raw/v1.20.6/api/openapi-spec/swagger.json";
+        sha256 = "sha256-xzVOarQDSomHMimpt8H6MfpiQrLl9am2fDvk/GfLkDw=";
       });
     }
 
     {
-      name = "v1.10.nix";
-      path = generateK8S "v1.10" (builtins.fetchurl {
-        url = "https://github.com/kubernetes/kubernetes/raw/v1.10.13/api/openapi-spec/swagger.json";
-        sha256 = "133ldlrlh9yfgp39ij1qm9mwlb92igbnxf5flfm1ffifdsd5j3hy";
-      });
-    }
-
-    {
-      name = "v1.11.nix";
-      path = generateK8S "v1.11" (builtins.fetchurl {
-        url = "https://github.com/kubernetes/kubernetes/raw/v1.11.8/api/openapi-spec/swagger.json";
-        sha256 = "1c7wjvi5rh69lpm373jp3z1dqzyzgkk5csr8qxw0pqr26bhr7w6s";
-      });
-    }
-
-    {
-      name = "v1.12.nix";
-      path = generateK8S "v1.12" (builtins.fetchurl {
-        url = "https://github.com/kubernetes/kubernetes/raw/v1.12.6/api/openapi-spec/swagger.json";
-        sha256 = "1bmvmwd8jakh5q2rcf17y4fdn1pb4srvcm816m9q5kavz60wdbkx";
-      });
-    }
-
-    {
-      name = "v1.13.nix";
-      path = generateK8S "v1.13" (builtins.fetchurl {
-        url = "https://github.com/kubernetes/kubernetes/raw/v1.13.4/api/openapi-spec/swagger.json";
-        sha256 = "158izzjlq3qayhfg2ns5w6nwwn11gzxn1pyyxjz6rvvk526drs92";
-      });
-    }
-
-    {
-      name = "v1.14.nix";
-      path = generateK8S "v1.14" (builtins.fetchurl {
-        url = "https://github.com/kubernetes/kubernetes/raw/v1.14.10/api/openapi-spec/swagger.json";
-        sha256 = "017jf5pr559d3a6cacbz79c892fh50iz7f0zcg8iwsr5af10h8xr";
-      });
-    }
-
-    {
-      name = "v1.15.nix";
-      path = generateK8S "v1.15" (builtins.fetchurl {
-        url = "https://github.com/kubernetes/kubernetes/raw/v1.15.7/api/openapi-spec/swagger.json";
-        sha256 = "0lrya0i632xjdyr92q8hriifk6xr8cbv2qymfcrshrmx1a45h0kp";
-      });
-    }
-
-    {
-      name = "v1.16.nix";
-      path = generateK8S "v1.16" (builtins.fetchurl {
-        url = "https://github.com/kubernetes/kubernetes/raw/v1.16.8/api/openapi-spec/swagger.json";
-        sha256 = "06rh8phsdfvw0mg5nxnnpqfxfmgcka4rq64ardyzns0s2kv6x8l3";
-      });
-    }
-
-    {
-      name = "v1.17.nix";
-      path = generateK8S "v1.17" (builtins.fetchurl {
-        url = "https://github.com/kubernetes/kubernetes/raw/v1.17.4/api/openapi-spec/swagger.json";
-        sha256 = "1yljdpi172dzj0djc9s665r9kz423wd30d7gxvnf3rswg73ial8k";
-      });
-    }
-
-    {
-      name = "v1.18.nix";
-      path = generateK8S "v1.18" (builtins.fetchurl {
-        url = "https://github.com/kubernetes/kubernetes/raw/v1.18.0/api/openapi-spec/swagger.json";
-        sha256 = "0f3qdn8bfc25a0h8cbdh75mpz1dykbmgymn6qr0rjnisc124fsy1";
+      name = "v1.21.nix";
+      path = generateK8S "v1.21" (builtins.fetchurl {
+        url = "https://github.com/kubernetes/kubernetes/raw/v1.21.0/api/openapi-spec/swagger.json";
+        sha256 = "sha256-EoqYTbtaTlzs7vneoNtXUmdnjTM/U+1gYwCiEy0lOcw=";
       });
     }
   ];
@@ -128,14 +64,9 @@ rec {
   }];
 
   tests = {
-    k8s-1_11 = runK8STests "1.11";
-    k8s-1_12 = runK8STests "1.12";
-    k8s-1_13 = runK8STests "1.13";
-    k8s-1_14 = runK8STests "1.14";
-    k8s-1_15 = runK8STests "1.15";
-    k8s-1_16 = runK8STests "1.16";
-    k8s-1_17 = runK8STests "1.17";
-    k8s-1_18 = runK8STests "1.18";
+    k8s-1_19 = runK8STests "1.19";
+    k8s-1_20 = runK8STests "1.20";
+    k8s-1_21 = runK8STests "1.21";
   };
 
   test-results = pkgs.recurseIntoAttrs (mapAttrs

tests/default.nix

@@ -1,7 +1,7 @@
 { pkgs ? import <nixpkgs> {}
 , lib ? pkgs.lib
 , kubenix ? import ../. { inherit pkgs lib; }
-, k8sVersion ? "1.18"
+, k8sVersion ? "1.21"
 , nixosPath ? toString <nixpkgs/nixos>
 
 # whether any testing error should throw an error