add missing kube version, move jobs to packages

This commit is contained in:
Bryton Hall 2022-08-15 00:29:27 -04:00
parent 85649dd3fd
commit 2891ede6d4
6 changed files with 21323 additions and 21 deletions

View file

@ -33,7 +33,7 @@ To support a new Kubernetes version:
- Build and copy the updated specs to [`modules/generated/`](./modules/generated/) - Build and copy the updated specs to [`modules/generated/`](./modules/generated/)
nix build '.#jobs.x86_64-linux.generators.k8s' nix build '.#generators.k8s'
cp ./result/* modules/generated/ cp ./result/* modules/generated/
## Tests ## Tests

View file

@ -1,10 +1,14 @@
(import
( (
let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in import
(
let
lock = builtins.fromJSON (builtins.readFile ./flake.lock);
in
fetchTarball { fetchTarball {
url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz"; url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
sha256 = lock.nodes.flake-compat.locked.narHash; sha256 = lock.nodes.flake-compat.locked.narHash;
} }
) )
{src = ./.;} {src = ./.;}
).defaultNix )
.defaultNix

8
flake.lock generated
View file

@ -33,16 +33,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1660396586, "lastModified": 1660494700,
"narHash": "sha256-ePuWn7z/J5p2lO7YokOG1o01M0pDDVL3VrStaPpS5Ig=", "narHash": "sha256-OU9ceb6JvwqUVqFYvYOtpNDwJpHgC3z/dy6GRoaiGgM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e105167e98817ba9fe079c6c3c544c6ef188e276", "rev": "bc4b4a50c7a105c56f1b712a87818678298deef3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View file

@ -68,8 +68,6 @@
in { in {
inherit evalModules pkgs; inherit evalModules pkgs;
jobs = import ./jobs {inherit pkgs;};
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
# formatters # formatters
@ -109,7 +107,8 @@
// { // {
cli = pkgs.callPackage ./pkgs/kubenix.nix {}; cli = pkgs.callPackage ./pkgs/kubenix.nix {};
default = self.packages.${system}.cli; default = self.packages.${system}.cli;
}; }
// import ./jobs {inherit pkgs;};
checks = let checks = let
wasSuccess = suite: wasSuccess = suite:

21298
modules/generated/v1.22.nix Normal file

File diff suppressed because it is too large Load diff

View file

@ -1,10 +1,11 @@
let let
full = { full = {
"1.19.10" = "sha256-ZXxonUAUxRK6rhTgK62ytTdDKCuOoWPwxJmktiKgcJc="; "1.19.16" = "sha256-ZXxonUAUxRK6rhTgK62ytTdDKCuOoWPwxJmktiKgcJc="; # final
"1.20.6" = "sha256-xzVOarQDSomHMimpt8H6MfpiQrLl9am2fDvk/GfLkDw="; "1.20.15" = "sha256-xzVOarQDSomHMimpt8H6MfpiQrLl9am2fDvk/GfLkDw="; # final
"1.21.0" = "sha256-EoqYTbtaTlzs7vneoNtXUmdnjTM/U+1gYwCiEy0lOcw="; "1.21.14" = "sha256-EoqYTbtaTlzs7vneoNtXUmdnjTM/U+1gYwCiEy0lOcw="; # final
"1.23.0" = "sha256:0jivg8nlxka1y7gzqpcxkmbvhcbxynyrxmjn0blky30q5064wx2a"; "1.22.12" = "sha256-EoqYTbtaTlzs7vneoNtXUmdnjTM/U+1gYwCiEy0lOcw=";
"1.24.0" = "sha256:0fp5hbqk2q0imrfi4mwp1ia0bmn0xnl6hcr07y52q2cp41pmfhqd"; "1.23.9" = "sha256:0jivg8nlxka1y7gzqpcxkmbvhcbxynyrxmjn0blky30q5064wx2a";
"1.24.3" = "sha256:0fp5hbqk2q0imrfi4mwp1ia0bmn0xnl6hcr07y52q2cp41pmfhqd";
}; };
in { in {
inherit full; inherit full;