Skip to content

Commit

Permalink
Use Velero 1.9.4 (#197)
Browse files Browse the repository at this point in the history
This corresponds with downstream OADP for 4.14

Signed-off-by: Michael Henriksen <[email protected]>
  • Loading branch information
mhenriks authored Nov 6, 2023
1 parent 44559ff commit 22c61d9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
2 changes: 1 addition & 1 deletion hack/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ DEPLOYMENT_TIMEOUT=600
USE_CSI=${USE_CSI:-1}
USE_RESTIC=${USE_RESTIC:-0}
CSI_PLUGIN=${CSI_PLUGIN:-velero/velero-plugin-for-csi:v0.5.1}
VELERO_VERSION=${VELERO_VERSION:-v1.12.0}
VELERO_VERSION=${VELERO_VERSION:-v1.9.4}
VELERO_DIR=_output/velero/bin

source cluster-up/hack/config.sh
Expand Down
15 changes: 5 additions & 10 deletions tests/resource_filtering_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1307,8 +1307,7 @@ var _ = Describe("Resource includes", func() {
// - VolumeSnapshot
// - VolumeSnapshotContent
// - VolumeSpapshotClass
// - Namespace
expectedItems := 8
expectedItems := 7
if framework.IsDataVolumeGC(f.KvClient) {
expectedItems -= 1
}
Expand Down Expand Up @@ -1381,8 +1380,7 @@ var _ = Describe("Resource includes", func() {
// - 2 VolumeSnapshotContent
// - VolumeSpapshotClass
// - DataVolume CRD
// - Namespace
expectedItems := 14
expectedItems := 13
if framework.IsDataVolumeGC(f.KvClient) {
expectedItems -= 2
}
Expand Down Expand Up @@ -1426,8 +1424,7 @@ var _ = Describe("Resource includes", func() {
// - VolumeSnapshotContent
// - VolumeSpapshotClass
// - DataVolume CRD
// - Namespace
expectedItems := 9
expectedItems := 8
if framework.IsDataVolumeGC(f.KvClient) {
expectedItems -= 1
}
Expand Down Expand Up @@ -1476,8 +1473,7 @@ var _ = Describe("Resource includes", func() {
// - VolumeSnapshotContent
// - VolumeSpapshotClass
// - DataVolume CRD
// - Namespace
expectedItems := 11
expectedItems := 10
if framework.IsDataVolumeGC(f.KvClient) {
expectedItems -= 1
}
Expand Down Expand Up @@ -1545,8 +1541,7 @@ var _ = Describe("Resource includes", func() {
// - VolumeSnapshotContent (PVC)
// - VolumeSpapshotClass
// - DataVolume CRD
// - Namespace
expectedItems := 14
expectedItems := 13
if framework.IsDataVolumeGC(f.KvClient) {
expectedItems -= 1
}
Expand Down

0 comments on commit 22c61d9

Please sign in to comment.