Image and manifest changes for configmap tests for conf files

stackhpc · Jun 23, 2023 · f4e57be · f4e57be
1 parent 08ffd5f
commit f4e57be
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 66 deletions.
diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml
@@ -4,6 +4,7 @@ on:
     paths:
       - .github/workflows/build-containers.yml
       - Dockerfile
+      - docker-entrypoint.sh
     workflow_dispatch:
 
 jobs:

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -8,8 +8,8 @@ then
 
     echo "---> Starting the Slurm Database Daemon (slurmdbd) ..."
 
-    chown slurm:slurm /etc/slurm/slurmdbd.conf
-    chmod 600 /etc/slurm/slurmdbd.conf
+    #chown slurm:slurm /etc/slurm/slurmdbd.conf
+    #chmod 600 /etc/slurm/slurmdbd.conf
     {
         . /etc/slurm/slurmdbd.conf
         until echo "SELECT 1" | mysql -h $StorageHost -u$StorageUser -p$StoragePass 2>&1 > /dev/null

diff --git a/kube-deploy.sh b/kube-deploy.sh
@@ -0,0 +1,3 @@
+kubectl apply -f 'kube-manifests/*.yaml'
+kubectl create configmap slurm-conf-configmap --from-file=slurm.conf
+kubectl create configmap slurmdbd-conf-configmap --from-file=slurmdbd.conf
diff --git a/kube-manifests/c1-claim3-persistentvolumeclaim.yaml b/kube-manifests/c1-claim3-persistentvolumeclaim.yaml
diff --git a/kube-manifests/slurmctld-claim3-persistentvolumeclaim.yaml b/kube-manifests/slurmctld-claim3-persistentvolumeclaim.yaml
diff --git a/kube-manifests/slurmdbd-claim2-persistentvolumeclaim.yaml b/kube-manifests/slurmdbd-claim2-persistentvolumeclaim.yaml
diff --git a/kube-manifests/slurmdbd-claim3-persistentvolumeclaim.yaml b/kube-manifests/slurmdbd-claim3-persistentvolumeclaim.yaml
diff --git a/kube-manifests/slurmdbd-deployment.yaml b/kube-manifests/slurmdbd-deployment.yaml
@@ -36,19 +36,20 @@ spec:
             - mountPath: /var/log/slurm
               name: var-log-slurm
             - mountPath: /etc/slurm/slurm.conf
-              name: slurmdbd-claim2
+              name: slurm-config-volume
             - mountPath: /etc/slurm/slurmdbd.conf
-              name: slurmdbd-claim3
+              name: dbd-config-volume
       hostname: slurmdbd
       restartPolicy: Always
       volumes:
         - name: var-log-slurm
           persistentVolumeClaim:
             claimName: var-log-slurm
-        - name: slurmdbd-claim2
-          persistentVolumeClaim:
-            claimName: slurmdbd-claim2
-        - name: slurmdbd-claim3
-          persistentVolumeClaim:
-            claimName: slurmdbd-claim3
+        - name: dbd-config-volume
+          configMap:
+            name: slurmdbd-conf-configmap
+            defaultMode: 384
+        - name: slurm-config-volume
+          configMap:
+            name: slurm-conf-configmap
 status: {}