Update image references to 6.1.0

Author: bsngardner

docs/faq.md

@@ -234,11 +234,11 @@ accross all instances and allows easy user control with
 ### What Slurm image do I use for production?
 
 By default, the [slurm_cluster](../terraform/slurm_cluster/README.md) terraform
-module uses the latest Slurm image family (e.g. `slurm-gcp-6-0-hpc-centos-7`).
-As new Slurm image families are released, coenciding with periodic Slurm
-releases, the terraform module will be updated to track the newest image family
-by setting it as the new default. This update can be considered a breaking
-change.
+module uses the latest Slurm image family (e.g.
+`slurm-gcp-6-1-hpc-rocky-linux-8`). As new Slurm image families are released,
+coenciding with periodic Slurm releases, the terraform module will be updated to
+track the newest image family by setting it as the new default. This update can
+be considered a breaking change.
 
 In a production setting, it is recommended to explicitly set an image family.
 Doing so will prevent `slurm-gcp` changes to the default image family from

docs/images.md

@@ -74,12 +74,12 @@ For the [TPU](./glossary.md#tpu) nodes docker images are also released.
 
 |       Project        | Image Family                        | Arch   | Status         |
 | :------------------: | :---------------------------------- | :----- | :------------- |
-| schedmd-slurm-public | slurm-gcp-6-0-debian-11             | x86_64 | Supported      |
-| schedmd-slurm-public | slurm-gcp-6-0-hpc-rocky-linux-8     | x86_64 | Supported      |
-| schedmd-slurm-public | slurm-gcp-6-0-ubuntu-2004-lts       | x86_64 | Supported      |
-| schedmd-slurm-public | slurm-gcp-6-0-ubuntu-2204-lts-arm64 | ARM64  | Supported      |
-| schedmd-slurm-public | slurm-gcp-6-0-hpc-centos-7-k80      | x86_64 | EOL 2024-05-01 |
-| schedmd-slurm-public | slurm-gcp-6-0-hpc-centos-7          | x86_64 | EOL 2024-01-01 |
+| schedmd-slurm-public | slurm-gcp-6-1-debian-11             | x86_64 | Supported      |
+| schedmd-slurm-public | slurm-gcp-6-1-hpc-rocky-linux-8     | x86_64 | Supported      |
+| schedmd-slurm-public | slurm-gcp-6-1-ubuntu-2004-lts       | x86_64 | Supported      |
+| schedmd-slurm-public | slurm-gcp-6-1-ubuntu-2204-lts-arm64 | ARM64  | Supported      |
+| schedmd-slurm-public | slurm-gcp-6-1-hpc-centos-7-k80      | x86_64 | EOL 2024-05-01 |
+| schedmd-slurm-public | slurm-gcp-6-1-hpc-centos-7          | x86_64 | EOL 2024-01-01 |
 
 ### Published Docker Image Family
 

docs/tpu.md

@@ -68,12 +68,12 @@ state we will also include if it is tested or not.
 
 |       Project        | Image Family                        | Arch   | TPU Status  |
 | :------------------: | :---------------------------------- | :----- | :---------- |
-| schedmd-slurm-public | slurm-gcp-6-0-debian-11             | x86_64 | Untested    |
-| schedmd-slurm-public | slurm-gcp-6-0-hpc-rocky-linux-8     | x86_64 | Tested      |
-| schedmd-slurm-public | slurm-gcp-6-0-ubuntu-2004-lts       | x86_64 | Untested    |
-| schedmd-slurm-public | slurm-gcp-6-0-ubuntu-2204-lts-arm64 | ARM64  | Untested    |
-| schedmd-slurm-public | slurm-gcp-6-0-hpc-centos-7-k80      | x86_64 | Unsupported |
-| schedmd-slurm-public | slurm-gcp-6-0-hpc-centos-7          | x86_64 | Unsupported |
+| schedmd-slurm-public | slurm-gcp-6-1-debian-11             | x86_64 | Untested    |
+| schedmd-slurm-public | slurm-gcp-6-1-hpc-rocky-linux-8     | x86_64 | Tested      |
+| schedmd-slurm-public | slurm-gcp-6-1-ubuntu-2004-lts       | x86_64 | Untested    |
+| schedmd-slurm-public | slurm-gcp-6-1-ubuntu-2204-lts-arm64 | ARM64  | Untested    |
+| schedmd-slurm-public | slurm-gcp-6-1-hpc-centos-7-k80      | x86_64 | Unsupported |
+| schedmd-slurm-public | slurm-gcp-6-1-hpc-centos-7          | x86_64 | Unsupported |
 
 ## Terraform
 

terraform/slurm_cluster/modules/slurm_instance_template/main.tf

@@ -47,7 +47,7 @@ locals {
   source_image_family = (
     var.source_image_family != "" && var.source_image_family != null
     ? var.source_image_family
-    : "slurm-gcp-6-0-hpc-rocky-linux-8"
+    : "slurm-gcp-6-1-hpc-rocky-linux-8"
   )
   source_image_project = (
     var.source_image_project != "" && var.source_image_project != null

terraform/slurm_cluster/modules/slurm_nodeset_tpu/main.tf

@@ -58,7 +58,7 @@ locals {
     service_account        = var.service_account != null ? var.service_account : local.service_account
     preserve_tpu           = contains(local.simple_nodes, var.node_type) ? var.preserve_tpu : false
     data_disks             = var.data_disks
-    docker_image           = var.docker_image != "" ? var.docker_image : "gcr.io/schedmd-slurm-public/tpu:slurm-gcp-6-0-ubuntu-20.04-tf-${var.tf_version}"
+    docker_image           = var.docker_image != "" ? var.docker_image : "gcr.io/schedmd-slurm-public/tpu:slurm-gcp-6-1-ubuntu-20.04-tf-${var.tf_version}"
     network                = var.network
     subnetwork             = local.snetwork
   }