oceanbox/platform
6
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix cluster setups to unmask lib

Browse Source
This commit is contained in:
Jonas Juselius
2020-10-31 08:55:03 +01:00
parent ec98ac483e
commit 375a26915f
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
clusters/fs0/default.nix
View File

@@ -1,6 +1,6 @@
with import <nixpkgs> {}; with import <nixpkgs> {};
let let
lib = import ../../lib/default.nix { inherit pkgs cfg lib config; }; setup = import ../../lib/default.nix { inherit pkgs cfg lib config; };
hosts = [ hosts = [
{ name = "fs0-0"; address = "10.253.18.106"; hw = ./fs0-0.nix; } { name = "fs0-0"; address = "10.253.18.106"; hw = ./fs0-0.nix; }
@@ -41,4 +41,4 @@ let
''; '';
}; };
in in
lib.fs.mkDeployment hosts setup.fs.mkDeployment hosts

6
clusters/fs2/default.nix
View File

@@ -1,12 +1,12 @@
with import <nixpkgs> {}; with import <nixpkgs> {};
let let
lib = import ../../lib/default.nix { inherit pkgs cfg lib config; }; setup = import ../../lib/default.nix { inherit pkgs cluster lib config; };
hosts = [ hosts = [
{ name = "fs2-0"; address = "10.1.2.117"; hw = ./fs2-0.nix; } { name = "fs2-0"; address = "10.1.2.117"; hw = ./fs2-0.nix; }
]; ];
cfg = { cluster = {
initca = ./ca; initca = ./ca;
clusterName = "fs2"; clusterName = "fs2";
extraHosts = '' extraHosts = ''
@@ -41,4 +41,4 @@ let
''; '';
}; };
in in
lib.fs.mkDeployment hosts setup.fs.mkDeployment hosts

4
clusters/k0/default.nix
View File

@@ -1,6 +1,6 @@
with import <nixpkgs> {}; with import <nixpkgs> {};
let let
lib = import ../../lib/default.nix { inherit pkgs cfg customize lib config; }; setup = import ../../lib/default.nix { inherit pkgs cfg customize lib config; };
hosts = [ hosts = [
{ name = "k0-1"; address = "10.253.18.101"; hw = ./k0-1.nix; } { name = "k0-1"; address = "10.253.18.101"; hw = ./k0-1.nix; }
@@ -72,4 +72,4 @@ let
}; };
}; };
in in
lib.k8s.mkDeployment cfg.k8s.master hosts setup.k8s.mkDeployment cfg.k8s.master hosts

4
clusters/k1/default.nix
View File

@@ -1,6 +1,6 @@
with import <nixpkgs> {}; with import <nixpkgs> {};
let let
lib = import ../../lib/default.nix { inherit pkgs cfg customize lib config; }; setup = import ../../lib/default.nix { inherit pkgs cfg customize lib config; };
hosts = [ hosts = [
{ name = "k1-1"; address = "10.253.18.110"; hw = ./k1-1.nix; } { name = "k1-1"; address = "10.253.18.110"; hw = ./k1-1.nix; }
@@ -74,4 +74,4 @@ let
}; };
}; };
in in
lib.k8s.mkDeployment cfg.k8s.master hosts setup.k8s.mkDeployment cfg.k8s.master hosts

4
clusters/k2/default.nix
View File

@@ -1,6 +1,6 @@
with import <nixpkgs> {}; with import <nixpkgs> {};
let let
lib = import ../../lib/default.nix { inherit pkgs cfg customize lib config; }; setup = import ../../lib/default.nix { inherit pkgs cfg customize lib config; };
hosts = [ hosts = [
{ name = "k2-1"; address = "10.253.18.115"; hw = ./k2-1.nix; } { name = "k2-1"; address = "10.253.18.115"; hw = ./k2-1.nix; }
@@ -75,4 +75,4 @@ let
}; };
}; };
in in
lib.k8s.mkDeployment cfg.k8s.master hosts setup.k8s.mkDeployment cfg.k8s.master hosts