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

Update k0 and k2 to improved mkDeployment

Browse Source
This commit is contained in:
Jonas Juselius
2020-11-20 20:03:44 +01:00
parent a0b9af7f37
commit eca29357eb
7 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
clusters/k0/default.nix
View File

@@ -1,8 +1,9 @@
with import <nixpkgs> {};
let
setup = import ../../modules/default.nix { inherit pkgs cluster customize lib config; };
setup = import ../../modules { inherit pkgs cluster customize lib config; };
hosts = [
{ name = "k0-0"; address = "10.1.8.53"; hw = ./k0-0.nix; }
{ name = "k0-1"; address = "10.1.8.54"; hw = ./k0-1.nix; }
{ name = "k0-2"; address = "10.1.8.55"; hw = ./k0-2.nix; }
];
@@ -15,6 +16,9 @@ let
clusterName = "k0";
initca = ./ca;
domain = "itpartner.intern";
searchDomains = [ "itpartner.intern" "itpartner.no" ];
extraHosts = import ../hosts.nix;
adminAuthorizedKeys = [
@@ -24,15 +28,10 @@ let
k8s = {
enable = true;
master = {
name = "k0-0";
address = "10.1.8.53";
extraSANs = [ "k0.itpartner.no" ];
hw = ./k0-0.nix;
};
nodes = hosts;
cidr = "10.11.0.0/16";
extraIngressNodes = [ "k0-1" "k0-2" ];
cidr = "10.100.0.0/16";
master = builtins.head hosts // { extraSANs = [ "k0.itpartner.no" ]; };
nodes = builtins.tail hosts;
extraIngressNodes = [ "k0-1.itpartner.intern" "k0-2.itpartner.intern" ];
fileserver = "fs2-0";
charts = {
acme_email = "innovasjon@itpartner.no";
@@ -42,4 +41,4 @@ let
};
};
in
setup.k8s.mkDeployment cluster.k8s.master hosts
setup.k8s.mkDeployment