Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Copy dummy flannel.conf to get around absence of CNI Network #6985

Merged
merged 3 commits into from
Mar 10, 2021
Merged

Copy dummy flannel.conf to get around absence of CNI Network #6985

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed52f9f
Copy dummy flannel.conf to get around absence of CNI package
renukamanavalan Mar 8, 2021
26d7abd
s/print/log_debug
renukamanavalan Mar 8, 2021
1a2b82a
Corresponding test code updates
renukamanavalan Mar 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions files/build_templates/sonic_debian_extension.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,10 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install azure-
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install watchdog==0.10.3

{% if include_kubernetes == "y" %}
# Copy Flannel conf file into sonic-templates
#
sudo cp $BUILD_TEMPLATES/kube_cni.10-flannel.conflist $FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES/

# Install remote Container mgmt package
# Required even if include_kubernetes != y, as it contains the
# the container wrapper for docker start/stop/wait commands.
Expand Down
10 changes: 9 additions & 1 deletion src/sonic-ctrmgrd/ctrmgr/kube_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
KUBELET_YAML = "/var/lib/kubelet/config.yaml"
SERVER_ADMIN_URL = "https://{}/admin.conf"
LOCK_FILE = "/var/lock/kube_join.lock"
FLANNEL_CONF_FILE = "/usr/share/sonic/templates/kube_cni.10-flannel.conflist"
CNI_DIR = "/etc/cni/net.d"

# kubectl --kubeconfig <KUBE_ADMIN_CONF> label nodes
# <device_info.get_hostname()> <label to be added>
Expand Down Expand Up @@ -272,7 +274,7 @@ def _do_reset(pending_join = False):
format(KUBE_ADMIN_CONF, device_info.get_hostname()))

_run_command("kubeadm reset -f", 10)
_run_command("rm -rf /etc/cni/net.d")
_run_command("rm -rf {}".format(CNI_DIR))
if not pending_join:
_run_command("rm -f {}".format(KUBE_ADMIN_CONF))
_run_command("systemctl stop kubelet")
Expand All @@ -295,6 +297,12 @@ def _do_join(server, port, insecure):
KUBE_ADMIN_CONF, device_info.get_hostname()), timeout=60)
print("ret = {}".format(ret))

if ret == 0:
# Copy flannel.conf
_run_command("mkdir -p {}".format(CNI_DIR))
_run_command("cp {} {}".format(FLANNEL_CONF_FILE, CNI_DIR))
_run_command("systemctl restart kubelet")

except IOError as e:
err = "Download failed: {}".format(str(e))
ret = -1
Expand Down
40 changes: 29 additions & 11 deletions src/sonic-ctrmgrd/tests/kube_commands_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@


KUBE_ADMIN_CONF = "/tmp/kube_admin.conf"
FLANNEL_CONF_FILE = "/tmp/flannel.conf"
CNI_DIR = "/tmp/cni/net.d"

