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

Update k1 to latest setup.

Browse Source
This commit is contained in:
Jonas Juselius
2020-11-26 15:18:30 +01:00
parent b877f39cd5
commit 16d1c73d2f
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
clusters/k1/default.nix
View File

@@ -1,12 +1,12 @@
with import <nixpkgs> {}; with import <nixpkgs> {};
let let
setup = import ../../modules/default.nix { inherit pkgs cluster customize lib config; }; setup = import ../../modules { inherit pkgs cluster customize lib config; };
hosts = [ hosts = [
{ name = "k1-1"; address = "10.253.18.110"; hw = ./k1-1.nix; } { name = "k1-0"; address = "10.253.18.109"; }
{ name = "k1-2"; address = "10.253.18.111"; hw = ./k1-2.nix; } { name = "k1-1"; address = "10.253.18.110"; }
{ name = "k1-3"; address = "10.253.18.108"; hw = ./k1-3.nix; } { name = "k1-2"; address = "10.253.18.111"; }
# { name = "k1-4"; address = "10.253.18.107"; hw = ./k1-4.nix; } { name = "k1-3"; address = "10.253.18.108"; }
]; ];
customize = { customize = {
@@ -14,30 +14,29 @@ let
}; };
cluster = { cluster = {
clusterName = "k2"; clusterName = "k1";
initca = ./ca; initca = ./ca;
domain = "itpartner.intern"; domain = "itpartner.intern";
# externalInterface = "ens32";
# defaultGateway = "10.1.8.1";
# nameservers = [ "8.8.8.8" ];
searchDomains = [ "itpartner.intern" "itpartner.no" ]; searchDomains = [ "itpartner.intern" "itpartner.no" ];
extraHosts = import ../hosts.nix; extraHosts = import ../hosts.nix;
adminAuthorizedKeys = [ adminAuthorizedKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf jonas" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiAS30ZO+wgfAqDE9Y7VhRunn2QszPHA5voUwo+fGOf jonas"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMWEYtm1u3HiK4q4J5su6iKWfFjLXt9CIlm9Z9BfJYVj jens@itpartner@Jens-HP3"
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCk5EKXxo/KLogjqSxSf/GkQdZ30UxB3wXc5k6Y6RRKQ/5iJ+XyYTbuqYOUp30p54apZzbayU2icahE/upr754lQicQwJtOXW/Iut57VRhSpq4P+mKCIdT58xCUkAZYr8Aja8UjHlYeJgFvp023K/fqmwbapu8R1gh4bzXm7uU1XeJoYfuOb+Cb8NGMn1ICrw2aztA0yVOXZ7tyJd2qyr1+6PuM/Ca2nKN4wLIX2vwyN3vZjR15nkIaHQGlTaJlNk2NEG1YTxsIQ9axDjNtyL80kjUr5M8zxW6s0h3451zr1b21EetP1i+1POIjS9uWXv5iabF+1Qb1GaS4FAYzzpqNY+moLzY7Zqfi05MPsMYkNoZ1Kg5aj0IuZb0OM9i6ZJrFs9nYAGG0uLSUTfrs957f9nokFyILGYg5xY46YN3uQrqfZifvcR0KaEdxEKvnfq0qrNG3uYLR/OYm2yblRcNbWgDoQ1hH7qa9uJM2JrPM07s4sJGkqfAib8Hwz9+l7jMrL6KIGUOA4aX0B1KZaIKKiZa42WlgdbeA17aW3laIqS5mZCkI3pLMYZAxe+A6rQi+V8ZAvDSyOL/Vws3lboXaN5QLu17R8uCY7MkIAvRBiZSpdWNeX3JO5m6zexkxkrFlxyEBf+ott4ATSw+eMYMs8i5xQRqPjgO1cABWkUdGpw== martin.moe.carstens@itpartner.no" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCk5EKXxo/KLogjqSxSf/GkQdZ30UxB3wXc5k6Y6RRKQ/5iJ+XyYTbuqYOUp30p54apZzbayU2icahE/upr754lQicQwJtOXW/Iut57VRhSpq4P+mKCIdT58xCUkAZYr8Aja8UjHlYeJgFvp023K/fqmwbapu8R1gh4bzXm7uU1XeJoYfuOb+Cb8NGMn1ICrw2aztA0yVOXZ7tyJd2qyr1+6PuM/Ca2nKN4wLIX2vwyN3vZjR15nkIaHQGlTaJlNk2NEG1YTxsIQ9axDjNtyL80kjUr5M8zxW6s0h3451zr1b21EetP1i+1POIjS9uWXv5iabF+1Qb1GaS4FAYzzpqNY+moLzY7Zqfi05MPsMYkNoZ1Kg5aj0IuZb0OM9i6ZJrFs9nYAGG0uLSUTfrs957f9nokFyILGYg5xY46YN3uQrqfZifvcR0KaEdxEKvnfq0qrNG3uYLR/OYm2yblRcNbWgDoQ1hH7qa9uJM2JrPM07s4sJGkqfAib8Hwz9+l7jMrL6KIGUOA4aX0B1KZaIKKiZa42WlgdbeA17aW3laIqS5mZCkI3pLMYZAxe+A6rQi+V8ZAvDSyOL/Vws3lboXaN5QLu17R8uCY7MkIAvRBiZSpdWNeX3JO5m6zexkxkrFlxyEBf+ott4ATSw+eMYMs8i5xQRqPjgO1cABWkUdGpw== martin.moe.carstens@itpartner.no"
]; ];
k8s = { k8s = {
enable = true; enable = true;
master = {
name = "k1-0";
address = "10.253.18.109";
extraSANs = [ "k1.itpartner.no" ];
hw = ./k1-0.nix;
};
nodes = hosts;
cidr = "10.11.0.0/16"; cidr = "10.11.0.0/16";
fileserver = "fs0-0"; master = builtins.head hosts // { extraSANs = [ "k1.itpartner.no" ]; };
nodes = builtins.tail hosts;
ingressNodes = [ "k1-0.itpartner.intern" "k1-1.itpartner.intern" "k1-2.itpartner.intern" ];
fileserver = "fs1-0";
charts = { charts = {
acme_email = "innovasjon@itpartner.no"; acme_email = "innovasjon@itpartner.no";
grafana_smtp_user = "utvikling"; grafana_smtp_user = "utvikling";
@@ -46,4 +45,4 @@ let
}; };
}; };
in in
setup.k8s.mkDeployment cluster.k8s.master hosts setup.k8s.mkDeployment ./.