fix: only remove CRI if re-installing (#3654)

Azure · Jul 30, 2020 · fd2c45d · fd2c45d
1 parent 7fccb42
commit fd2c45d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/parts/k8s/cloud-init/artifacts/cse_config.sh b/parts/k8s/cloud-init/artifacts/cse_config.sh
@@ -296,7 +296,6 @@ configureAzureCNI() {
 }
 {{- if NeedsContainerd}}
 installContainerd() {
-  removeMoby
   CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||')
   if [[ $CURRENT_VERSION != "${CONTAINERD_VERSION}" ]]; then
     os_lower=$(echo ${OS} | tr '[:upper:]' '[:lower:]')
@@ -307,6 +306,7 @@ installContainerd() {
     else
       exit 25
     fi
+    removeMoby
     removeContainerd
     retrycmd_no_stats 120 5 25 curl https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/prod.list >/tmp/microsoft-prod.list || exit 25
     retrycmd 10 5 10 cp /tmp/microsoft-prod.list /etc/apt/sources.list.d/ || exit 25
@@ -678,10 +678,4 @@ cleanUpContainerd() {
 removeEtcd() {
   rm -rf /usr/bin/etcd
 }
-removeMoby() {
-  apt_get_purge moby-engine moby-cli || exit 27
-}
-removeContainerd() {
-  apt_get_purge moby-containerd || exit 27
-}
 #EOF
diff --git a/parts/k8s/cloud-init/artifacts/cse_install.sh b/parts/k8s/cloud-init/artifacts/cse_install.sh
@@ -86,10 +86,16 @@ downloadGPUDrivers() {
     exit 85
   fi
 }
+removeMoby() {
+  apt_get_purge moby-engine moby-cli || exit 27
+}
+removeContainerd() {
+  apt_get_purge moby-containerd || exit 27
+}
 installMoby() {
-  removeContainerd
   CURRENT_VERSION=$(dockerd --version | grep "Docker version" | cut -d "," -f 1 | cut -d " " -f 3 | cut -d "+" -f 1)
   if [[ $CURRENT_VERSION != "${MOBY_VERSION}" ]]; then
+    removeContainerd
     removeMoby
     retrycmd_no_stats 120 5 25 curl https://packages.microsoft.com/config/ubuntu/${UBUNTU_RELEASE}/prod.list >/tmp/microsoft-prod.list || exit 25
     retrycmd 10 5 10 cp /tmp/microsoft-prod.list /etc/apt/sources.list.d/ || exit 25

diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go