From 34a501b38449dadead9e4c63c3b06703994ee762 Mon Sep 17 00:00:00 2001 From: Ian Lumsden Date: Mon, 7 Jul 2025 13:51:27 -0700 Subject: [PATCH 1/2] Fixes CSIDriver URL across all infrastructure --- .../infrastructure/test-c7i-24xlarge/configure_kubernetes.sh | 2 +- .../infrastructure/test-c7i-48xlarge/configure_kubernetes.sh | 2 +- .../infrastructure/test-c7i-metal-24xl/configure_kubernetes.sh | 2 +- .../infrastructure/test-c7i-metal-48xl/configure_kubernetes.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2025-HPDC/infrastructure/test-c7i-24xlarge/configure_kubernetes.sh b/2025-HPDC/infrastructure/test-c7i-24xlarge/configure_kubernetes.sh index 9cee3f6..3b21e07 100755 --- a/2025-HPDC/infrastructure/test-c7i-24xlarge/configure_kubernetes.sh +++ b/2025-HPDC/infrastructure/test-c7i-24xlarge/configure_kubernetes.sh @@ -10,7 +10,7 @@ if ! command -v kubectl >/dev/null 2>&1; then fi echo "Configuring the Cluster Autoscaler:" -kubectl apply -k "github.com/kubernetes-sigs/aws-ebs-csi-driver/deploy/kubernetes/overlays/stable/?ref=1.45.0" +kubectl apply -k "github.com/kubernetes-sigs/aws-ebs-csi-driver/deploy/kubernetes/overlays/stable/?ref=release-1.45.0" kubectl apply -f ./cluster-autoscaler.yaml echo "" echo "Configuring the Storage Class:" diff --git a/2025-HPDC/infrastructure/test-c7i-48xlarge/configure_kubernetes.sh b/2025-HPDC/infrastructure/test-c7i-48xlarge/configure_kubernetes.sh index 9cee3f6..3b21e07 100755 --- a/2025-HPDC/infrastructure/test-c7i-48xlarge/configure_kubernetes.sh +++ b/2025-HPDC/infrastructure/test-c7i-48xlarge/configure_kubernetes.sh @@ -10,7 +10,7 @@ if ! command -v kubectl >/dev/null 2>&1; then fi echo "Configuring the Cluster Autoscaler:" -kubectl apply -k "github.com/kubernetes-sigs/aws-ebs-csi-driver/deploy/kubernetes/overlays/stable/?ref=1.45.0" +kubectl apply -k "github.com/kubernetes-sigs/aws-ebs-csi-driver/deploy/kubernetes/overlays/stable/?ref=release-1.45.0" kubectl apply -f ./cluster-autoscaler.yaml echo "" echo "Configuring the Storage Class:" diff --git a/2025-HPDC/infrastructure/test-c7i-metal-24xl/configure_kubernetes.sh b/2025-HPDC/infrastructure/test-c7i-metal-24xl/configure_kubernetes.sh index 9cee3f6..3b21e07 100755 --- a/2025-HPDC/infrastructure/test-c7i-metal-24xl/configure_kubernetes.sh +++ b/2025-HPDC/infrastructure/test-c7i-metal-24xl/configure_kubernetes.sh @@ -10,7 +10,7 @@ if ! command -v kubectl >/dev/null 2>&1; then fi echo "Configuring the Cluster Autoscaler:" -kubectl apply -k "github.com/kubernetes-sigs/aws-ebs-csi-driver/deploy/kubernetes/overlays/stable/?ref=1.45.0" +kubectl apply -k "github.com/kubernetes-sigs/aws-ebs-csi-driver/deploy/kubernetes/overlays/stable/?ref=release-1.45.0" kubectl apply -f ./cluster-autoscaler.yaml echo "" echo "Configuring the Storage Class:" diff --git a/2025-HPDC/infrastructure/test-c7i-metal-48xl/configure_kubernetes.sh b/2025-HPDC/infrastructure/test-c7i-metal-48xl/configure_kubernetes.sh index 9cee3f6..3b21e07 100755 --- a/2025-HPDC/infrastructure/test-c7i-metal-48xl/configure_kubernetes.sh +++ b/2025-HPDC/infrastructure/test-c7i-metal-48xl/configure_kubernetes.sh @@ -10,7 +10,7 @@ if ! command -v kubectl >/dev/null 2>&1; then fi echo "Configuring the Cluster Autoscaler:" -kubectl apply -k "github.com/kubernetes-sigs/aws-ebs-csi-driver/deploy/kubernetes/overlays/stable/?ref=1.45.0" +kubectl apply -k "github.com/kubernetes-sigs/aws-ebs-csi-driver/deploy/kubernetes/overlays/stable/?ref=release-1.45.0" kubectl apply -f ./cluster-autoscaler.yaml echo "" echo "Configuring the Storage Class:" From 4078aa11faac18301c946c7324a545d53838fd3f Mon Sep 17 00:00:00 2001 From: Ian Lumsden Date: Mon, 7 Jul 2025 14:39:02 -0700 Subject: [PATCH 2/2] Finally actually fixes the CSIDriver URLs --- 2025-HPDC/infrastructure/test-c7i-24xlarge/config.toml | 2 +- .../infrastructure/test-c7i-24xlarge/configure_kubernetes.sh | 2 +- 2025-HPDC/infrastructure/test-c7i-48xlarge/config.toml | 2 +- .../infrastructure/test-c7i-48xlarge/configure_kubernetes.sh | 2 +- 2025-HPDC/infrastructure/test-c7i-metal-24xl/config.toml | 2 +- .../infrastructure/test-c7i-metal-24xl/configure_kubernetes.sh | 2 +- 2025-HPDC/infrastructure/test-c7i-metal-48xl/config.toml | 2 +- .../infrastructure/test-c7i-metal-48xl/configure_kubernetes.sh | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/2025-HPDC/infrastructure/test-c7i-24xlarge/config.toml b/2025-HPDC/infrastructure/test-c7i-24xlarge/config.toml index 235bd27..714ca6a 100644 --- a/2025-HPDC/infrastructure/test-c7i-24xlarge/config.toml +++ b/2025-HPDC/infrastructure/test-c7i-24xlarge/config.toml @@ -50,5 +50,5 @@ init_image_entrypoint = "/entrypoint.sh" [aws."utility scripts"] tutorial_name = "hpdc-2025-c7i-24xlarge" jupyterhub_helm_version = "4.2.0" -ebs_csidriver_version = "1.45.0" +ebs_csidriver_version = "v1.45.0" ebs_storage_type = "gp3" diff --git a/2025-HPDC/infrastructure/test-c7i-24xlarge/configure_kubernetes.sh b/2025-HPDC/infrastructure/test-c7i-24xlarge/configure_kubernetes.sh index 3b21e07..5c4bee6 100755 --- a/2025-HPDC/infrastructure/test-c7i-24xlarge/configure_kubernetes.sh +++ b/2025-HPDC/infrastructure/test-c7i-24xlarge/configure_kubernetes.sh @@ -10,7 +10,7 @@ if ! command -v kubectl >/dev/null 2>&1; then fi echo "Configuring the Cluster Autoscaler:" -kubectl apply -k "github.com/kubernetes-sigs/aws-ebs-csi-driver/deploy/kubernetes/overlays/stable/?ref=release-1.45.0" +kubectl apply -k "github.com/kubernetes-sigs/aws-ebs-csi-driver/deploy/kubernetes/overlays/stable/?ref=v1.45.0" kubectl apply -f ./cluster-autoscaler.yaml echo "" echo "Configuring the Storage Class:" diff --git a/2025-HPDC/infrastructure/test-c7i-48xlarge/config.toml b/2025-HPDC/infrastructure/test-c7i-48xlarge/config.toml index e30c386..16c22af 100644 --- a/2025-HPDC/infrastructure/test-c7i-48xlarge/config.toml +++ b/2025-HPDC/infrastructure/test-c7i-48xlarge/config.toml @@ -50,5 +50,5 @@ init_image_entrypoint = "/entrypoint.sh" [aws."utility scripts"] tutorial_name = "hpdc-2025-c7i-48xlarge" jupyterhub_helm_version = "4.2.0" -ebs_csidriver_version = "1.45.0" +ebs_csidriver_version = "v1.45.0" ebs_storage_type = "gp3" diff --git a/2025-HPDC/infrastructure/test-c7i-48xlarge/configure_kubernetes.sh b/2025-HPDC/infrastructure/test-c7i-48xlarge/configure_kubernetes.sh index 3b21e07..5c4bee6 100755 --- a/2025-HPDC/infrastructure/test-c7i-48xlarge/configure_kubernetes.sh +++ b/2025-HPDC/infrastructure/test-c7i-48xlarge/configure_kubernetes.sh @@ -10,7 +10,7 @@ if ! command -v kubectl >/dev/null 2>&1; then fi echo "Configuring the Cluster Autoscaler:" -kubectl apply -k "github.com/kubernetes-sigs/aws-ebs-csi-driver/deploy/kubernetes/overlays/stable/?ref=release-1.45.0" +kubectl apply -k "github.com/kubernetes-sigs/aws-ebs-csi-driver/deploy/kubernetes/overlays/stable/?ref=v1.45.0" kubectl apply -f ./cluster-autoscaler.yaml echo "" echo "Configuring the Storage Class:" diff --git a/2025-HPDC/infrastructure/test-c7i-metal-24xl/config.toml b/2025-HPDC/infrastructure/test-c7i-metal-24xl/config.toml index 1a6e319..dbf985e 100644 --- a/2025-HPDC/infrastructure/test-c7i-metal-24xl/config.toml +++ b/2025-HPDC/infrastructure/test-c7i-metal-24xl/config.toml @@ -50,5 +50,5 @@ init_image_entrypoint = "/entrypoint.sh" [aws."utility scripts"] tutorial_name = "hpdc-2025-c7i-metal-24xl" jupyterhub_helm_version = "4.2.0" -ebs_csidriver_version = "1.45.0" +ebs_csidriver_version = "v1.45.0" ebs_storage_type = "gp3" diff --git a/2025-HPDC/infrastructure/test-c7i-metal-24xl/configure_kubernetes.sh b/2025-HPDC/infrastructure/test-c7i-metal-24xl/configure_kubernetes.sh index 3b21e07..5c4bee6 100755 --- a/2025-HPDC/infrastructure/test-c7i-metal-24xl/configure_kubernetes.sh +++ b/2025-HPDC/infrastructure/test-c7i-metal-24xl/configure_kubernetes.sh @@ -10,7 +10,7 @@ if ! command -v kubectl >/dev/null 2>&1; then fi echo "Configuring the Cluster Autoscaler:" -kubectl apply -k "github.com/kubernetes-sigs/aws-ebs-csi-driver/deploy/kubernetes/overlays/stable/?ref=release-1.45.0" +kubectl apply -k "github.com/kubernetes-sigs/aws-ebs-csi-driver/deploy/kubernetes/overlays/stable/?ref=v1.45.0" kubectl apply -f ./cluster-autoscaler.yaml echo "" echo "Configuring the Storage Class:" diff --git a/2025-HPDC/infrastructure/test-c7i-metal-48xl/config.toml b/2025-HPDC/infrastructure/test-c7i-metal-48xl/config.toml index b59f4c0..eb27e08 100644 --- a/2025-HPDC/infrastructure/test-c7i-metal-48xl/config.toml +++ b/2025-HPDC/infrastructure/test-c7i-metal-48xl/config.toml @@ -50,5 +50,5 @@ init_image_entrypoint = "/entrypoint.sh" [aws."utility scripts"] tutorial_name = "hpdc-2025-c7i-metal-48xl" jupyterhub_helm_version = "4.2.0" -ebs_csidriver_version = "1.45.0" +ebs_csidriver_version = "v1.45.0" ebs_storage_type = "gp3" diff --git a/2025-HPDC/infrastructure/test-c7i-metal-48xl/configure_kubernetes.sh b/2025-HPDC/infrastructure/test-c7i-metal-48xl/configure_kubernetes.sh index 3b21e07..5c4bee6 100755 --- a/2025-HPDC/infrastructure/test-c7i-metal-48xl/configure_kubernetes.sh +++ b/2025-HPDC/infrastructure/test-c7i-metal-48xl/configure_kubernetes.sh @@ -10,7 +10,7 @@ if ! command -v kubectl >/dev/null 2>&1; then fi echo "Configuring the Cluster Autoscaler:" -kubectl apply -k "github.com/kubernetes-sigs/aws-ebs-csi-driver/deploy/kubernetes/overlays/stable/?ref=release-1.45.0" +kubectl apply -k "github.com/kubernetes-sigs/aws-ebs-csi-driver/deploy/kubernetes/overlays/stable/?ref=v1.45.0" kubectl apply -f ./cluster-autoscaler.yaml echo "" echo "Configuring the Storage Class:"