# kube_commands test cases
# NOTE: Ensure state-db entry is complete in PRE as we need to
Expand Down Expand Up @@ -108,12 +110,15 @@
"kubectl --kubeconfig {} --request-timeout 20s delete node \
None".format(KUBE_ADMIN_CONF),
"kubeadm reset -f",
"rm -rf /etc/cni/net.d",
"rm -rf {}".format(CNI_DIR),
"systemctl stop kubelet",
"modprobe br_netfilter",
"systemctl start kubelet",
"kubeadm join --discovery-file {} --node-name None".format(
KUBE_ADMIN_CONF)
KUBE_ADMIN_CONF),
"mkdir -p {}".format(CNI_DIR),
"cp {} {}".format(FLANNEL_CONF_FILE, CNI_DIR),
"systemctl restart kubelet"
],
common_test.PROC_RUN: [True, True]
},
Expand All @@ -129,12 +134,15 @@
"kubectl --kubeconfig {} --request-timeout 20s delete node \
None".format(KUBE_ADMIN_CONF),
"kubeadm reset -f",
"rm -rf /etc/cni/net.d",
"rm -rf {}".format(CNI_DIR),
"systemctl stop kubelet",
"modprobe br_netfilter",
"systemctl start kubelet",
"kubeadm join --discovery-file {} --node-name None".format(
KUBE_ADMIN_CONF)
KUBE_ADMIN_CONF),
"mkdir -p {}".format(CNI_DIR),
"cp {} {}".format(FLANNEL_CONF_FILE, CNI_DIR),
"systemctl restart kubelet"
],
common_test.PROC_RUN: [True, True]
},
Expand All @@ -159,12 +167,15 @@
"kubectl --kubeconfig {} --request-timeout 20s delete node \
None".format(KUBE_ADMIN_CONF),
"kubeadm reset -f",
"rm -rf /etc/cni/net.d",
"rm -rf {}".format(CNI_DIR),
"systemctl stop kubelet",
"modprobe br_netfilter",
"systemctl start kubelet",
"kubeadm join --discovery-file {} --node-name None".format(
KUBE_ADMIN_CONF)
KUBE_ADMIN_CONF),
"mkdir -p {}".format(CNI_DIR),
"cp {} {}".format(FLANNEL_CONF_FILE, CNI_DIR),
"systemctl restart kubelet"
],
common_test.PROC_RUN: [True, True],
common_test.PROC_FAIL: [True]
Expand All @@ -181,12 +192,15 @@
"kubectl --kubeconfig {} --request-timeout 20s delete node \
None".format(KUBE_ADMIN_CONF),
"kubeadm reset -f",
"rm -rf /etc/cni/net.d",
"rm -rf {}".format(CNI_DIR),
"systemctl stop kubelet",
"modprobe br_netfilter",
"systemctl start kubelet",
"kubeadm join --discovery-file {} --node-name None".format(
KUBE_ADMIN_CONF)
KUBE_ADMIN_CONF),
"mkdir -p {}".format(CNI_DIR),
"cp {} {}".format(FLANNEL_CONF_FILE, CNI_DIR),
"systemctl restart kubelet"
],
common_test.PROC_RUN: [True, True],
common_test.PROC_FAIL: [True],
Expand All @@ -213,7 +227,7 @@
"kubectl --kubeconfig {} --request-timeout 20s delete node \
None".format(KUBE_ADMIN_CONF),
"kubeadm reset -f",
"rm -rf /etc/cni/net.d",
"rm -rf {}".format(CNI_DIR),
"rm -f {}".format(KUBE_ADMIN_CONF),
"systemctl stop kubelet"
]
Expand All @@ -228,7 +242,7 @@
"kubectl --kubeconfig {} --request-timeout 20s delete node \
None".format(KUBE_ADMIN_CONF),
"kubeadm reset -f",
"rm -rf /etc/cni/net.d",
"rm -rf {}".format(CNI_DIR),
"rm -f {}".format(KUBE_ADMIN_CONF),
"systemctl stop kubelet"
]
Expand All @@ -239,7 +253,7 @@
common_test.ARGS: [True],
common_test.PROC_CMD: [
"kubeadm reset -f",
"rm -rf /etc/cni/net.d",
"rm -rf {}".format(CNI_DIR),
"rm -f {}".format(KUBE_ADMIN_CONF),
"systemctl stop kubelet"
]
Expand Down Expand Up @@ -269,7 +283,11 @@ def init(self):
kubelet_yaml = "/tmp/kubelet_config.yaml"
with open(kubelet_yaml, "w") as s:
s.close()
with open(FLANNEL_CONF_FILE, "w") as s:
s.close()
kube_commands.KUBELET_YAML = kubelet_yaml
kube_commands.CNI_DIR = CNI_DIR
kube_commands.FLANNEL_CONF_FILE = FLANNEL_CONF_FILE
kube_commands.SERVER_ADMIN_URL = "file://{}".format(self.admin_conf_file)
kube_commands.KUBE_ADMIN_CONF = KUBE_ADMIN_CONF

Expand Down