Merge pull request #5905 from danfengliu/cherrypick-rollback-velero-client-factory-code

[Cherrypick 1.10] rollback velero client factory code

.github/workflows/crds-verify-kind.yaml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.18
+          go-version: 1.18.10
         id: go
       # Look for a CLI that's made for this PR
       - name: Fetch built CLI
@@ -57,15 +57,13 @@ jobs:
       matrix:
         # Latest k8s versions. There's no series-based tag, nor is there a latest tag.
         k8s:
-          - 1.16.15
-          - 1.17.17
-          - 1.18.15
           - 1.19.7
           - 1.20.2
           - 1.21.1
           - 1.22.0
           - 1.23.6
           - 1.24.2
+          - 1.25.3
     # All steps run in parallel unless otherwise specified.
     # See https://docs.github.com/en/actions/learn-github-actions/managing-complex-workflows#creating-dependent-jobs
     steps:
@@ -83,7 +81,7 @@ jobs:
             velero-${{ github.event.pull_request.number }}-
       - uses: engineerd/setup-kind@v0.5.0
         with:
-          version: "v0.14.0"
+          version: "v0.17.0"
           image: "kindest/node:v${{ matrix.k8s }}"
       - name: Install CRDs
         run: |

.github/workflows/e2e-test-kind.yaml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.18
+          go-version: 1.18.10
         id: go
       # Look for a CLI that's made for this PR
       - name: Fetch built CLI
@@ -60,23 +60,19 @@ jobs:
     strategy:
       matrix:
         k8s:
-          # doesn't cover 1.15 as 1.15 doesn't support "apiextensions.k8s.io/v1" that is needed for the case
-          #- 1.15.12
-          - 1.16.15
-          - 1.17.17
-          - 1.18.20
           - 1.19.16
           - 1.20.15
           - 1.21.12
           - 1.22.9
           - 1.23.6
           - 1.24.0
+          - 1.25.3
       fail-fast: false
     steps:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.18
+          go-version: 1.18.10
         id: go
       - name: Check out the code
         uses: actions/checkout@v2
@@ -85,7 +81,7 @@ jobs:
           docker run -d --rm -p 9000:9000 -e "MINIO_ACCESS_KEY=minio" -e "MINIO_SECRET_KEY=minio123" -e "MINIO_DEFAULT_BUCKETS=bucket,additional-bucket" bitnami/minio:2021.6.17-debian-10-r7
       - uses: engineerd/setup-kind@v0.5.0
         with:
-          version: "v0.14.0"
+          version: "v0.17.0"
           image: "kindest/node:v${{ matrix.k8s }}"
       - name: Fetch built CLI
         id: cli-cache

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

@@ -8,7 +8,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.18
+          go-version: 1.18.10
         id: go
       - name: Check out the code
         uses: actions/checkout@v2

.github/workflows/pr-containers.yml

@@ -0,0 +1,37 @@
+name: build Velero containers on Dockerfile change
+
+on:
+  pull_request:
+    branches:
+      - 'main'
+      - 'release-**'
+    paths:
+      - 'Dockerfile'
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      name: Checkout
+
+    - name: Set up QEMU
+      id: qemu
+      uses: docker/setup-qemu-action@v1
+      with:
+        platforms: all
+
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@v1
+      with:
+        version: latest
+
+    # Although this action also calls docker-push.sh, it is not triggered
+    # by push, so BRANCH and TAG are empty by default. docker-push.sh will
+    # only build Velero image without pushing.
+    - name: Make Velero container without pushing to registry.
+      if: github.repository == 'vmware-tanzu/velero'
+      run: |
+        ./hack/docker-push.sh

.github/workflows/push-builder.yml

@@ -2,7 +2,9 @@ name: build-image
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - 'main'
+      - 'release-**'
     paths:
     - 'hack/build-image/Dockerfile'
 

.github/workflows/push.yml

@@ -18,11 +18,16 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.18
+        go-version: 1.18.10
       id: go
 
     - uses: actions/checkout@v3
 
+    # Fix issue of setup-gcloud
+    - run: |
+        sudo apt-get install python2.7
+        export CLOUDSDK_PYTHON="/usr/bin/python2"
+
     - uses: google-github-actions/setup-gcloud@v0
       with:
         version: '285.0.0'
@@ -94,4 +99,7 @@ jobs:
     - name: Publish container image to GCR
       if: github.repository == 'vmware-tanzu/velero'
       run: |
+        sudo swapoff -a
+        sudo rm -f /mnt/swapfile
+        docker image prune -a --force
         REGISTRY=gcr.io/velero-gcp ./hack/docker-push.sh

Dockerfile

@@ -11,48 +11,68 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM --platform=$BUILDPLATFORM golang:1.18 as builder-env
+
+# Velero binary build section
+FROM --platform=$BUILDPLATFORM golang:1.18.10 as velero-builder
 
 ARG GOPROXY
+ARG BIN
 ARG PKG
 ARG VERSION
+ARG REGISTRY
 ARG GIT_SHA
 ARG GIT_TREE_STATE
-ARG REGISTRY
+ARG TARGETOS
+ARG TARGETARCH
+ARG TARGETVARIANT
 
 ENV CGO_ENABLED=0 \
     GO111MODULE=on \
     GOPROXY=${GOPROXY} \
+    GOOS=${TARGETOS} \
+    GOARCH=${TARGETARCH} \
+    GOARM=${TARGETVARIANT} \
     LDFLAGS="-X ${PKG}/pkg/buildinfo.Version=${VERSION} -X ${PKG}/pkg/buildinfo.GitSHA=${GIT_SHA} -X ${PKG}/pkg/buildinfo.GitTreeState=${GIT_TREE_STATE} -X ${PKG}/pkg/buildinfo.ImageRegistry=${REGISTRY}"
 
 WORKDIR /go/src/github.com/vmware-tanzu/velero
 
 COPY . /go/src/github.com/vmware-tanzu/velero
 
-FROM --platform=$BUILDPLATFORM builder-env as builder
-
-ARG TARGETOS
-ARG TARGETARCH
-ARG TARGETVARIANT
-ARG PKG
-ARG BIN
-ARG RESTIC_VERSION
-
-ENV GOOS=${TARGETOS} \
-    GOARCH=${TARGETARCH} \
-    GOARM=${TARGETVARIANT}
-
 RUN mkdir -p /output/usr/bin && \
     export GOARM=$( echo "${GOARM}" | cut -c2-) && \
-    bash ./hack/build-restic.sh && \
     go build -o /output/${BIN} \
     -ldflags "${LDFLAGS}" ${PKG}/cmd/${BIN}
 
-FROM gcr.io/distroless/base-debian11:nonroot
+# Restic binary build section
+FROM --platform=$BUILDPLATFORM golang:1.19.4-bullseye as restic-builder
+
+ARG BIN
+ARG TARGETOS
+ARG TARGETARCH
+ARG TARGETVARIANT
+ARG RESTIC_VERSION
+
+env CGO_ENABLED=0 \
+    GO111MODULE=on \
+    GOPROXY=${GOPROXY} \
+    GOOS=${TARGETOS} \
+    GOARCH=${TARGETARCH} \
+    GOARM=${TARGETVARIANT}
+
+COPY . /go/src/github.com/vmware-tanzu/velero
+
+RUN mkdir -p /output/usr/bin && \
+    export GOARM=$(echo "${GOARM}" | cut -c2-) && \
+    /go/src/github.com/vmware-tanzu/velero/hack/build-restic.sh
+
+# Velero image packing section
+FROM gcr.io/distroless/base-debian11@sha256:db7ea5913b13bb5fc4a5f5ee5a1fab693d262846d3e7b28efd3f8f62f835c161
 
 LABEL maintainer="Nolan Brubaker <brubakern@vmware.com>"
 
-COPY --from=builder /output /
+COPY --from=velero-builder /output /
+
+COPY --from=restic-builder /output /
 
 USER nonroot:nonroot
 

Makefile

@@ -82,7 +82,7 @@ see: https://velero.io/docs/main/build-from-source/#making-images-and-updating-v
 endef
 
 # The version of restic binary to be downloaded
-RESTIC_VERSION ?= 0.13.1
+RESTIC_VERSION ?= 0.14.0
 
 CLI_PLATFORMS ?= linux-amd64 linux-arm linux-arm64 darwin-amd64 darwin-arm64 windows-amd64 linux-ppc64le
 BUILDX_PLATFORMS ?= $(subst -,/,$(ARCH))
@@ -120,7 +120,7 @@ build-%:
 
 all-build: $(addprefix build-, $(CLI_PLATFORMS))
 
-all-containers: container-builder-env
+all-containers:
 	@$(MAKE) --no-print-directory container
 	@$(MAKE) --no-print-directory container BIN=velero-restore-helper
 
@@ -178,20 +178,6 @@ shell: build-dirs build-env
 		$(BUILDER_IMAGE) \
 		/bin/sh $(CMD)
 
-container-builder-env:
-ifneq ($(BUILDX_ENABLED), true)
-	$(error $(BUILDX_ERROR))
-endif
-	@docker buildx build \
-	--target=builder-env \
-	--build-arg=GOPROXY=$(GOPROXY) \
-	--build-arg=PKG=$(PKG) \
-	--build-arg=VERSION=$(VERSION) \
-	--build-arg=GIT_SHA=$(GIT_SHA) \
-	--build-arg=GIT_TREE_STATE=$(GIT_TREE_STATE) \
-	--build-arg=REGISTRY=$(REGISTRY) \
-	-f $(VELERO_DOCKERFILE) .
-
 container:
 ifneq ($(BUILDX_ENABLED), true)
 	$(error $(BUILDX_ERROR))
@@ -200,6 +186,7 @@ endif
 	--output=type=$(BUILDX_OUTPUT_TYPE) \
 	--platform $(BUILDX_PLATFORMS) \
 	$(addprefix -t , $(IMAGE_TAGS)) \
+	--build-arg=GOPROXY=$(GOPROXY) \
 	--build-arg=PKG=$(PKG) \
 	--build-arg=BIN=$(BIN) \
 	--build-arg=VERSION=$(VERSION) \

README.md

@@ -40,7 +40,7 @@ The following is a list of the supported Kubernetes versions for each Velero ver
 
 | Velero version | Expected Kubernetes version compatibility| Tested on Kubernetes version|
 |----------------|--------------------|--------------------|
-| 1.10           | 1.16-latest        |  1.21, 1.22, 1.23, 1.24 and 1.25 |
+| 1.10           | 1.16-latest        |  1.22.5, 1.23.8, 1.24.6 and 1.25.1 |
 | 1.9            | 1.16-latest        |  1.20.5, 1.21.2, 1.22.5, 1.23, and 1.24 |
 | 1.8            | 1.16-latest        |  |
 | 1.6.3-1.7.1    | 1.12-latest        ||

Tiltfile

