Change domain for better CN conectivity

awslabs · Sep 28, 2024 · 19cff1b · 19cff1b
1 parent bcea9d1
commit 19cff1b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/templates/al2/provisioners/install-worker.sh b/templates/al2/provisioners/install-worker.sh
@@ -293,7 +293,6 @@ done
 # Verify that the aws-iam-authenticator is at last v0.5.9 or greater. Otherwise, nodes will be
 # unable to join clusters due to upgrading to client.authentication.k8s.io/v1beta1
 iam_auth_version=$(sudo /usr/bin/aws-iam-authenticator version | jq -r .Version)
-iam_auth_version="${iam_auth_version#*-}"
 if vercmp "$iam_auth_version" lt "v0.5.9"; then
   # To resolve this issue, you need to update the aws-iam-authenticator binary. Using binaries distributed by EKS
   # with kubernetes_build_date 2022-10-31 or later include v0.5.10 or greater.

diff --git a/templates/al2023/provisioners/install-nvidia-driver.sh b/templates/al2023/provisioners/install-nvidia-driver.sh
@@ -12,7 +12,14 @@ echo "Installing NVIDIA ${NVIDIA_DRIVER_MAJOR_VERSION} drivers..."
 ################################################################################
 ### Add repository #############################################################
 ################################################################################
-sudo dnf config-manager --add-repo https://developer.download.nvidia.com/compute/cuda/repos/amzn2023/x86_64/cuda-amzn2023.repo
+# Determine the domain based on the region
+if [ "$AWS_REGION" == "cn-*" ]; then
+    DOMAIN="nvidia.cn"
+else
+    DOMAIN="nvidia.com"
+fi
+
+sudo dnf config-manager --add-repo https://developer.download.${DOMAIN}/compute/cuda/repos/amzn2023/x86_64/cuda-amzn2023.repo
 sudo dnf config-manager --add-repo https://nvidia.github.io/libnvidia-container/stable/rpm/nvidia-container-toolkit.repo
 
 sudo sed -i 's/gpgcheck=0/gpgcheck=1/g' /etc/yum.repos.d/nvidia-container-toolkit.repo /etc/yum.repos.d/cuda-amzn2023.repo

diff --git a/templates/al2023/variables-default.json b/templates/al2023/variables-default.json
@@ -20,7 +20,7 @@
     "kms_key_id": "",
     "launch_block_device_mappings_volume_size": "20",
     "nodeadm_build_image": "public.ecr.aws/eks-distro-build-tooling/golang:1.23",
-    "nvidia_driver_major_version": "555",
+    "nvidia_driver_major_version": "560",
     "remote_folder": "/tmp",
     "runc_version": "*",
     "security_group_id": "",