From f425e92fab74266f432146dc9a05d189b1777935 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 Aug 2024 15:24:15 -0600
Subject: [PATCH] chore(deps): update velero (#486)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)
This PR contains the following updates:
| Package | Update | Change |
|---|---|---|
|
[cgr.dev/du-uds-defenseunicorns/kubectl-fips](https://edu.chainguard.dev/chainguard/chainguard-images/reference/kubectl-fips/)
([source](https://togithub.com/chainguard-images/images/tree/HEAD/images/kubectl-fips))
| patch | `1.29.5-dev` -> `1.29.7-dev` |
|
[cgr.dev/du-uds-defenseunicorns/velero-fips](https://edu.chainguard.dev/chainguard/chainguard-images/reference/velero-fips/)
([source](https://togithub.com/chainguard-images/images/tree/HEAD/images/velero-fips))
| minor | `1.13.2-dev` -> `1.14.0-dev` |
|
[cgr.dev/du-uds-defenseunicorns/velero-plugin-for-aws-fips](https://edu.chainguard.dev/chainguard/chainguard-images/reference/velero-plugin-for-aws-fips/)
([source](https://togithub.com/chainguard-images/images/tree/HEAD/images/velero-plugin-for-aws-fips))
| minor | `1.9.2` -> `1.10.0` |
| [docker.io/bitnami/kubectl](https://togithub.com/bitnami/containers)
([source](https://togithub.com/bitnami/containers/tree/HEAD/bitnami/kubectl))
| patch | `1.30.2` -> `1.30.3` |
|
[registry1.dso.mil/ironbank/opensource/velero/velero](https://velero.io)
([source](https://repo1.dso.mil/dsop/opensource/velero/velero)) | minor
| `v1.13.2` -> `v1.14.0` |
|
[registry1.dso.mil/ironbank/opensource/velero/velero-plugin-for-aws](https://togithub.com/vmware-tanzu/velero-plugin-for-aws)
([source](https://repo1.dso.mil/dsop/opensource/velero/velero-plugin-for-aws))
| minor | `v1.9.2` -> `v1.10.0` |
| [velero](https://togithub.com/vmware-tanzu/velero)
([source](https://togithub.com/vmware-tanzu/helm-charts)) | major |
`6.6.0` -> `7.1.4` |
| velero/velero | minor | `v1.13.2` -> `v1.14.0` |
|
[velero/velero-plugin-for-aws](https://togithub.com/vmware-tanzu/velero-plugin-for-aws)
| minor | `v1.9.2` -> `v1.10.0` |
---
### Release Notes
vmware-tanzu/helm-charts (velero)
###
[`v7.1.4`](https://togithub.com/vmware-tanzu/helm-charts/releases/tag/velero-7.1.4)
[Compare
Source](https://togithub.com/vmware-tanzu/helm-charts/compare/velero-7.1.3...velero-7.1.4)
A Helm chart for velero
#### What's Changed
- \[velero] Fix maintenance Job resource requests by
[@yaraskm](https://togithub.com/yaraskm) in
[https://github.com/vmware-tanzu/helm-charts/pull/610](https://togithub.com/vmware-tanzu/helm-charts/pull/610)
#### New Contributors
- [@yaraskm](https://togithub.com/yaraskm) made their first
contribution in
[https://github.com/vmware-tanzu/helm-charts/pull/610](https://togithub.com/vmware-tanzu/helm-charts/pull/610)
**Full Changelog**:
https://github.com/vmware-tanzu/helm-charts/compare/velero-7.1.3...velero-7.1.4
###
[`v7.1.3`](https://togithub.com/vmware-tanzu/helm-charts/releases/tag/velero-7.1.3)
[Compare
Source](https://togithub.com/vmware-tanzu/helm-charts/compare/velero-7.1.2...velero-7.1.3)
A Helm chart for velero
#### What's Changed
- \[velero] feat: Adds --keep-latest-jobs-count for repository
maintenance job by [@navilg](https://togithub.com/navilg) in
[https://github.com/vmware-tanzu/helm-charts/pull/604](https://togithub.com/vmware-tanzu/helm-charts/pull/604)
#### New Contributors
- [@navilg](https://togithub.com/navilg) made their first
contribution in
[https://github.com/vmware-tanzu/helm-charts/pull/604](https://togithub.com/vmware-tanzu/helm-charts/pull/604)
**Full Changelog**:
https://github.com/vmware-tanzu/helm-charts/compare/velero-7.1.2...velero-7.1.3
###
[`v7.1.2`](https://togithub.com/vmware-tanzu/helm-charts/releases/tag/velero-7.1.2)
[Compare
Source](https://togithub.com/vmware-tanzu/helm-charts/compare/velero-7.1.1...velero-7.1.2)
A Helm chart for velero
#### What's Changed
- \[velero] feat: Adds resources and limits for repository maintenance
job by [@Sebastian-RG](https://togithub.com/Sebastian-RG) in
[https://github.com/vmware-tanzu/helm-charts/pull/602](https://togithub.com/vmware-tanzu/helm-charts/pull/602)
**Full Changelog**:
https://github.com/vmware-tanzu/helm-charts/compare/velero-7.1.1...velero-7.1.2
###
[`v7.1.1`](https://togithub.com/vmware-tanzu/helm-charts/releases/tag/velero-7.1.1)
[Compare
Source](https://togithub.com/vmware-tanzu/helm-charts/compare/velero-7.1.0...velero-7.1.1)
A Helm chart for velero
#### What's Changed
- \[velero] fix imagePullSecrets to velero server serviceaccount
[#595](https://togithub.com/vmware-tanzu/helm-charts/issues/595)
by [@adonispd](https://togithub.com/adonispd) in
[https://github.com/vmware-tanzu/helm-charts/pull/596](https://togithub.com/vmware-tanzu/helm-charts/pull/596)
#### New Contributors
- [@adonispd](https://togithub.com/adonispd) made their first
contribution in
[https://github.com/vmware-tanzu/helm-charts/pull/596](https://togithub.com/vmware-tanzu/helm-charts/pull/596)
**Full Changelog**:
https://github.com/vmware-tanzu/helm-charts/compare/velero-7.1.0...velero-7.1.1
###
[`v7.1.0`](https://togithub.com/vmware-tanzu/helm-charts/releases/tag/velero-7.1.0)
[Compare
Source](https://togithub.com/vmware-tanzu/helm-charts/compare/velero-7.0.0...velero-7.1.0)
A Helm chart for velero
#### What's Changed
- \[velero] add extraArgs to Velero node agent configuration by
[@simoncampion](https://togithub.com/simoncampion) in
[https://github.com/vmware-tanzu/helm-charts/pull/593](https://togithub.com/vmware-tanzu/helm-charts/pull/593)
#### New Contributors
- [@simoncampion](https://togithub.com/simoncampion) made their
first contribution in
[https://github.com/vmware-tanzu/helm-charts/pull/593](https://togithub.com/vmware-tanzu/helm-charts/pull/593)
**Full Changelog**:
https://github.com/vmware-tanzu/helm-charts/compare/velero-7.0.0...velero-7.1.0
###
[`v7.0.0`](https://togithub.com/vmware-tanzu/helm-charts/releases/tag/velero-7.0.0)
[Compare
Source](https://togithub.com/vmware-tanzu/helm-charts/compare/velero-6.7.0...velero-7.0.0)
A Helm chart for velero
#### What's Changed
- \[velero] Bump up Velero 1.14.0 by
[@xebia-progress](https://togithub.com/xebia-progress) in
[https://github.com/vmware-tanzu/helm-charts/pull/590](https://togithub.com/vmware-tanzu/helm-charts/pull/590)
#### New Contributors
- [@xebia-progress](https://togithub.com/xebia-progress) made
their first contribution in
[https://github.com/vmware-tanzu/helm-charts/pull/590](https://togithub.com/vmware-tanzu/helm-charts/pull/590)
**Full Changelog**:
https://github.com/vmware-tanzu/helm-charts/compare/velero-6.7.0...velero-7.0.0
###
[`v6.7.0`](https://togithub.com/vmware-tanzu/helm-charts/releases/tag/velero-6.7.0)
[Compare
Source](https://togithub.com/vmware-tanzu/helm-charts/compare/velero-6.6.0...velero-6.7.0)
A Helm chart for velero
#### What's Changed
- \[velero] Remove default values for resources by
[@rissson](https://togithub.com/rissson) in
[https://github.com/vmware-tanzu/helm-charts/pull/499](https://togithub.com/vmware-tanzu/helm-charts/pull/499)
#### New Contributors
- [@rissson](https://togithub.com/rissson) made their first
contribution in
[https://github.com/vmware-tanzu/helm-charts/pull/499](https://togithub.com/vmware-tanzu/helm-charts/pull/499)
**Full Changelog**:
https://github.com/vmware-tanzu/helm-charts/compare/velero-6.6.0...velero-6.7.0
vmware-tanzu/velero-plugin-for-aws
(velero/velero-plugin-for-aws)
###
[`v1.10.0`](https://togithub.com/vmware-tanzu/velero-plugin-for-aws/releases/tag/v1.10.0):
v1.10
[Compare
Source](https://togithub.com/vmware-tanzu/velero-plugin-for-aws/compare/v1.9.2...v1.10.0)
#### All changes
- Add label
org.opencontainers.image.source([#190](https://togithub.com/vmware-tanzu/velero-plugin-for-aws/issues/190),
[@robinschneider](https://togithub.com/robinschneider))
- Unset env vars for role-assumption when creds are
set([#191](https://togithub.com/vmware-tanzu/velero-plugin-for-aws/issues/191),
[@reasonerjt](https://togithub.com/reasonerjt))
- configuration for checksum algorithm for PutObject to
S3([#194](https://togithub.com/vmware-tanzu/velero-plugin-for-aws/issues/194),
[@reasonerjt](https://togithub.com/reasonerjt))
- Respect the TLS setting in BSL in object store
plugin([#195](https://togithub.com/vmware-tanzu/velero-plugin-for-aws/issues/195),
[@reasonerjt](https://togithub.com/reasonerjt))
- Bump up to golang
v1.22([#199](https://togithub.com/vmware-tanzu/velero-plugin-for-aws/issues/199),
reasonerjt)
---
### Configuration
📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).
🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.
â™» **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.
👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://togithub.com/renovatebot/renovate/discussions) if
that's undesired.
---
- [ ] If you want to rebase/retry this PR, check
this box
---
This PR was generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View the
[repository job
log](https://developer.mend.io/github/defenseunicorns/uds-core).
---------
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Micah Nagel
---
src/velero/README.md | 15 +++++++++++----
src/velero/common/zarf.yaml | 2 +-
src/velero/values/registry1-values.yaml | 10 ++--------
src/velero/values/unicorn-values.yaml | 12 +++---------
src/velero/values/upstream-values.yaml | 12 +++---------
src/velero/zarf.yaml | 19 ++++++++-----------
6 files changed, 28 insertions(+), 42 deletions(-)
diff --git a/src/velero/README.md b/src/velero/README.md
index a24c25567..00f175543 100644
--- a/src/velero/README.md
+++ b/src/velero/README.md
@@ -44,8 +44,9 @@ By overriding the velero values in the bundle as follows:
value: "velero-bucket-credentials"
```
-## Plugin Compatability
-This package currently assumes the availability of S3 API compatible object storage. As such, only the AWS specific plugin image is included. More information about all available plugins [can be found in the upstream docs](https://velero.io/plugins/). Ironbank includes images for Azure and the generic CSI driver, but those are currently excluded from this package. We may revisit package defaults at some point in the future depending on usage and user requests.
+## Plugin Compatibility
+
+This package currently assumes the availability of S3 API compatible object storage. As such, only the AWS specific plugin image is included, in addition to the CSI plugin which is baked into Velero by default. More information about all available plugins [can be found in the upstream docs](https://velero.io/plugins/). Ironbank includes images for the Azure plugin, but it is currently excluded from this package. We may revisit package defaults at some point in the future depending on usage and user requests.
## Deploy
@@ -64,18 +65,23 @@ UDS_PKG=velero uds run deploy-single-package
### Test the package via UDS tasks
Running the following will check that the velero deployment exists in the cluster and attempt to execute a backup:
+
```bash
uds run -f src/velero/tasks.yaml validate
```
+
> Alternatively, you can combine package creation, cluster setup, package deploy and the test command with a simple `UDS_PKG=velero uds run test-single-package`
## Manually trigger the default backup for testing purposes
-```
+
+```bash
velero backup create --from-schedule velero-udsbackup -n velero
```
+
> NOTE: requires [the velero CLI](https://velero.io/docs/v1.3.0/velero-install/)
Alternatively, manually create a `backup` object with `kubectl`:
+
```bash
uds zarf tools kubectl apply -f - <<-EOF
apiVersion: velero.io/v1
@@ -99,6 +105,7 @@ EOF
```
## Manually restore backup
+
```bash
velero restore create uds-restore-$(date +%s) \
--from-backup \
@@ -113,4 +120,4 @@ velero restore create uds-restore-$(date +%s) \
> [!NOTE]
> Additional configuration will be required to get CSI backed PVCs to be snapshotted
> as noted in the [Velero documentation](https://velero.io/docs/main/csi/#prerequisites) - VolumeSnapshotLocation, VolumeSnapshotClass, etc.
-> as well as switching `snapshotVolume` to `true` in the backup config.
\ No newline at end of file
+> as well as switching `snapshotVolume` to `true` in the backup config.
diff --git a/src/velero/common/zarf.yaml b/src/velero/common/zarf.yaml
index 6cb1f8951..e6cbfb61b 100644
--- a/src/velero/common/zarf.yaml
+++ b/src/velero/common/zarf.yaml
@@ -37,7 +37,7 @@ components:
- name: velero
namespace: velero
url: https://vmware-tanzu.github.io/helm-charts
- version: 6.6.0
+ version: 7.1.4
repoName: velero
releaseName: velero
valuesFiles:
diff --git a/src/velero/values/registry1-values.yaml b/src/velero/values/registry1-values.yaml
index a49cd91cf..397d34a08 100644
--- a/src/velero/values/registry1-values.yaml
+++ b/src/velero/values/registry1-values.yaml
@@ -1,6 +1,6 @@
image:
repository: registry1.dso.mil/ironbank/opensource/velero/velero
- tag: v1.13.2
+ tag: v1.14.0
kubectl:
image:
@@ -9,13 +9,7 @@ kubectl:
initContainers:
- name: velero-plugin-for-aws
- image: registry1.dso.mil/ironbank/opensource/velero/velero-plugin-for-aws:v1.9.2
- imagePullPolicy: IfNotPresent
- volumeMounts:
- - mountPath: /target
- name: plugins
- - name: velero-plugin-for-csi
- image: registry1.dso.mil/ironbank/opensource/velero/velero-plugin-for-csi:v0.7.1
+ image: registry1.dso.mil/ironbank/opensource/velero/velero-plugin-for-aws:v1.10.0
imagePullPolicy: IfNotPresent
volumeMounts:
- mountPath: /target
diff --git a/src/velero/values/unicorn-values.yaml b/src/velero/values/unicorn-values.yaml
index c5eb19b14..5db76ac4b 100644
--- a/src/velero/values/unicorn-values.yaml
+++ b/src/velero/values/unicorn-values.yaml
@@ -1,21 +1,15 @@
image:
repository: cgr.dev/du-uds-defenseunicorns/velero-fips
- tag: 1.13.2-dev
+ tag: 1.14.0-dev
kubectl:
image:
repository: cgr.dev/du-uds-defenseunicorns/kubectl-fips
- tag: 1.29.5-dev
+ tag: 1.29.7-dev
initContainers:
- name: velero-plugin-for-aws
- image: cgr.dev/du-uds-defenseunicorns/velero-plugin-for-aws-fips:1.9.2
- imagePullPolicy: IfNotPresent
- volumeMounts:
- - mountPath: /target
- name: plugins
- - name: velero-plugin-for-csi
- image: cgr.dev/du-uds-defenseunicorns/velero-plugin-for-csi-fips:0.7.1
+ image: cgr.dev/du-uds-defenseunicorns/velero-plugin-for-aws-fips:1.10.0
imagePullPolicy: IfNotPresent
volumeMounts:
- mountPath: /target
diff --git a/src/velero/values/upstream-values.yaml b/src/velero/values/upstream-values.yaml
index 7bb3d6c0b..dd4fa7216 100644
--- a/src/velero/values/upstream-values.yaml
+++ b/src/velero/values/upstream-values.yaml
@@ -1,21 +1,15 @@
image:
repository: velero/velero
- tag: v1.13.2
+ tag: v1.14.0
kubectl:
image:
repository: docker.io/bitnami/kubectl
- tag: 1.30.2
+ tag: 1.30.3
initContainers:
- name: velero-plugin-for-aws
- image: velero/velero-plugin-for-aws:v1.9.2
- imagePullPolicy: IfNotPresent
- volumeMounts:
- - mountPath: /target
- name: plugins
- - name: velero-plugin-for-csi
- image: velero/velero-plugin-for-csi:v0.7.1
+ image: velero/velero-plugin-for-aws:v1.10.0
imagePullPolicy: IfNotPresent
volumeMounts:
- mountPath: /target
diff --git a/src/velero/zarf.yaml b/src/velero/zarf.yaml
index 694179415..b0f2d56a2 100644
--- a/src/velero/zarf.yaml
+++ b/src/velero/zarf.yaml
@@ -16,10 +16,9 @@ components:
valuesFiles:
- values/upstream-values.yaml
images:
- - velero/velero:v1.13.2
- - velero/velero-plugin-for-aws:v1.9.2
- - docker.io/bitnami/kubectl:1.30.2
- - velero/velero-plugin-for-csi:v0.7.1
+ - velero/velero:v1.14.0
+ - velero/velero-plugin-for-aws:v1.10.0
+ - docker.io/bitnami/kubectl:1.30.3
- name: velero
required: true
@@ -32,9 +31,8 @@ components:
valuesFiles:
- values/registry1-values.yaml
images:
- - registry1.dso.mil/ironbank/opensource/velero/velero:v1.13.2
- - registry1.dso.mil/ironbank/opensource/velero/velero-plugin-for-aws:v1.9.2
- - registry1.dso.mil/ironbank/opensource/velero/velero-plugin-for-csi:v0.7.1
+ - registry1.dso.mil/ironbank/opensource/velero/velero:v1.14.0
+ - registry1.dso.mil/ironbank/opensource/velero/velero-plugin-for-aws:v1.10.0
- registry1.dso.mil/ironbank/big-bang/base:2.1.0
- name: velero
@@ -48,7 +46,6 @@ components:
valuesFiles:
- values/unicorn-values.yaml
images:
- - cgr.dev/du-uds-defenseunicorns/velero-fips:1.13.2-dev
- - cgr.dev/du-uds-defenseunicorns/velero-plugin-for-aws-fips:1.9.2
- - cgr.dev/du-uds-defenseunicorns/velero-plugin-for-csi-fips:0.7.1
- - cgr.dev/du-uds-defenseunicorns/kubectl-fips:1.29.5-dev
+ - cgr.dev/du-uds-defenseunicorns/velero-fips:1.14.0-dev
+ - cgr.dev/du-uds-defenseunicorns/velero-plugin-for-aws-fips:1.10.0
+ - cgr.dev/du-uds-defenseunicorns/kubectl-fips:1.29.7-dev