gitops unige

.helmignore

@@ -5,3 +5,4 @@ drupal7-db-for-astrooda
 postfix-container
 /private
 *config
+frontend-container

templates/deployment.yaml

@@ -37,6 +37,9 @@ spec:
         configMap:
           name: frontend-init-script
           defaultMode: 0555
+      - name: backups
+        persistentVolumeClaim:
+          claimName: backups
       - name: patched-files
         emptyDir: {}
       {{- if .Values.extra_instr_dir.enabled }}
@@ -68,6 +71,9 @@ spec:
               mountPath: /instruments-dir
               readOnly: false
             {{- end }}
+            - name: backups
+              mountPath: /backups
+              readOnly: true
           env:
             - name: PASSWORD
               valueFrom: 
@@ -151,7 +157,31 @@ spec:
             mountPath: /var/www/mmoda/sites/all/modules/mmoda/instruments
             readOnly: false
           {{- end }}
+        - name: backup
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          command:
+          - bash
+          - -c
+          - |
+            set -x
+            while true; do 
+              mysqldump -h mysql -u astrooda -p$PASSWORD astrooda > /backups/state-snapshot-$(date +%s).sql              
+              sleep 3600; 
+            done
 
+
+          volumeMounts:
+            - name: backups
+              mountPath: /backups
+              readOnly: false
+          env:
+            - name: PASSWORD
+              valueFrom: 
+                secretKeyRef:
+                  name: {{ .Values.mysql_pw_secret }}
+                  key: mysql-password
+
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

templates/init-script-cm.yaml

@@ -6,7 +6,7 @@ metadata:
 data:
   init-script.sh: |
     #!/bin/bash
-    set -x
+    set -xe
     # Install jq if not available
     JQ_URL=https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64
     JQ_BIN=/usr/local/bin/jq
@@ -52,16 +52,22 @@ data:
 
     # Drush reinstall all mmoda modules
     ALL_MMODA_MODULES=`~/.composer/vendor/bin/drush pm-list --type=module --format=json | jq -r '[ keys[] | select(startswith("mmoda_")) ] | join(",")'`
+    ENABLED_MMODA_MODULES=`~/.composer/vendor/bin/drush pm-list --type=module --status=enabled --format=json | jq -r '[ keys[] | select(startswith("mmoda_")) ] | join(",")'`
+    ~/.composer/vendor/bin/drush dis -y mmoda_integral
     ~/.composer/vendor/bin/drush dis -y mmoda 
     ~/.composer/vendor/bin/drush pm-uninstall -y $ALL_MMODA_MODULES
+    ~/.composer/vendor/bin/drush pm-uninstall -y mmoda_integral
     ~/.composer/vendor/bin/drush pm-uninstall -y mmoda
     ~/.composer/vendor/bin/drush en -y mmoda 
+    ~/.composer/vendor/bin/drush en -y mmoda_integral
     ~/.composer/vendor/bin/drush en -y $MMODA_MODULES
+    ~/.composer/vendor/bin/drush en -y $ENABLED_MMODA_MODULES
 
 
     chmod -R 777 /var/www/mmoda/sites/default/files
 
     #reset drupal admin
+    ~/.composer/vendor/bin/drush user-cancel admin -y || true
     ~/.composer/vendor/bin/drush user-create admin --password=$DRUPAL_PW
     ~/.composer/vendor/bin/drush user-add-role "administrator" admin
     ~/.composer/vendor/bin/drush upwd --password=$DRUPAL_PW admin
@@ -72,6 +78,12 @@ data:
 
     run-sql <(echo "use astrooda; update variable set value='s:30:"vendor/swiftmailer/swiftmailer";' where name='swiftmailer_path';")
 
+    if [ -f /backups/state-snapshot.sql ]; then
+      echo run-sql /backups/state-snapshot.sql
+    else
+      echo "No state-snapshot.sql found in /backups"
+    fi
+
     ~/.composer/vendor/bin/drush cc -y all 
 
     #cp -rfv /var/www/mmoda/sites/all/modules/rules /patched-files/rules

templates/pvc.yaml

@@ -53,17 +53,32 @@ spec:
   #storageClassName: {{ .Values.storage_class_rwmany }}
   #volumeMode: Filesystem
 
-{{ if .Values.extra_instr_dir.enabled | default false }}
+# {{ if .Values.extra_instr_dir.enabled | default false }}
+# ---
+# apiVersion: v1
+# kind: PersistentVolumeClaim
+# metadata:
+#   name: instruments-dir
+# spec:
+#   accessModes:
+#   - ReadWriteMany
+#   resources:
+#     requests:
+#       storage: 1G
+#   storageClassName: {{ .Values.storage_class_rwmany }}
+# {{ end }}
+
 ---
+
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: instruments-dir
+  name: backups
+  namespace: staging
 spec:
+  storageClassName: nfs
   accessModes:
-  - ReadWriteMany
+    - ReadWriteMany
   resources:
     requests:
-      storage: 1G
-  storageClassName: {{ .Values.storage_class_rwmany }}
-{{ end }}
+      storage: 100Gi