From 94136fdc1b6c0eb71d10b27a9a2cb597d73ca33e Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Wed, 13 Feb 2019 17:17:52 +0100 Subject: nixos/flannel: node name needs to be configured for flannel to work with kubernetes storage backend --- nixos/modules/services/networking/flannel.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'nixos/modules/services/networking/flannel.nix') diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix index cb39a53b5f9..6c43573851b 100644 --- a/nixos/modules/services/networking/flannel.nix +++ b/nixos/modules/services/networking/flannel.nix @@ -87,6 +87,15 @@ in { type = types.str; }; + nodeName = mkOption { + description = '' + Needed when running with Kubernetes as backend as this cannot be auto-detected"; + ''; + type = types.nullOr types.str; + default = with config.networking; (hostName + optionalString (!isNull domain) ".${domain}"); + example = "node1.example.com"; + }; + storageBackend = mkOption { description = "Determines where flannel stores its configuration at runtime"; type = types.enum ["etcd" "kubernetes"]; @@ -150,6 +159,7 @@ in { } // optionalAttrs (cfg.storageBackend == "kubernetes") { FLANNELD_KUBE_SUBNET_MGR = "true"; FLANNELD_KUBECONFIG_FILE = cfg.kubeconfig; + NODE_NAME = cfg.nodeName; }; preStart = mkIf (cfg.storageBackend == "etcd") '' echo "setting network configuration" -- cgit 1.4.1