Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update logic for pulling cni plugins and bump version
Browse files Browse the repository at this point in the history
ndbaker1 committed Nov 12, 2024

Verified

This commit was signed with the committer’s verified signature.
jkcdarunday Jan Keith Darunday
1 parent f81d9fa commit 916ff5f
Showing 2 changed files with 26 additions and 5 deletions.
29 changes: 25 additions & 4 deletions templates/al2/provisioners/install-worker.sh
Original file line number Diff line number Diff line change
@@ -272,9 +272,30 @@ elif [ "$BINARY_BUCKET_REGION" = "eu-isoe-west-1" ]; then
elif [ "$BINARY_BUCKET_REGION" = "us-isof-south-1" ]; then
S3_DOMAIN="csp.hci.ic.gov"
fi

# TODO: start deprecating these.
S3_URL_BASE="https://$BINARY_BUCKET_NAME.s3.$BINARY_BUCKET_REGION.$S3_DOMAIN/$KUBERNETES_VERSION/$KUBERNETES_BUILD_DATE/bin/linux/$ARCH"
S3_PATH="s3://$BINARY_BUCKET_NAME/$KUBERNETES_VERSION/$KUBERNETES_BUILD_DATE/bin/linux/$ARCH"

function s3_binary_path() {
local binary_name=""
local os="linux"
local arch="$ARCH"
local version=""
while getopts 'n:o:a:v:' OPTION; do
case "$OPTION" in
n) binary_name="$OPTARG" ;;
o) os="$OPTARG" ;;
a) arch="$OPTARG" ;;
v) version="$OPTARG" ;;
esac
done
echo "bin/$binary_name/$version/$os/$arch/$binary_name"
}

S3_URI_BASE="s3://$BINARY_BUCKET_NAME"
S3_HTTP_BASE="https://$BINARY_BUCKET_NAME.s3.$BINARY_BUCKET_REGION.$S3_DOMAIN"

BINARIES=(
kubelet
aws-iam-authenticator
@@ -316,12 +337,12 @@ if [ "$PULL_CNI_FROM_GITHUB" = "true" ]; then
else
if [[ -n "$AWS_ACCESS_KEY_ID" ]]; then
echo "AWS cli present - using it to copy binaries from s3."
aws s3 cp --region $BINARY_BUCKET_REGION $S3_PATH/${CNI_PLUGIN_FILENAME}.tgz .
aws s3 cp --region $BINARY_BUCKET_REGION $S3_PATH/${CNI_PLUGIN_FILENAME}.tgz.sha256 .
aws s3 cp --region $BINARY_BUCKET_REGION $S3_URI_BASE/$(s3_binary_path -n cni-plugins -v $CNI_PLUGIN_VERSION).tgz $CNI_PLUGIN_FILENAME.tgz
aws s3 cp --region $BINARY_BUCKET_REGION $S3_URI_BASE/$(s3_binary_path -n cni-plugins -v $CNI_PLUGIN_VERSION).tgz.sha256 $CNI_PLUGIN_FILENAME.tgz.sha256
else
echo "AWS cli missing - using wget to fetch cni binaries from s3. Note: This won't work for private bucket."
sudo wget "$S3_URL_BASE/${CNI_PLUGIN_FILENAME}.tgz"
sudo wget "$S3_URL_BASE/${CNI_PLUGIN_FILENAME}.tgz.sha256"
sudo wget -O $CNI_PLUGIN_FILENAME.tgz "$S3_HTTP_BASE/$(s3_binary_path -n cni-plugins -v $CNI_PLUGIN_VERSION).tgz"
sudo wget -O $CNI_PLUGIN_FILENAME.tgz.sha256 "$S3_HTTP_BASE/$(s3_binary_path -n cni-plugins -v $CNI_PLUGIN_VERSION).tgz.sha256"
fi
sudo sha256sum -c "${CNI_PLUGIN_FILENAME}.tgz.sha256"
fi
2 changes: 1 addition & 1 deletion templates/al2/variables-default.json
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
"binary_bucket_name": "amazon-eks",
"binary_bucket_region": "us-west-2",
"cache_container_images": "false",
"cni_plugin_version": "v1.2.0",
"cni_plugin_version": "v1.5.1",
"containerd_version": "1.7.*",
"creator": "{{env `USER`}}",
"docker_version": "none",

0 comments on commit 916ff5f

Please sign in to comment.