From afd2403adc2a423455d5521a157886d5a15ad9aa Mon Sep 17 00:00:00 2001 From: Spyros Trigazis Date: Thu, 4 Jul 2019 14:37:32 +0200 Subject: [PATCH] k8s: Clear cni configuration In fedora atomic 29, podman is present and configures its own cni. We need to clear the cni configuration otherwise we will get that cni0 is already used. story: 2006171 task: 35682 Change-Id: Ic70938184bdb98eaaf4f384ce553818cf2624a2a Signed-off-by: Spyros Trigazis --- .../kubernetes/fragments/configure-kubernetes-master.sh | 4 ++++ .../kubernetes/fragments/configure-kubernetes-minion.sh | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh index 56e6646a44..d5301f9c82 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh @@ -20,7 +20,11 @@ fi _prefix=${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/} +$ssh_cmd rm -rf /etc/cni/net.d/* +$ssh_cmd rm -rf /var/lib/cni/* +$ssh_cmd rm -rf /opt/cni/* $ssh_cmd mkdir -p /opt/cni +$ssh_cmd mkdir -p /etc/cni/net.d/ _addtl_mounts=',{"type":"bind","source":"/opt/cni","destination":"/opt/cni","options":["bind","rw","slave","mode=777"]},{"type":"bind","source":"/var/lib/docker","destination":"/var/lib/docker","options":["bind","rw","slave","mode=755"]}' if [ "$NETWORK_DRIVER" = "calico" ]; then diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh index d7ac2f0f88..0f4a21e98c 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-minion.sh @@ -22,7 +22,11 @@ fi _prefix=${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/} +$ssh_cmd rm -rf /etc/cni/net.d/* +$ssh_cmd rm -rf /var/lib/cni/* +$ssh_cmd rm -rf /opt/cni/* $ssh_cmd mkdir -p /opt/cni +$ssh_cmd mkdir -p /etc/cni/net.d/ _addtl_mounts=',{"type":"bind","source":"/opt/cni","destination":"/opt/cni","options":["bind","rw","slave","mode=777"]},{"type":"bind","source":"/var/lib/docker","destination":"/var/lib/docker","options":["bind","rw","slave","mode=755"]}' if [ "$NETWORK_DRIVER" = "calico" ]; then