Skip to content

Merge V1.51.0 into Develop#4112

Merged
tpdownes merged 6 commits intodevelopfrom
main
May 13, 2025
Merged

Merge V1.51.0 into Develop#4112
tpdownes merged 6 commits intodevelopfrom
main

Conversation

@rick154
Copy link
Contributor

@rick154 rick154 commented May 13, 2025

Submission Checklist

NOTE: Community submissions can take up to 2 weeks to be reviewed.

Please take the following actions before submitting this pull request.

  • Fork your PR branch from the Toolkit "develop" branch (not main)
  • Test all changes with pre-commit in a local branch #
  • Confirm that "make tests" passes all tests
  • Add or modify unit tests to cover code changes
  • Ensure that unit test coverage remains above 80%
  • Update all applicable documentation
  • Follow Cluster Toolkit Contribution guidelines #

@rick154 rick154 requested review from abbas1902, mr0re1 and tpdownes May 13, 2025 00:13
@rick154 rick154 self-assigned this May 13, 2025
@rick154 rick154 added the release-chore To not include into release notes label May 13, 2025
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @rick154, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

Summary of Changes

This pull request merges changes from the main branch into the develop branch. The primary change is updating the version number of the HPC Toolkit from v1.50.0 to v1.51.0. This version update is reflected in the cmd/root.go file and across multiple versions.tf files within different modules, including compute, database, file-system, internal, network, project, pubsub, scheduler, and scripts. Additionally, a new precondition has been added to community/modules/compute/schedmd-slurm-gcp-v6-nodeset/outputs.tf to prevent the use of both Flex-Start and Spot VMs for provisioning. A modification was also made to community/modules/compute/schedmd-slurm-gcp-v6-partition/main.tf to adjust the logic for setting the ResumeTimeout parameter, prioritizing user-defined values and Flex-Start configurations.

Highlights

  • Version Update: The HPC Toolkit version has been bumped from v1.50.0 to v1.51.0, affecting the main application and various Terraform modules.
  • Slurm Nodeset Precondition: A new precondition was added to the Slurm nodeset module to prevent the simultaneous use of Flex-Start and Spot VMs.
  • Slurm Partition ResumeTimeout Logic: The logic for setting the ResumeTimeout parameter in the Slurm partition module has been updated to prioritize user-defined values and Flex-Start configurations.
  • Documentation Update: The documentation file docs/slurm-dws-flex.md was updated to include a section on node behavior when using DWS Flex Start mode with SlurmGCP.

Changelog

Click here to see the changelog
  • cmd/root.go
    • Updated the HPC Toolkit version from v1.50.0 to v1.51.0.
  • community/modules/compute/htcondor-execute-point/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • community/modules/compute/mig/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • community/modules/compute/schedmd-slurm-gcp-v6-nodeset-dynamic/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • community/modules/compute/schedmd-slurm-gcp-v6-nodeset-tpu/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • community/modules/compute/schedmd-slurm-gcp-v6-nodeset/outputs.tf
    • Added a precondition to prevent using both Flex-Start and Spot VMs.
  • community/modules/compute/schedmd-slurm-gcp-v6-nodeset/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • community/modules/compute/schedmd-slurm-gcp-v6-partition/main.tf
    • Modified logic for setting ResumeTimeout, prioritizing user-defined values and Flex-Start configurations.
  • community/modules/compute/schedmd-slurm-gcp-v6-partition/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • community/modules/database/slurm-cloudsql-federation/versions.tf
    • Updated module version from v1.50.0 to v1.51.0 for both google and google-beta providers.
  • community/modules/file-system/cloud-storage-bucket/versions.tf
    • Updated module version from v1.50.0 to v1.51.0 for both google and google-beta providers.
  • community/modules/file-system/nfs-server/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • community/modules/files/fsi-montecarlo-on-batch/versions.tf
    • Updated module version from v1.50.0 to v1.51.0 for both google and google-beta providers.
  • community/modules/internal/slurm-gcp/login/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • community/modules/network/private-service-access/versions.tf
    • Updated module version from v1.50.0 to v1.51.0 for both google and google-beta providers.
  • community/modules/project/service-enablement/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • community/modules/pubsub/bigquery-sub/versions.tf
    • Updated module version from v1.50.0 to v1.51.0 for both google and google-beta providers.
  • community/modules/pubsub/topic/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • community/modules/scheduler/htcondor-access-point/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • community/modules/scheduler/htcondor-central-manager/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • community/modules/scheduler/htcondor-pool-secrets/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • community/modules/scheduler/schedmd-slurm-gcp-v6-controller/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • community/modules/scheduler/schedmd-slurm-gcp-v6-login/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • community/modules/scripts/wait-for-startup/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • community/modules/scripts/windows-startup-script/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • docs/slurm-dws-flex.md
    • Added a section on node behavior when using DWS Flex Start mode with SlurmGCP.
  • modules/compute/gke-node-pool/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • modules/compute/vm-instance/versions.tf
    • Updated module version from v1.50.0 to v1.51.0 for both google and google-beta providers.
  • modules/file-system/filestore/versions.tf
    • Updated module version from v1.50.0 to v1.51.0 for both google and google-beta providers.
  • modules/file-system/gke-persistent-volume/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • modules/file-system/gke-storage/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • modules/file-system/managed-lustre/versions.tf
    • Updated module version from v1.50.0 to v1.51.0 for both google and google-beta providers.
  • modules/monitoring/dashboard/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • modules/network/firewall-rules/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • modules/network/pre-existing-subnetwork/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • modules/network/pre-existing-vpc/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • modules/scheduler/batch-login-node/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • modules/scheduler/gke-cluster/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • modules/scheduler/pre-existing-gke-cluster/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
  • modules/scripts/startup-script/versions.tf
    • Updated module version from v1.50.0 to v1.51.0.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in issue comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist is currently in preview and may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments to provide feedback.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.


