Skip to content

Fix restore with azcopy

Clemens Beck requested to merge fix-restore-with-azcopy into master

What does this MR do?

Fix restore with azcopy

Restoring with azcopy was restoring files
to a wrong directory structure.

Closes: https://gitlab.com/gitlab-org/charts/gitlab/-/issues/4682

Changelog: fixed

Related issues

Closes: gitlab-org/charts/gitlab#4682 (closed)

Test Plan

Prerequisites: Access to a Azure Storage Account

  1. Deploy the Helm chart:

    1. with Azure Block Storage as external object storage Docs
    2. with Azure Block Storage as backup storage Docs
    3. using the toolbox image of this branch
    $ cat conf.yaml
    provider: AzureRM
    azure_storage_account_name: "<REDACTED>"
    azure_storage_access_key: "<REDACTED>"
    azure_storage_domain: blob.core.windows.net
    $ kubectl create secret generic backup-azure-creds --from-file=config=conf.yaml
    $ helm upgrade --install gitlab gitlab/gitlab --version 6.11.3 \
       --set gitlab.toolbox.backups.objectStorage.config.secret=backup-azure-creds \
       --set gitlab.toolbox.backups.objectStorage.config.key=config \
       --set gitlab.toolbox.backups.objectStorage.backend=azure \
       --set global.appConfig.object_store.enabled=true \
       --set global.appConfig.object_store.connection.secret=backup-azure-creds \
       --set global.appConfig.object_store.connection.key=config \
       --set global.minio.enabled=false \
       --set gitlab.toolbox.image.repository=registry.gitlab.com/gitlab-org/build/cng/gitlab-toolbox-ee \
       --set gitlab.toolbox.image.tag=fix-restore-with-azcopy
  2. create at least the following buckets: gitlab-uploads, tmp, gitlab-backups

  3. create an issue and attach images (this creates uploads)

  4. Create a backup

  5. Restore the created backup

  6. Access the issue, and verify the uploads can be fetched

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion

Required

  • Merge Request Title, and Description are up to date, accurate, and descriptive
  • MR targeting the appropriate branch
  • MR has a green pipeline on GitLab.com
  • When ready for review, MR is labeled "~workflow::ready for review" per the Distribution MR workflow

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes
  • Documentation created/updated
  • Integration tests added to GitLab QA
  • The impact any change in container size has should be evaluated
Edited by Clemens Beck

Merge request reports