Skip to content

Commit

Permalink
Merge pull request #3497 from harshthakkar01/remove-v5-modules
Browse files Browse the repository at this point in the history
Remove Slurm-gcp v5 modules and update documentation
  • Loading branch information
harshthakkar01 authored Jan 9, 2025
2 parents 0890bd2 + 38570da commit 23bfeb3
Show file tree
Hide file tree
Showing 58 changed files with 47 additions and 5,089 deletions.
17 changes: 0 additions & 17 deletions cmd/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,27 +125,10 @@ func expandOrDie(path string) (config.Blueprint, *config.YamlCtx) {
// Expand the blueprint
checkErr(bp.Expand(), ctx)
validateMaybeDie(bp, *ctx)
v5DeprecationWarning(bp)

return bp, ctx
}

// TODO: Remove this warning when v5 deprecation is complete
func v5DeprecationWarning(bp config.Blueprint) {
alreadyContainsV5 := false
bp.WalkModulesSafe(func(mp config.ModulePath, m *config.Module) {
if strings.Contains(m.Source, "schedmd-slurm-gcp-v5-controller") && !alreadyContainsV5 {
logging.Info("%s", boldYellow(
"We have been supporting slurm-gcp v5 since July 2022 and are now deprecating it, as we've launched slurm-gcp v6 in June 2024. \n"+
"Toolkit blueprints using Slurm-gcp v5 will be marked “deprecated” starting October 2024 and slurm-gcp v6 will be the default deployment. \n"+
"However we won't begin removing slurm-gcp v5 blueprints until January 6, 2025. Beginning on January 6, 2025, the Cluster Toolkit team will cease their support for Slurm-gcp v5. \n"+
"While this will not directly or immediately impact running clusters, we recommend replacing any v5 clusters with Slurm-gcp v6.",
))
alreadyContainsV5 = true // This is to avoid the logging message showing repeatedly for multiple v5 controllers
}
})
}

// TODO: move to expand.go
func validateMaybeDie(bp config.Blueprint, ctx config.YamlCtx) {
err := validators.Execute(bp)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ EOL

dnf install -y grafana

# Packages for https://github.com/GoogleCloudPlatform/cluster-toolkit/tree/main/community/modules/scheduler/schedmd-slurm-gcp-v5-controller#input_enable_cleanup_compute
pip3.8 install google-api-python-client \
google-cloud-secret-manager \
google.cloud.pubsub \
Expand Down
174 changes: 0 additions & 174 deletions community/modules/compute/schedmd-slurm-gcp-v5-node-group/README.md

This file was deleted.

This file was deleted.

96 changes: 0 additions & 96 deletions community/modules/compute/schedmd-slurm-gcp-v5-node-group/main.tf

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 23bfeb3

Please sign in to comment.