Merge branch 'develop' into dependabot/pip/community/front-end/ofe/urllib3-2.6.0

Author: aslam-quad

CONTRIBUTING.md

@@ -3,6 +3,15 @@
 We'd love to accept your patches and contributions to this project. There are
 just a few small guidelines you need to follow.
 
+## Branching Strategy
+To maintain a stable release history, this repository follows a specific branching workflow:
+
+`main`: Contains the latest stable release. This branch is only updated during a new release cycle.
+
+`develop`: The active development branch. All new features, bug fixes, and community contributions are merged here first.
+
+**Important**: All Pull Requests must be targeted at the `develop` branch. PRs targeting `main` will be closed or redirected.
+
 ## Contributor License Agreement
 
 Contributions to this project must be accompanied by a Contributor License

community/examples/client-google-cloud-storage.yaml

@@ -31,7 +31,7 @@ deployment_groups:
     source: modules/network/vpc
 
   - id: new-bucket
-    source: community/modules/file-system/cloud-storage-bucket
+    source: modules/file-system/cloud-storage-bucket
     settings:
       name_prefix: new-bucket
       random_suffix: true

community/examples/fsi-montecarlo-on-batch.yaml

@@ -45,7 +45,7 @@ deployment_groups:
   modules:
 
   - id: fsi_bucket
-    source: community/modules/file-system/cloud-storage-bucket
+    source: modules/file-system/cloud-storage-bucket
     settings:
       name_prefix: fsi_bucket
       random_suffix: true

community/front-end/ofe/requirements.txt

@@ -20,7 +20,7 @@ dill==0.4.0
 distlib==0.4.0
 # django-revproxy==0.11.0 released but not yet in pypi
 git+https://github.com/jazzband/django-revproxy.git@d2234005135dc0771b7c4e0bb0465664ccfa5787
-Django==5.2.8
+Django==5.2.9
 django-allauth==65.13.0
 django-crispy-forms==2.4
 django-extensions==3.2.3

community/modules/compute/notebook/README.md

@@ -12,7 +12,7 @@ This is a simple usage, using the default network:
 
 ```yaml
   - id: bucket
-    source: community/modules/file-system/cloud-storage-bucket
+    source: modules/file-system/cloud-storage-bucket
     settings: 
       name_prefix: my-bucket
       local_mount: /home/jupyter/my-bucket
@@ -30,7 +30,7 @@ If the user wants do specify a custom subnetwork, or specific external IP restri
 
 ```yaml
   - id: bucket
-    source: community/modules/file-system/cloud-storage-bucket
+    source: modules/file-system/cloud-storage-bucket
     settings: 
       name_prefix: my-bucket
       local_mount: /home/jupyter/my-bucket

community/modules/compute/notebook/main.tf

@@ -26,7 +26,7 @@ locals {
   bucket               = replace(var.gcs_bucket_path, "gs://", "")
   post_script_filename = "mount-${local.suffix}.sh"
 
-  # mount_runner_args is defined here: https://github.com/GoogleCloudPlatform/hpc-toolkit/blob/3abddcfbd245b0e6747917a4e55b30658414ffd7/community/modules/file-system/cloud-storage-bucket/outputs.tf#L40
+  # mount_runner_args is defined in the file: cluster-toolkit/modules/file-system/cloud-storage-bucket/outputs.tf
   mount_args = split(" ", var.mount_runner.args)
 
   unused       = local.mount_args[0]

community/modules/scheduler/htcondor-setup/README.md

@@ -91,7 +91,7 @@ No providers.
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_health_check_firewall_rule"></a> [health\_check\_firewall\_rule](#module\_health\_check\_firewall\_rule) | ../../../../modules/network/firewall-rules | n/a |
-| <a name="module_htcondor_bucket"></a> [htcondor\_bucket](#module\_htcondor\_bucket) | ../../../../community/modules/file-system/cloud-storage-bucket | n/a |
+| <a name="module_htcondor_bucket"></a> [htcondor\_bucket](#module\_htcondor\_bucket) | ../../../../modules/file-system/cloud-storage-bucket | n/a |
 
 ## Resources
 

community/modules/scheduler/htcondor-setup/main.tf

@@ -54,7 +54,7 @@ module "health_check_firewall_rule" {
 }
 
 module "htcondor_bucket" {
-  source = "../../../../community/modules/file-system/cloud-storage-bucket"
+  source = "../../../../modules/file-system/cloud-storage-bucket"
 
   project_id      = var.project_id
   deployment_name = var.deployment_name

examples/gke-a3-ultragpu/gke-a3-ultragpu.yaml

@@ -146,7 +146,7 @@ deployment_groups:
       - container.admin
 
   - id: training_bucket
-    source: community/modules/file-system/cloud-storage-bucket
+    source: modules/file-system/cloud-storage-bucket
     settings:
       local_mount: /training-data
       name_prefix: training
@@ -155,7 +155,7 @@ deployment_groups:
       enable_hierarchical_namespace: true
 
   - id: checkpoint_bucket
-    source: community/modules/file-system/cloud-storage-bucket
+    source: modules/file-system/cloud-storage-bucket
     settings:
       local_mount: /checkpoint-data
       name_prefix: checkpoint

examples/gke-a4/gke-a4.yaml

@@ -161,7 +161,7 @@ deployment_groups:
       - container.admin
 
   - id: training_bucket
-    source: community/modules/file-system/cloud-storage-bucket
+    source: modules/file-system/cloud-storage-bucket
     settings:
       local_mount: /training-data
       name_prefix: training
@@ -170,7 +170,7 @@ deployment_groups:
       enable_hierarchical_namespace: true
 
   - id: checkpoint_bucket
-    source: community/modules/file-system/cloud-storage-bucket
+    source: modules/file-system/cloud-storage-bucket
     settings:
       local_mount: /checkpoint-data
       name_prefix: checkpoint