v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Actions Packages Projects Releases Activity

disable k3s until: https://github.com/k3s-io/k3s/pull/5882 is in a release

Browse source
This commit is contained in:
Vivian 2022-08-20 10:32:30 +02:00
parent fc28592bde
commit 355bffe6d6
2 changed files with 61 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
flake.lock
View file

@ -3,6 +3,7 @@
"colmena": { "colmena": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -10,11 +11,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1659157989, "lastModified": 1660720183,
"narHash": "sha256-XHyjblfOAhoHwIDfPxYqAbvYzCO0/XjntULV6Dmavo8=", "narHash": "sha256-ijhji1zWZgrdhiMG2GhsGpom/wXSr7tfowj9cKmEmew=",
"owner": "zhaofengli", "owner": "zhaofengli",
"repo": "colmena", "repo": "colmena",
"rev": "34bb2e46747e69c9a34f94583330ad9a9f5ad20a", "rev": "797297b609457a1a85e18fb00b609df9d9436916",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -105,6 +106,21 @@
} }
}, },
"flake-utils": { "flake-utils": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"locked": { "locked": {
"lastModified": 1644229661, "lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
@ -119,7 +135,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": { "flake-utils_3": {
"locked": { "locked": {
"lastModified": 1631561581, "lastModified": 1631561581,
"narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=",
@ -133,7 +149,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"flake-utils_3": { "flake-utils_4": {
"locked": { "locked": {
"lastModified": 1631561581, "lastModified": 1631561581,
"narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=",
@ -203,11 +219,11 @@
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1659232680, "lastModified": 1660631203,
"narHash": "sha256-arnkjPUVeZsNVNrlg/pWcQzkGZVpG9INcE7Cp6GieOY=", "narHash": "sha256-F4jZRBJHwynDYoSQ6Dbzgi5sYaoZZ8jKgwle0N3oB4E=",
"owner": "jyooru", "owner": "jyooru",
"repo": "nix-minecraft-servers", "repo": "nix-minecraft-servers",
"rev": "190b7aaf522ca7aa217cac94f59b4357268ebe5b", "rev": "0858887b08d32e61e88b4bc75675f6362bc5d771",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -234,6 +250,29 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nix-eval-jobs": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"colmena",
"nixpkgs"
]
},
"locked": {
"lastModified": 1660713017,
"narHash": "sha256-w6KLNkT/2fI7UvPg3NoKj7gve4CgUHpyWOFq0BUwW7o=",
"owner": "zhaofengli",
"repo": "nix-eval-jobs",
"rev": "b4c078a4870c5b1a5b74420ca1dca41f4d75b7cc",
"type": "github"
},
"original": {
"owner": "zhaofengli",
"ref": "colmena",
"repo": "nix-eval-jobs",
"type": "github"
}
},
"nix_2": { "nix_2": {
"inputs": { "inputs": {
"lowdown-src": "lowdown-src_2", "lowdown-src": "lowdown-src_2",
@ -254,11 +293,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1659242643, "lastModified": 1660639432,
"narHash": "sha256-Xq81/wdhzOBEO0cjMRWfI3XG/E3dlYEvYpXpZhTUTwY=", "narHash": "sha256-2WDiboOCfB0LhvnDVMXOAr8ZLDfm3WdO54CkoDPwN1A=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b2544f1301520be456fc33d296e6c9a5f6126391", "rev": "6c6409e965a6c883677be7b9d87a95fab6c3472e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -327,7 +366,7 @@
"inputs": { "inputs": {
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"gitignore-nix": "gitignore-nix", "gitignore-nix": "gitignore-nix",
"nix": "nix", "nix": "nix",
"nixpkgs": [ "nixpkgs": [
@ -350,11 +389,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1656433693, "lastModified": 1660496378,
"narHash": "sha256-m29hSYsu2U+tnBo5v1/2RGo3lYY6KKb52MHV/89NeCs=", "narHash": "sha256-sgAhmrC1iSnl5T2VPPiMpciH1aRw5c7PYEdXX6jd6Gk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "babb041b7167008af3faca4c78f9dd8c6e83ef3a", "rev": "879121648fe522b38cc1cf75aef160a14a1f2e7b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -366,11 +405,11 @@
}, },
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1653893745, "lastModified": 1659877975,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -381,7 +420,7 @@
}, },
"utils_2": { "utils_2": {
"inputs": { "inputs": {
"flake-utils": "flake-utils" "flake-utils": "flake-utils_2"
}, },
"locked": { "locked": {
"lastModified": 1657226504, "lastModified": 1657226504,
@ -415,7 +454,7 @@
"vault-secrets": { "vault-secrets": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_4",
"nix": "nix_2", "nix": "nix_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"

3
nixos/hosts/olympus/k3s/configuration.nix
View file

@ -33,10 +33,11 @@
# Ensure `mount` and `grep` are available # Ensure `mount` and `grep` are available
systemd.services.k3s.path = [ pkgs.gnugrep pkgs.utillinux ]; systemd.services.k3s.path = [ pkgs.gnugrep pkgs.utillinux ];
systemd.services.k3s.serviceConfig.TimeoutStartSec = 3000;
# Enable k3s as a master node # Enable k3s as a master node
services.k3s = { services.k3s = {
enable = true; enable = false;
role = "server"; role = "server";
extraFlags = builtins.toString [ extraFlags = builtins.toString [