starlingx
/
update
Code Issues Proposed changes

Mount kubernetes bind mounts after in-service patch is installed 

This commit adds some additional steps within sw-patch host-install
to support the current implementation of kubernetes-unversioned.

Test Plan:
[PASS] Run kubectl after installing in-service patch
Closes-Bug: 1995973
Signed-off-by: Jessica Castelino <jessica.castelino@windriver.com>
Change-Id: Ic89da6cd2e1cbd771cf1f3620a83ffa37ea832ca
This commit is contained in:
Jessica Castelino 2022-11-04 20:13:18 +00:00
parent 3171a50e9c
commit c1f907a9cf
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sw-patch/cgcs-patch/cgcs_patch/ostree_utils.py
View File

@ -166,7 +166,7 @@ def pull_ostree_from_remote():
Pull from remote ostree to sysroot ostree
"""
cmd = "ostree pull %s --depth=-1" % constants.OSTREE_REMOTE
cmd = "ostree pull %s --depth=-1 --mirror" % constants.OSTREE_REMOTE
try:
subprocess.run(cmd, shell=True, check=True, capture_output=True)
@ -260,6 +260,15 @@ def mount_new_deployment(deployment_dir):
% (e.stderr.decode("utf-8"))
LOG.info(info_msg)
raise OSTreeCommandFail(msg)
finally:
try:
sh.mount("/usr/local/kubernetes/current/stage1")
sh.mount("/usr/local/kubernetes/current/stage2")
except sh.ErrorReturnCode:
msg = "Failed to mount kubernetes. Please manually run these commands:\n" \
"sudo mount /usr/local/kubernetes/current/stage1\n" \
"sudo mount /usr/local/kubernetes/current/stage2\n"
LOG.info(msg)
def delete_older_deployments():
@ -277,6 +286,7 @@ def delete_older_deployments():
# debian 3334dc80691a38c0ba6c519ec4b4b449f8420e98ac4d8bded3436ade56bb229d.1 (rollback)
# debian 3334dc80691a38c0ba6c519ec4b4b449f8420e98ac4d8bded3436ade56bb229d.0
LOG.info("Inside delete_older_deployments of ostree_utils")
cmd = "ostree admin status | grep debian"
try: