Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick PRs to Release 1.5 #583

Merged
merged 8 commits into from
Jun 21, 2024

Conversation

xing-yang
Copy link
Contributor

@xing-yang xing-yang commented Jun 21, 2024

What this PR does / why we need it:
Cherry-pick PR #574 #575 #576 #572 #569 #578 #581 #582

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

Cherry-pick 582: For Supervisor's using NSX Operator with VPC Networking, Velero backups will omit all NSX Operator v1alpha1 VPC APIs. vSphere Pods, Services, and any other resource's networking-related properties will need to be re-created by NSX Operator upon restore.
Cherry-pick 578: Fixed a problem in backup in the VDS setup on Supervisor.

lipingxue and others added 8 commits June 21, 2024 11:02
Signed-off-by: Liping Xue <lipingx@vmware.com>
(cherry picked from commit f0fec71)
Signed-off-by: xing-yang <xingyang105@gmail.com>
…#575)

* Update support matrix for Supervisor and Guest cluster.

Signed-off-by: Liping Xue <lipingx@vmware.com>

* Address review comment.

Signed-off-by: Liping Xue <lipingx@vmware.com>

* Address comments from Xing.

Signed-off-by: Liping Xue <lipingx@vmware.com>

---------

Signed-off-by: Liping Xue <lipingx@vmware.com>
(cherry picked from commit 29e4080)
Signed-off-by: xing-yang <xingyang105@gmail.com>
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.17.0 to 0.23.0.
- [Commits](golang/net@v0.17.0...v0.23.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit d51d5d2)
Signed-off-by: xing-yang <xingyang105@gmail.com>
Bumps google.golang.org/protobuf from 1.30.0 to 1.33.0.

---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit acc7c43)
Signed-off-by: xing-yang <xingyang105@gmail.com>
…#569)

* Update vanilla install notes with escape character note

Signed-off-by: Varun Srinivasan <varuns6@vmware.com>

* More examples of password configurations

Signed-off-by: Varun Srinivasan <varuns6@vmware.com>

---------

Signed-off-by: Varun Srinivasan <varuns6@vmware.com>
(cherry picked from commit b4449ff)
Signed-off-by: xing-yang <xingyang105@gmail.com>
Signed-off-by: Varun Srinivasan <varuns6@vmware.com>
(cherry picked from commit 72d685c)
Signed-off-by: xing-yang <xingyang105@gmail.com>
This change introduces support for ARM-based builds of the plugin and
related components via targetting specific platform builds for
linux/amd64 Dockerfiles and binaries.

Additionally, it supports building with different container runtimes by
expressing a "DOCKER" Makefile variable, to enable support for other
container runtimes such as podman or nerdctl.

Signed-off-by: Ian Gann <ian.gann@broadcom.com>
(cherry picked from commit 0d73abc)
Signed-off-by: xing-yang <xingyang105@gmail.com>
…nzu#582)

This change prevents Velero Backup from backing up the following NSX
Operator CRs to support the VPC topology, which can be found at
https://github.com/vmware-tanzu/nsx-operator/tree/main/pkg/apis.

Additionally, the following Pod annotations are stripped on backup,
as added via
https://github.com/vmware-tanzu/nsx-operator/blob/main/pkg/controllers/pod/pod_controller.go.

* nsx.vmware.com/attachment
* nsx.vmware.com/mac

Signed-off-by: Ian Gann <ian.gann@broadcom.com>
(cherry picked from commit 6fb650c)
Signed-off-by: xing-yang <xingyang105@gmail.com>
@xing-yang xing-yang merged commit 26b7b39 into vmware-tanzu:release-1.5 Jun 21, 2024
2 checks passed
@xing-yang xing-yang added the bug Something isn't working label Jun 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants