Works with cluster nfs server

stackhpc · Jun 26, 2023 · 36fda5d · 36fda5d
1 parent 1d4c5af
commit 36fda5d
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 32 deletions.
diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml
@@ -5,7 +5,7 @@ on:
       - .github/workflows/build-containers.yml
       - Dockerfile
       - docker-entrypoint.sh
-    workflow_dispatch:
+  workflow_dispatch: 
 
 jobs:
   build_push_api:

diff --git a/kube-manifests/c1-deployment.yaml b/kube-manifests/c1-deployment.yaml
@@ -27,33 +27,27 @@ spec:
       containers:
         - args:
             - slurmd
-          image: ghcr.io/stackhpc/slurm-docker-cluster:e41370d
+          image: ghcr.io/stackhpc/slurm-docker-cluster:1d4c5af
           name: c1
           ports:
             - containerPort: 6818
           resources: {}
           volumeMounts:
-#            - mountPath: /etc/munge
-#              name: etc-munge
+    #      - mountPath: /etc/slurm/slurm.conf
+    #        name: slurm-config-volume
+    #        subPath: slurm.conf
             - mountPath: /data
               name: slurm-jobdir
-            - mountPath: /var/log/slurm
-              name: var-log-slurm
-            - mountPath: /etc/slurm/slurm.conf
-              name: c1-claim3
       hostname: c1
       restartPolicy: Always
       volumes:
-#        - name: etc-munge
-#          persistentVolumeClaim:
-#            claimName: etc-munge
         - name: slurm-jobdir
-          persistentVolumeClaim:
-            claimName: slurm-jobdir
-        - name: var-log-slurm
-          persistentVolumeClaim:
-            claimName: var-log-slurm
-        - name: c1-claim3
-          persistentVolumeClaim:
-            claimName: c1-claim3
+          nfs:
+            server: 172.20.37.208
+            path: /exports/k8s-nfs
+          #persistentVolumeClaim:
+          #  claimName: slurm-jobdir
+    #  - name: slurm-config-volume
+    #    configMap:
+    #      name: slurm-conf-configmap
 status: {}
diff --git a/kube-manifests/slurmctld-deployment.yaml b/kube-manifests/slurmctld-deployment.yaml
@@ -27,7 +27,7 @@ spec:
       containers:
         - args:
             - slurmctld
-          image: ghcr.io/stackhpc/slurm-docker-cluster:e41370d
+          image: ghcr.io/stackhpc/slurm-docker-cluster:1d4c5af
           name: slurmctld
           ports:
             - containerPort: 6817
@@ -37,18 +37,20 @@ spec:
               name: slurm-jobdir
             - mountPath: /var/log/slurm
               name: var-log-slurm
-            - mountPath: /etc/slurm/slurm.conf
-              name: slurmctld-claim3
+    #      - mountPath: /etc/slurm/slurm.conf
+    #        name: slurm-config-volume
+    #        subPath: slurm.conf
       hostname: slurmctld
       restartPolicy: Always
       volumes:
         - name: slurm-jobdir
-          persistentVolumeClaim:
-            claimName: slurm-jobdir
+          nfs:
+            server: 172.20.37.208
+            path: /exports/k8s-nfs
         - name: var-log-slurm
           persistentVolumeClaim:
             claimName: var-log-slurm
-        - name: slurmctld-claim3
-          persistentVolumeClaim:
-            claimName: slurmctld-claim3
+    #  - name: slurm-config-volume
+    #    configMap:
+    #      name: slurm-conf-configmap
 status: {}
diff --git a/kube-manifests/slurmdbd-deployment.yaml b/kube-manifests/slurmdbd-deployment.yaml
@@ -24,21 +24,35 @@ spec:
       labels:
         io.kompose.service: slurmdbd
     spec:
+      securityContext: 
+      #  runAsUser: 990
+      #  runAsGroup: 990
+      #  fsGroup: 990
       containers:
         - args:
             - slurmdbd
-          image: ghcr.io/stackhpc/slurm-docker-cluster:e41370d
+          image: ghcr.io/stackhpc/slurm-docker-cluster:1d4c5af
           name: slurmdbd
           ports:
             - containerPort: 6819
           resources: {}
           volumeMounts:
             - mountPath: /var/log/slurm
               name: var-log-slurm
-            - mountPath: /etc/slurm/slurm.conf
-              name: slurm-config-volume
-            - mountPath: /etc/slurm/slurmdbd.conf
-              name: dbd-config-volume
+      #      - mountPath: /etc/slurm/slurm.conf
+      #        name: slurm-config-volume
+      #        subPath: slurm.conf
+      #      - mountPath: /etc/slurm/slurmdbd.conf
+      #        name: dbd-config-volume
+      #        subPath: slurmdbd.conf
+      #initContainers:
+      #  - name: init-perms-set
+      #    image: busybox
+      #    command: ["sh", "-c", "addgroup --system --gid=990 slurm; adduser --system -G slurm --uid=990 slurm && chown slurm:slurm /etc/slurm/slurmdbd.conf"]
+      #    volumeMounts:
+      #      - mountPath: /etc/slurm/slurmdbd.conf
+      #        name: dbd-config-volume
+      #        subPath: slurmdbd.conf
       hostname: slurmdbd
       restartPolicy: Always
       volumes: