Skip to content

Commit ef5e03c

Browse files
authored
fix: only update pmc repo when installing deb pkgs (#7332)
1 parent 2da48e9 commit ef5e03c

File tree

85 files changed

+178
-168
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+178
-168
lines changed

parts/linux/cloud-init/artifacts/ubuntu/cse_helpers_ubuntu.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ _apt_get_update() {
4646
apt_get_update() {
4747
_apt_get_update 10 ""
4848
}
49+
apt_get_update_with_opts() {
50+
local apt_opts=$1
51+
_apt_get_update 10 "${apt_opts}"
52+
}
4953
_apt_get_install() {
5054
local retries=$1
5155
local wait_sleep=$2

parts/linux/cloud-init/artifacts/ubuntu/cse_install_ubuntu.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@ updateAptWithMicrosoftPkg() {
7272
apt_get_update || exit $ERR_APT_UPDATE_TIMEOUT
7373
}
7474

75+
updatePMCRepository() {
76+
local opts="-o Dir::Etc::sourcelist=/etc/apt/sources.list.d/microsoft-prod.list -o Dir::Etc::sourceparts=-"
77+
apt_get_update_with_opts "${opts}" || exit $ERR_APT_UPDATE_TIMEOUT
78+
}
79+
7580
updateAptWithNvidiaPkg() {
7681
readonly nvidia_gpg_keyring_path="/etc/apt/keyrings/nvidia.pub"
7782
mkdir -p "$(dirname "${nvidia_gpg_keyring_path}")"
@@ -272,8 +277,9 @@ installPkgWithAptGet() {
272277
return 0
273278
fi
274279

280+
# update pmc repo to get latest package versions
281+
updatePMCRepository
275282
# query all package versions and get the latest version for matching k8s version
276-
updateAptWithMicrosoftPkg
277283
fullPackageVersion=$(apt list ${packageName} --all-versions | grep ${packageVersion}- | awk '{print $2}' | sort -V | tail -n 1)
278284
if [ -z "${fullPackageVersion}" ]; then
279285
echo "Failed to find valid ${packageName} version for ${packageVersion}"

pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)