NOTIC: Fix REST API when custom Slurm conf is used

nebius · Mar 7, 2025 · c76dc54 · c76dc54
1 parent e2b8bf9
commit c76dc54
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/images/restd/slurm_rest.conf b/images/restd/slurm_rest.conf
diff --git a/images/restd/slurmrestd.dockerfile b/images/restd/slurmrestd.dockerfile
@@ -48,9 +48,6 @@ RUN for pkg in slurm-smd slurm-smd-slurmrestd; do \
 # Expose the port used for accessing slurmrestd
 EXPOSE 6820
 
-# Copy restd conf file (overwrite AuthType)
-COPY restd/slurm_rest.conf /etc/slurm_rest.conf
-
 # Copy & run the entrypoint script
 COPY restd/slurmrestd_entrypoint.sh /opt/bin/slurm/
 RUN chmod +x /opt/bin/slurm/slurmrestd_entrypoint.sh

diff --git a/images/restd/slurmrestd_entrypoint.sh b/images/restd/slurmrestd_entrypoint.sh
@@ -8,4 +8,4 @@ rm -rf /etc/slurm && ln -s /mnt/slurm-configs /etc/slurm
 chown www-data:www-data /usr/sbin/slurmrestd && chmod 500 /usr/sbin/slurmrestd
 
 echo "Start slurmrestd daemon"
-exec /usr/sbin/slurmrestd -f /etc/slurm_rest.conf -u www-data -g www-data -a rest_auth/jwt -vvvvvv :6820
+exec /usr/sbin/slurmrestd -f /etc/slurm/slurm_rest.conf -u www-data -g www-data -a rest_auth/jwt -vvvvvv :6820
diff --git a/internal/consts/configmap.go b/internal/consts/configmap.go
@@ -14,6 +14,7 @@ const (
 	ConfigMapNameSupervisord       = supervisord
 
 	ConfigMapKeySlurmConfig       = "slurm.conf"
+	ConfigMapKeyRESTConfig        = "slurm_rest.conf"
 	ConfigMapKeyCustomSlurmConfig = "custom_slurm.conf"
 	ConfigMapKeyCGroupConfig      = "cgroup.conf"
 	ConfigMapKeySpankConfig       = "plugstack.conf"

diff --git a/internal/render/common/configmap.go b/internal/render/common/configmap.go
@@ -30,6 +30,7 @@ func RenderConfigMapSlurmConfigs(cluster *values.SlurmCluster, topologyConfig co
 		},
 		Data: map[string]string{
 			consts.ConfigMapKeySlurmConfig:       generateSlurmConfig(cluster, topologyConfig).Render(),
+			consts.ConfigMapKeyRESTConfig:        generateRESTConfig().Render(),
 			consts.ConfigMapKeyCustomSlurmConfig: generateCustomSlurmConfig(cluster).Render(),
 			consts.ConfigMapKeyCGroupConfig:      generateCGroupConfig(cluster).Render(),
 			consts.ConfigMapKeySpankConfig:       generateSpankConfig().Render(),
@@ -273,6 +274,14 @@ func generateMPIConfig(cluster *values.SlurmCluster) renderutils.ConfigFile {
 	return res
 }
 
+func generateRESTConfig() renderutils.ConfigFile {
+	res := &renderutils.PropertiesConfig{}
+	res.AddComment("REST API config")
+	res.AddPropertyWithConnector("include", consts.ConfigMapKeySlurmConfig, renderutils.SpaceConnector)
+	res.AddProperty("AuthType", "auth/jwt")
+	return res
+}
+
 // region Security limits
 
 // RenderConfigMapSecurityLimits renders new [corev1.ConfigMap] containing security limits config file