Set cron-job and migrate-build-files env credentials to use moodle-se…

…crets Added 10 second deley to file delete for migrate script
bcgov · Jan 3, 2024 · 3f9ed5a · 3f9ed5a
1 parent f5ddf20
commit 3f9ed5a
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 16 deletions.
diff --git a/openshift/migrate-build-files-job.yml b/openshift/migrate-build-files-job.yml
@@ -46,6 +46,22 @@ objects:
                - name: cron-config
                  mountPath: /var/www/html/config.php
                  subPath: config.php
+             env:
+               - name: DB_USER
+                 valueFrom:
+                   secretKeyRef:
+                     name: moodle-secrets
+                     key: database-user
+               - name: DB_NAME
+                 valueFrom:
+                   secretKeyRef:
+                     name: moodle-secrets
+                     key: database-name
+               - name: DB_PASSWORD
+                 valueFrom:
+                   secretKeyRef:
+                     name: moodle-secrets
+                     key: database-password
              command:
                - bash
                - "-c"
@@ -66,4 +82,4 @@ parameters:
     value: "moodle"
   - name: BUILD_TAG
     required: true
-    value: "dev"
+    value: "dev"
diff --git a/openshift/moodle-cron-job.yml b/openshift/moodle-cron-job.yml
@@ -35,15 +35,24 @@ objects:
                    path: ./.env
                defaultMode: 420
          containers:
-           - name: moodle-cron-job-job
+           - name: ${BUILD_NAME}
              image: ${IMAGE_REPO}${BUILD_NAMESPACE}/${BUILD_NAME}:${BUILD_TAG}
              env:
-               - name: DB_NAME
-                 value: ${DB_NAME}
                - name: DB_USER
-                 value: ${DB_USER}
+                 valueFrom:
+                   secretKeyRef:
+                     name: moodle-secrets
+                     key: database-user
+               - name: DB_NAME
+                 valueFrom:
+                   secretKeyRef:
+                     name: moodle-secrets
+                     key: database-name
                - name: DB_PASSWORD
-                 value: ${DB_PASSWORD}
+                 valueFrom:
+                   secretKeyRef:
+                     name: moodle-secrets
+                     key: database-password
              volumeMounts:
                - name: moodle-data
                  mountPath: /var/www/html
@@ -81,12 +90,3 @@ parameters:
   - name: BUILD_TAG
     required: true
     value: "dev"
-  - name: DB_USER
-    required: true
-    value: "moodle"
-  - name: DB_NAME
-    required: true
-    value: "moodle"
-  - name: DB_PASSWORD
-    required: true
-    value: "CHANGE_ME"
diff --git a/openshift/scripts/migrate-build-files.sh b/openshift/scripts/migrate-build-files.sh
@@ -6,7 +6,8 @@
 # echo "Delete Moodle config..."
 
 # rm -f /var/www/html/config.php
-echo "Deleting shared Moodle files..."
+echo "Deleting shared Moodle files... in 10...9...8..."
+sleep 10
 rm -rf /var/www/html/*
 # echo "Move Moodle web files to /tmp/old..."
 # mv /var/www/html/* /tmp/old