Skip to content

fix: fix delete cached kube binaries #8533

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

Merged
lilypan26 merged 3 commits into from
May 18, 2026
Merged

fix: fix delete cached kube binaries #8533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de5091d
fix: fix delete cached kube binaries
lilypan26 May 18, 2026
66a49f8
always cleanup cached binaries
lilypan26 May 18, 2026
a8baf88
add more cleanup places
lilypan26 May 18, 2026
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
2 changes: 2 additions & 0 deletions parts/linux/cloud-init/artifacts/azlosguard/cse_install_osguard.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ installRPMPackageFromFile() {
# 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/${packageName}" "./usr/local/bin/${packageName}" | install -m0755 /dev/stdin "${targetPath}"
rm -rf "${downloadDir}"
# Clean up stale cached binaries that were not used
rm -f /opt/bin/"${packageName}"-* &
}

downloadPkgFromVersion() {
Expand Down
2 changes: 1 addition & 1 deletion parts/linux/cloud-init/artifacts/cse_helpers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,7 @@ fallbackToKubeBinaryInstall() {
mv "/opt/bin/${packageName}-${packageVersion}" "${targetPath}"
chown root:root "${targetPath}"
chmod 0755 "${targetPath}"
rm -rf "/opt/bin/${packageName}-*" &
rm -rf /opt/bin/"${packageName}"-* &
return 0
else
echo "No binary fallback found for ${packageName} version ${packageVersion}"
Expand Down
1 change: 1 addition & 0 deletions parts/linux/cloud-init/artifacts/cse_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,7 @@ installToolFromBootstrapProfileRegistry() {

# All tools installed successfully
rm -rf "${download_root}"
rm -f /opt/bin/"${tool_name}"-* &
return 0
}

Expand Down
3 changes: 3 additions & 0 deletions parts/linux/cloud-init/artifacts/mariner/cse_install_mariner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,8 @@ installRPMPackageFromFile() {
rpmFile="${downloadDir}/${rpmFile}"
logs_to_events "AKS.CSE.install${packageName}.extractBinaryFromRPM" "extractBinaryFromRPM ${rpmFile} ${packageName} ${targetPath}" || exit "$ERR_APT_INSTALL_TIMEOUT"
rm -rf "${downloadDir}"
# Clean up stale cached binaries that were not used
rm -f /opt/bin/"${packageName}"-* &
}

installPackageFromCache() {
Expand Down Expand Up @@ -546,6 +548,7 @@ installPackageFromCache() {
rpmFile="${downloadDir}/${rpmFile}"
logs_to_events "AKS.CSE.install${packageName}.extractBinaryFromRPM" "extractBinaryFromRPM ${rpmFile} ${packageName} ${targetPath}" || exit "$ERR_APT_INSTALL_TIMEOUT"
rm -rf "${downloadDir}"
rm -f /opt/bin/"${packageName}"-* &
}

downloadPkgFromVersion() {
Expand Down
3 changes: 3 additions & 0 deletions parts/linux/cloud-init/artifacts/ubuntu/cse_install_ubuntu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,8 @@ installPkgWithAptGet() {
logs_to_events "AKS.CSE.install${packageName}.extractDebBinaryFromFile" "extractDebBinaryFromFile ${debFile} ${packageName} ${targetPath}" || exit "$ERR_APT_INSTALL_TIMEOUT"

rm -rf "${downloadDir}"
# Clean up stale cached binaries that were not used
rm -f /opt/bin/"${packageName}"-* &
Comment thread
Devinwong marked this conversation as resolved.
}

installPackageFromCache() {
Expand Down Expand Up @@ -425,6 +427,7 @@ installPackageFromCache() {
logs_to_events "AKS.CSE.install${packageName}.extractDebBinaryFromFile" "extractDebBinaryFromFile ${debFile} ${packageName} ${targetPath}" || exit "$ERR_APT_INSTALL_TIMEOUT"

rm -rf "${downloadDir}"
rm -f /opt/bin/"${packageName}"-* &
}

downloadPkgFromVersion() {
Expand Down
Loading