Staging 0.35.2 (#2042)

Co-authored-by: Cristi <[email protected]>

helmfile/values/velero-sc.yaml.gotmpl

@@ -136,6 +136,9 @@ kubectl:
     runAsGroup: 10000
     runAsUser: 10000
 
+# This job upgrades the CRDs.
+upgradeCRDs: false
+
 # Run velero-restore-helper init container with numeric UID and GID.
 configMaps:
   restore-helper-config:

helmfile/values/velero-wc.yaml.gotmpl

@@ -144,6 +144,9 @@ kubectl:
     runAsGroup: 10000
     runAsUser: 10000
 
+# This job upgrades the CRDs.
+upgradeCRDs: false
+
 # Run velero-restore-helper init container with numeric UID and GID.
 configMaps:
   restore-helper-config:

migration/v0.35/README.md

@@ -159,6 +159,12 @@ As with all scripts in this repository `CK8S_CONFIG_PATH` is expected to be set.
     ./migration/v0.35/apply/50-harbor.sh execute
     ```
 
+1. Upgrade Velero
+
+    ```bash
+    ./migration/v0.35/apply/60-velero-crds-upgrade.sh execute
+    ```
+
 1. Upgrade applications:
 
     ```bash

migration/v0.35/apply/60-velero-crds-upgrade.sh

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+ROOT="$(readlink -f "$(dirname "${0}")/../../../")"
+
+# shellcheck source=scripts/migration/lib.sh
+source "${ROOT}/scripts/migration/lib.sh"
+
+run() {
+  case "${1:-}" in
+  execute)
+    if [[ "${CK8S_CLUSTER}" =~ ^(sc|both)$ ]]; then
+      log_info "  - applying the Velero CRDs on sc"
+      kubectl_do sc apply --server-side --force-conflicts -f "${ROOT}"/helmfile/upstream/vmware-tanzu/velero/crds
+
+      helmfile_upgrade sc app=velero
+    fi
+    if [[ "${CK8S_CLUSTER}" =~ ^(wc|both)$ ]]; then
+      log_info "  - applying the Velero CRDs on wc"
+      kubectl_do wc apply --server-side --force-conflicts -f "${ROOT}"/helmfile/upstream/vmware-tanzu/velero/crds
+
+      helmfile_upgrade wc app=velero
+    fi
+    ;;
+  rollback)
+    log_warn "rollback not implemented"
+    ;;
+  *)
+    log_fatal "usage: \"${0}\" <execute|rollback>"
+    ;;
+  esac
+}
+
+run "${@}"

migration/v0.35/apply/80-apply.sh

@@ -10,6 +10,7 @@ source "${ROOT}/scripts/migration/lib.sh"
 declare -a skipped
 skipped=(
   "app!=trivy-operator"
+  "app!=velero"
 )
 declare -a skipped_sc
 skipped_sc=(