Skip to content
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

bug: don't create k8s_downloads_dir if var is not set #5984

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

bug: don't create k8s_downloads_dir if var is not set #5984

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4723673
save times were looking correct?
AlisonB319 Mar 4, 2025
0e93d58
feat: fix k8s downloads dir
AlisonB319 Mar 4, 2025
9a62e04
cleanup
AlisonB319 Mar 4, 2025
feefed0
cleanup
AlisonB319 Mar 4, 2025
ea15a4e
remove space
AlisonB319 Mar 4, 2025
22aba23
test data
AlisonB319 Mar 4, 2025
20fcb5e
rework the logic
AlisonB319 Mar 5, 2025
cc562d6
just add an if around mkdir
AlisonB319 Mar 5, 2025
34efde4
add space
AlisonB319 Mar 5, 2025
a6e098a
remove space to retrigger
AlisonB319 Mar 5, 2025
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
4 changes: 3 additions & 1 deletion 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 @@ -558,7 +558,9 @@ extractKubeBinaries() {
rm -rf /usr/local/bin/kubelet-* /usr/local/bin/kubectl-*
else
k8s_tgz_tmp="${k8s_downloads_dir}/${k8s_tgz_tmp_filename}"
mkdir -p ${k8s_downloads_dir}
if [[ -n "${k8s_downloads_dir}" ]]; then
mkdir -p ${k8s_downloads_dir}
fi
# if the url is a registry url, use oras to pull the artifact instead of curl
if isRegistryUrl "${kube_binary_url}"; then
echo "detect kube_binary_url, ${kube_binary_url}, as registry url, will use oras to pull artifact binary"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Containerd/line40.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,9 @@ extractKubeBinaries() {
rm -rf /usr/local/bin/kubelet-* /usr/local/bin/kubectl-*
else
k8s_tgz_tmp="${k8s_downloads_dir}/${k8s_tgz_tmp_filename}"
mkdir -p ${k8s_downloads_dir}
if [[ -n "${k8s_downloads_dir}" ]]; then
mkdir -p ${k8s_downloads_dir}
fi
if isRegistryUrl "${kube_binary_url}"; then
echo "detect kube_binary_url, ${kube_binary_url}, as registry url, will use oras to pull artifact binary"
k8s_tgz_tmp="${k8s_downloads_dir}/kubernetes-node-linux-${CPU_ARCH}.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line40.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,9 @@ extractKubeBinaries() {
rm -rf /usr/local/bin/kubelet-* /usr/local/bin/kubectl-*
else
k8s_tgz_tmp="${k8s_downloads_dir}/${k8s_tgz_tmp_filename}"
mkdir -p ${k8s_downloads_dir}
if [[ -n "${k8s_downloads_dir}" ]]; then
mkdir -p ${k8s_downloads_dir}
fi
if isRegistryUrl "${kube_binary_url}"; then
echo "detect kube_binary_url, ${kube_binary_url}, as registry url, will use oras to pull artifact binary"
k8s_tgz_tmp="${k8s_downloads_dir}/kubernetes-node-linux-${CPU_ARCH}.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line40.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,9 @@ extractKubeBinaries() {
rm -rf /usr/local/bin/kubelet-* /usr/local/bin/kubectl-*
else
k8s_tgz_tmp="${k8s_downloads_dir}/${k8s_tgz_tmp_filename}"
mkdir -p ${k8s_downloads_dir}
if [[ -n "${k8s_downloads_dir}" ]]; then
mkdir -p ${k8s_downloads_dir}
fi
if isRegistryUrl "${kube_binary_url}"; then
echo "detect kube_binary_url, ${kube_binary_url}, as registry url, will use oras to pull artifact binary"
k8s_tgz_tmp="${k8s_downloads_dir}/kubernetes-node-linux-${CPU_ARCH}.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line40.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,9 @@ extractKubeBinaries() {
rm -rf /usr/local/bin/kubelet-* /usr/local/bin/kubectl-*
else
k8s_tgz_tmp="${k8s_downloads_dir}/${k8s_tgz_tmp_filename}"
mkdir -p ${k8s_downloads_dir}
if [[ -n "${k8s_downloads_dir}" ]]; then
mkdir -p ${k8s_downloads_dir}
fi
if isRegistryUrl "${kube_binary_url}"; then
echo "detect kube_binary_url, ${kube_binary_url}, as registry url, will use oras to pull artifact binary"
k8s_tgz_tmp="${k8s_downloads_dir}/kubernetes-node-linux-${CPU_ARCH}.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/line40.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,9 @@ extractKubeBinaries() {
rm -rf /usr/local/bin/kubelet-* /usr/local/bin/kubectl-*
else
k8s_tgz_tmp="${k8s_downloads_dir}/${k8s_tgz_tmp_filename}"
mkdir -p ${k8s_downloads_dir}
if [[ -n "${k8s_downloads_dir}" ]]; then
mkdir -p ${k8s_downloads_dir}
fi
if isRegistryUrl "${kube_binary_url}"; then
echo "detect kube_binary_url, ${kube_binary_url}, as registry url, will use oras to pull artifact binary"
k8s_tgz_tmp="${k8s_downloads_dir}/kubernetes-node-linux-${CPU_ARCH}.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Docker/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion pkg/agent/testdata/AKSUbuntu1604+Docker/line40.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,9 @@ extractKubeBinaries() {
rm -rf /usr/local/bin/kubelet-* /usr/local/bin/kubectl-*
else
k8s_tgz_tmp="${k8s_downloads_dir}/${k8s_tgz_tmp_filename}"
mkdir -p ${k8s_downloads_dir}
if [[ -n "${k8s_downloads_dir}" ]]; then
mkdir -p ${k8s_downloads_dir}
fi
if isRegistryUrl "${kube_binary_url}"; then
echo "detect kube_binary_url, ${kube_binary_url}, as registry url, will use oras to pull artifact binary"
k8s_tgz_tmp="${k8s_downloads_dir}/kubernetes-node-linux-${CPU_ARCH}.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/line40.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,9 @@ extractKubeBinaries() {
rm -rf /usr/local/bin/kubelet-* /usr/local/bin/kubectl-*
else
k8s_tgz_tmp="${k8s_downloads_dir}/${k8s_tgz_tmp_filename}"
mkdir -p ${k8s_downloads_dir}
if [[ -n "${k8s_downloads_dir}" ]]; then
mkdir -p ${k8s_downloads_dir}
fi
if isRegistryUrl "${kube_binary_url}"; then
echo "detect kube_binary_url, ${kube_binary_url}, as registry url, will use oras to pull artifact binary"
k8s_tgz_tmp="${k8s_downloads_dir}/kubernetes-node-linux-${CPU_ARCH}.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/line40.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,9 @@ extractKubeBinaries() {
rm -rf /usr/local/bin/kubelet-* /usr/local/bin/kubectl-*
else
k8s_tgz_tmp="${k8s_downloads_dir}/${k8s_tgz_tmp_filename}"
mkdir -p ${k8s_downloads_dir}
if [[ -n "${k8s_downloads_dir}" ]]; then
mkdir -p ${k8s_downloads_dir}
fi
if isRegistryUrl "${kube_binary_url}"; then
echo "detect kube_binary_url, ${kube_binary_url}, as registry url, will use oras to pull artifact binary"
k8s_tgz_tmp="${k8s_downloads_dir}/kubernetes-node-linux-${CPU_ARCH}.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/line40.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,9 @@ extractKubeBinaries() {
rm -rf /usr/local/bin/kubelet-* /usr/local/bin/kubectl-*
else
k8s_tgz_tmp="${k8s_downloads_dir}/${k8s_tgz_tmp_filename}"
mkdir -p ${k8s_downloads_dir}
if [[ -n "${k8s_downloads_dir}" ]]; then
mkdir -p ${k8s_downloads_dir}
fi
if isRegistryUrl "${kube_binary_url}"; then
echo "detect kube_binary_url, ${kube_binary_url}, as registry url, will use oras to pull artifact binary"
k8s_tgz_tmp="${k8s_downloads_dir}/kubernetes-node-linux-${CPU_ARCH}.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+K8S115/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion pkg/agent/testdata/AKSUbuntu1604+K8S115/line40.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,9 @@ extractKubeBinaries() {
rm -rf /usr/local/bin/kubelet-* /usr/local/bin/kubectl-*
else
k8s_tgz_tmp="${k8s_downloads_dir}/${k8s_tgz_tmp_filename}"
mkdir -p ${k8s_downloads_dir}
if [[ -n "${k8s_downloads_dir}" ]]; then
mkdir -p ${k8s_downloads_dir}
fi
if isRegistryUrl "${kube_binary_url}"; then
echo "detect kube_binary_url, ${kube_binary_url}, as registry url, will use oras to pull artifact binary"
k8s_tgz_tmp="${k8s_downloads_dir}/kubernetes-node-linux-${CPU_ARCH}.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+K8S117/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion pkg/agent/testdata/AKSUbuntu1604+K8S117/line40.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,9 @@ extractKubeBinaries() {
rm -rf /usr/local/bin/kubelet-* /usr/local/bin/kubectl-*
else
k8s_tgz_tmp="${k8s_downloads_dir}/${k8s_tgz_tmp_filename}"
mkdir -p ${k8s_downloads_dir}
if [[ -n "${k8s_downloads_dir}" ]]; then
mkdir -p ${k8s_downloads_dir}
fi
if isRegistryUrl "${kube_binary_url}"; then
echo "detect kube_binary_url, ${kube_binary_url}, as registry url, will use oras to pull artifact binary"
k8s_tgz_tmp="${k8s_downloads_dir}/kubernetes-node-linux-${CPU_ARCH}.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+K8S118/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion pkg/agent/testdata/AKSUbuntu1604+K8S118/line40.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,9 @@ extractKubeBinaries() {
rm -rf /usr/local/bin/kubelet-* /usr/local/bin/kubectl-*
else
k8s_tgz_tmp="${k8s_downloads_dir}/${k8s_tgz_tmp_filename}"
mkdir -p ${k8s_downloads_dir}
if [[ -n "${k8s_downloads_dir}" ]]; then
mkdir -p ${k8s_downloads_dir}
fi
if isRegistryUrl "${kube_binary_url}"; then
echo "detect kube_binary_url, ${kube_binary_url}, as registry url, will use oras to pull artifact binary"
k8s_tgz_tmp="${k8s_downloads_dir}/kubernetes-node-linux-${CPU_ARCH}.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/line40.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,9 @@ extractKubeBinaries() {
rm -rf /usr/local/bin/kubelet-* /usr/local/bin/kubectl-*
else
k8s_tgz_tmp="${k8s_downloads_dir}/${k8s_tgz_tmp_filename}"
mkdir -p ${k8s_downloads_dir}
if [[ -n "${k8s_downloads_dir}" ]]; then
mkdir -p ${k8s_downloads_dir}
fi
if isRegistryUrl "${kube_binary_url}"; then
echo "detect kube_binary_url, ${kube_binary_url}, as registry url, will use oras to pull artifact binary"
k8s_tgz_tmp="${k8s_downloads_dir}/kubernetes-node-linux-${CPU_ARCH}.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/line40.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,9 @@ extractKubeBinaries() {
rm -rf /usr/local/bin/kubelet-* /usr/local/bin/kubectl-*
else
k8s_tgz_tmp="${k8s_downloads_dir}/${k8s_tgz_tmp_filename}"
mkdir -p ${k8s_downloads_dir}
if [[ -n "${k8s_downloads_dir}" ]]; then
mkdir -p ${k8s_downloads_dir}
fi
if isRegistryUrl "${kube_binary_url}"; then
echo "detect kube_binary_url, ${kube_binary_url}, as registry url, will use oras to pull artifact binary"
k8s_tgz_tmp="${k8s_downloads_dir}/kubernetes-node-linux-${CPU_ARCH}.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/line40.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,9 @@ extractKubeBinaries() {
rm -rf /usr/local/bin/kubelet-* /usr/local/bin/kubectl-*
else
k8s_tgz_tmp="${k8s_downloads_dir}/${k8s_tgz_tmp_filename}"
mkdir -p ${k8s_downloads_dir}
if [[ -n "${k8s_downloads_dir}" ]]; then
mkdir -p ${k8s_downloads_dir}
fi
if isRegistryUrl "${kube_binary_url}"; then
echo "detect kube_binary_url, ${kube_binary_url}, as registry url, will use oras to pull artifact binary"
k8s_tgz_tmp="${k8s_downloads_dir}/kubernetes-node-linux-${CPU_ARCH}.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/line40.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,9 @@ extractKubeBinaries() {
rm -rf /usr/local/bin/kubelet-* /usr/local/bin/kubectl-*
else
k8s_tgz_tmp="${k8s_downloads_dir}/${k8s_tgz_tmp_filename}"
mkdir -p ${k8s_downloads_dir}
if [[ -n "${k8s_downloads_dir}" ]]; then
mkdir -p ${k8s_downloads_dir}
fi
if isRegistryUrl "${kube_binary_url}"; then
echo "detect kube_binary_url, ${kube_binary_url}, as registry url, will use oras to pull artifact binary"
k8s_tgz_tmp="${k8s_downloads_dir}/kubernetes-node-linux-${CPU_ARCH}.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/line40.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,9 @@ extractKubeBinaries() {
rm -rf /usr/local/bin/kubelet-* /usr/local/bin/kubectl-*
else
k8s_tgz_tmp="${k8s_downloads_dir}/${k8s_tgz_tmp_filename}"
mkdir -p ${k8s_downloads_dir}
if [[ -n "${k8s_downloads_dir}" ]]; then
mkdir -p ${k8s_downloads_dir}
fi
if isRegistryUrl "${kube_binary_url}"; then
echo "detect kube_binary_url, ${kube_binary_url}, as registry url, will use oras to pull artifact binary"
k8s_tgz_tmp="${k8s_downloads_dir}/kubernetes-node-linux-${CPU_ARCH}.tar.gz"
Expand Down
Loading
Loading