Skip to content

Commit 01ab164

Browse files
authored
fix: ni cluster local repo package install fail to handle test k8s version (#7585)
1 parent 74721c1 commit 01ab164

File tree

61 files changed

+66
-61
lines changed

Some content is hidden

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

61 files changed

+66
-61
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,12 @@ installToolFromBootstrapProfileRegistry() {
535535
# Try to pull distro-specific packages (e.g., .deb for Ubuntu) from registry
536536
local download_root="/tmp/kubernetes/downloads" # /opt folder will return permission error
537537

538-
tool_package_url="${registry_server}/aks/packages/kubernetes/${tool_name}:v${version}"
538+
version_tag="${version}"
539+
if [ "${version}" != "v*" ]; then
540+
version_tag="v${version_tag}"
541+
fi
542+
version_tag="${version_tag/\~/-}"
543+
tool_package_url="${registry_server}/aks/packages/kubernetes/${tool_name}:${version_tag}"
539544
tool_download_dir="${download_root}/${tool_name}"
540545
mkdir -p "${tool_download_dir}"
541546

pkg/agent/testdata/AKSUbuntu2204+China/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pkg/agent/testdata/AKSUbuntu2204+Containerd+CDI/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pkg/agent/testdata/AKSUbuntu2204+Containerd+DevicePlugin/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pkg/agent/testdata/AKSUbuntu2204+CustomCloud+USNat/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pkg/agent/testdata/AKSUbuntu2204+CustomCloud+USSec/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pkg/agent/testdata/AKSUbuntu2204+CustomCloud+ootcredentialprovider/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pkg/agent/testdata/AKSUbuntu2204+CustomCloud/CustomData

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)