Merge branch 'main' of https://github.com/qiuming-best/velero into pe…

…rf-test

.github/workflows/pr-ci-check.yml

@@ -24,8 +24,9 @@ jobs:
       - name: Make ci
         run: make ci
       - name: Upload test coverage
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage.out
           verbose: true
+          fail_ci_if_error: true

Dockerfile

@@ -41,7 +41,9 @@ COPY . /go/src/github.com/vmware-tanzu/velero
 RUN mkdir -p /output/usr/bin && \
     export GOARM=$( echo "${GOARM}" | cut -c2-) && \
     go build -o /output/${BIN} \
-    -ldflags "${LDFLAGS}" ${PKG}/cmd/${BIN}
+    -ldflags "${LDFLAGS}" ${PKG}/cmd/${BIN} && \
+    go build -o /output/velero-helper \
+    -ldflags "${LDFLAGS}" ${PKG}/cmd/velero-helper
 
 # Restic binary build section
 FROM --platform=$BUILDPLATFORM golang:1.20-bullseye as restic-builder
@@ -52,7 +54,7 @@ ARG TARGETARCH
 ARG TARGETVARIANT
 ARG RESTIC_VERSION
 
-env CGO_ENABLED=0 \
+ENV CGO_ENABLED=0 \
     GO111MODULE=on \
     GOPROXY=${GOPROXY} \
     GOOS=${TARGETOS} \

changelogs/unreleased/6558-kaovilai

@@ -0,0 +1 @@
+Non default s3 credential profiles work on Unified Repository Provider (kopia)

changelogs/unreleased/6587-Lyndon-Li

@@ -0,0 +1 @@
+Fix issue 6575, flush the repo after delete the snapshot, otherwise, the changes(deleting repo snapshot) cannot be committed to the repo.

changelogs/unreleased/6594-Lyndon-Li

@@ -0,0 +1 @@
+Fix issue #6571, fix the problem for restore item operation to set the errors correctly so that they can be recorded by Velero restore and then reflect the correct status for Velero restore.

changelogs/unreleased/6598-aws_creds

@@ -0,0 +1 @@
+Fix how the AWS credentials are obtained from configuration

changelogs/unreleased/6634-27149chen

@@ -0,0 +1 @@
+Fixes #6498. Get resource client again after restore actions in case resource's gv is changed. This is an improvement of pr #6499, to support group changes. A group change usually happens in a restore plugin which is used for resource conversion: convert a resource from a not supported gv to a supported gv

cmd/velero-helper/velero-helper.go

@@ -0,0 +1,27 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"time"
+)
+
+const (
+	// workingModePause indicates it is for general purpose to hold the pod under running state
+	workingModePause = "pause"
+)
+
+func main() {
+	if len(os.Args) < 2 {
+		fmt.Fprintln(os.Stderr, "ERROR: at least one argument must be provided, the working mode")
+		os.Exit(1)
+	}
+
+	switch os.Args[1] {
+	case workingModePause:
+		time.Sleep(time.Duration(1<<63 - 1))
+	default:
+		fmt.Fprintln(os.Stderr, "ERROR: wrong working mode provided")
+		os.Exit(1)
+	}
+}

config/crd/v2alpha1/bases/velero.io_datauploads.yaml

@@ -79,7 +79,7 @@ spec:
                 nullable: true
                 properties:
                   snapshotClass:
-                    description: StorageClass is the name of the snapshot class that
+                    description: SnapshotClass is the name of the snapshot class that
                       the volume snapshot is created with
                     type: string
                   storageClass:

design/upload-progress.md

@@ -89,7 +89,7 @@ will be deleted and at that point any uploads still in progress should be aborte
 
 ### Uploading (new)
 The "Uploading" phase signifies that the main part of the backup, including snapshotting has completed successfully
-and and uploading is continuing.  In the event of an error during uploading, the phase will change to 
+and uploading is continuing.  In the event of an error during uploading, the phase will change to 
 UploadingPartialFailure.  On success, the phase changes to Completed.  The backup cannot be
 restored from when it is in the Uploading state.
 

design/volume-snapshot-data-movement/volume-snapshot-data-movement.md

@@ -245,7 +245,7 @@ spec:
                   of the CSI snapshot.
                 properties:
                   snapshotClass:
-                    description: StorageClass is the name of the snapshot class that
+                    description: SnapshotClass is the name of the snapshot class that
                       the volume snapshot is created with
                     type: string                
                   storageClass:

hack/update-1fmt.sh

@@ -35,7 +35,7 @@ fi
 
 files="$(find . -type f -name '*.go' -not -path './.go/*' -not -path './vendor/*' -not -path './site/*' -not -path '*/generated/*' -not -name 'zz_generated*' -not -path '*/mocks/*')"
 echo "${ACTION} gofmt"
-output=$(printf '%s\n' "${files}" | xargs gofmt "${MODE}" -s)
+output=$(gofmt "${MODE}" -s ${files})
 if [[ -n "${output}" ]]; then
   VERIFY_FMT_FAILED=1
   echo "${output}"
@@ -47,7 +47,7 @@ else
 fi
 
 echo "${ACTION} goimports"
-output=$(printf '%s\n' "${files}" | xargs goimports "${MODE}" -local github.com/vmware-tanzu/velero)
+output=$(goimports "${MODE}" -local github.com/vmware-tanzu/velero ${files})
 if [[ -n "${output}" ]]; then
   VERIFY_IMPORTS_FAILED=1
   echo "${output}"