Merge branch 'release-candidate' into release-candidate

Author: mohitchaurasia91

cluster-toolkit-writers.json

@@ -385,5 +385,8 @@
   },
   {
     "login": "Neelabh94"
+  },
+  {
+    "login": "saara-tyagi27"
   }
 ]

cmd/root.go

@@ -53,7 +53,7 @@ HPC deployments on the Google Cloud Platform.`,
 				logging.Fatal("cmd.Help function failed: %s", err)
 			}
 		},
-		Version:     "v1.65.0",
+		Version:     "v1.66.0",
 		Annotations: annotation,
 	}
 )

community/examples/hpc-slinky/hpc-slinky.yaml

@@ -24,8 +24,14 @@ vars:
   authorized_cidr:  # <your-ip-address>/32
   gcp_public_cidrs_access_enabled: false
   exporter_pod_monitoring_path: $(ghpc_stage("./exporter-pod-monitoring.yaml"))
+  base_pool_machine_type: e2-standard-8
+  base_pool_size: 2
   debug_nodeset_replicas: 2
-  h3_nodeset_replicas: 2
+  compute_pool_machine_type: h3-standard-88
+  compute_pool_size: 2
+  compute_nodeset_replicas: 2
+  login_rootSshAuthorizedKeys: []  # The `/root/.ssh/authorized_keys` file to write in Login nodes, represented as a list.
+  # - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx user@example.com
 
 deployment_groups:
 - group: primary
@@ -83,18 +89,20 @@ deployment_groups:
     source: modules/compute/gke-node-pool
     use: [gke_cluster, node_pool_service_account]
     settings:
-      initial_node_count: 1
+      initial_node_count: $(vars.base_pool_size)
+      autoscaling_total_min_nodes: $(vars.base_pool_size)
       disk_type: pd-balanced
-      machine_type: e2-standard-4
+      machine_type: $(vars.base_pool_machine_type)
       zones: $(vars.zones)
 
-  - id: h3_pool
+  - id: compute_pool
     source: modules/compute/gke-node-pool
     use: [gke_cluster, node_pool_service_account]
     settings:
-      initial_node_count: 2
+      initial_node_count: $(vars.compute_pool_size)
+      autoscaling_total_min_nodes: $(vars.compute_pool_size)
       disk_type: pd-balanced
-      machine_type: h3-standard-88
+      machine_type: $(vars.compute_pool_machine_type)
       zones: $(vars.zones)
 
   - id: slinky
@@ -128,12 +136,12 @@ deployment_groups:
                     - key: "node.kubernetes.io/instance-type"
                       operator: In
                       values:
-                      - e2-standard-4
+                      - $(vars.base_pool_machine_type)
             partition:
               enabled: true
-          - name: h3
+          - name: compute
             enabled: true
-            replicas: $(vars.h3_nodeset_replicas)
+            replicas: $(vars.compute_nodeset_replicas)
             image:
               # Use the default nodeset image
               repository: ""
@@ -153,9 +161,33 @@ deployment_groups:
                     - key: "node.kubernetes.io/instance-type"
                       operator: In
                       values:
-                      - h3-standard-88
+                      - $(vars.compute_pool_machine_type)
             partition:
               enabled: true
+        login:
+          enabled: true
+          replicas: 1
+          rootSshAuthorizedKeys: $(vars.login_rootSshAuthorizedKeys)
+          image:
+            # Use the default login image
+            repository: ""
+            tag: ""
+          resources:
+            requests:
+              cpu: 500m
+              memory: 4Gi
+            limits:
+              cpu: 500m
+              memory: 4Gi
+          affinity:
+            nodeAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+                nodeSelectorTerms:
+                - matchExpressions:
+                  - key: "node.kubernetes.io/instance-type"
+                    operator: In
+                    values:
+                    - $(vars.base_pool_machine_type)
     outputs: [instructions]
 
   - id: slurm_exporter_monitoring

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.5
+Django==5.2.6
 django-allauth==65.11.1
 django-crispy-forms==2.4
 django-extensions==3.2.3

community/modules/compute/htcondor-execute-point/versions.tf

@@ -29,6 +29,6 @@ terraform {
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:htcondor-execute-point/v1.65.0"
+    module_name = "blueprints/terraform/hpc-toolkit:htcondor-execute-point/v1.66.0"
   }
 }

community/modules/compute/mig/versions.tf

@@ -22,6 +22,6 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:mig/v1.65.0"
+    module_name = "blueprints/terraform/hpc-toolkit:mig/v1.66.0"
   }
 }

community/modules/compute/schedmd-slurm-gcp-v6-nodeset-dynamic/versions.tf

@@ -17,6 +17,6 @@
 terraform {
   required_version = ">= 1.3"
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-dynamic/v1.65.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-dynamic/v1.66.0"
   }
 }

community/modules/compute/schedmd-slurm-gcp-v6-nodeset-tpu/versions.tf

@@ -18,6 +18,6 @@ terraform {
   required_version = ">= 1.3"
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-tpu/v1.65.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset-tpu/v1.66.0"
   }
 }

community/modules/compute/schedmd-slurm-gcp-v6-nodeset/versions.tf

@@ -24,6 +24,6 @@ terraform {
     }
   }
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset/v1.65.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-nodeset/v1.66.0"
   }
 }

community/modules/compute/schedmd-slurm-gcp-v6-partition/versions.tf

@@ -18,6 +18,6 @@ terraform {
   required_version = ">= 1.3"
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-partition/v1.65.0"
+    module_name = "blueprints/terraform/hpc-toolkit:schedmd-slurm-gcp-v6-partition/v1.66.0"
   }
 }