From f4e57bea91c5339befdf1f7d061a2807f3fe8fdb Mon Sep 17 00:00:00 2001
From: Will <iq20064@bristol.ac.uk>
Date: Fri, 23 Jun 2023 16:47:15 +0100
Subject: [PATCH] Image and manifest changes for configmap tests for conf files

---
 .github/workflows/build-containers.yml          |  1 +
 docker-entrypoint.sh                            |  4 ++--
 kube-deploy.sh                                  |  3 +++
 .../c1-claim3-persistentvolumeclaim.yaml        | 14 --------------
 .../slurmctld-claim3-persistentvolumeclaim.yaml | 14 --------------
 .../slurmdbd-claim2-persistentvolumeclaim.yaml  | 14 --------------
 .../slurmdbd-claim3-persistentvolumeclaim.yaml  | 14 --------------
 kube-manifests/slurmdbd-deployment.yaml         | 17 +++++++++--------
 8 files changed, 15 insertions(+), 66 deletions(-)
 create mode 100644 kube-deploy.sh
 delete mode 100644 kube-manifests/c1-claim3-persistentvolumeclaim.yaml
 delete mode 100644 kube-manifests/slurmctld-claim3-persistentvolumeclaim.yaml
 delete mode 100644 kube-manifests/slurmdbd-claim2-persistentvolumeclaim.yaml
 delete mode 100644 kube-manifests/slurmdbd-claim3-persistentvolumeclaim.yaml

diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml
index cfee9c0..a38b93f 100644
--- 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
index 97511c1..811232e 100755
--- 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
new file mode 100644
index 0000000..c415a00
--- /dev/null
+++ 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
\ No newline at end of file
diff --git a/kube-manifests/c1-claim3-persistentvolumeclaim.yaml b/kube-manifests/c1-claim3-persistentvolumeclaim.yaml
deleted file mode 100644
index 545f671..0000000
--- a/kube-manifests/c1-claim3-persistentvolumeclaim.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  creationTimestamp: null
-  labels:
-    io.kompose.service: c1-claim3
-  name: c1-claim3
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 100Mi
-status: {}
diff --git a/kube-manifests/slurmctld-claim3-persistentvolumeclaim.yaml b/kube-manifests/slurmctld-claim3-persistentvolumeclaim.yaml
deleted file mode 100644
index ab3d8c6..0000000
--- a/kube-manifests/slurmctld-claim3-persistentvolumeclaim.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  creationTimestamp: null
-  labels:
-    io.kompose.service: slurmctld-claim3
-  name: slurmctld-claim3
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 100Mi
-status: {}
diff --git a/kube-manifests/slurmdbd-claim2-persistentvolumeclaim.yaml b/kube-manifests/slurmdbd-claim2-persistentvolumeclaim.yaml
deleted file mode 100644
index e93f3fd..0000000
--- a/kube-manifests/slurmdbd-claim2-persistentvolumeclaim.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  creationTimestamp: null
-  labels:
-    io.kompose.service: slurmdbd-claim2
-  name: slurmdbd-claim2
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 100Mi
-status: {}
diff --git a/kube-manifests/slurmdbd-claim3-persistentvolumeclaim.yaml b/kube-manifests/slurmdbd-claim3-persistentvolumeclaim.yaml
deleted file mode 100644
index 40d8d37..0000000
--- a/kube-manifests/slurmdbd-claim3-persistentvolumeclaim.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  creationTimestamp: null
-  labels:
-    io.kompose.service: slurmdbd-claim3
-  name: slurmdbd-claim3
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 100Mi
-status: {}
diff --git a/kube-manifests/slurmdbd-deployment.yaml b/kube-manifests/slurmdbd-deployment.yaml
index df29561..5b64db5 100644
--- 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: {}