updated k3s and vmagent
This commit is contained in:
parent
4fed5d2c38
commit
b62cf0bebc
4 changed files with 15 additions and 16 deletions
|
@ -349,16 +349,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1661208473,
|
"lastModified": 1661414334,
|
||||||
"narHash": "sha256-EcoSSCrhc/qkoACcbB1Q2zi1jiFvb93kb4SS1AbviFw=",
|
"narHash": "sha256-9uL8a3v1L9FNCJIhhXZzNQJLS8dq1S0vd03cDrbc0Lw=",
|
||||||
"owner": "NULLx76",
|
"owner": "NULLx76",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a73f576bc51a194b6cf77580f84b60c610e0bbbe",
|
"rev": "ed0a4bf92a7b00da1497d87846c068af92919f54",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NULLx76",
|
"owner": "NULLx76",
|
||||||
"ref": "direnv-vscode-extension",
|
"ref": "0x76",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
16
flake.nix
16
flake.nix
|
@ -6,7 +6,7 @@
|
||||||
# * https://git.voidcorp.nl/j00lz/nixos-configs/src/branch/main/flake.nix
|
# * https://git.voidcorp.nl/j00lz/nixos-configs/src/branch/main/flake.nix
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NULLx76/nixpkgs/direnv-vscode-extension";
|
nixpkgs.url = "github:NULLx76/nixpkgs/0x76";
|
||||||
|
|
||||||
colmena.url = "github:zhaofengli/colmena";
|
colmena.url = "github:zhaofengli/colmena";
|
||||||
colmena.inputs.nixpkgs.follows = "nixpkgs";
|
colmena.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
@ -46,7 +46,11 @@
|
||||||
|
|
||||||
# Define args each module gets access to (access to hosts is useful for DNS/DHCP)
|
# Define args each module gets access to (access to hosts is useful for DNS/DHCP)
|
||||||
specialArgs = { inherit hosts flat_hosts inputs; };
|
specialArgs = { inherit hosts flat_hosts inputs; };
|
||||||
pkgs = serokell-nix.lib.pkgsWith nixpkgs.legacyPackages.${system} [ vault-secrets.overlay ];
|
pkgs = serokell-nix.lib.pkgsWith nixpkgs.legacyPackages.${system} [
|
||||||
|
(import ./nixos/pkgs)
|
||||||
|
vault-secrets.overlay
|
||||||
|
minecraft-servers.overlays.default
|
||||||
|
];
|
||||||
|
|
||||||
# Script to apply local colmena deployments
|
# Script to apply local colmena deployments
|
||||||
apply-local = pkgs.writeScriptBin "apply-local" ''
|
apply-local = pkgs.writeScriptBin "apply-local" ''
|
||||||
|
@ -68,14 +72,8 @@
|
||||||
{
|
{
|
||||||
meta = {
|
meta = {
|
||||||
inherit specialArgs;
|
inherit specialArgs;
|
||||||
nixpkgs = import nixpkgs {
|
nixpkgs = pkgs;
|
||||||
inherit system;
|
|
||||||
overlays = [
|
|
||||||
(import ./nixos/pkgs)
|
|
||||||
minecraft-servers.overlays.default
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
};
|
|
||||||
}
|
}
|
||||||
nixHosts;
|
nixHosts;
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
|
|
||||||
# Enable k3s as a master node
|
# Enable k3s as a master node
|
||||||
services.k3s = {
|
services.k3s = {
|
||||||
enable = false;
|
enable = true;
|
||||||
role = "server";
|
role = "server";
|
||||||
|
|
||||||
extraFlags = builtins.toString [
|
extraFlags = builtins.toString [
|
||||||
|
|
|
@ -1,13 +1,14 @@
|
||||||
{ lib, fetchFromGitHub, buildGoModule }:
|
{ lib, fetchFromGitHub, buildGoModule }:
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "vmagent";
|
pname = "vmagent";
|
||||||
version = "1.79.0";
|
version = "1.80.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "VictoriaMetrics";
|
owner = "VictoriaMetrics";
|
||||||
repo = "VictoriaMetrics";
|
repo = "VictoriaMetrics";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-+LirbGbKeazXMtgVh5kZP+KEk/fDbSxceZ26OlE0hbY=";
|
sha256 = "sha256-SIwl8Mgbkk/z3xZ6wCmce7D2T2A2+dcuQ607BOsfrkQ=";
|
||||||
|
# sha256 = lib.fakeSha256;
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = null;
|
vendorSha256 = null;
|
||||||
|
|
Loading…
Reference in a new issue