commit eca1e080d7ca016da62a1557d85efe59cb96f984
author Bartosz Stebel <implr@hackerspace.pl> Sat Nov 27 01:04:31 2021 +0100
committer implr <implr@hackerspace.pl> Fri Dec 03 03:10:13 2021 +0000
tree 91b56fa37cd3c6e032c784dea64d5758529c81b7
parent 12f176c1eb68dca457b653a669615e0499708a44

calico: restore CNI_NET_DIR

Change-Id: I04e17f8639505f5b7cc42e86392abc175b7922db
Reviewed-on: https://gerrit.hackerspace.pl/c/hscloud/+/1178
Reviewed-by: q3k <q3k@hackerspace.pl>

cluster/kube/lib/calico.libsonnet

diff --git a/cluster/kube/lib/calico.libsonnet b/cluster/kube/lib/calico.libsonnet
index 6a9b799..d580197 100644
--- a/cluster/kube/lib/calico.libsonnet
+++ b/cluster/kube/lib/calico.libsonnet
@@ -278,6 +278,10 @@
                                     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"),