A version ascends,
Modules align in new light,
Code marches onward.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@Shuang-cnt Shuang-cnt marked this pull request as ready for review May 13, 2025 00:15
@Shuang-cnt Shuang-cnt requested review from a team and samskillman as code owners May 13, 2025 00:15
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request merges changes from the main branch into develop. The primary changes include a version bump from v1.50.0 to v1.51.0 across various modules and the CLI, along with several enhancements and fixes related to DWS Flex Start functionality in Slurm. These include a new precondition to prevent conflicts with Spot VMs, refined logic for ResumeTimeout in partitions using DWS Flex, and updated documentation for DWS Flex node behavior. Overall, the changes appear to be well-contained and improve the robustness and clarity of the DWS Flex feature.

Summary of Findings

  • Version Increment: The toolkit and its modules have been consistently updated from version v1.50.0 to v1.51.0.
  • DWS Flex Enhancements: Several improvements for DWS Flex Start support were introduced:
  • A new precondition in schedmd-slurm-gcp-v6-nodeset prevents enabling both DWS Flex and Spot VMs simultaneously for a nodeset.
  • The ResumeTimeout logic in schedmd-slurm-gcp-v6-partition now enforces a value of 65535 when DWS Flex is active, ensuring compatibility.
  • Documentation for slurm-dws-flex.md has been updated to clarify node behavior with max_run_duration and exclusive partitions.
  • Terraform Code Idiom: In community/modules/compute/schedmd-slurm-gcp-v6-partition/main.tf, a suggestion was made to use lookup instead of try for map key access to enhance code clarity and adhere to common Terraform idioms. This is a medium-severity suggestion.

Merge Readiness

This pull request appears to be a standard merge from the main branch to develop, incorporating version updates and feature enhancements, particularly for DWS Flex. The changes are generally positive. The single review comment is of medium severity and suggests an idiomatic improvement rather than a functional bug.

Given the nature of this PR as a merge from main, the changes have likely been reviewed and tested. However, as a reviewer, I am not authorized to approve pull requests. Please ensure appropriate approvals are obtained before merging.

@tpdownes tpdownes changed the title Merge Main to Develop Merge v1.51.0 to develop May 13, 2025
@Shuang-cnt Shuang-cnt changed the title Merge v1.51.0 to develop Merge V1.51.0 into Develop May 13, 2025
Copy link
Contributor

@tpdownes tpdownes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@tpdownes tpdownes merged commit 3bc5f33 into develop May 13, 2025
22 of 82 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

release-chore To not include into release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants