forked from hswaw/hscloud
calico: restore CNI_NET_DIR
Change-Id: I04e17f8639505f5b7cc42e86392abc175b7922db Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1178 Reviewed-by: q3k <q3k@hackerspace.pl>master
parent
12f176c1eb
commit
eca1e080d7
|
@ -278,6 +278,10 @@ local bindServiceAccountClusterRole(sa, cr) = kube.ClusterRoleBinding(cr.metadat
|
|||
CNI_NETWORK_CONFIG: kube.ConfigMapRef(env.cm, "cni_network_config"),
|
||||
ETCD_ENDPOINTS: kube.ConfigMapRef(env.cm, "etcd_endpoints"),
|
||||
CNI_MTU: kube.ConfigMapRef(env.cm, "veth_mtu"),
|
||||
# Important: our directory is changed from the default (/etc/cni/net.d)
|
||||
# to inside /opt/ above in the cni_config HostPathVolume.
|
||||
# See projectcalico/cni-plugin//k8s-install/scripts/install-cni.sh:24 for reference.
|
||||
CNI_NET_DIR: "/opt/cni/conf",
|
||||
# TODO(implr) needed?
|
||||
CNI_CONF_ETCD_CA_CERT_FILE: kube.ConfigMapRef(env.cm, "etcd_ca"),
|
||||
CNI_CONF_ETCD_KEY_FILE: kube.ConfigMapRef(env.cm, "etcd_key"),
|
||||
|
|
Loading…
Reference in New Issue