Working k8s module!

This commit is contained in:
Jonas Juselius
2020-10-30 16:14:56 +01:00
parent b89514eae4
commit 45487af168
2 changed files with 19 additions and 10 deletions

View File

@@ -33,8 +33,7 @@ let
let
workerNodes = pkgs.writeText "kube-worker-nodes" (
builtins.foldl' (a: x:
a + " - ${x.address}\n"
) "" cfg.k8s.nodes);
a + " - ${x.address}\n") "" cfg.k8s.nodes);
grafanaLdap = pkgs.writeText "grafana-ldap.toml"
cfg.k8s.bootstrap.grafana_ldap_toml;
in
@@ -54,7 +53,7 @@ let
export initca="${pki.initca}"
export cluster="${cfg.clusterName}"
export fileserver="${cfg.k8s.fileserver}"
export acme_email="${cfg.k8s.bootrstrap.acme_email}"
export acme_email="${cfg.k8s.bootstrap.acme_email}"
export grafana_smtp_user="$(echo -n ${cfg.k8s.bootstrap.grafana_smtp_user} | base64 -w0)"
export grafana_smtp_password="$(echo -n ${cfg.k8s.bootstrap.grafana_smtp_password} | base64 -w0)"
export grafana_ldap_toml="$(cat ${grafanaLdap} | base64 -w0)"
@@ -206,8 +205,8 @@ let
in {
options.cluster.k8s = {
nodes = mkOption {
type = types.attrs;
default = {};
type = types.listOf types.attrs;
default = [];
};
fileserver = mkOption {
@@ -232,6 +231,16 @@ in {
type = types.str;
default = "apiserver";
};
extraSANs = mkOption {
type = types.listOf types.str;
default = [];
};
hw = mkOption {
type = types.path;
default = null;
};
};
node = {
@@ -254,7 +263,7 @@ in {
default = "";
};
grafana_ldap = mkOption {
grafana_ldap_toml = mkOption {
type = types.str;
default = "";
};