Merge pull request #461 from nebius/release-1-18-2/0

rdjjke · web-flow · commit ff2fef710ee1 · 2025-02-18T21:16:06.000+01:00
Release 1.18.2
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.18.1
+1.18.2
diff --git a/api/v1/slurmcluster_types.go b/api/v1/slurmcluster_types.go
@@ -148,6 +148,12 @@ type SlurmConfig struct {
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=86400
 	MinJobAge *int32 `json:"minJobAge,omitempty"`
+	// MessageTimeout specifies the permitted time for a round-trip communication to complete in seconds.
+	// See https://slurm.schedmd.com/slurm.conf.html#OPT_MessageTimeout.
+	//
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default=30
+	MessageTimeout *int32 `json:"messageTimeout,omitempty"`
 }
 
 type MPIConfig struct {
diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/slurm.nebius.ai_slurmclusters.yaml b/config/crd/bases/slurm.nebius.ai_slurmclusters.yaml
@@ -1541,6 +1541,13 @@ spec:
                     description: Keep N last jobs in controller memory
                     format: int32
                     type: integer
+                  messageTimeout:
+                    default: 30
+                    description: |-
+                      MessageTimeout specifies the permitted time for a round-trip communication to complete in seconds.
+                      See https://slurm.schedmd.com/slurm.conf.html#OPT_MessageTimeout.
+                    format: int32
+                    type: integer
                   minJobAge:
                     default: 86400
                     description: Don't remove jobs from controller memory after some
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -3,4 +3,4 @@ resources:
 images:
   - name: controller
     newName: cr.eu-north1.nebius.cloud/soperator/slurm-operator
-    newTag: 1.18.1
+    newTag: 1.18.2
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -87,7 +87,7 @@ spec:
             value: "false"
           - name: SLURM_OPERATOR_WATCH_NAMESPACES
             value: "*"
-        image: controller:1.18.1
+        image: controller:1.18.2
         imagePullPolicy: Always
         name: manager
         securityContext:
diff --git a/helm/slurm-cluster-storage/Chart.yaml b/helm/slurm-cluster-storage/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: helm-slurm-cluster-storage
 description: A Helm chart for Kubernetes
 type: application
-version: "1.18.1"
-appVersion: "1.18.1"
+version: "1.18.2"
+appVersion: "1.18.2"
diff --git a/helm/slurm-cluster/Chart.yaml b/helm/slurm-cluster/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: helm-slurm-cluster
 description: A Helm chart for Kubernetes
 type: application
-version: "1.18.1"
-appVersion: "1.18.1"
+version: "1.18.2"
+appVersion: "1.18.2"
 kubeVersion: ">=1.29.0-0"
diff --git a/helm/slurm-cluster/values.yaml b/helm/slurm-cluster/values.yaml
@@ -408,14 +408,14 @@ telemetry: {}
 #   otelCollectorPort: 8429
 
 images:
-  slurmctld: "cr.eu-north1.nebius.cloud/soperator/controller_slurmctld:1.18.1-jammy-slurm24.05.5"
-  slurmrestd: "cr.eu-north1.nebius.cloud/soperator/slurmrestd:1.18.1-jammy-slurm24.05.5"
-  slurmd: "cr.eu-north1.nebius.cloud/soperator/worker_slurmd:1.18.1-jammy-slurm24.05.5"
-  sshd: "cr.eu-north1.nebius.cloud/soperator/login_sshd:1.18.1-jammy-slurm24.05.5"
-  munge: "cr.eu-north1.nebius.cloud/soperator/munge:1.18.1-jammy-slurm24.05.5"
-  populateJail: "cr.eu-north1.nebius.cloud/soperator/populate_jail:1.18.1-jammy-slurm24.05.5"
-  ncclBenchmark: "cr.eu-north1.nebius.cloud/soperator/nccl_benchmark:1.18.1-jammy-slurm24.05.5"
-  slurmdbd: "cr.eu-north1.nebius.cloud/soperator/controller_slurmdbd:1.18.1-jammy-slurm24.05.5"
-  exporter: "cr.eu-north1.nebius.cloud/soperator/exporter:1.18.1-jammy-slurm24.05.5"
+  slurmctld: "cr.eu-north1.nebius.cloud/soperator/controller_slurmctld:1.18.2-jammy-slurm24.05.5"
+  slurmrestd: "cr.eu-north1.nebius.cloud/soperator/slurmrestd:1.18.2-jammy-slurm24.05.5"
+  slurmd: "cr.eu-north1.nebius.cloud/soperator/worker_slurmd:1.18.2-jammy-slurm24.05.5"
+  sshd: "cr.eu-north1.nebius.cloud/soperator/login_sshd:1.18.2-jammy-slurm24.05.5"
+  munge: "cr.eu-north1.nebius.cloud/soperator/munge:1.18.2-jammy-slurm24.05.5"
+  populateJail: "cr.eu-north1.nebius.cloud/soperator/populate_jail:1.18.2-jammy-slurm24.05.5"
+  ncclBenchmark: "cr.eu-north1.nebius.cloud/soperator/nccl_benchmark:1.18.2-jammy-slurm24.05.5"
+  slurmdbd: "cr.eu-north1.nebius.cloud/soperator/controller_slurmdbd:1.18.2-jammy-slurm24.05.5"
+  exporter: "cr.eu-north1.nebius.cloud/soperator/exporter:1.18.2-jammy-slurm24.05.5"
   mariaDB: "docker-registry1.mariadb.com/library/mariadb:11.4.3"
   rebooter: "cr.eu-north1.nebius.cloud/soperator/rebooter:1.17.0"
diff --git a/helm/soperator-crds/Chart.yaml b/helm/soperator-crds/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: helm-soperator-crds
 description: A Helm chart for Kubernetes
 type: application
-version: 1.18.1
-appVersion: "1.18.1"
+version: 1.18.2
+appVersion: "1.18.2"
 kubeVersion: ">=1.29.0-0"
diff --git a/helm/soperator-crds/templates/slurmcluster-crd.yaml b/helm/soperator-crds/templates/slurmcluster-crd.yaml
@@ -1540,6 +1540,13 @@ spec:
                     description: Keep N last jobs in controller memory
                     format: int32
                     type: integer
+                  messageTimeout:
+                    default: 30
+                    description: |-
+                      MessageTimeout specifies the permitted time for a round-trip communication to complete in seconds.
+                      See https://slurm.schedmd.com/slurm.conf.html#OPT_MessageTimeout.
+                    format: int32
+                    type: integer
                   minJobAge:
                     default: 86400
                     description: Don't remove jobs from controller memory after some
diff --git a/helm/soperator/Chart.yaml b/helm/soperator/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: helm-soperator
 description: A Helm chart for Kubernetes
 type: application
-version: 1.18.1
-appVersion: "1.18.1"
+version: 1.18.2
+appVersion: "1.18.2"
 kubeVersion: ">=1.29.0-0"
diff --git a/helm/soperator/crds/slurmcluster-crd.yaml b/helm/soperator/crds/slurmcluster-crd.yaml
@@ -1540,6 +1540,13 @@ spec:
                     description: Keep N last jobs in controller memory
                     format: int32
                     type: integer
+                  messageTimeout:
+                    default: 30
+                    description: |-
+                      MessageTimeout specifies the permitted time for a round-trip communication to complete in seconds.
+                      See https://slurm.schedmd.com/slurm.conf.html#OPT_MessageTimeout.
+                    format: int32
+                    type: integer
                   minJobAge:
                     default: 86400
                     description: Don't remove jobs from controller memory after some
diff --git a/helm/soperator/values.yaml b/helm/soperator/values.yaml
@@ -37,7 +37,7 @@ controllerManager:
       slurmOperatorWatchNamespaces: '*'
     image:
       repository: cr.eu-north1.nebius.cloud/soperator/slurm-operator
-      tag: 1.18.1
+      tag: 1.18.2
     imagePullPolicy: Always
     resources:
       limits:
diff --git a/images/common/scripts/complement_jail.sh b/images/common/scripts/complement_jail.sh
@@ -140,6 +140,6 @@ pushd "${jaildir}"
     # For $worker node only
     if [ -n "$worker" ]; then
         echo "Update linker cache inside the jail"
-        flock etc/complement_jail_ldconfig.lock -c "chroot \"${jaildir}\" /usr/sbin/ldconfig"
+        flock --nonblock etc/complement_jail_ldconfig.lock -c "chroot \"${jaildir}\" /usr/sbin/ldconfig" || true
     fi
 popd
diff --git a/internal/check/maintanence.go b/internal/check/maintanence.go
@@ -3,7 +3,7 @@ package check
 import "nebius.ai/slurm-operator/internal/consts"
 
 func IsMaintenanceActive(maintenance *consts.MaintenanceMode) bool {
-	return maintenance != nil && *maintenance != consts.ModeNone
+	return maintenance != nil && *maintenance != consts.ModeNone && *maintenance != consts.ModeSkipPopulate
 }
 
 func IsModeDownscaleAndDeletePopulate(maintenance *consts.MaintenanceMode) bool {
diff --git a/internal/consts/version.go b/internal/consts/version.go
@@ -2,5 +2,5 @@
 package consts
 
 const (
-	VersionCR = "1.18.1"
+	VersionCR = "1.18.2"
 )
