diff --git a/2025-HPCIC/infrastructure/production/README.md b/2025-HPCIC/infrastructure/production/README.md index a276698..8eec86e 100644 --- a/2025-HPCIC/infrastructure/production/README.md +++ b/2025-HPCIC/infrastructure/production/README.md @@ -1,6 +1,6 @@ -# Deploy hpcic-2025-tutorial to AWS Elastic Kubernetes Service (EKS) +# Deploy perftools-hpcic-2025-tutorial to AWS Elastic Kubernetes Service (EKS) -These config files and scripts can be used to deploy the hpcic-2025-tutorial tutorial to EKS. +These config files and scripts can be used to deploy the perftools-hpcic-2025-tutorial tutorial to EKS. The sections below walk you through the steps to deploying your cluster. All commands in these sections should be run from the same directory as this README. @@ -111,4 +111,4 @@ $ ./cleanup.sh ``` After cleaning everything up, you can verify that everything has been cleaned up by going to the AWS web consle -and ensuring nothing from your tutorial still exists in CloudFormation and EKS. +and ensuring nothing from your tutorial still exists in CloudFormation and EKS. \ No newline at end of file diff --git a/2025-HPCIC/infrastructure/production/cleanup.sh b/2025-HPCIC/infrastructure/production/cleanup.sh index 1d4ed2d..1ba8862 100755 --- a/2025-HPCIC/infrastructure/production/cleanup.sh +++ b/2025-HPCIC/infrastructure/production/cleanup.sh @@ -27,7 +27,7 @@ fi # if the JupyterHub deployment failed or was previously torn down set +e echo "Tearing down JupyterHub and uninstalling everything related to Helm:" -helm uninstall hpcic-2025-tutorial-jupyter +helm uninstall perftools-hpcic-2025-tutorial-jupyter set -e echo "" @@ -39,4 +39,4 @@ echo "Deleting the EKS cluster:" eksctl delete cluster --config-file ./eksctl-config.yaml --wait echo "" -echo "Everything is now cleaned up!" +echo "Everything is now cleaned up!" \ No newline at end of file diff --git a/2025-HPCIC/infrastructure/production/cluster-autoscaler.yaml b/2025-HPCIC/infrastructure/production/cluster-autoscaler.yaml index 29d29d9..fbfc2c6 100644 --- a/2025-HPCIC/infrastructure/production/cluster-autoscaler.yaml +++ b/2025-HPCIC/infrastructure/production/cluster-autoscaler.yaml @@ -245,7 +245,7 @@ spec: - --cloud-provider=aws - --skip-nodes-with-local-storage=false - --expander=least-waste - - --node-group-auto-discovery=asg:tag=k8s.io/cluster-autoscaler/enabled,k8s.io/cluster-autoscaler/hpcic-2025-tutorial + - --node-group-auto-discovery=asg:tag=k8s.io/cluster-autoscaler/enabled,k8s.io/cluster-autoscaler/perftools-hpcic-2025-tutorial volumeMounts: # Mount the CA SSL/TLS certificates into the container - name: ssl-certs @@ -269,4 +269,4 @@ spec: volumes: - name: ssl-certs hostPath: - path: "/etc/ssl/certs/ca-bundle.crt" + path: "/etc/ssl/certs/ca-bundle.crt" \ No newline at end of file diff --git a/2025-HPCIC/infrastructure/production/config.toml b/2025-HPCIC/infrastructure/production/config.toml index 60d9561..7c97277 100644 --- a/2025-HPCIC/infrastructure/production/config.toml +++ b/2025-HPCIC/infrastructure/production/config.toml @@ -1,7 +1,7 @@ -tutorial_name = "hpcic-2025-tutorial" +tutorial_name = "perftools-hpcic-2025-tutorial" [aws.eksctl] -cluster_name = "hpcic-2025-tutorial" +cluster_name = "perftools-hpcic-2025-tutorial" cluster_deployment_region = "us-east-1" cluster_availability_zones = [ "us-east-1a", diff --git a/2025-HPCIC/infrastructure/production/deploy_jupyterhub.sh b/2025-HPCIC/infrastructure/production/deploy_jupyterhub.sh index 247d11a..7962d98 100755 --- a/2025-HPCIC/infrastructure/production/deploy_jupyterhub.sh +++ b/2025-HPCIC/infrastructure/production/deploy_jupyterhub.sh @@ -14,7 +14,7 @@ helm repo add jupyterhub https://hub.jupyter.org/helm-chart/ helm repo update echo "" echo "Installing the Helm chart and deploying JupyterHub to EKS:" -helm install hpcic-2025-tutorial-jupyter jupyterhub/jupyterhub --version 4.2.0 --values ./helm-config.yaml +helm install perftools-hpcic-2025-tutorial-jupyter jupyterhub/jupyterhub --version 4.2.0 --values ./helm-config.yaml echo "" echo "Done deploying JupyterHub!" @@ -37,4 +37,4 @@ echo "Note: users should have unique usernames. If two users have the same usern echo " share the same pod." echo "" echo "After you are done with your tutorial, you should finally run cleanup.sh to bring down" -echo "the EKS cluster and all associated resources." +echo "the EKS cluster and all associated resources." \ No newline at end of file diff --git a/2025-HPCIC/infrastructure/production/eksctl-config.yaml b/2025-HPCIC/infrastructure/production/eksctl-config.yaml index 270160f..43ece6a 100644 --- a/2025-HPCIC/infrastructure/production/eksctl-config.yaml +++ b/2025-HPCIC/infrastructure/production/eksctl-config.yaml @@ -2,7 +2,7 @@ apiVersion: eksctl.io/v1alpha5 kind: ClusterConfig # Define the name of the cluster and the deployment region metadata: - name: hpcic-2025-tutorial + name: perftools-hpcic-2025-tutorial region: us-east-1 # Create the IAM policies needed to enable the autoscaler and storage diff --git a/2025-HPCIC/infrastructure/production/helm-config.yaml b/2025-HPCIC/infrastructure/production/helm-config.yaml index 97e7fd1..82481ff 100644 --- a/2025-HPCIC/infrastructure/production/helm-config.yaml +++ b/2025-HPCIC/infrastructure/production/helm-config.yaml @@ -118,3 +118,4 @@ singleuser: extraVolumeMounts: - name: shm-volume mountPath: /dev/shm + \ No newline at end of file diff --git a/2025-HPCIC/infrastructure/production/tear_down_jupyterhub.sh b/2025-HPCIC/infrastructure/production/tear_down_jupyterhub.sh index 652e5eb..9b9ac17 100755 --- a/2025-HPCIC/infrastructure/production/tear_down_jupyterhub.sh +++ b/2025-HPCIC/infrastructure/production/tear_down_jupyterhub.sh @@ -9,9 +9,9 @@ if ! command -v helm >/dev/null 2>&1; then exit 1 fi -helm uninstall hpcic-2025-tutorial-jupyter +helm uninstall perftools-hpcic-2025-tutorial-jupyter echo "Helm's JupyterHub deployment is torn down." echo "If any attendee pods are remaining, you can delete them with 'kubectl delete pod '" echo "" -echo "To recreate the JupyterHub deployment, just run deploy_jupyterhub.sh again." +echo "To recreate the JupyterHub deployment, just run deploy_jupyterhub.sh again." \ No newline at end of file diff --git a/2025-HPCIC/infrastructure/production/update_jupyterhub_deployment.sh b/2025-HPCIC/infrastructure/production/update_jupyterhub_deployment.sh index ecc0b49..bf136ab 100755 --- a/2025-HPCIC/infrastructure/production/update_jupyterhub_deployment.sh +++ b/2025-HPCIC/infrastructure/production/update_jupyterhub_deployment.sh @@ -9,6 +9,6 @@ if ! command -v helm >/dev/null 2>&1; then exit 1 fi -helm upgrade hpcic-2025-tutorial-jupyter jupyterhub/jupyterhub --values ./helm-config.yaml +helm upgrade perftools-hpcic-2025-tutorial-jupyter jupyterhub/jupyterhub --values ./helm-config.yaml -echo "The JupyterHub deployment is updated!" +echo "The JupyterHub deployment is updated!" \ No newline at end of file