ff

Author: fseldow

parts/linux/cloud-init/artifacts/cse_install.sh

@@ -149,44 +149,46 @@ installFixedCNI() {
         return
     fi
     #always just use what is listed in components.json so we don't have to sync.
-    cniPackage=$(jq ".Packages" "$COMPONENTS_FILEPATH" | jq ".[] | select(.name == \"cni-plugins\")") || exit $ERR_CNI_VERSION_INVALID
+    if [ -z "$(jq -r '.Packages[] | select(.name == "containernetworking-plugins") | .name' < $COMPONENTS_FILEPATH)" ]; then
+        cniPackage=$(jq ".Packages" "$COMPONENTS_FILEPATH" | jq ".[] | select(.name == \"cni-plugins\")") || exit $ERR_CNI_VERSION_INVALID
+
+        #CNI doesn't really care about this but wanted to reuse updatePackageVersions which requires it.
+        os=${UBUNTU_OS_NAME}
+        if [ -z "$UBUNTU_RELEASE" ]; then
+            os=${OS}
+            os_version="current"
+        fi
+        os_version="${UBUNTU_RELEASE}"
+        if isMarinerOrAzureLinux "${OS}" && [ "${IS_KATA}" = "true" ]; then
+            os=${MARINER_KATA_OS_NAME}
+        fi
+        updatePackageVersions "${cniPackage}" "${os}" "${os_version}" "${OS_VARIANT}"
 
-    #CNI doesn't really care about this but wanted to reuse updatePackageVersions which requires it.
-    os=${UBUNTU_OS_NAME}
-    if [ -z "$UBUNTU_RELEASE" ]; then
-        os=${OS}
-        os_version="current"
-    fi
-    os_version="${UBUNTU_RELEASE}"
-    if isMarinerOrAzureLinux "${OS}" && [ "${IS_KATA}" = "true" ]; then
-        os=${MARINER_KATA_OS_NAME}
-    fi
-    updatePackageVersions "${cniPackage}" "${os}" "${os_version}" "${OS_VARIANT}"
+        #should change to ne
+        # shellcheck disable=SC3010
+        if [[ ${#PACKAGE_VERSIONS[@]} -gt 1 ]]; then
+            echo "WARNING: containerd package versions array has more than one element. Installing the last element in the array."
+            exit $ERR_CONTAINERD_VERSION_INVALID
+        fi
+        packageVersion=${PACKAGE_VERSIONS[0]}
 
-    #should change to ne
-    # shellcheck disable=SC3010
-    if [[ ${#PACKAGE_VERSIONS[@]} -gt 1 ]]; then
-        echo "WARNING: containerd package versions array has more than one element. Installing the last element in the array."
-        exit $ERR_CONTAINERD_VERSION_INVALID
-    fi
-    packageVersion=${PACKAGE_VERSIONS[0]}
+        # Is there a ${arch} variable I can use instead of the iff
+        if [ "$(isARM64)" -eq 1 ]; then
+            CNI_DIR_TMP="cni-plugins-linux-arm64-v${packageVersion}"
+        else
+            CNI_DIR_TMP="cni-plugins-linux-amd64-v${packageVersion}"
+        fi
 
-    # Is there a ${arch} variable I can use instead of the iff
-    if [ "$(isARM64)" -eq 1 ]; then
-        CNI_DIR_TMP="cni-plugins-linux-arm64-v${packageVersion}"
-    else
-        CNI_DIR_TMP="cni-plugins-linux-amd64-v${packageVersion}"
-    fi
+        if [ -d "$CNI_DOWNLOADS_DIR/${CNI_DIR_TMP}" ]; then
+            #not clear to me when this would ever happen. assume its related to the line above Latest VHD should have the untar, older should have the tgz.
+            mv ${CNI_DOWNLOADS_DIR}/${CNI_DIR_TMP}/* $CNI_BIN_DIR
+        else
+            echo "CNI tarball should already be unzipped by components.json"
+            exit $ERR_CNI_VERSION_INVALID
+        fi
 
-    if [ -d "$CNI_DOWNLOADS_DIR/${CNI_DIR_TMP}" ]; then
-        #not clear to me when this would ever happen. assume its related to the line above Latest VHD should have the untar, older should have the tgz.
-        mv ${CNI_DOWNLOADS_DIR}/${CNI_DIR_TMP}/* $CNI_BIN_DIR
-    else
-        echo "CNI tarball should already be unzipped by components.json"
-        exit $ERR_CNI_VERSION_INVALID
+        chown -R root:root $CNI_BIN_DIR
     fi
-
-    chown -R root:root $CNI_BIN_DIR
 }
 
 installNetworkPlugin() {