diff options
| author | Johan Thomsen <jth@dbc.dk> | 2021-02-25 16:00:59 +0100 |
|---|---|---|
| committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-03-07 12:51:14 +1000 |
| commit | 7b5c38e97384257a03ec29e9eec56e2a46a07816 (patch) | |
| tree | e5120c04c8ef4e1ab84473eaba946dd443e87e3c /nixos/modules/services/networking/flannel.nix | |
| parent | 7da62867be079bb5f6412fb12a76dbb68f9bad4b (diff) | |
| download | nixpkgs-7b5c38e97384257a03ec29e9eec56e2a46a07816.tar nixpkgs-7b5c38e97384257a03ec29e9eec56e2a46a07816.tar.gz nixpkgs-7b5c38e97384257a03ec29e9eec56e2a46a07816.tar.bz2 nixpkgs-7b5c38e97384257a03ec29e9eec56e2a46a07816.tar.lz nixpkgs-7b5c38e97384257a03ec29e9eec56e2a46a07816.tar.xz nixpkgs-7b5c38e97384257a03ec29e9eec56e2a46a07816.tar.zst nixpkgs-7b5c38e97384257a03ec29e9eec56e2a46a07816.zip | |
nixos/kubernetes: docker -> containerd
also, nixos/containerd: module init
Diffstat (limited to 'nixos/modules/services/networking/flannel.nix')
| -rw-r--r-- | nixos/modules/services/networking/flannel.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix index 4c040112d28..32a7eb3ed69 100644 --- a/nixos/modules/services/networking/flannel.nix +++ b/nixos/modules/services/networking/flannel.nix @@ -162,10 +162,7 @@ in { NODE_NAME = cfg.nodeName; }; path = [ pkgs.iptables ]; - preStart = '' - mkdir -p /run/flannel - touch /run/flannel/docker - '' + optionalString (cfg.storageBackend == "etcd") '' + preStart = optionalString (cfg.storageBackend == "etcd") '' echo "setting network configuration" until ${pkgs.etcdctl}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}' do @@ -177,6 +174,7 @@ in { ExecStart = "${cfg.package}/bin/flannel"; Restart = "always"; RestartSec = "10s"; + RuntimeDirectory = "flannel"; }; }; |