final fix for munged handling on shutdown

naps-product-sa · Nov 7, 2023 · 99d2417 · 99d2417
1 parent e7db767
commit 99d2417
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/slurm/manifests/kustomization.yaml b/slurm/manifests/kustomization.yaml
@@ -20,6 +20,5 @@ configMapGenerator:
 - name: slurm-conf
   files:
     - configs/slurm.conf
-    - configs/munge-init
   options:
     disableNameSuffixHash: true
diff --git a/slurm/manifests/statefulset-compute.yaml b/slurm/manifests/statefulset-compute.yaml
@@ -29,7 +29,6 @@ spec:
   serviceName: "compute"
   replicas: 1
   minReadySeconds: 10
-  terminationGracePeriodSeconds: 60
   template:
     metadata:
       labels:
@@ -42,7 +41,7 @@ spec:
         searches:
         - slurm.slurm-system.svc.cluster.local
       enableServiceLinks: false
-      terminationGracePeriodSeconds: 10
+      terminationGracePeriodSeconds: 15
       serviceAccountName: slurm
       initContainers:
       - name: fix-munge-paths
@@ -89,6 +88,9 @@ spec:
           mountPath: /home
       - name: munge
         image: ghcr.io/naps-product-sa/openshift-batch/munge:latest
+        command:
+        - /bin/bash
+        - /scripts/munged-container.sh
         securityContext:
           runAsUser: 500
           runAsGroup: 500