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.

Sign up for GitHub

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

Staging 0.35.2 #2042

Merged
merged 2 commits into from
Mar 14, 2024
Merged

Staging 0.35.2 #2042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e7d83f
apps: apply velero crds manually during apps v0.35 upgrade (#2008)
crssnd Feb 27, 2024
9f41980
QA changes
lucianvlad Mar 12, 2024
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
3 changes: 3 additions & 0 deletions helmfile/values/velero-sc.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions helmfile/values/velero-wc.yaml.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 6 additions & 0 deletions migration/v0.35/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
33 changes: 33 additions & 0 deletions migration/v0.35/apply/60-velero-crds-upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 "${@}"
1 change: 1 addition & 0 deletions migration/v0.35/apply/80-apply.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=(
Expand Down
Loading