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

Jump to bottom

feat: add oras binary to cache #4691

Merged
merged 20 commits into from
Aug 7, 2024
Merged

feat: add oras binary to cache #4691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
cf803c5
fix weird merge with master
AlisonB319 Jul 31, 2024
2da462b
Merge branch 'master' into alburgess/cache-oras
AlisonB319 Aug 1, 2024
8c81b2f
Trigger pipelines
AlisonB319 Aug 1, 2024
985d975
continue when successful
AlisonB319 Aug 1, 2024
10d74ec
fix my logic
AlisonB319 Aug 2, 2024
3bc3226
Merge branch 'master' into alburgess/cache-oras
AlisonB319 Aug 2, 2024
ab3d543
Merge branch 'master' into alburgess/cache-oras
AlisonB319 Aug 5, 2024
c3a5143
Merge branch 'master' into alburgess/cache-oras
AlisonB319 Aug 5, 2024
f25580c
put it at the top of components
AlisonB319 Aug 5, 2024
f828b85
move to packages
AlisonB319 Aug 5, 2024
5ab90b6
add testdata
AlisonB319 Aug 5, 2024
1e43fb4
Merge branch 'master' into alburgess/cache-oras
AlisonB319 Aug 5, 2024
ca25b20
Merge branch 'master' into alburgess/cache-oras
AlisonB319 Aug 6, 2024
85bd830
Merge branch 'master' into alburgess/cache-oras
AlisonB319 Aug 6, 2024
d1d1799
Merge branch 'master' into alburgess/cache-oras
AlisonB319 Aug 7, 2024
a2d50d6
test data
AlisonB319 Aug 7, 2024
5f13fe2
Merge branch 'master' into alburgess/cache-oras
AlisonB319 Aug 7, 2024
8cc300f
install oras after other critical packages
AlisonB319 Aug 7, 2024
34a6a78
Merge branch 'master' into alburgess/cache-oras
AlisonB319 Aug 7, 2024
5afd866
add fixes for 1804
AlisonB319 Aug 7, 2024
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
14 changes: 14 additions & 0 deletions parts/linux/cloud-init/artifacts/components.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,20 @@
}
],
"Packages": [
{
"name": "oras",
"downloadLocation": "/usr/local/bin",
"downloadURIs": {
"default": {
"current": {
"versions": [
"1.2.0"
],
"downloadURL": "https://github.com/oras-project/oras/releases/download/v${version}/oras_${version}_linux_${CPU_ARCH}.tar.gz"
}
}
}
},
{
"name": "runc",
"downloadLocation": "/opt/runc/downloads",
Expand Down
1 change: 1 addition & 0 deletions 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 @@ -30,6 +30,7 @@ ERR_CNI_DOWNLOAD_TIMEOUT=41 # Timeout waiting for CNI downloads
ERR_MS_PROD_DEB_DOWNLOAD_TIMEOUT=42 # Timeout waiting for https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb
ERR_MS_PROD_DEB_PKG_ADD_FAIL=43 # Failed to add repo pkg file
# ERR_FLEXVOLUME_DOWNLOAD_TIMEOUT=44 Failed to add repo pkg file -- DEPRECATED
ERR_ORAS_DOWNLOAD_ERROR=45 # Unable to install oras
ERR_SYSTEMD_INSTALL_FAIL=48 # Unable to install required systemd version
ERR_MODPROBE_FAIL=49 # Unable to load a kernel module using modprobe
ERR_OUTBOUND_CONN_FAIL=50 # Unable to establish outbound connection
Expand Down
25 changes: 25 additions & 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 @@ -189,6 +189,31 @@ downloadContainerdWasmShims() {
done
}

# TODO (alburgess) have oras version managed by dependant or Renovate
installOras() {
ORAS_DOWNLOAD_DIR="/opt/oras/downloads"
ORAS_EXTRACTED_DIR=${1} # Use components.json var for /usr/local/bin for linux-vhd-content-test.sh binary file checks.
ORAS_DOWNLOAD_URL=${2}
ORAS_VERSION=${3}

mkdir -p $ORAS_DOWNLOAD_DIR

echo "Installing Oras version $ORAS_VERSION..."
ORAS_TMP=${ORAS_DOWNLOAD_URL##*/} # Use bash builtin ## to remove all chars ("*") up to the final "/"
retrycmd_get_tarball 120 5 "$ORAS_DOWNLOAD_DIR/${ORAS_TMP}" ${ORAS_DOWNLOAD_URL} || exit $ERR_ORAS_DOWNLOAD_ERROR

if [ ! -f "$ORAS_DOWNLOAD_DIR/${ORAS_TMP}" ]; then
echo "File $ORAS_DOWNLOAD_DIR/${ORAS_TMP} does not exist."
exit $ERR_ORAS_DOWNLOAD_ERROR
fi

echo "File $ORAS_DOWNLOAD_DIR/${ORAS_TMP} exists."
sudo tar -zxf "$ORAS_DOWNLOAD_DIR/${ORAS_TMP}" -C $ORAS_EXTRACTED_DIR/
rm -r "$ORAS_DOWNLOAD_DIR"
echo "Oras version $ORAS_VERSION installed successfully."

}

evalPackageDownloadURL() {
local url=${1:-}
if [[ -n "$url" ]]; then
Expand Down
4 changes: 2 additions & 2 deletions pkg/agent/testdata/AKSUbuntu1604+Containerd/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 24 additions & 0 deletions pkg/agent/testdata/AKSUbuntu1604+Containerd/line40.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,30 @@ downloadContainerdWasmShims() {
done
}

installOras() {
ORAS_DOWNLOAD_DIR="/opt/oras/downloads"
ORAS_EXTRACTED_DIR=${1}
ORAS_DOWNLOAD_URL=${2}
ORAS_VERSION=${3}

mkdir -p $ORAS_DOWNLOAD_DIR

echo "Installing Oras version $ORAS_VERSION..."
ORAS_TMP=${ORAS_DOWNLOAD_URL##*/} # Use bash builtin #
retrycmd_get_tarball 120 5 "$ORAS_DOWNLOAD_DIR/${ORAS_TMP}" ${ORAS_DOWNLOAD_URL} || exit $ERR_ORAS_DOWNLOAD_ERROR

if [ ! -f "$ORAS_DOWNLOAD_DIR/${ORAS_TMP}" ]; then
echo "File $ORAS_DOWNLOAD_DIR/${ORAS_TMP} does not exist."
exit $ERR_ORAS_DOWNLOAD_ERROR
fi

echo "File $ORAS_DOWNLOAD_DIR/${ORAS_TMP} exists."
sudo tar -zxf "$ORAS_DOWNLOAD_DIR/${ORAS_TMP}" -C $ORAS_EXTRACTED_DIR/
rm -r "$ORAS_DOWNLOAD_DIR"
echo "Oras version $ORAS_VERSION installed successfully."

}

evalPackageDownloadURL() {
local url=${1:-}
if [[ -n "$url" ]]; then
Expand Down
1 change: 1 addition & 0 deletions pkg/agent/testdata/AKSUbuntu1604+Containerd/line9.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ ERR_CONTAINERD_VERSION_INVALID=39
ERR_CNI_DOWNLOAD_TIMEOUT=41
ERR_MS_PROD_DEB_DOWNLOAD_TIMEOUT=42
ERR_MS_PROD_DEB_PKG_ADD_FAIL=43
ERR_ORAS_DOWNLOAD_ERROR=45
ERR_SYSTEMD_INSTALL_FAIL=48
ERR_MODPROBE_FAIL=49
ERR_OUTBOUND_CONN_FAIL=50
Expand Down
4 changes: 2 additions & 2 deletions pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 24 additions & 0 deletions 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 @@ -181,6 +181,30 @@ downloadContainerdWasmShims() {
done
}

installOras() {
ORAS_DOWNLOAD_DIR="/opt/oras/downloads"
ORAS_EXTRACTED_DIR=${1}
ORAS_DOWNLOAD_URL=${2}
ORAS_VERSION=${3}

mkdir -p $ORAS_DOWNLOAD_DIR

echo "Installing Oras version $ORAS_VERSION..."
ORAS_TMP=${ORAS_DOWNLOAD_URL##*/} # Use bash builtin #
retrycmd_get_tarball 120 5 "$ORAS_DOWNLOAD_DIR/${ORAS_TMP}" ${ORAS_DOWNLOAD_URL} || exit $ERR_ORAS_DOWNLOAD_ERROR

if [ ! -f "$ORAS_DOWNLOAD_DIR/${ORAS_TMP}" ]; then
echo "File $ORAS_DOWNLOAD_DIR/${ORAS_TMP} does not exist."
exit $ERR_ORAS_DOWNLOAD_ERROR
fi

echo "File $ORAS_DOWNLOAD_DIR/${ORAS_TMP} exists."
sudo tar -zxf "$ORAS_DOWNLOAD_DIR/${ORAS_TMP}" -C $ORAS_EXTRACTED_DIR/
rm -r "$ORAS_DOWNLOAD_DIR"
echo "Oras version $ORAS_VERSION installed successfully."

}

evalPackageDownloadURL() {
local url=${1:-}
if [[ -n "$url" ]]; then
Expand Down
1 change: 1 addition & 0 deletions pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line9.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ ERR_CONTAINERD_VERSION_INVALID=39
ERR_CNI_DOWNLOAD_TIMEOUT=41
ERR_MS_PROD_DEB_DOWNLOAD_TIMEOUT=42
ERR_MS_PROD_DEB_PKG_ADD_FAIL=43
ERR_ORAS_DOWNLOAD_ERROR=45
ERR_SYSTEMD_INSTALL_FAIL=48
ERR_MODPROBE_FAIL=49
ERR_OUTBOUND_CONN_FAIL=50
Expand Down
4 changes: 2 additions & 2 deletions pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 24 additions & 0 deletions 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 @@ -181,6 +181,30 @@ downloadContainerdWasmShims() {
done
}

installOras() {
ORAS_DOWNLOAD_DIR="/opt/oras/downloads"
ORAS_EXTRACTED_DIR=${1}
ORAS_DOWNLOAD_URL=${2}
ORAS_VERSION=${3}

mkdir -p $ORAS_DOWNLOAD_DIR

echo "Installing Oras version $ORAS_VERSION..."
ORAS_TMP=${ORAS_DOWNLOAD_URL##*/} # Use bash builtin #
retrycmd_get_tarball 120 5 "$ORAS_DOWNLOAD_DIR/${ORAS_TMP}" ${ORAS_DOWNLOAD_URL} || exit $ERR_ORAS_DOWNLOAD_ERROR

if [ ! -f "$ORAS_DOWNLOAD_DIR/${ORAS_TMP}" ]; then
echo "File $ORAS_DOWNLOAD_DIR/${ORAS_TMP} does not exist."
exit $ERR_ORAS_DOWNLOAD_ERROR
fi

echo "File $ORAS_DOWNLOAD_DIR/${ORAS_TMP} exists."
sudo tar -zxf "$ORAS_DOWNLOAD_DIR/${ORAS_TMP}" -C $ORAS_EXTRACTED_DIR/
rm -r "$ORAS_DOWNLOAD_DIR"
echo "Oras version $ORAS_VERSION installed successfully."

}

evalPackageDownloadURL() {
local url=${1:-}
if [[ -n "$url" ]]; then
Expand Down
1 change: 1 addition & 0 deletions pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/line9.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ ERR_CONTAINERD_VERSION_INVALID=39
ERR_CNI_DOWNLOAD_TIMEOUT=41
ERR_MS_PROD_DEB_DOWNLOAD_TIMEOUT=42
ERR_MS_PROD_DEB_PKG_ADD_FAIL=43
ERR_ORAS_DOWNLOAD_ERROR=45
ERR_SYSTEMD_INSTALL_FAIL=48
ERR_MODPROBE_FAIL=49
ERR_OUTBOUND_CONN_FAIL=50
Expand Down
4 changes: 2 additions & 2 deletions pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 24 additions & 0 deletions 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 @@ -181,6 +181,30 @@ downloadContainerdWasmShims() {
done
}

installOras() {
ORAS_DOWNLOAD_DIR="/opt/oras/downloads"
ORAS_EXTRACTED_DIR=${1}
ORAS_DOWNLOAD_URL=${2}
ORAS_VERSION=${3}

mkdir -p $ORAS_DOWNLOAD_DIR

echo "Installing Oras version $ORAS_VERSION..."
ORAS_TMP=${ORAS_DOWNLOAD_URL##*/} # Use bash builtin #
retrycmd_get_tarball 120 5 "$ORAS_DOWNLOAD_DIR/${ORAS_TMP}" ${ORAS_DOWNLOAD_URL} || exit $ERR_ORAS_DOWNLOAD_ERROR

if [ ! -f "$ORAS_DOWNLOAD_DIR/${ORAS_TMP}" ]; then
echo "File $ORAS_DOWNLOAD_DIR/${ORAS_TMP} does not exist."
exit $ERR_ORAS_DOWNLOAD_ERROR
fi

echo "File $ORAS_DOWNLOAD_DIR/${ORAS_TMP} exists."
sudo tar -zxf "$ORAS_DOWNLOAD_DIR/${ORAS_TMP}" -C $ORAS_EXTRACTED_DIR/
rm -r "$ORAS_DOWNLOAD_DIR"
echo "Oras version $ORAS_VERSION installed successfully."

}

evalPackageDownloadURL() {
local url=${1:-}
if [[ -n "$url" ]]; then
Expand Down
1 change: 1 addition & 0 deletions pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line9.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ ERR_CONTAINERD_VERSION_INVALID=39
ERR_CNI_DOWNLOAD_TIMEOUT=41
ERR_MS_PROD_DEB_DOWNLOAD_TIMEOUT=42
ERR_MS_PROD_DEB_PKG_ADD_FAIL=43
ERR_ORAS_DOWNLOAD_ERROR=45
ERR_SYSTEMD_INSTALL_FAIL=48
ERR_MODPROBE_FAIL=49
ERR_OUTBOUND_CONN_FAIL=50
Expand Down
Loading
Loading