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.

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

feat: Move WASM to components.json #4969

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

Conversation

AlisonB319
Copy link
Collaborator

@AlisonB319 AlisonB319 commented Sep 18, 2024

What type of PR is this?

What this PR does / why we need it: removing hard coded wasm version and acs-mirror url to components.json

Which issue(s) this PR fixes:

Fixes #

Requirements:

Special notes for your reviewer:

Release note:

none

parts/linux/cloud-init/artifacts/components.json Outdated Show resolved Hide resolved
parts/linux/cloud-init/artifacts/cse_main.sh Outdated Show resolved Hide resolved
parts/linux/cloud-init/artifacts/cse_main.sh Outdated Show resolved Hide resolved
parts/linux/cloud-init/artifacts/cse_install.sh Outdated Show resolved Hide resolved
parts/linux/cloud-init/artifacts/cse_install.sh Outdated Show resolved Hide resolved
parts/linux/cloud-init/artifacts/cse_install.sh Outdated Show resolved Hide resolved
vhdbuilder/packer/install-dependencies.sh Outdated Show resolved Hide resolved
vhdbuilder/packer/test/linux-vhd-content-test.sh Outdated Show resolved Hide resolved
vhdbuilder/packer/test/linux-vhd-content-test.sh Outdated Show resolved Hide resolved
parts/linux/cloud-init/artifacts/cse_install.sh Outdated Show resolved Hide resolved
parts/linux/cloud-init/artifacts/cse_install.sh Outdated Show resolved Hide resolved
parts/linux/cloud-init/artifacts/cse_install.sh Outdated Show resolved Hide resolved
done
fi
for shim in "${shims_to_download[@]}"; do
chmod 755 "$containerd_wasm_filepath/containerd-${shim}-${binary_version}-v1"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
chmod 755 "$containerd_wasm_filepath/containerd-${shim}-${binary_version}-v1"
chmod 755 "$containerd_wasm_filepath/containerd-shim-${shim}-${binary_version}-v1"

local shims_to_download=${3}
local binary_version="$(echo "${shim_version}" | tr . -)"

chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v2"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-${binary_version}-v2"
chmod 755 "$containerd_wasm_filepath/containerd-shim-spin-v2"

Comment on lines +271 to +275
for shim in "${shims_to_download[@]}"; do
retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-${shim}-${binary_version}-v1" "$containerd_wasm_url/containerd-shim-${shim}-v1" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) &
WASMSHIMPIDS+=($!)
done
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question: shouldn't this for loop be put in the else block since it's downloading from acs-mirror path, instead of MCR registry?

Comment on lines +328 to +330
retrycmd_if_failure 30 5 60 curl -fSLv -o "$containerd_wasm_filepath/containerd-shim-spin-v2" "$containerd_wasm_url/containerd-shim-spin-v2" 2>&1 | tee $CURL_OUTPUT >/dev/null | grep -E "^(curl:.*)|([eE]rr.*)$" && (cat $CURL_OUTPUT && exit $ERR_KRUSTLET_DOWNLOAD_TIMEOUT) &
SPINKUBEPIDS+=($!)
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same question as above, shound't this be placed inside a else block?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants