Merge pull request #3 from InformaticsMatters/backup-fixes

Fix backup deployment

Author: alanbchristie

.pre-commit-config.yaml

@@ -35,13 +35,13 @@ repos:
     args:
     - --markdown-linebreak-ext=md
 
-- repo: https://github.com/adrienverge/yamllint
-  rev: v1.37.1
-  hooks:
-  - id: yamllint
-    types:
-    - file
-    files: (\.yaml|\.yaml.j2)$
+#- repo: https://github.com/adrienverge/yamllint
+#  rev: v1.37.1
+#  hooks:
+#  - id: yamllint
+#    types:
+#    - file
+#    files: (\.yaml|\.yaml.j2)$
 
 #- repo: https://github.com/ansible-community/ansible-lint
 #  rev: v6.16.1

.yamllint

@@ -38,6 +38,7 @@ ignore: |
   roles/infrastructure/templates/cronjob-postgres-backup-hourly.yaml.j2
   roles/infrastructure/templates/cronjob-postgres-backup-daily.yaml.j2
   roles/infrastructure/templates/cronjob-postgres-backup-weekly.yaml.j2
+  roles/infrastructure/templates/cronjob-postgres-backup-monthly.yaml.j2
   roles/infrastructure/templates/pvc-postgres.yaml.j2
   roles/infrastructure/templates/pvc-postgres-backup.yaml.j2
   roles/infrastructure/templates/serviceaccount-im-infra.yaml.j2

parameters-local.yaml

@@ -14,7 +14,6 @@ infra_priority_class: im-application-critical
 
 ingress_class: "{{ lookup('env', 'IM_DEV_INGRESS_CLASS') | default('nginx', True)}}"
 
-ic_state: absent
 efs_state: absent
 cinder_state: absent
 ax_state: absent

parameters-scw-im-main.yaml

@@ -1,5 +1,12 @@
 ---
 
+# Where are we deploying this stuff?
+#
+# The name is used to decrypt installation-specific variables
+# that are expected to be found in 'vars/sensitive-<name>.vault',
+# and you will need to provide the vault password when running the playbook.
+infra_installation_name: scw-im-main
+
 # A set of parameters for our im-main Scaleway cluster.
 
 k8s_kubeconfig: "{{ lookup('env', 'KUBECONFIG') }}"
@@ -11,19 +18,31 @@ infra_priority_class: im-application-critical
 
 ingress_class: nginx
 
-ic_state: absent
 efs_state: absent
 cinder_state: absent
-ax_state: absent
 
 pg_state: present
-pg_bu_state: absent
 pg_image: informaticsmatters/rdkit-cartridge-debian
 pg_version: Release_2024_03_3
 pg_vol_size_g: 1
 pg_cpu_request: 100m
 pg_mem_request: 250Mi
 
+pg_bu_state: present
+pg_bu_image_tag: "15.8"
+# 4 backups a day (at 6-hourly intervals)
+pg_bu_hourly_schedule: "1 5,11,17,23 * * *"
+pg_bu_hourly_history: 4
+# 7 daily backups
+pg_bu_daily_schedule: "31 5 * * *"
+pg_bu_daily_history: 7
+# 4 weekly backups (on Sundays)
+pg_bu_weekly_schedule: "41 5 * * 0"
+pg_bu_weekly_history: 4
+# 3 monthly backups (on the 1st of each month)
+pg_bu_monthly_schedule: "41 5 1 * *"
+pg_bu_monthly_history: 3
+
 kc_state: present
 kc_hostname: keycloak-scw.informaticsmatters.com