pyrox.dev
nixos/flannel: upgrade to etcdv3 (#180315)
+6
-5
nixos/modules/services/networking/flannel.nix
+6
-5
nixos/modules/services/networking/flannel.nix
···
155
FLANNELD_ETCD_KEYFILE = cfg.etcd.keyFile;
156
FLANNELD_ETCD_CERTFILE = cfg.etcd.certFile;
157
FLANNELD_ETCD_CAFILE = cfg.etcd.caFile;
158
-
ETCDCTL_CERT_FILE = cfg.etcd.certFile;
159
-
ETCDCTL_KEY_FILE = cfg.etcd.keyFile;
160
-
ETCDCTL_CA_FILE = cfg.etcd.caFile;
161
-
ETCDCTL_PEERS = concatStringsSep "," cfg.etcd.endpoints;
162
} // optionalAttrs (cfg.storageBackend == "kubernetes") {
163
FLANNELD_KUBE_SUBNET_MGR = "true";
164
FLANNELD_KUBECONFIG_FILE = cfg.kubeconfig;
···
167
path = [ pkgs.iptables ];
168
preStart = optionalString (cfg.storageBackend == "etcd") ''
169
echo "setting network configuration"
170
-
until ${pkgs.etcd}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}'
171
do
172
echo "setting network configuration, retry"
173
sleep 1
···
155
FLANNELD_ETCD_KEYFILE = cfg.etcd.keyFile;
156
FLANNELD_ETCD_CERTFILE = cfg.etcd.certFile;
157
FLANNELD_ETCD_CAFILE = cfg.etcd.caFile;
158
+
ETCDCTL_CERT = cfg.etcd.certFile;
159
+
ETCDCTL_KEY = cfg.etcd.keyFile;
160
+
ETCDCTL_CACERT = cfg.etcd.caFile;
161
+
ETCDCTL_ENDPOINTS = concatStringsSep "," cfg.etcd.endpoints;
162
+
ETCDCTL_API = "3";
163
} // optionalAttrs (cfg.storageBackend == "kubernetes") {
164
FLANNELD_KUBE_SUBNET_MGR = "true";
165
FLANNELD_KUBECONFIG_FILE = cfg.kubeconfig;
···
168
path = [ pkgs.iptables ];
169
preStart = optionalString (cfg.storageBackend == "etcd") ''
170
echo "setting network configuration"
171
+
until ${pkgs.etcd}/bin/etcdctl put /coreos.com/network/config '${builtins.toJSON networkConfig}'
172
do
173
echo "setting network configuration, retry"
174
sleep 1