Merge branch 'main' into batch-delete-snapshot

vmware-tanzu · Feb 18, 2024 · 5787935 · 5787935
2 parents 32d92ca + 3b8370e
commit 5787935
Show file tree

Hide file tree

Showing 164 changed files with 1,119 additions and 487 deletions.
diff --git a/.github/workflows/e2e-test-kind.yaml b/.github/workflows/e2e-test-kind.yaml
@@ -67,6 +67,16 @@ jobs:
           - 1.23.6
           - 1.24.0
           - 1.25.3
+        focus:
+          # tests to focus on, use `|` to concatenate multiple regexes to run on the same job
+          # ordered according to e2e_suite_test.go order
+          - Basic\]\[ClusterResource
+          - ResourceFiltering
+          - ResourceModifier|Backups|PrivilegesMgmt\]\[SSR
+          - Schedule\]\[OrderedResources
+          - NamespaceMapping\]\[Single\]\[Restic|NamespaceMapping\]\[Multiple\]\[Restic
+          - Basic\]\[Nodeport
+          - Basic\]\[StorageClass
       fail-fast: false
     steps:
       - name: Set up Go
@@ -123,7 +133,8 @@ jobs:
               CREDS_FILE=/tmp/credential BSL_BUCKET=bucket \
               ADDITIONAL_OBJECT_STORE_PROVIDER=aws ADDITIONAL_BSL_CONFIG=region=minio,s3ForcePathStyle="true",s3Url=http://$(hostname -i):9000 \
               ADDITIONAL_CREDS_FILE=/tmp/credential ADDITIONAL_BSL_BUCKET=additional-bucket \
-              GINKGO_FOCUS='Basic\]\[ClusterResource' VELERO_IMAGE=velero:pr-test \
+              GINKGO_FOCUS='${{ matrix.focus }}' VELERO_IMAGE=velero:pr-test \
+              GINKGO_SKIP='SKIP_KIND|pv-backup|Restic|Snapshot|LongTime' \
               make -C test/e2e run
         timeout-minutes: 30
       - name: Upload debug bundle

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,9 @@
 ## Current release:
-  * [CHANGELOG-1.11.md][21]
+  * [CHANGELOG-1.13.md][23]
 
 ## Older releases:
+  * [CHANGELOG-1.12.md][22]
+  * [CHANGELOG-1.11.md][21]
   * [CHANGELOG-1.10.md][20]
   * [CHANGELOG-1.9.md][19]
   * [CHANGELOG-1.8.md][18]
@@ -24,6 +26,8 @@
   * [CHANGELOG-0.3.md][1]
 
 
+[23]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.13.md
+[22]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.12.md
 [21]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.11.md
 [20]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.10.md
 [19]: https://github.com/vmware-tanzu/velero/blob/main/changelogs/CHANGELOG-1.9.md

diff --git a/Makefile b/Makefile
@@ -108,6 +108,7 @@ platform_temp = $(subst -, ,$(ARCH))
 GOOS = $(word 1, $(platform_temp))
 GOARCH = $(word 2, $(platform_temp))
 GOPROXY ?= https://proxy.golang.org
+GOBIN=$$(pwd)/.go/bin
 
 # If you want to build all binaries, see the 'all-build' rule.
 # If you want to build all containers, see the 'all-containers' rule.
@@ -129,6 +130,7 @@ local: build-dirs
 # Add DEBUG=1 to enable debug locally
 	GOOS=$(GOOS) \
 	GOARCH=$(GOARCH) \
+	GOBIN=$(GOBIN) \
 	VERSION=$(VERSION) \
 	REGISTRY=$(REGISTRY) \
 	PKG=$(PKG) \
@@ -145,6 +147,7 @@ _output/bin/$(GOOS)/$(GOARCH)/$(BIN): build-dirs
 	$(MAKE) shell CMD="-c '\
 		GOOS=$(GOOS) \
 		GOARCH=$(GOARCH) \
+		GOBIN=$(GOBIN) \
 		VERSION=$(VERSION) \
 		REGISTRY=$(REGISTRY) \
 		PKG=$(PKG) \

diff --git a/changelogs/CHANGELOG-1.13.md b/changelogs/CHANGELOG-1.13.md
diff --git a/changelogs/unreleased/5211-cleverhu b/changelogs/unreleased/5211-cleverhu
diff --git a/changelogs/unreleased/6475-nilesh-akhade b/changelogs/unreleased/6475-nilesh-akhade
diff --git a/changelogs/unreleased/6635-27149chen b/changelogs/unreleased/6635-27149chen
diff --git a/changelogs/unreleased/6637-Lyndon-Li b/changelogs/unreleased/6637-Lyndon-Li
diff --git a/changelogs/unreleased/6649-sseago b/changelogs/unreleased/6649-sseago
diff --git a/changelogs/unreleased/6680-dzaninovic b/changelogs/unreleased/6680-dzaninovic
diff --git a/changelogs/unreleased/6686-ywk253100 b/changelogs/unreleased/6686-ywk253100
diff --git a/changelogs/unreleased/6704-27149chen b/changelogs/unreleased/6704-27149chen
diff --git a/changelogs/unreleased/6712-kaovilai b/changelogs/unreleased/6712-kaovilai
diff --git a/changelogs/unreleased/6715-nilesh-akhade b/changelogs/unreleased/6715-nilesh-akhade
diff --git a/changelogs/unreleased/6723-sseago b/changelogs/unreleased/6723-sseago
diff --git a/changelogs/unreleased/6724-27149chen b/changelogs/unreleased/6724-27149chen
diff --git a/changelogs/unreleased/6751-Lyndon-Li b/changelogs/unreleased/6751-Lyndon-Li
diff --git a/changelogs/unreleased/6757-Lyndon-Li b/changelogs/unreleased/6757-Lyndon-Li
diff --git a/changelogs/unreleased/6760-blackpiglet b/changelogs/unreleased/6760-blackpiglet
diff --git a/changelogs/unreleased/6770-ywk253100 b/changelogs/unreleased/6770-ywk253100
diff --git a/changelogs/unreleased/6771-qiuming-best b/changelogs/unreleased/6771-qiuming-best
diff --git a/changelogs/unreleased/6784-yanggangtony b/changelogs/unreleased/6784-yanggangtony
diff --git a/changelogs/unreleased/6797-27149chen b/changelogs/unreleased/6797-27149chen
diff --git a/changelogs/unreleased/6827-Lyndon-Li b/changelogs/unreleased/6827-Lyndon-Li
diff --git a/changelogs/unreleased/6830-sseago b/changelogs/unreleased/6830-sseago
diff --git a/changelogs/unreleased/6833-Lyndon-Li b/changelogs/unreleased/6833-Lyndon-Li
diff --git a/changelogs/unreleased/6838-yanggangtony b/changelogs/unreleased/6838-yanggangtony
diff --git a/changelogs/unreleased/6863-qiuming-best b/changelogs/unreleased/6863-qiuming-best
diff --git a/changelogs/unreleased/6872-Lyndon-Li b/changelogs/unreleased/6872-Lyndon-Li
diff --git a/changelogs/unreleased/6875-Lyndon-Li b/changelogs/unreleased/6875-Lyndon-Li
diff --git a/changelogs/unreleased/6883-ywk253100 b/changelogs/unreleased/6883-ywk253100
diff --git a/changelogs/unreleased/6885-Lyndon-Li b/changelogs/unreleased/6885-Lyndon-Li
diff --git a/changelogs/unreleased/6914-shubham-pampattiwar b/changelogs/unreleased/6914-shubham-pampattiwar
diff --git a/changelogs/unreleased/6917-27149chen b/changelogs/unreleased/6917-27149chen
diff --git a/changelogs/unreleased/6918-Ripolin b/changelogs/unreleased/6918-Ripolin
diff --git a/changelogs/unreleased/6923-reasonerjt b/changelogs/unreleased/6923-reasonerjt
diff --git a/changelogs/unreleased/6926-Lyndon-Li b/changelogs/unreleased/6926-Lyndon-Li
diff --git a/changelogs/unreleased/6938-yanggangtony b/changelogs/unreleased/6938-yanggangtony
diff --git a/changelogs/unreleased/6946-Lyndon-Li b/changelogs/unreleased/6946-Lyndon-Li
diff --git a/changelogs/unreleased/6947-0x113 b/changelogs/unreleased/6947-0x113
diff --git a/changelogs/unreleased/6950-Lyndon-Li b/changelogs/unreleased/6950-Lyndon-Li
diff --git a/changelogs/unreleased/6958-blackpiglet b/changelogs/unreleased/6958-blackpiglet
diff --git a/changelogs/unreleased/6962-blackpiglet b/changelogs/unreleased/6962-blackpiglet
diff --git a/changelogs/unreleased/6968-blackpiglet b/changelogs/unreleased/6968-blackpiglet
diff --git a/changelogs/unreleased/6976-Lyndon-Li b/changelogs/unreleased/6976-Lyndon-Li
diff --git a/changelogs/unreleased/6989-blackpiglet b/changelogs/unreleased/6989-blackpiglet
diff --git a/changelogs/unreleased/6990-Lyndon-Li b/changelogs/unreleased/6990-Lyndon-Li
diff --git a/changelogs/unreleased/6995-kaovilai b/changelogs/unreleased/6995-kaovilai
diff --git a/changelogs/unreleased/7000-qiuming-best b/changelogs/unreleased/7000-qiuming-best
diff --git a/changelogs/unreleased/7001-Lyndon-Li b/changelogs/unreleased/7001-Lyndon-Li
diff --git a/changelogs/unreleased/7004-kaovilai b/changelogs/unreleased/7004-kaovilai
diff --git a/changelogs/unreleased/7011-Lyndon-Li b/changelogs/unreleased/7011-Lyndon-Li
diff --git a/changelogs/unreleased/7022-allenxu404 b/changelogs/unreleased/7022-allenxu404
diff --git a/changelogs/unreleased/7026-blackpiglet b/changelogs/unreleased/7026-blackpiglet
diff --git a/changelogs/unreleased/7028-shubham-pampattiwar b/changelogs/unreleased/7028-shubham-pampattiwar
diff --git a/changelogs/unreleased/7032-deefdragon b/changelogs/unreleased/7032-deefdragon
diff --git a/changelogs/unreleased/7034-ywk253100 b/changelogs/unreleased/7034-ywk253100
diff --git a/changelogs/unreleased/7038-Lyndon-Li b/changelogs/unreleased/7038-Lyndon-Li
diff --git a/changelogs/unreleased/7041-blackpiglet b/changelogs/unreleased/7041-blackpiglet
diff --git a/changelogs/unreleased/7046-kaovilai b/changelogs/unreleased/7046-kaovilai
diff --git a/changelogs/unreleased/7051-blackpiglet b/changelogs/unreleased/7051-blackpiglet
diff --git a/changelogs/unreleased/7052-qiuming-best b/changelogs/unreleased/7052-qiuming-best
diff --git a/changelogs/unreleased/7059-Lyndon-Li b/changelogs/unreleased/7059-Lyndon-Li
diff --git a/changelogs/unreleased/7061-blackpiglet b/changelogs/unreleased/7061-blackpiglet
diff --git a/changelogs/unreleased/7069-27149chen b/changelogs/unreleased/7069-27149chen
diff --git a/changelogs/unreleased/7070-blackpiglet b/changelogs/unreleased/7070-blackpiglet
diff --git a/changelogs/unreleased/7072-ywk253100 b/changelogs/unreleased/7072-ywk253100
diff --git a/changelogs/unreleased/7077-Lyndon-Li b/changelogs/unreleased/7077-Lyndon-Li
diff --git a/changelogs/unreleased/7081-ywk253100 b/changelogs/unreleased/7081-ywk253100
diff --git a/changelogs/unreleased/7095-Lyndon-Li b/changelogs/unreleased/7095-Lyndon-Li
diff --git a/changelogs/unreleased/7096-Lyndon-Li b/changelogs/unreleased/7096-Lyndon-Li
diff --git a/changelogs/unreleased/7100-blackpiglet b/changelogs/unreleased/7100-blackpiglet
diff --git a/changelogs/unreleased/7102-Lyndon-Li b/changelogs/unreleased/7102-Lyndon-Li
diff --git a/changelogs/unreleased/7115-reasonerjt b/changelogs/unreleased/7115-reasonerjt
diff --git a/changelogs/unreleased/7117-allenxu404 b/changelogs/unreleased/7117-allenxu404
diff --git a/changelogs/unreleased/7125-Lyndon-Li b/changelogs/unreleased/7125-Lyndon-Li
diff --git a/changelogs/unreleased/7130-qiuming-best b/changelogs/unreleased/7130-qiuming-best
diff --git a/changelogs/unreleased/7138-blackpiglet b/changelogs/unreleased/7138-blackpiglet
diff --git a/changelogs/unreleased/7141-qiuming-best b/changelogs/unreleased/7141-qiuming-best
diff --git a/changelogs/unreleased/7143-reasonerjt b/changelogs/unreleased/7143-reasonerjt
diff --git a/changelogs/unreleased/7150-Lyndon-Li b/changelogs/unreleased/7150-Lyndon-Li
diff --git a/changelogs/unreleased/7151-blackpiglet b/changelogs/unreleased/7151-blackpiglet
diff --git a/changelogs/unreleased/7152-reasonerjt b/changelogs/unreleased/7152-reasonerjt
diff --git a/changelogs/unreleased/7153-allenxu404 b/changelogs/unreleased/7153-allenxu404
diff --git a/changelogs/unreleased/7161-Lyndon-Li b/changelogs/unreleased/7161-Lyndon-Li
diff --git a/changelogs/unreleased/7169-kaovilai b/changelogs/unreleased/7169-kaovilai
diff --git a/changelogs/unreleased/7175-blackpiglet b/changelogs/unreleased/7175-blackpiglet
diff --git a/changelogs/unreleased/7184-blackpiglet b/changelogs/unreleased/7184-blackpiglet
diff --git a/changelogs/unreleased/7201-Lyndon-Li b/changelogs/unreleased/7201-Lyndon-Li
diff --git a/changelogs/unreleased/7229-allenxu404 b/changelogs/unreleased/7229-allenxu404
diff --git a/changelogs/unreleased/7238-allenxu404 b/changelogs/unreleased/7238-allenxu404
diff --git a/changelogs/unreleased/7245-Lyndon-Li b/changelogs/unreleased/7245-Lyndon-Li
diff --git a/changelogs/unreleased/7274-reasonerjt b/changelogs/unreleased/7274-reasonerjt
diff --git a/changelogs/unreleased/7282-Lyndon-Li b/changelogs/unreleased/7282-Lyndon-Li
diff --git a/changelogs/unreleased/7295-josemarevalo b/changelogs/unreleased/7295-josemarevalo
@@ -0,0 +1 @@
+Add CRD name to error message when it is not ready to use
diff --git a/changelogs/unreleased/7307-guikcd b/changelogs/unreleased/7307-guikcd
@@ -0,0 +1 @@
+Bump up aws-sdk to latest version to leverage Pod Identity credentials.
diff --git a/changelogs/unreleased/7311-ywk253100 b/changelogs/unreleased/7311-ywk253100
@@ -0,0 +1 @@
+Increase the k8s client QPS/burst to avoid throttling request errors
diff --git a/changelogs/unreleased/7317-allenxu404 b/changelogs/unreleased/7317-allenxu404
@@ -0,0 +1 @@
+Include the design for adding the finalization phase to the restore workflow
diff --git a/changelogs/unreleased/7322-kaovilai b/changelogs/unreleased/7322-kaovilai
@@ -0,0 +1 @@
+Check resource Group Version and Kind is available in cluster before attempting restore to prevent being stuck.
diff --git a/changelogs/unreleased/7373-ywk253100 b/changelogs/unreleased/7373-ywk253100
@@ -0,0 +1 @@
+Upgrade the version of go plugin related libs/tools
diff --git a/changelogs/unreleased/7374-reasonerjt b/changelogs/unreleased/7374-reasonerjt
@@ -0,0 +1 @@
+Respect and use `credentialsFile` specified in BSL.spec.config when IRSA is configured over Velero Pod Environment credentials
diff --git a/changelogs/unreleased/7380-kaovilai b/changelogs/unreleased/7380-kaovilai
@@ -0,0 +1 @@
+BackupRepositories associated with a BSL are invalidated when BSL is (re-)created.
diff --git a/changelogs/unreleased/7438-Lyndon-Li b/changelogs/unreleased/7438-Lyndon-Li
@@ -0,0 +1 @@
+Fix issue #7281, batch delete snapshots in the same repo
diff --git a/cmd/velero-restore-helper/velero-restore-helper.go b/cmd/velero-restore-helper/velero-restore-helper.go
@@ -66,10 +66,10 @@ func done() bool {
 		doneFile := filepath.Join("/restores", child.Name(), ".velero", os.Args[1])
 
 		if _, err := os.Stat(doneFile); os.IsNotExist(err) {
-			fmt.Printf("Not found: %s\n", doneFile)
+			fmt.Printf("The filesystem restore done file %s is not found yet. Retry later.\n", doneFile)
 			return false
 		} else if err != nil {
-			fmt.Fprintf(os.Stderr, "ERROR looking for %s: %s\n", doneFile, err)
+			fmt.Fprintf(os.Stderr, "ERROR looking filesystem restore done file %s: %s\n", doneFile, err)
 			return false
 		}
 

diff --git a/config/crd/v1/bases/velero.io_backups.yaml b/config/crd/v1/bases/velero.io_backups.yaml
@@ -315,7 +315,7 @@ spec:
               itemOperationTimeout:
                 description: ItemOperationTimeout specifies the time used to wait
                   for asynchronous BackupItemAction operations The default value is
-                  1 hour.
+                  4 hour.
                 type: string
               labelSelector:
                 description: LabelSelector is a metav1.LabelSelector to filter with

diff --git a/config/crd/v1/bases/velero.io_restores.yaml b/config/crd/v1/bases/velero.io_restores.yaml
@@ -246,7 +246,7 @@ spec:
                 type: array
               itemOperationTimeout:
                 description: ItemOperationTimeout specifies the time used to wait
-                  for RestoreItemAction operations The default value is 1 hour.
+                  for RestoreItemAction operations The default value is 4 hour.
                 type: string
               labelSelector:
                 description: LabelSelector is a metav1.LabelSelector to filter with

diff --git a/config/crd/v1/bases/velero.io_schedules.yaml b/config/crd/v1/bases/velero.io_schedules.yaml
@@ -361,7 +361,7 @@ spec:
                   itemOperationTimeout:
                     description: ItemOperationTimeout specifies the time used to wait
                       for asynchronous BackupItemAction operations The default value
-                      is 1 hour.
+                      is 4 hour.
                     type: string
                   labelSelector:
                     description: LabelSelector is a metav1.LabelSelector to filter
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Add CRD name to error message when it is not ready to use
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Bump up aws-sdk to latest version to leverage Pod Identity credentials.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Increase the k8s client QPS/burst to avoid throttling request errors
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Include the design for adding the finalization phase to the restore workflow
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Check resource Group Version and Kind is available in cluster before attempting restore to prevent being stuck.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Upgrade the version of go plugin related libs/tools
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Respect and use `credentialsFile` specified in BSL.spec.config when IRSA is configured over Velero Pod Environment credentials
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		BackupRepositories associated with a BSL are invalidated when BSL is (re-)created.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix issue #7281, batch delete snapshots in the same repo