Release Soperator 1.17.0-2

modules/nfs-server/README.md

@@ -13,7 +13,7 @@ module nfs-module {
   parent_id         = var.parent_id
   subnet_id         = var.subnet_id
   ssh_user_name     = var.ssh_user_name
-  ssh_public_key    = var.ssh_public_key.key
+  ssh_public_keys   = var.ssh_public_keys
   nfs_ip_range      = var.nfs_ip_range
   nfs_size          = var.nfs_size
 }

modules/nfs-server/files/nfs-cloud-init.tftpl

@@ -5,7 +5,9 @@ users:
     shell: /bin/bash
     sudo: 'ALL=(ALL) NOPASSWD:ALL'
     ssh-authorized-keys:
-      - ${ssh_public_key}
+%{ for key in ssh_public_keys ~}
+      - ${key}
+%{ endfor ~}
 
 runcmd:
 - apt-get update

modules/nfs-server/main.tf

@@ -30,7 +30,7 @@ resource "nebius_compute_v1_instance" "nfs_server" {
 
   cloud_init_user_data = templatefile("${path.module}/files/nfs-cloud-init.tftpl", {
     ssh_user_name  = var.ssh_user_name,
-    ssh_public_key = var.ssh_public_key,
+    ssh_public_keys = var.ssh_public_keys,
     nfs_ip_range   = var.nfs_ip_range,
     nfs_path       = var.nfs_path,
     mtu_size       = var.mtu_size

modules/nfs-server/variables.tf

@@ -34,9 +34,10 @@ variable "preset" {
 }
 
 # SSH KEY
-variable "ssh_public_key" {
-  description = "SSH public key for the 'root' user."
-  type        = string
+variable "ssh_public_keys" {
+  type        = list(string)
+  description = "List of SSH public keys allowed to access the NFS server."
+  default     = []
 }
 
 variable "instance_name" {

nfs-server/README.md

@@ -13,16 +13,16 @@ source ./env.sh
 
 ## Usage
 
-To use this module in your Terraform environment, you must first create a Terraform configuration, such as the file `nfs.tfvars`, with the following example content:
+To use this module in your Terraform environment, you must first create a Terraform configuration, such as the file `terraform.tfvars`, with the following example content:
 
 ```hcl
 parent_id = ""
 subnet_id = ""
 ssh_user_name = "nfs"
-ssh_public_key = {
-  key  = "put your public ssh key here"
-  path = "put path to ssh key here"
-}
+ssh_public_keys = [
+  "ssh-rsa AAAA...", # First user's public key
+  "ssh-rsa AAAA..."  # Second user's public key
+]
 nfs_ip_range = "192.168.0.0/16"
 ```
 
@@ -31,7 +31,7 @@ run terraform:
 ```
 terraform init
 terraform plan
-terraform apply -var-file nfs.tfvars
+terraform apply
 ```
 
 Once you have done that, you can mount on your target device using command 

nfs-server/locals.tf

@@ -1,7 +1,4 @@
 locals {
-  ssh_public_key = var.ssh_public_key.key != null ? var.ssh_public_key.key : (
-  fileexists(var.ssh_public_key.path) ? file(var.ssh_public_key.path) : null)
-
   regions_default = {
     eu-west1 = {
       cpu_nodes_platform = "cpu-d3"
@@ -17,4 +14,5 @@ locals {
 
   cpu_nodes_preset   = coalesce(var.cpu_nodes_preset, local.current_region_defaults.cpu_nodes_preset)
   cpu_nodes_platform = coalesce(var.cpu_nodes_platform, local.current_region_defaults.cpu_nodes_platform)
+  ssh_public_keys = var.ssh_public_keys
 }

nfs-server/main.tf

@@ -2,13 +2,13 @@ module "nfs-module" {
   providers = {
     nebius = nebius
   }
-  source         = "../modules/nfs-server"
-  parent_id      = var.parent_id
-  subnet_id      = var.subnet_id
-  ssh_user_name  = var.ssh_user_name
-  ssh_public_key = var.ssh_public_key.key
-  nfs_ip_range   = var.nfs_ip_range
-  nfs_size       = var.nfs_size
-  platform       = local.cpu_nodes_platform
-  preset         = local.cpu_nodes_preset
+  source          = "../modules/nfs-server"
+  parent_id       = var.parent_id
+  subnet_id       = var.subnet_id
+  ssh_user_name   = var.ssh_user_name
+  ssh_public_keys = var.ssh_public_keys
+  nfs_ip_range    = var.nfs_ip_range
+  nfs_size        = var.nfs_size
+  platform        = local.cpu_nodes_platform
+  preset          = local.cpu_nodes_preset
 }

nfs-server/terraform.tfvars

@@ -2,8 +2,8 @@
 # subnet_id      = "" # Use the command "nebius vpc v1alpha1 network list" to see the subnet id
 # region         = "" # Project region
 # ssh_user_name  = "" # Username you want to use to connect to the nodes
-# ssh_public_key = {
-# key  = "put your public ssh key here" OR
-# path = "put path to ssh key here"
-# }
+# ssh_public_keys = [
+#   "ssh-rsa AAAA...", # First user's public key
+#   "ssh-rsa AAAA..."  # Second user's public key
+# ]
 nfs_ip_range = "192.168.0.0/16"

nfs-server/variables.tf

@@ -31,17 +31,10 @@ variable "nfs_size" {
   description = "Size of the NFS in GB, should be divisbile by 93"
 }
 
-variable "ssh_public_key" {
-  description = "SSH Public Key to access the cluster nodes"
-  type = object({
-    key  = optional(string),
-    path = optional(string, "~/.ssh/id_rsa.pub")
-  })
-  default = {}
-  validation {
-    condition     = var.ssh_public_key.key != null || fileexists(var.ssh_public_key.path)
-    error_message = "SSH Public Key must be set by `key` or file `path` ${var.ssh_public_key.path}"
-  }
+variable "ssh_public_keys" {
+  description = "List of SSH Public Keys to access the NFS server"
+  type        = list(string)
+  default     = []
 }
 
 variable "ssh_user_name" {

soperator/.gitignore

@@ -1,2 +1,3 @@
 .terraform*
-installations/alexkim
+installations/alexkim
+installations/pikachu

soperator/README.md

@@ -130,9 +130,8 @@ kubectl get pods --all-namespaces
 
 Get the Slurm cluster IP address
 ```bash
-export SLURM_IP=$(terraform state show module.login_script.terraform_data.connection_ip | grep 'input' | grep -oE '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | head -n 1
-)
-ssh root@$SLURM_IP -i ~/.ssh/<private_id_rsa_key>  -p <node_port_if_not_default>
+export SLURM_IP=$(terraform state show module.login_script.terraform_data.connection_ip | grep 'input' | grep -oE '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | head -n 1)
+ssh root@$SLURM_IP -i ~/.ssh/<private_id_rsa_key>
 ```
 
 or connect using the login script:

soperator/SUBVERSION

@@ -1 +1 @@
-1
+2

soperator/installations/example/.envrc

@@ -1,5 +1,6 @@
 NEBIUS_TENANT_ID='tenant-...'
 NEBIUS_PROJECT_ID='project-...'
+NEBIUS_REGION='eu-north1'
 
 if [ -z "${NEBIUS_TENANT_ID}" ]; then
   echo "Error: NEBIUS_TENANT_ID is not set"
@@ -33,16 +34,18 @@ export NEBIUS_VPC_SUBNET_ID
 
 # region TF variables
 
+export TF_VAR_region="${NEBIUS_REGION}"
 export TF_VAR_iam_token="${NEBIUS_IAM_TOKEN}"
 export TF_VAR_iam_tenant_id="${NEBIUS_TENANT_ID}"
 export TF_VAR_iam_project_id="${NEBIUS_PROJECT_ID}"
 export TF_VAR_vpc_subnet_id="${NEBIUS_VPC_SUBNET_ID}"
 export TFE_PARALLELISM=20
 
 echo "Exported variables:"
-echo "NEBIUS_TENANT_ID: ${NEBIUS_TENANT_ID}"
-echo "NEBIUS_PROJECT_ID: ${NEBIUS_PROJECT_ID}"
-echo "NEBIUS_VPC_SUBNET_ID: ${NEBIUS_VPC_SUBNET_ID}"
+echo "TF_VAR_region: ${TF_VAR_region}"
+echo "TF_VAR_iam_tenant_id: ${TF_VAR_iam_tenant_id}"
+echo "TF_VAR_iam_project_id: ${TF_VAR_iam_project_id}"
+echo "TF_VAR_vpc_subnet_id: ${TF_VAR_vpc_subnet_id}"
 echo "TFE_PARALLELISM: ${TFE_PARALLELISM}"
 
 # endregion TF variables
@@ -168,9 +171,9 @@ terraform {
     key    = "slurm-k8s.tfstate"
 
     endpoints = {
-      s3 = "https://storage.eu-north1.nebius.cloud:443"
+      s3 = "https://storage.${NEBIUS_REGION}.nebius.cloud:443"
     }
-    region = "eu-north1"
+    region = "${NEBIUS_REGION}"
 
     skip_region_validation      = true
     skip_credentials_validation = true

soperator/installations/example/.tflint.hcl

@@ -0,0 +1,6 @@
+rule "terraform_required_providers" {
+  enabled = true
+
+  source = true
+  version = false
+}