feat(backup): use s3 based backup in staging and local (#1082)

* feat(backup): use s3 based backup in staging and local * fix: chart repo is misspelled Co-authored-by: Deniz Erdogan <[email protected]> * Update k8s/helmfile/helmfile.yaml Co-authored-by: Deniz Erdogan <[email protected]> --------- Co-authored-by: Deniz Erdogan <[email protected]>
wmde · Aug 14, 2023 · e038ba8 · e038ba8
1 parent d142ffb
commit e038ba8
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 11 deletions.
diff --git a/k8s/helmfile/env/local/wbaas-backup.values.yaml.gotmpl b/k8s/helmfile/env/local/wbaas-backup.values.yaml.gotmpl
@@ -1,13 +1,20 @@
 image:
-  tag: v0.2.0
+  tag: v0.3.0
 
 job:
   failedJobsHistoryLimit: 1
   successfulJobsHistoryLimit: 1
   cronSchedule: "* * 1 1 *"
 
+scratchDiskSpace: 4Gi
+
+restorePodRunning: false
+
 storage:
-  scratchDiskSpace: 4Gi
-  gcs:
-    bucketName: nacho-cheese
-    uploadToBucket: false
+  bucketName: backups
+  uploadToBucket: true
+  accessKeySecretName: minio-credentials
+  accessKeySecretKey: rootUser
+  secretKeySecretName: minio-credentials
+  secretKeySecretKey: rootPassword
+  endpoint: http://minio.default.svc.cluster.local:9000
diff --git a/k8s/helmfile/env/staging/wbaas-backup.values.yaml.gotmpl b/k8s/helmfile/env/staging/wbaas-backup.values.yaml.gotmpl
@@ -1,7 +1,8 @@
 image:
-  tag: v0.2.0
+  tag: v0.3.0
+
+scratchDiskSpace: 8Gi
 
 storage:
-  scratchDiskSpace: 8Gi
-  gcs:
-    bucketName: wikibase-dev-sql-backup
+  bucketName: wikibase-dev-sql-backup
+  uploadToBucket: true
diff --git a/k8s/helmfile/helmfile.yaml b/k8s/helmfile/helmfile.yaml
@@ -211,7 +211,7 @@ releases:
   - name: wbaas-backup
     namespace: default
     chart: wbstack/wbaas-backup
-    version: 0.0.6
+    version: {{ ternary "0.1.0" "0.0.6" (ne .Environment.Name "production") }}
     <<: *default_release
 
   - name: kube-prometheus-stack

diff --git a/tf/env/staging/secrets-gcs.tf b/tf/env/staging/secrets-gcs.tf
@@ -0,0 +1,24 @@
+resource "google_service_account" "dev-backup-upload" {
+  account_id = "dev-backup-upload"
+}
+
+resource "google_storage_hmac_key" "dev-backup-upload-key" {
+  service_account_email = google_service_account.dev-backup-upload.email
+}
+
+resource "google_project_iam_member" "dev-backup-upload" {
+  role    = "roles/storage.admin"
+  member  = "serviceAccount:${google_service_account.dev-backup-upload.email}"
+  project = local.project_id
+}
+
+resource "kubernetes_secret" "gcs-hmac-key" {
+  provider = kubernetes.wbaas-2
+  metadata {
+    name = "gcs-hmac-key"
+  }
+  data = {
+    "access-key" = google_storage_hmac_key.dev-backup-upload-key.access_id
+    "secret-key" = google_storage_hmac_key.dev-backup-upload-key.secret
+  }
+}
diff --git a/tf/env/staging/serviceaccount.tf b/tf/env/staging/serviceaccount.tf
@@ -32,4 +32,4 @@ resource "google_service_account_key" "dev-api" {
     keepers = {
         rotate = 1
     }
-}
+}