feat: add topology.yaml to config files

Signed-off-by: Dmitry Shmulevich <[email protected]>

Author: dmitsh

CHANGELOG.md

@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 ### Added
 
 - Added NodeSet level authcred configuration.
+- Added topology.yaml to config files
 
 ### Fixed
 

helm/slurm/scripts/reconfigure.sh

@@ -13,7 +13,7 @@ INTERVAL=30
 INIT_RECONFIGURE=false
 
 function reconfigure() {
-	local rsync_cmd='rsync -vaLrzPci --delete --include="*.conf" --include="prolog-*" --include="epilog-*" --exclude="*" "${SLURM_MOUNT}/" "${SLURM_DIR}"'
+	local rsync_cmd='rsync -vaLrzPci --delete --include="*.conf" --include="*.yaml" --include="prolog-*" --include="epilog-*" --exclude="*" "${SLURM_MOUNT}/" "${SLURM_DIR}"'
 
 	if [ -z "$(eval "$rsync_cmd --dry-run | grep '\./'")" ] && $INIT_RECONFIGURE; then
 		return
@@ -23,6 +23,8 @@ function reconfigure() {
 	eval "$rsync_cmd"
 	find "${SLURM_DIR}" -type f -name "*.conf" -print0 | xargs -0r chown -v "${SLURM_USER}:${SLURM_USER}"
 	find "${SLURM_DIR}" -type f -name "*.conf" -print0 | xargs -0r chmod -v 644
+	find "${SLURM_DIR}" -type f -name "*.yaml" -print0 | xargs -0r chown -v "${SLURM_USER}:${SLURM_USER}"
+	find "${SLURM_DIR}" -type f -name "*.yaml" -print0 | xargs -0r chmod -v 644
 	find "${SLURM_DIR}" -type f -regextype posix-extended -regex "^.*/(pro|epi)log-.*$" -print0 | xargs -0r chown -v "${SLURM_USER}:${SLURM_USER}"
 	find "${SLURM_DIR}" -type f -regextype posix-extended -regex "^.*/(pro|epi)log-.*$" -print0 | xargs -0r chmod -v 755
 

helm/slurm/templates/controller/slurm-configmap.yaml

@@ -5,7 +5,7 @@ SPDX-License-Identifier: Apache-2.0
 
 {{- $nodesetList := list "ALL" -}}
 {{- $failList := list "slurm.conf" "slurmdbd.conf" -}}
-{{- $allowList := list "acct_gather.conf" "burst_buffer.conf" "cgroup.conf" "gres.conf" "helpers.conf" "job_container.conf" "mpi.conf" "oci.conf" "plugstack.conf" "topology.conf" -}}
+{{- $allowList := list "acct_gather.conf" "burst_buffer.conf" "cgroup.conf" "gres.conf" "helpers.conf" "job_container.conf" "mpi.conf" "oci.conf" "plugstack.conf" "topology.conf" "topology.yaml" -}}
 {{- $partitionList := list -}}
 apiVersion: v1
 kind: ConfigMap

helm/slurm/values.yaml

@@ -137,6 +137,8 @@ slurm:
     #   # Ref: https://slurm.schedmd.com/plugstack.conf.html
     # topology.conf: |
     #   # Ref: https://slurm.schedmd.com/topology.conf.html
+    # topology.yaml: |
+    #   # Ref: https://slurm.schedmd.com/topology.yaml.html
   #
   # -- (map[string]string)
   # The Prolog scripts for compute nodesets, as a map.