From 5a98be5a263050c5a3be5cddcaab5299066e9a5b Mon Sep 17 00:00:00 2001
From: Will <iq20064@bristol.ac.uk>
Date: Tue, 29 Aug 2023 13:33:56 +0100
Subject: [PATCH] Made database more configurable and made separate options for
 interally managed database

---
 .../templates/database-auth-secret.yaml       | 12 ++++++++++
 .../templates/mysql-deployment.yaml           |  6 ++++-
 .../templates/mysql-service.yaml              |  6 ++++-
 .../templates/slurmdbd-conf-configmap.yaml    |  4 ++--
 .../var-lib-mysql-persistentvolumeclaim.yaml  |  4 ++++
 slurm-cluster-chart/values.yaml               | 23 +++++++++++++++----
 6 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/slurm-cluster-chart/templates/database-auth-secret.yaml b/slurm-cluster-chart/templates/database-auth-secret.yaml
index 1a1d6ea..28b09d5 100644
--- a/slurm-cluster-chart/templates/database-auth-secret.yaml
+++ b/slurm-cluster-chart/templates/database-auth-secret.yaml
@@ -2,7 +2,19 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: database-auth-secret
+  {{ if not .Values.databaseConnection.password }}
   annotations:
     helm.sh/hook: pre-install
+  {{ end }}
+
+{{ if .Values.databaseConnection.password }}
+
+stringData:
+  password: {{ .Values.databaseConnection.password }}
+
+{{ else }}
+
 data:
   password: {{ randAlphaNum 32 | b64enc }}
+
+{{ end }}
diff --git a/slurm-cluster-chart/templates/mysql-deployment.yaml b/slurm-cluster-chart/templates/mysql-deployment.yaml
index 96dc88f..83b32d2 100644
--- a/slurm-cluster-chart/templates/mysql-deployment.yaml
+++ b/slurm-cluster-chart/templates/mysql-deployment.yaml
@@ -1,3 +1,5 @@
+{{ if .Values.database.enabled }}
+
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -33,7 +35,7 @@ spec:
             - name: MYSQL_RANDOM_ROOT_PASSWORD
               value: "yes"
             - name: MYSQL_USER
-              value: "slurm"
+              value: {{ .Values.databaseConnection.user }}
           image: {{ .Values.database.image }}
           name: mysql
           ports:
@@ -48,3 +50,5 @@ spec:
         - name: var-lib-mysql
           persistentVolumeClaim:
             claimName: var-lib-mysql
+
+{{ end }}
diff --git a/slurm-cluster-chart/templates/mysql-service.yaml b/slurm-cluster-chart/templates/mysql-service.yaml
index a7d58cc..08b63a9 100644
--- a/slurm-cluster-chart/templates/mysql-service.yaml
+++ b/slurm-cluster-chart/templates/mysql-service.yaml
@@ -1,3 +1,5 @@
+{{ if .Values.database.enabled }}
+
 apiVersion: v1
 kind: Service
 metadata:
@@ -5,7 +7,7 @@ metadata:
   labels:
     app.kubernetes.io/name: slurm
     app.kubernetes.io/component: mysql
-  name: mysql
+  name: {{ .Values.databaseConnection.hostname }}
 spec:
   ports:
     - name: mysql
@@ -14,3 +16,5 @@ spec:
   selector:
     app.kubernetes.io/name: slurm
     app.kubernetes.io/component: mysql
+
+{{ end }}
diff --git a/slurm-cluster-chart/templates/slurmdbd-conf-configmap.yaml b/slurm-cluster-chart/templates/slurmdbd-conf-configmap.yaml
index 105580b..83e0b6c 100644
--- a/slurm-cluster-chart/templates/slurmdbd-conf-configmap.yaml
+++ b/slurm-cluster-chart/templates/slurmdbd-conf-configmap.yaml
@@ -22,6 +22,6 @@ data:
     #
     # Database info
     StorageType=accounting_storage/mysql
-    StorageHost=mysql
-    StorageUser=slurm
+    StorageHost={{ .Values.databaseConnection.hostname }}
+    StorageUser={{ .Values.databaseConnection.user }}
     
\ No newline at end of file
diff --git a/slurm-cluster-chart/templates/var-lib-mysql-persistentvolumeclaim.yaml b/slurm-cluster-chart/templates/var-lib-mysql-persistentvolumeclaim.yaml
index a5f4503..6ab5561 100644
--- a/slurm-cluster-chart/templates/var-lib-mysql-persistentvolumeclaim.yaml
+++ b/slurm-cluster-chart/templates/var-lib-mysql-persistentvolumeclaim.yaml
@@ -1,3 +1,5 @@
+{{ if .Values.database.enabled }}
+
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -12,3 +14,5 @@ spec:
   resources:
     requests:
       storage: {{ .Values.database.storage }}
+
+{{ end }}
diff --git a/slurm-cluster-chart/values.yaml b/slurm-cluster-chart/values.yaml
index 086ccf1..e8baab7 100644
--- a/slurm-cluster-chart/values.yaml
+++ b/slurm-cluster-chart/values.yaml
@@ -52,14 +52,29 @@ rooknfs:
   # backingStorageClass: 
 
 
-
-# Values for Slurm's database container
+# Optional internally managed database deployment. If enabled, will deploy
+# MySQL server pod backed by a PVC and a service that can be resolved as databaseConnection.hostname
 database:
-  #Database image to be used
+  # If enabled, will install an internally managed database pod 
+  enabled: true
+  # Database image to be used
   image: mariadb:10.10
-  #Storage requested by the var-lib-mysql volume backing the database
+  # Storage requested by the var-lib-mysql volume backing the database
   storage: 100Mi
 
+# MySQL session connection info
+databaseConnection:
+  # Hostname of SQL server.
+  # If using the internal database, it's service will be configured to resolve with this name
+  # If using external database, should be set as its endpoint
+  hostname: mysql
+  # User with access to the Slurm accounting database on the server
+  # If using the internal database, changing this field will have no effect
+  # If using the external database, this user must exist on it
+  user: slurm
+  # Password for database user. If left as nil, one will be randomly generated (recommended for internal database)
+  password:
+
 # Configmap resource names
 configmaps:
   slurmConf: slurm-conf-configmap