Skip to content

Commit

Permalink
Merge pull request #3533 from GoogleCloudPlatform/release-candidate
Browse files Browse the repository at this point in the history
Release v1.45.0
  • Loading branch information
RachaelSTamakloe authored Jan 15, 2025
2 parents 484da6e + 6e47851 commit 79299a1
Show file tree
Hide file tree
Showing 328 changed files with 16,287 additions and 12,183 deletions.
39 changes: 31 additions & 8 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,16 @@ updates:
target-branch: develop
ignore:
- dependency-name: "google.golang.org/api"

groups:
# group all Go minor/patch updates together and individual PRs for major updates
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/optimizing-pr-creation-version-updates#example-3-individual-pull-requests-for-major-updates-and-grouped-for-minorpatch-updates
go-minor-and-patch-updates:
applies-to: version-updates
patterns:
- "*"
update-types:
- minor
- patch
- package-ecosystem: pip
directory: /community/front-end/ofe/
labels:
Expand All @@ -45,21 +54,35 @@ updates:
reviewers:
- ek-nag
- mattstreet-nag
# Disable version updates, do security updates only
# See https://docs.github.com/en/code-security/dependabot/dependabot-security-updates/configuring-dependabot-security-updates#overriding-the-default-behavior-with-a-configuration-file
open-pull-requests-limit: 0
groups:
# group all OFE minor/patch updates together and individual PRs for major updates
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/optimizing-pr-creation-version-updates#example-3-individual-pull-requests-for-major-updates-and-grouped-for-minorpatch-updates
ofe-minor-and-patch-updates:
applies-to: version-updates
patterns:
- "*"
update-types:
- minor
- patch
- package-ecosystem: pip
directory: /community/modules/scheduler/schedmd-slurm-gcp-v6-controller/modules/slurm_files/scripts/
labels:
- dependencies
- python
- release-chore
schedule:
interval: weekly
interval: monthly
day: monday
time: "03:00"
timezone: America/Los_Angeles
target-branch: develop
# Disable version updates, do security updates only
# See https://docs.github.com/en/code-security/dependabot/dependabot-security-updates/configuring-dependabot-security-updates#overriding-the-default-behavior-with-a-configuration-file
open-pull-requests-limit: 0
groups:
# group all Slurm minor/patch updates together and individual PRs for major updates
# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/optimizing-pr-creation-version-updates#example-3-individual-pull-requests-for-major-updates-and-grouped-for-minorpatch-updates
slurm-python-minor-and-patch-updates:
applies-to: version-updates
patterns:
- "*"
update-types:
- minor
- patch
25 changes: 4 additions & 21 deletions cmd/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func printAdvancedInstructionsMessage(deplDir string) {
logging.Info("Find instructions for cleanly destroying infrastructure and advanced manual")
logging.Info("deployment instructions at:")
logging.Info("")
logging.Info(modulewriter.InstructionsPath(deplDir))
logging.Info("%s", modulewriter.InstructionsPath(deplDir))
}

// TODO: move to expand.go
Expand Down Expand Up @@ -125,34 +125,17 @@ 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(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)
if err == nil {
return
}
logging.Error(renderError(err, ctx))
logging.Error("%s", renderError(err, ctx))

logging.Error("One or more blueprint validators has failed. See messages above for suggested")
logging.Error("actions. General troubleshooting guidance and instructions for configuring")
Expand All @@ -169,12 +152,12 @@ func validateMaybeDie(bp config.Blueprint, ctx config.YamlCtx) {
switch bp.ValidationLevel {
case config.ValidationWarning:
{
logging.Error(boldYellow("Validation failures were treated as a warning, continuing to create blueprint."))
logging.Error("%s", boldYellow("Validation failures were treated as a warning, continuing to create blueprint."))
logging.Error("")
}
case config.ValidationError:
{
logging.Fatal(boldRed("validation failed due to the issues listed above"))
logging.Fatal("%s", boldRed("validation failed due to the issues listed above"))
}
}

Expand Down
4 changes: 2 additions & 2 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ HPC deployments on the Google Cloud Platform.`,
logging.Fatal("cmd.Help function failed: %s", err)
}
},
Version: "v1.44.0",
Version: "v1.45.0",
Annotations: annotation,
}
)
Expand Down Expand Up @@ -262,6 +262,6 @@ func checkErr(err error, ctx *config.YamlCtx) {
ctx = &config.YamlCtx{}
}
if err != nil {
logging.Fatal(renderError(err, *ctx))
logging.Fatal("%s", renderError(err, *ctx))
}
}
4 changes: 0 additions & 4 deletions community/examples/AMD/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
# AMD solutions for the Cluster Toolkit (formerly HPC Toolkit)

> [!NOTE]
> This document uses Slurm-GCP v6. If you want to use Slurm-GCP v5 version you
> scan refer [blueprint](./hpc-amd-slurm-v5-legacy.yaml)
## AMD-Optimized Slurm Cluster

This example provisions a Slurm cluster using the AMD-based Computed Optimized
Expand Down
231 changes: 0 additions & 231 deletions community/examples/AMD/hpc-amd-slurm-v5-legacy.yaml

This file was deleted.

Loading

0 comments on commit 79299a1

Please sign in to comment.