Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Aug 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions k8s/helmfile/env/local/wbaas-backup.values.yaml.gotmpl
Original file line number Diff line number Diff line change
@@ -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
9 changes: 5 additions & 4 deletions k8s/helmfile/env/staging/wbaas-backup.values.yaml.gotmpl
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion k8s/helmfile/helmfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,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
Expand Down
24 changes: 24 additions & 0 deletions tf/env/staging/secrets-gcs.tf
Original file line number Diff line number Diff line change
@@ -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
}
}
2 changes: 1 addition & 1 deletion tf/env/staging/serviceaccount.tf
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ resource "google_service_account_key" "dev-api" {
keepers = {
rotate = 1
}
}
}