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

Fix bug in etcd config: name was missing.

Browse Source
This commit is contained in:
Jonas Juselius
2017-07-12 10:50:26 +02:00
parent 153cb55b6d
commit 543bf90e84
3 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
k8s.nix
View File

@@ -4,7 +4,7 @@ let
name = "kubernetes";
csr = csr {
cn = "kubernetes";
hosts = ''"kubernetes", "k8s0-0", "10.253.18.100"'';
hosts = ''"kubernetes", "k8s0-0", "etcd0", "10.253.18.100"'';
};
profile = "server";
};
@@ -13,7 +13,7 @@ let
name = "etcd0";
csr = csr {
cn = "etcd0";
hosts = ''"etcd0", "10.253.18.100"'';
hosts = ''"etcd0", "k8s0-0", "10.253.18.100"'';
};
profile = "peer";
};
@@ -22,7 +22,7 @@ let
name = "etcd1";
csr = csr {
cn = "etcd1";
hosts = ''"etcd1", "10.253.18.101"'';
hosts = ''"etcd1", "k8s0-1", "10.253.18.101"'';
};
profile = "peer";
};
@@ -55,6 +55,7 @@ let
etcdConfig = etcd: {
services.etcd = {
name = etcd.name;
enable = true;
listenClientUrls = ["https://0.0.0.0:2379"];
listenPeerUrls = ["https://0.0.0.0:2380"];
@@ -120,11 +121,12 @@ let
kubelet = {
tlsKeyFile = "${client_key}";
tlsCertFile = "${client_cert}";
extraOpts = "--client-ca-file=${ca_cert}";
networkPlugin = null;
clusterDns = "kubernetes";
clusterDns = "10.253.18.100";
};
};
networking.firewall.allowedTCPPorts = [ 53 ];
networking.firewall.allowedUDPPorts = [ 53 ]; # VXLAN
};
kubeMaster = {
@@ -150,19 +152,27 @@ let
};
networking.firewall.allowedTCPPorts = [ 5000 8080 443 53 ];
networking.firewall.allowedUDPPorts = [ 53 ];
systemd.services.flannel.after = [ "etcd.service" ];
};
baseConfig = node: {
imports = [ (./hw + "/${node}.nix") ./base/configuration.nix ];
require = [ kubeConfig ];
networking.hostName = node;
networking.extraHosts = ''
10.253.18.100 etcd0 kubernetes
10.253.18.101 etcd1
'';
};
minion = host: ip: { config, lib, pkgs, ... }:
let
inherit host;
base = baseConfig host;
in
{
deployment.targetHost = ip;
require = [ base kubeConfig kubeNode ];
};
in
{
k8s0-0 = { config, lib, pkgs, ... }:
@@ -177,7 +187,7 @@ in
in
{
deployment.targetHost = "10.253.18.100";
require = [ base etcd kubeMaster kubeNode ];
require = [ base etcd kubeConfig kubeMaster kubeNode ];
};
k8s0-1 = { config, lib, pkgs, ... }:
@@ -192,16 +202,8 @@ in
in
{
deployment.targetHost = "10.253.18.101";
require = [ base etcd kubeNode ];
require = [ base etcd kubeConfig kubeNode ];
};
k8s0-2 = { config, lib, pkgs, ... }:
let
host = "k8s0-2";
base = baseConfig host;
in
{
deployment.targetHost = "10.253.18.102";
require = [ base kubeNode ];
};
k8s0-2 = minion "k8s0-2" "10.253.18.102";
}