fix: issues caused by the /usr/local/bin to /opt/bin move (#7703)

Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>

Author: chewi

parts/linux/cloud-init/artifacts/azlosguard/cse_install_osguard.sh

@@ -52,6 +52,7 @@ installRPMPackageFromFile() {
     fi
 
     echo "Unpacking usr/bin/${rpmBinaryName} from ${downloadDir}/${packageName}-${desiredVersion}*"
+    mkdir -p "${targetBinDir}"
     # This assumes that the binary will either be in /usr/bin or /usr/local/bin, but not both.
     rpm2cpio "${rpmFile}" | cpio -i --to-stdout "./usr/bin/${rpmBinaryName}" "./usr/local/bin/${rpmBinaryName}" | install -m0755 /dev/stdin "${targetBinDir}/${targetBinaryName}"
 	rm -rf ${downloadDir}

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

@@ -938,10 +938,10 @@ fallbackToKubeBinaryInstall() {
         if [ "${SHOULD_ENFORCE_KUBE_PMC_INSTALL}" = "true" ]; then
             echo "Kube PMC install is enforced, skipping fallback to kube binary install for ${packageName}"
             return 1
-        elif [ -f "/usr/local/bin/${packageName}-${packageVersion}" ]; then
-            mv "/usr/local/bin/${packageName}-${packageVersion}" "/usr/local/bin/${packageName}"
-            chmod a+x /usr/local/bin/${packageName}
-            rm -rf /usr/local/bin/${packageName}-* &
+        elif [ -f "/opt/bin/${packageName}-${packageVersion}" ]; then
+            mv "/opt/bin/${packageName}-${packageVersion}" "/opt/bin/${packageName}"
+            chmod a+x /opt/bin/${packageName}
+            rm -rf /opt/bin/${packageName}-* &
             return 0
         else
             echo "No binary fallback found for ${packageName} version ${packageVersion}"

parts/linux/cloud-init/artifacts/mariner/mariner-package-update.sh

@@ -9,7 +9,7 @@ OS_RELEASE_FILE="/etc/os-release"
 SECURITY_PATCH_REPO_DIR="/etc/yum.repos.d"
 KUBECONFIG="/var/lib/kubelet/kubeconfig"
 KUBECTL="/opt/bin/kubectl --kubeconfig ${KUBECONFIG}"
-KUBELET_EXECUTABLE="/usr/local/bin/kubelet"
+KUBELET_EXECUTABLE="/opt/bin/kubelet"
 SECURITY_PATCH_TMP_DIR="/tmp/security-patch"
 
 # Function definitions used in this file.