@@ -50,7 +50,7 @@ git_sha = str(local("git rev-parse HEAD", quiet = True, echo_off = True)).strip(
 
 tilt_helper_dockerfile_header = """
 # Tilt image
-FROM golang:1.18 as tilt-helper
+FROM golang:1.18.10 as tilt-helper
 
 # Support live reloading with Tilt
 RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh  && \

changelogs/CHANGELOG-1.10.md

@@ -1,5 +1,55 @@
-  ## v1.10.0
-### 2022-11-11
+## v1.10.2
+### 2023-02-22
+
+### Download
+https://github.com/vmware-tanzu/velero/releases/tag/v1.10.2
+
+### Container Image
+`velero/velero:v1.10.2`
+
+### Documentation
+https://velero.io/docs/v1.10/
+
+### Upgrading
+https://velero.io/docs/v1.10/upgrade-to-1.10/
+
+### All changes
+  * Update distroless image and fix CVE-2022-41717 for release-1.10 (#5891, @blackpiglet)
+  * Set Kopia IgnoreUnknownTypes in ErrorHandlingPolicy to True for ignoring backup unknown file type (#5890, @qiuiming-best)
+  * Add labels for velero installed namespace to support PSA. (#5888, @blackpiglet)
+  * Publish backupresults json to enhance error info during backups. (#5879, @anshulahuja98)
+  * Restore finalizer and managedFields of metadata during the restoration (#5877, @ywk253100)
+  * Add secret restore item action to handle service account token secret (#5869, @ywk253100)
+  * Correct PVB/PVR Failed Phase patching during startup (#5830, @kaovilai)
+
+## v1.10.1
+### 2023-01-19
+
+### Download
+https://github.com/vmware-tanzu/velero/releases/tag/v1.10.1
+
+### Container Image
+`velero/velero:v1.10.1`
+
+### Documentation
+https://velero.io/docs/v1.10/
+
+### Upgrading
+https://velero.io/docs/v1.10/upgrade-to-1.10/
+
+### All changes
+  * Fix Restic v0.14.0 HIGH grade CVEs. (#5817, @blackpiglet)
+  * Bump up golang net to fix CVE-2022-41721 (#5811, @Lyndon-Li)
+  * Bump up golang to 1.18.10 for Velero (#5780, @Lyndon-Li)
+  * Add PR container build action, which will not push image. Add GOARM parameter. Remove container-builder-env section. (#5770, @blackpiglet)
+  * Add Restic builder in Dockerfile, and keep the used built Golang image version in accordance with upstream Restic. (#5765, @blackpiglet)
+  * Fix issue 5696, check if the repo is still openable before running the prune and forget operation, if not, try to reconnect the repo (#5714, @Lyndon-Li)
+  * Fix error with Restic backup empty volumes (#5711, @qiuming-best)
+  * Prevent nil panic on exec restore hooks (#5708, @dymurray)
+  * Fix CVEs scanned by trivy (#5655, @qiuming-best)
+
+## v1.10.0
+### 2022-11-23
 
 ### Download
 https://github.com/vmware-tanzu/velero/releases/tag/v1.10.0
@@ -20,20 +70,20 @@ In this release, we introduced the Unified Repository architecture to build a da
 
 In this release, we also deeply integrate Velero with Kopia, specifically, Kopia's uploader modules are isolated as a generic file system uploader; Kopia's repository modules are encapsulated as the unified backup repository.
 
-For more information, refer to the design document.
+For more information, refer to the [design document](https://github.com/vmware-tanzu/velero/blob/v1.10.0/design/unified-repo-and-kopia-integration/unified-repo-and-kopia-integration.md).
 
 #### File system backup refactor
-Velero's file system backup (a.k.s. pod volume backup or formerly restic backup) is refactored as the first user of the Unified Repository architecture. Specifically, we added a new path, the Kopia path, besides the existing Restic path. While Restic path is still available and set as default, you can opt in Kopia path by specifying the uploader-type parameter at installation time. Meanwhile, you are free to restore from existing backups under either path, Velero dynamically switches to the correct path to process the restore.
+Velero's file system backup (a.k.s. pod volume backup or formerly restic backup) is refactored as the first user of the Unified Repository architecture. Specifically, we added a new path, the Kopia path, besides the existing Restic path. While Restic path is still available and set as default, you can opt in Kopia path by specifying the `uploader-type` parameter at installation time. Meanwhile, you are free to restore from existing backups under either path, Velero dynamically switches to the correct path to process the restore.
 
 Because of the new path, we renamed some modules and parameters, refer to the Break Changes section for more details.
 
-For more information, visit the file system backup document and v1.10 upgrade guide document.
+For more information, visit the [file system backup document](https://velero.io/docs/v1.10/file-system-backup/) and [v1.10 upgrade guide document](https://velero.io/docs/v1.10/upgrade-to-1.10/).
 
-Meanwhile, we've created a performance guide for both Restic path and Kopia path, which helps you to choose between the two paths and provides you the best practice to configure them under different scenarios. Please note that the results in the guide are based on our testing environments, you may get different results when testing in your own ones. For more information, visit the performance guide document.
+Meanwhile, we've created a performance guide for both Restic path and Kopia path, which helps you to choose between the two paths and provides you the best practice to configure them under different scenarios. Please note that the results in the guide are based on our testing environments, you may get different results when testing in your own ones. For more information, visit the [performance guide document](https://velero.io/docs/v1.10/performance-guidance/).
 
 #### Plugin versioning V1 refactor
 In this release, Velero moves plugins BackupItemAction, RestoreItemAction and VolumeSnapshotterAction to version v1, this allows future plugin changes that do not support backward compatibility, so is a preparation for various complex tasks, for example, data movement tasks.
-For more information, refer to the plugin versioning design document.
+For more information, refer to the [plugin versioning design document](https://github.com/vmware-tanzu/velero/blob/v1.10.0/design/plugin-versioning.md).
 
 #### Refactor the controllers using Kubebuilder v3
 In this release we continued our code modernization work, rewriting some controllers using Kubebuilder v3. This work is ongoing and we will continue to make progress in future releases.
@@ -41,7 +91,7 @@ In this release we continued our code modernization work, rewriting some control
 #### Add credentials to volume snapshot locations
 In this release, we enabled dedicate credentials options to volume snapshot locations so that you can specify credentials per volume snapshot location as same as backup storage location.
 
-For more information, please visit the locations document.
+For more information, please visit the [locations document](https://velero.io/docs/v1.10/locations/).
 
 #### CSI snapshot enhancements
 In this release we added several changes to enhance the robustness of CSI snapshot procedures, for example, some protection code for error handling, and a mechanism to skip exclusion checks so that CSI snapshot works with various backup resource filters.
@@ -49,8 +99,8 @@ In this release we added several changes to enhance the robustness of CSI snapsh
 #### Backup schedule pause/unpause
 In this release, Velero supports to pause/unpause a backup schedule during or after its creation. Specifically:
 
-At creation time, you can specify "–paused" flag to "velero schedule create" command, if so, you will create a paused schedule that will not run until it is unpaused
-After creation, you can run "velero schedule pause" or "velero schedule unpause" command to pause/unpause a schedule
+At creation time, you can specify `–paused` flag to `velero schedule create` command, if so, you will create a paused schedule that will not run until it is unpaused
+After creation, you can run `velero schedule pause` or `velero schedule unpause` command to pause/unpause a schedule
 
 #### Runtime and dependencies
 In order to fix CVEs, we changed Velero's runtime and dependencies as follows:
@@ -63,35 +113,36 @@ Compile Restic (v0.13.1) with go 1.18.8 instead of packaging the official binary
 #### Breaking changes
 Due to file system backup refactor, below modules and parameters name have been changed in this release:
 
-"restic" daemonset is renamed to "node-agent"
-"resticRepository" CR is renamed to "backupRepository"
-"velero restic repo" command is renamed to "velero repo"
-"velero-restic-credentials" secret is renamed to "velero-repo-credentials"
-"default-volumes-to-restic" parameter is renamed to default-volumes-to-fs-backup
-"restic-timeout" parameter is renamed to "fs-backup-timeout"
-"default-restic-prune-frequency" parameter is renamed to "default-repo-maintain-frequency"
+`restic` daemonset is renamed to `node-agent`
+`resticRepository` CR is renamed to `backupRepository`
+`velero restic repo` command is renamed to `velero repo`
+`velero-restic-credentials` secret is renamed to `velero-repo-credentials`
+`default-volumes-to-restic` parameter is renamed to `default-volumes-to-fs-backup`
+`restic-timeout` parameter is renamed to `fs-backup-timeout`
+`default-restic-prune-frequency` parameter is renamed to `default-repo-maintain-frequency`
 
 #### Upgrade
-Due to the major changes of file system backup, the old upgrade steps are not suitable any more. For the new upgrade steps, visit v1.10 upgrade guide document.
+Due to the major changes of file system backup, the old upgrade steps are not suitable any more. For the new upgrade steps, visit [v1.10 upgrade guide document](https://velero.io/docs/v1.10/upgrade-to-1.10/).
 
 #### Limitations/Known issues
-In this release, Kopia backup repository (so the Kopia path of file system backup) doesn't support self signed certificate for S3 compatible storage. To track this problem, refer to this Velero issue or Kopia issue. 
+In this release, Kopia backup repository (so the Kopia path of file system backup) doesn't support self signed certificate for S3 compatible storage. To track this problem, refer to this [Velero issue](https://github.com/vmware-tanzu/velero/issues/5123) or [Kopia issue](https://github.com/kopia/kopia/issues/1443). 
 
-Due to the code change in Velero, there will be some code change required in vSphere plugin, without which the functionality may be impacted.  Therefore, if you are using vSphere plugin in your workflow, please hold the upgrade until the issue #485 is fixed in vSphere plugin.
+Due to the code change in Velero, there will be some code change required in vSphere plugin, without which the functionality may be impacted.  Therefore, if you are using vSphere plugin in your workflow, please hold the upgrade until the issue [#485](https://github.com/vmware-tanzu/velero-plugin-for-vsphere/issues/485) is fixed in vSphere plugin.
 
 ### All changes
   
+  * Restore ClusterBootstrap before Cluster otherwise a new default ClusterBootstrap object is create for the cluster  (#5616, @ywk253100)
   * Add compile restic binary for CVE fix  (#5574, @qiuming-best)
   * Fix controller problematic log output  (#5572, @qiuming-best)
   * Enhance the restore priorities list to support specifying the low prioritized resources that need to be restored in the last (#5535, @ywk253100)
   * fix restic backup progress error (#5534, @qiuming-best)
   * fix restic backup failure with self-signed certification backend storage (#5526, @qiuming-best)
   * Add credential store in backup deletion controller to support VSL credential. (#5521, @blackpiglet)
-  * Fix issue 5505: the pod volume backups/restores except the first one fail under the kopia path if "AZURE_CLOUD_NAME" is specified (#5512, @lyndon)
-  * After Pod Volume Backup/Restore refactor, remove all the unreasonable appearance of "restic" word from documents (#5499, @lyndon)
-  * Refactor Pod Volume Backup/Restore doc to match the new behavior (#5484, @lyndon)
+  * Fix issue 5505: the pod volume backups/restores except the first one fail under the kopia path if "AZURE_CLOUD_NAME" is specified (#5512, @Lyndon-Li)
+  * After Pod Volume Backup/Restore refactor, remove all the unreasonable appearance of "restic" word from documents (#5499, @Lyndon-Li)
+  * Refactor Pod Volume Backup/Restore doc to match the new behavior (#5484, @Lyndon-Li)
   * Remove redundancy code block left by #5388. (#5483, @blackpiglet)
-  * Issue fix 5477: create the common way to support S3 compatible object storages that work for both Restic and Kopia; Keep the resticRepoPrefix parameter for compatibility (#5478, @lyndon)
+  * Issue fix 5477: create the common way to support S3 compatible object storages that work for both Restic and Kopia; Keep the resticRepoPrefix parameter for compatibility (#5478, @Lyndon-Li)
   * Update the k8s.io dependencies to 0.24.0.
 This also required an update to github.com/bombsimon/logrusr/v3.
 Removed the `WithClusterName` method
@@ -99,24 +150,24 @@ as it is a "legacy field that was
 always cleared by the system and never used" as per upstream k8s
 https://github.com/kubernetes/apimachinery/blob/release-1.24/pkg/apis/meta/v1/types.go#L257-L259 (#5471, @kcboyle)
   * Add v1.10 velero upgrade doc (#5468, @qiuming-best)
-  * Upgrade velero docker image to use go 1.18 and upgrade golangci-lint to 1.45.0 (#5459, @lyndon)
+  * Upgrade velero docker image to use go 1.18 and upgrade golangci-lint to 1.45.0 (#5459, @Lyndon-Li)
   * Add VolumeSnapshot client back. (#5449, @blackpiglet)
   * Change subcommand `velero restic repo` to `velero repo` (#5446, @allenxu404)
-  * Remove irrational "Restic" names in Velero code after the PVBR refactor (#5444, @lyndon)
+  * Remove irrational "Restic" names in Velero code after the PVBR refactor (#5444, @Lyndon-Li)
   * moved RIA execute input/output structs back to velero package (#5441, @sseago)
-  * Rename Velero pod volume restore init helper from "velero-restic-restore-helper" to "velero-restore-helper" (#5432, @lyndon)
+  * Rename Velero pod volume restore init helper from "velero-restic-restore-helper" to "velero-restore-helper" (#5432, @Lyndon-Li)
   * Skip the exclusion check for additional resources returned by BIA (#5429, @reasonerjt)
   * Change B/R describe CLI to support Kopia (#5412, @allenxu404)
   * Add nil check before execution of csi snapshot delete (#5401, @shubham-pampattiwar)
   * update velero using klog to version v2.9.0 (#5396, @blackpiglet)
   * Fix Test_prepareBackupRequest_BackupStorageLocation UT failure. (#5394, @blackpiglet)
-  * Rename Velero daemonset from "restic" to "node-agent" (#5390, @lyndon)
+  * Rename Velero daemonset from "restic" to "node-agent" (#5390, @Lyndon-Li)
   * Add some corner cases checking for CSI snapshot in backup controller. (#5388, @blackpiglet)
-  * Fix issue 5386: Velero providers a full URL as the S3Url while the underlying minio client only accept the host part of the URL as the endpoint and the schema should be specified separately. (#5387, @lyndon)
+  * Fix issue 5386: Velero providers a full URL as the S3Url while the underlying minio client only accept the host part of the URL as the endpoint and the schema should be specified separately. (#5387, @Lyndon-Li)
   * Fix restore error with flag namespace-mappings (#5377, @qiuming-best)
-  * Pod Volume Backup/Restore Refactor: Rename parameters in CRDs and commands to remove "Restic" word (#5370, @lyndon)
+  * Pod Volume Backup/Restore Refactor: Rename parameters in CRDs and commands to remove "Restic" word (#5370, @Lyndon-Li)
   * Added backupController's UT to test the prepareBackupRequest() method BackupStorageLocation processing logic (#5362, @niulechuan)
-  * Fix a repoEnsurer problem introduced by the refactor - The repoEnsurer didn't check "" state of BackupRepository, as a result, the function GetBackupRepository always returns without an error even though the ensreReady is specified. (#5359, @lyndon)
+  * Fix a repoEnsurer problem introduced by the refactor - The repoEnsurer didn't check "" state of BackupRepository, as a result, the function GetBackupRepository always returns without an error even though the ensreReady is specified. (#5359, @Lyndon-Li)
   * Add E2E test for schedule backup (#5355, @danfengliu)
   * Add useOwnerReferencesInBackup field doc for schedule. (#5353, @cleverhu)
   * Clarify the help message for the default value of parameter --snapshot-volumes, when it's not set. (#5350, @blackpiglet)
@@ -126,22 +177,22 @@ https://github.com/kubernetes/apimachinery/blob/release-1.24/pkg/apis/meta/v1/ty
   * Add opt-in and opt-out PersistentVolume backup to E2E tests (#5331, @danfengliu)
   * Cancel downloadRequest when timeout without downloadURL (#5329, @kaovilai)
   * Fix PVB finds wrong parent snapshot (#5322, @qiuming-best)
-  * Fix issue 4874 and 4752: check the daemonset pod is running in the node where the workload pod resides before running the PVB for the pod (#5319, @lyndon)
+  * Fix issue 4874 and 4752: check the daemonset pod is running in the node where the workload pod resides before running the PVB for the pod (#5319, @Lyndon-Li)
   * plugin versioning v1 refactor for VolumeSnapshotter (#5318, @sseago)
   * Change the status of restore to completed from partially failed when restore empty backup (#5314, @allenxu404)
   * RestoreItemAction v1 refactoring for plugin api versioning (#5312, @sseago)
-  * Refactor the repoEnsurer code to use controller runtime client and wrap some common BackupRepository operations to share with other modules (#5308, @lyndon)
+  * Refactor the repoEnsurer code to use controller runtime client and wrap some common BackupRepository operations to share with other modules (#5308, @Lyndon-Li)
   * Remove snapshot related lister, informer and client from backup controller. (#5299, @jxun)
   * Remove github.com/apex/log logger. (#5297, @blackpiglet)
   * change CSISnapshotTimeout from pointer to normal variables. (#5294, @cleverhu)
   * Optimize code for restore exists resources. (#5293, @cleverhu)
   * Add more detailed comments for labels columns. (#5291, @cleverhu)
   * Add backup status checking in schedule controller. (#5283, @blackpiglet)
-  * Add changes for problems/enhancements found during smoking test for Kopia pod volume backup/restore (#5282, @lyndon)
+  * Add changes for problems/enhancements found during smoking test for Kopia pod volume backup/restore (#5282, @Lyndon-Li)
   * Support pause/unpause schedules (#5279, @ywk253100)
   *  plugin/clientmgmt refactoring for BackupItemAction v1 (#5271, @sseago)
   * Don't move velero v1 plugins to new proto dir (#5263, @sseago)
-  * Fill gaps for Kopia path of PVBR: integrate Repo Manager with Unified Repo; pass UploaderType to PVBR backupper and restorer; pass RepositoryType to BackupRepository controller and Repo Ensurer (#5259, @lyndon)
+  * Fill gaps for Kopia path of PVBR: integrate Repo Manager with Unified Repo; pass UploaderType to PVBR backupper and restorer; pass RepositoryType to BackupRepository controller and Repo Ensurer (#5259, @Lyndon-Li)
   * Add csiSnapshotTimeout for describe backup (#5252, @cleverhu)
   * equip gc controller with configurable frequency (#5248, @allenxu404)
   * Fix nil pointer panic when restoring StatefulSets (#5247, @divolgin)
@@ -149,9 +200,8 @@ https://github.com/kubernetes/apimachinery/blob/release-1.24/pkg/apis/meta/v1/ty
   * Fix edge cases for already exists resources (#5239, @shubham-pampattiwar)
   * Check for empty ns list before checking nslist[0] (#5236, @sseago)
   * Remove reference to non-existent doc (#5234, @reasonerjt)
-  * Add changes for Kopia Integration: Kopia Lib - method implementation
-Add changes to write Kopia Repository logs to Velero log (#5233, @lyndon)
-  * Add changes for Kopia Integration: Kopia Lib - initialize Kopia repo (#5231, @lyndon)
+  * Add changes for Kopia Integration: Kopia Lib - method implementation. Add changes to write Kopia Repository logs to Velero log (#5233, @Lyndon-Li)
+  * Add changes for Kopia Integration: Kopia Lib - initialize Kopia repo (#5231, @Lyndon-Li)
   * Uploader Implementation: Kopia backup and restore (#5221, @qiuming-best)
   * Migrate backup sync controller from code-generator to kubebuilder. (#5218, @jxun)
   * check vsc null pointer (#5217, @lilongfeng0902)
@@ -159,22 +209,19 @@ Add changes to write Kopia Repository logs to Velero log (#5233, @lyndon)
   * Uploader Implementation: Restic backup and restore (#5214, @qiuming-best)
   * Add parameter "uploader-type" to velero server (#5212, @reasonerjt)
   * Add annotation "pv.kubernetes.io/migrated-to" for CSI checking. (#5181, @jxun)
-  * Add changes for Kopia Integration: Unified Repository Provider - method implementation (#5179, @lyndon)
+  * Add changes for Kopia Integration: Unified Repository Provider - method implementation (#5179, @Lyndon-Li)
   * Treat namespaces with exclude label as excludedNamespaces
 Related issue: #2413 (#5178, @allenxu404)
   * Reduce CRD size. (#5174, @jxun)
   * Fix restic backups to multiple backup storage locations bug (#5172, @qiuming-best)
-  * Add changes for Kopia Integration: Unified Repository Provider - Repo Password (#5167, @lyndon)
+  * Add changes for Kopia Integration: Unified Repository Provider - Repo Password (#5167, @Lyndon-Li)
   * Skip registering "crd-remap-version" plugin when feature flag "EnableAPIGroupVersions" is set (#5165, @reasonerjt)
   * Kopia uploader integration on shim progress uploader module (#5163, @qiuming-best)
   * Add labeled and unlabeled events for PR changelog check action. (#5157, @jxun)
   * VolumeSnapshotLocation refactor with kubebuilder. (#5148, @jxun)
   * Delay CA file deletion in PVB controller. (#5145, @jxun)
   * This commit splits the pkg/restic package into several packages to support Kopia integration works (#5143, @ywk253100)
-  * Kopia Integration: Add the Unified Repository Interface definition.
-Kopia Integration: Add the changes for Unified Repository storage config.
-
-Related Issues; #5076, #5080 (#5142, @lyndon)
+  * Kopia Integration: Add the Unified Repository Interface definition. Kopia Integration: Add the changes for Unified Repository storage config. Related Issues; #5076, #5080 (#5142, @Lyndon-Li)
   * Update the CRD for kopia integration (#5135, @reasonerjt)
   * Let "make shell xxx" respect GOPROXY (#5128, @reasonerjt)
   * Modify BackupStoreGetter to avoid BSL spec changes (#5122, @sseago)
@@ -189,5 +236,5 @@ Related Issues; #5076, #5080 (#5142, @lyndon)
   * When spec.RestoreStatus is empty, don't restore status (#5008, @sseago)
   * Added DownloadTargetKindCSIBackupVolumeSnapshots for retrieving the signed URL to download only the `<backup name>`-csi-volumesnapshots.json.gz  and DownloadTargetKindCSIBackupVolumeSnapshotContents to download only `<backup name>`-csi-volumesnapshotcontents.json.gz in the DownloadRequest CR structure. These files are already present in the backup layout.  (#4980, @anshulahuja98)
   * Refactor BackupItemAction proto and related code to backupitemaction/v1 package.  This is part of implementation of the plugin version design https://github.com/vmware-tanzu/velero/blob/main/design/plugin-versioning.md (#4943, @phuongatemc)
-  * Unified Repository Design (#4926, @lyndon)
+  * Unified Repository Design (#4926, @Lyndon-Li)
   * Add credentials to volume snapshot locations (#4864, @sseago)

changelogs/unreleased/4864-sseago

@@ -1 +0,0 @@
-Add credentials to volume snapshot locations

changelogs/unreleased/4926-lyndon

@@ -1 +0,0 @@
-Unified Repository Design

changelogs/unreleased/4943-phuongatemc

@@ -1 +0,0 @@
-Refactor BackupItemAction proto and related code to backupitemaction/v1 package.  This is part of implementation of the plugin version design https://github.com/vmware-tanzu/velero/blob/main/design/plugin-versioning.md

changelogs/unreleased/4980-anshulahuja98

@@ -1 +0,0 @@
-Added DownloadTargetKindCSIBackupVolumeSnapshots for retrieving the signed URL to download only the `<backup name>`-csi-volumesnapshots.json.gz  and DownloadTargetKindCSIBackupVolumeSnapshotContents to download only `<backup name>`-csi-volumesnapshotcontents.json.gz in the DownloadRequest CR structure. These files are already present in the backup layout. 

changelogs/unreleased/5008-sseago

@@ -1 +0,0 @@
-When spec.RestoreStatus is empty, don't restore status

changelogs/unreleased/5041-jxun

@@ -1 +0,0 @@
-Delete opened issues triage action.

changelogs/unreleased/5051-niulechuan

@@ -1 +0,0 @@
-Fix typo in doc, in https://velero.io/docs/main/restore-reference/ "Restore order" section, "Mamespace" should be "Namespace".

changelogs/unreleased/5052-jxun

@@ -1 +0,0 @@
-Modify Github actions.

changelogs/unreleased/5053-niulechuan

@@ -1 +0,0 @@
-Move 'velero.io/exclude-from-backup' label string to const

changelogs/unreleased/5064-jxun

@@ -1 +0,0 @@
-Exclude "csinodes.storage.k8s.io" and "volumeattachments.storage.k8s.io" from restore by default.

changelogs/unreleased/5101-ywk253100

@@ -1 +0,0 @@
- Fix bsl validation bug: the BSL is validated continually and doesn't respect the validation period configured

changelogs/unreleased/5104-jxun

@@ -1 +0,0 @@
-Make CSI snapshot creation timeout configurable.

changelogs/unreleased/5110-reasonerjt

@@ -1 +0,0 @@
-Dump stack trace when the plugin server handles panic

changelogs/unreleased/5122-sseago

@@ -1 +0,0 @@
-Modify BackupStoreGetter to avoid BSL spec changes

changelogs/unreleased/5128-reasonerjt

@@ -1 +0,0 @@
-Let "make shell xxx" respect GOPROXY

changelogs/unreleased/5135-reasonerjt

@@ -1 +0,0 @@
-Update the CRD for kopia integration

changelogs/unreleased/5142-lyndon

@@ -1,4 +0,0 @@
-Kopia Integration: Add the Unified Repository Interface definition.
-Kopia Integration: Add the changes for Unified Repository storage config.
-
-Related Issues; #5076, #5080

changelogs/unreleased/5143-ywk253100

@@ -1 +0,0 @@
-This commit splits the pkg/restic package into several packages to support Kopia integration works

changelogs/unreleased/5145-jxun

@@ -1 +0,0 @@
-Delay CA file deletion in PVB controller.

changelogs/unreleased/5148-jxun

@@ -1 +0,0 @@
-VolumeSnapshotLocation refactor with kubebuilder.

changelogs/unreleased/5157-jxun

@@ -1 +0,0 @@
-Add labeled and unlabeled events for PR changelog check action.

changelogs/unreleased/5163-qiuming-best

@@ -1 +0,0 @@
-Kopia uploader integration on shim progress uploader module

changelogs/unreleased/5165-reasonerjt

@@ -1 +0,0 @@
-Skip registering "crd-remap-version" plugin when feature flag "EnableAPIGroupVersions" is set

changelogs/unreleased/5167-lyndon

@@ -1 +0,0 @@
-Add changes for Kopia Integration: Unified Repository Provider - Repo Password

changelogs/unreleased/5172-qiuming-best

@@ -1 +0,0 @@
-Fix restic backups to multiple backup storage locations bug

changelogs/unreleased/5174-jxun

@@ -1 +0,0 @@
-Reduce CRD size.

changelogs/unreleased/5178-allenxu404

@@ -1,2 +0,0 @@
-Treat namespaces with exclude label as excludedNamespaces
-Related issue: #2413

changelogs/unreleased/5179-lyndon

@@ -1 +0,0 @@
-Add changes for Kopia Integration: Unified Repository Provider - method implementation

changelogs/unreleased/5181-jxun

@@ -1 +0,0 @@
-Add annotation "pv.kubernetes.io/migrated-to" for CSI checking.

changelogs/unreleased/5212-reasonerjt

@@ -1 +0,0 @@
-Add parameter "uploader-type" to velero server

changelogs/unreleased/5214-qiuming-best

@@ -1 +0,0 @@
-Uploader Implementation: Restic backup and restore

changelogs/unreleased/5215-allenxu404

@@ -1 +0,0 @@
-Refactor GCController with kubebuilder

changelogs/unreleased/5217-lilongfeng0902

@@ -1 +0,0 @@
-check vsc null pointer

changelogs/unreleased/5218-jxun

@@ -1 +0,0 @@
-Migrate backup sync controller from code-generator to kubebuilder.

changelogs/unreleased/5221-qiuming-best

@@ -1 +0,0 @@
-Uploader Implementation: Kopia backup and restore

changelogs/unreleased/5231-lyndon

@@ -1 +0,0 @@
-Add changes for Kopia Integration: Kopia Lib - initialize Kopia repo

changelogs/unreleased/5233-lyndon

@@ -1,2 +0,0 @@
-Add changes for Kopia Integration: Kopia Lib - method implementation
-Add changes to write Kopia Repository logs to Velero log

changelogs/unreleased/5234-reasonerjt

@@ -1 +0,0 @@
-Remove reference to non-existent doc

changelogs/unreleased/5236-sseago

@@ -1 +0,0 @@
-Check for empty ns list before checking nslist[0]

changelogs/unreleased/5239-shubham-pampattiwar

@@ -1 +0,0 @@
-Fix edge cases for already exists resources

changelogs/unreleased/5241-jxun

@@ -1 +0,0 @@
-Controller refactor code modifications.

changelogs/unreleased/5247-divolgin

@@ -1 +0,0 @@
-Fix nil pointer panic when restoring StatefulSets

changelogs/unreleased/5248-allenxu404

@@ -1 +0,0 @@
-equip gc controller with configurable frequency

changelogs/unreleased/5252-cleverhu

@@ -1 +0,0 @@
-Add csiSnapshotTimeout for describe backup

changelogs/unreleased/5259-lyndon

@@ -1 +0,0 @@
-Fill gaps for Kopia path of PVBR: integrate Repo Manager with Unified Repo; pass UploaderType to PVBR backupper and restorer; pass RepositoryType to BackupRepository controller and Repo Ensurer

changelogs/unreleased/5263-sseago

@@ -1 +0,0 @@
-Don't move velero v1 plugins to new proto dir

changelogs/unreleased/5271-sseago

@@ -1 +0,0 @@
- plugin/clientmgmt refactoring for BackupItemAction v1

changelogs/unreleased/5279-ywk253100

@@ -1 +0,0 @@
-Support pause/unpause schedules

changelogs/unreleased/5282-lyndon

@@ -1 +0,0 @@
-Add changes for problems/enhancements found during smoking test for Kopia pod volume backup/restore

changelogs/unreleased/5283-blackpiglet

@@ -1 +0,0 @@
-Add backup status checking in schedule controller.

changelogs/unreleased/5291-cleverhu

@@ -1 +0,0 @@
-Add more detailed comments for labels columns.

changelogs/unreleased/5293-cleverhu

@@ -1 +0,0 @@
-Optimize code for restore exists resources.

changelogs/unreleased/5294-cleverhu

@@ -1 +0,0 @@
-change CSISnapshotTimeout from pointer to normal variables.

changelogs/unreleased/5297-blackpiglet

@@ -1 +0,0 @@
-Remove github.com/apex/log logger.

changelogs/unreleased/5299-jxun

@@ -1 +0,0 @@
-Remove snapshot related lister, informer and client from backup controller.

changelogs/unreleased/5308-lyndon

@@ -1 +0,0 @@
-Refactor the repoEnsurer code to use controller runtime client and wrap some common BackupRepository operations to share with other modules

changelogs/unreleased/5312-sseago

@@ -1 +0,0 @@
-RestoreItemAction v1 refactoring for plugin api versioning

changelogs/unreleased/5314-allenxu404

@@ -1 +0,0 @@
-Change the status of restore to completed from partially failed when restore empty backup

changelogs/unreleased/5318-sseago

@@ -1 +0,0 @@
-plugin versioning v1 refactor for VolumeSnapshotter

changelogs/unreleased/5319-lyndon

@@ -1 +0,0 @@
-Fix issue 4874 and 4752: check the daemonset pod is running in the node where the workload pod resides before running the PVB for the pod

changelogs/unreleased/5322-qiuming-best

@@ -1 +0,0 @@
-Fix PVB finds wrong parent snapshot

changelogs/unreleased/5329-kaovilai

@@ -1 +0,0 @@
-Cancel downloadRequest when timeout without downloadURL

changelogs/unreleased/5331-danfengliu

@@ -1 +0,0 @@
-Add opt-in and opt-out PersistentVolume backup to E2E tests

changelogs/unreleased/5335-shubham-pampattiwar

@@ -1 +0,0 @@
-Increase ensure restic repository timeout to 5m

changelogs/unreleased/5344-kaovilai

@@ -1 +0,0 @@
-Resolve gopkg.in/yaml.v3 vulnerabilities by upgrading gopkg.in/yaml.v3 to v3.0.1

changelogs/unreleased/5347-qiuming-best

@@ -1 +0,0 @@
-Fix restore cmd extraflag overwrite bug

changelogs/unreleased/5350-blackpiglet

@@ -1 +0,0 @@
-Clarify the help message for the default value of parameter --snapshot-volumes, when it's not set.

changelogs/unreleased/5353-cleverhu

@@ -1 +0,0 @@
-Add useOwnerReferencesInBackup field doc for schedule.

changelogs/unreleased/5355-danfengliu

@@ -1 +0,0 @@
-Add E2E test for schedule backup

changelogs/unreleased/5359-lyndon

@@ -1 +0,0 @@
-Fix a repoEnsurer problem introduced by the refactor - The repoEnsurer didn't check "" state of BackupRepository, as a result, the function GetBackupRepository always returns without an error even though the ensreReady is specified.

changelogs/unreleased/5362-niulechuan

@@ -1 +0,0 @@
-Added backupController's UT to test the prepareBackupRequest() method BackupStorageLocation processing logic

changelogs/unreleased/5370-lyndon

@@ -1 +0,0 @@
-Pod Volume Backup/Restore Refactor: Rename parameters in CRDs and commands to remove "Restic" word

changelogs/unreleased/5377-qiuming-best

@@ -1 +0,0 @@
-Fix restore error with flag namespace-mappings

changelogs/unreleased/5387-lyndon

@@ -1 +0,0 @@
-Fix issue 5386: Velero providers a full URL as the S3Url while the underlying minio client only accept the host part of the URL as the endpoint and the schema should be specified separately.

changelogs/unreleased/5388-blackpiglet

@@ -1 +0,0 @@
-Add some corner cases checking for CSI snapshot in backup controller.

changelogs/unreleased/5390-lyndon

@@ -1 +0,0 @@
-Rename Velero daemonset from "restic" to "node-agent"

changelogs/unreleased/5394-blackpiglet

@@ -1 +0,0 @@
-Fix Test_prepareBackupRequest_BackupStorageLocation UT failure.

changelogs/unreleased/5396-blackpiglet

@@ -1 +0,0 @@
-update velero using klog to version v2.9.0

changelogs/unreleased/5401-shubham-pampattiwar

@@ -1 +0,0 @@
-Add nil check before execution of csi snapshot delete

changelogs/unreleased/5412-allenxu404

@@ -1 +0,0 @@
-Change B/R describe CLI to support Kopia

changelogs/unreleased/5429-reasonerjt

@@ -1 +0,0 @@
-Skip the exclusion check for additional resources returned by BIA

changelogs/unreleased/5432-lyndon

@@ -1 +0,0 @@
-Rename Velero pod volume restore init helper from "velero-restic-restore-helper" to "velero-restore-helper"

changelogs/unreleased/5441-sseago

@@ -1 +0,0 @@
-moved RIA execute input/output structs back to velero package

changelogs/unreleased/5444-lyndon

@@ -1 +0,0 @@
-Remove irrational "Restic" names in Velero code after the PVBR refactor

changelogs/unreleased/5446-allenxu404

@@ -1 +0,0 @@
-Change subcommand `velero restic repo` to `velero repo`

changelogs/unreleased/5449-blackpiglet

@@ -1 +0,0 @@
-Add VolumeSnapshot client back.

changelogs/unreleased/5459-lyndon

@@ -1 +0,0 @@
-Upgrade velero docker image to use go 1.18 and upgrade golangci-lint to 1.45.0

changelogs/unreleased/5468-qiuming-best

@@ -1 +0,0 @@
-Add v1.10 velero upgrade doc

changelogs/unreleased/5471-kcboyle

@@ -1,6 +0,0 @@
-Update the k8s.io dependencies to 0.24.0.
-This also required an update to github.com/bombsimon/logrusr/v3.
-Removed the `WithClusterName` method
-as it is a "legacy field that was
-always cleared by the system and never used" as per upstream k8s
-https://github.com/kubernetes/apimachinery/blob/release-1.24/pkg/apis/meta/v1/types.go#L257-L259