Cherry-pick PRs to Release 1.5 (#583)

* Update changelog for 1.5.3 release. (#574) Signed-off-by: Liping Xue <lipingx@vmware.com> (cherry picked from commit f0fec71) Signed-off-by: xing-yang <xingyang105@gmail.com> * Update support matrix for Supervisor and Guest cluster. (#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> * Bump golang.org/x/net from 0.17.0 to 0.23.0 (#576) 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> * Bump google.golang.org/protobuf from 1.30.0 to 1.33.0 (#572) 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> * Update vanilla install notes with escape character note (#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> * Add vmware-system-network to pod annotations to skip (#578) Signed-off-by: Varun Srinivasan <varuns6@vmware.com> (cherry picked from commit 72d685c) Signed-off-by: xing-yang <xingyang105@gmail.com> * Support ARM builds (#581) 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> * Omit NSX Operator VPC CRs from Supervisor Namespace Backup (#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> --------- Signed-off-by: Liping Xue <lipingx@vmware.com> Signed-off-by: xing-yang <xingyang105@gmail.com> Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Varun Srinivasan <varuns6@vmware.com> Signed-off-by: Ian Gann <ian.gann@broadcom.com> Co-authored-by: Liping Xue <lipingx@vmware.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Varun Srinivasan <varuns6@vmware.com> Co-authored-by: Ian Gann <ianhuntergann@gmail.com>
vmware-tanzu · Jun 21, 2024 · 26b7b39 · 26b7b39
1 parent 055e686
commit 26b7b39
Show file tree

Hide file tree

Showing 9 changed files with 102 additions and 32 deletions.
diff --git a/Makefile b/Makefile
@@ -38,6 +38,9 @@ PLUGIN_IMAGE ?= $(REGISTRY)/$(PLUGIN_BIN)
 DATAMGR_IMAGE ?= $(REGISTRY)/$(DATAMGR_BIN)
 BACKUPDRIVER_IMAGE ?= $(REGISTRY)/$(BACKUPDRIVER_BIN)
 
+# The default container runtime is docker, but others are supported (e.g. podman, nerdctl).
+DOCKER ?= docker
+
 # Which architecture to build - see $(ALL_ARCH) for options.
 # if the 'local' rule is being run, detect the ARCH from 'go env'
 # if it wasn't specified by the caller.
@@ -119,8 +122,9 @@ _output/bin/$(GOOS)/$(GOARCH)/$(BIN): build-dirs copy-astrolabe
 TTY := $(shell tty -s && echo "-t")
 
 shell: build-dirs
-	@echo "running docker: $@"
-	docker run \
+	@echo "running $(DOCKER): $@"
+	$(DOCKER) run \
+		--platform $(GOOS)/$(GOARCH) \
 		-e GOFLAGS \
 		-i $(TTY) \
 		--rm \
@@ -131,7 +135,7 @@ shell: build-dirs
 		-v $$(pwd)/.go/std:/go/std:delegated \
 		-v $$(pwd):/go/src/$(PKG):delegated \
 		-v "$$(pwd)/_output/bin:/output:delegated" \
-		-v $$(pwd)/.go/std/$(GOOS)_$(GOARCH):/usr/local/go/pkg/$(GOOS)_$(GOARCH)_static:delegated \
+		-v $$(pwd)/.go/std/$(GOOS)/$(GOARCH):/usr/local/go/pkg/$(GOOS)/$(GOARCH)_static:delegated \
 		-v "$$(pwd)/.go/go-build:/.cache/go-build:delegated" \
 		-e CGO_ENABLED=1 \
 		-e GOPATH=/go \
@@ -168,7 +172,7 @@ copy-install-script:
 
 build-container: copy-vix-libs container-name
 	cp $(DOCKERFILE) _output/bin/$(GOOS)/$(GOARCH)/$(DOCKERFILE)
-	docker build -t $(IMAGE):$(VERSION) -f _output/bin/$(GOOS)/$(GOARCH)/$(DOCKERFILE) _output
+	$(DOCKER) build --platform $(GOOS)/$(GOARCH) -t $(IMAGE):$(VERSION) -f _output/bin/$(GOOS)/$(GOARCH)/$(DOCKERFILE) _output
 
 plugin-container: all copy-install-script
 	$(MAKE) build-container IMAGE=$(PLUGIN_IMAGE) DOCKERFILE=$(PLUGIN_DOCKERFILE) VERSION=$(VERSION)
@@ -186,29 +190,29 @@ update:
 	./hack/update-generated-crd-code.sh
 
 push-plugin: plugin-container
-	docker push $(PLUGIN_IMAGE):$(VERSION)
+	$(DOCKER) push $(PLUGIN_IMAGE):$(VERSION)
 
 push-datamgr: datamgr-container
-	docker push $(DATAMGR_IMAGE):$(VERSION)
+	$(DOCKER) push $(DATAMGR_IMAGE):$(VERSION)
 
 push-backup-driver: backup-driver-container
-	docker push $(BACKUPDRIVER_IMAGE):$(VERSION)
+	$(DOCKER) push $(BACKUPDRIVER_IMAGE):$(VERSION)
 
 push: push-datamgr push-plugin push-backup-driver
 
 QUALIFIED_TAG ?=
 RELEASE_TAG ?= latest
 release:
 ifneq (,$(QUALIFIED_TAG))
-	docker pull $(DATAMGR_IMAGE):$(QUALIFIED_TAG)
-	docker pull $(PLUGIN_IMAGE):$(QUALIFIED_TAG)
-	docker pull $(BACKUPDRIVER_IMAGE):$(QUALIFIED_TAG)
-	docker tag $(BACKUPDRIVER_IMAGE):$(QUALIFIED_TAG) $(RELEASE_REGISTRY)/$(BACKUPDRIVER_BIN):$(RELEASE_TAG)
-	docker tag $(DATAMGR_IMAGE):$(QUALIFIED_TAG) $(RELEASE_REGISTRY)/$(DATAMGR_BIN):$(RELEASE_TAG)
-	docker tag $(PLUGIN_IMAGE):$(QUALIFIED_TAG) $(RELEASE_REGISTRY)/$(PLUGIN_BIN):$(RELEASE_TAG)
-	docker push $(RELEASE_REGISTRY)/$(BACKUPDRIVER_BIN):$(RELEASE_TAG)
-	docker push $(RELEASE_REGISTRY)/$(DATAMGR_BIN):$(RELEASE_TAG)
-	docker push $(RELEASE_REGISTRY)/$(PLUGIN_BIN):$(RELEASE_TAG)
+	$(DOCKER) pull $(DATAMGR_IMAGE):$(QUALIFIED_TAG)
+	$(DOCKER) pull $(PLUGIN_IMAGE):$(QUALIFIED_TAG)
+	$(DOCKER) pull $(BACKUPDRIVER_IMAGE):$(QUALIFIED_TAG)
+	$(DOCKER) tag $(BACKUPDRIVER_IMAGE):$(QUALIFIED_TAG) $(RELEASE_REGISTRY)/$(BACKUPDRIVER_BIN):$(RELEASE_TAG)
+	$(DOCKER) tag $(DATAMGR_IMAGE):$(QUALIFIED_TAG) $(RELEASE_REGISTRY)/$(DATAMGR_BIN):$(RELEASE_TAG)
+	$(DOCKER) tag $(PLUGIN_IMAGE):$(QUALIFIED_TAG) $(RELEASE_REGISTRY)/$(PLUGIN_BIN):$(RELEASE_TAG)
+	$(DOCKER) push $(RELEASE_REGISTRY)/$(BACKUPDRIVER_BIN):$(RELEASE_TAG)
+	$(DOCKER) push $(RELEASE_REGISTRY)/$(DATAMGR_BIN):$(RELEASE_TAG)
+	$(DOCKER) push $(RELEASE_REGISTRY)/$(PLUGIN_BIN):$(RELEASE_TAG)
 endif
 
 verify:
@@ -236,4 +240,4 @@ clean:
 	@echo "cleaning"
 	rm -rf .container-* _output/.dockerfile-*
 	rm -rf .go _output
-	docker rmi $(BUILDER_IMAGE)
+	$(DOCKER) rmi $(BUILDER_IMAGE)
diff --git a/changelogs/CHANGELOG-1.5.md b/changelogs/CHANGELOG-1.5.md
@@ -1,4 +1,31 @@
 # Changelog since v1.4.0
+
+
+## v1.5.3
+
+Date: 2024-3-26
+
+### Changes
+
+- Prevents Restore when the target Restore StorageClass has WaitForFirstConsumer volumeBindingMode ([#568](https://github.com/vmware-tanzu/velero-plugin-for-vsphere/pull/568), [@deepakkinni](https://github.com/deepakkinni))
+- This change will allow users to restore PVC's in the target namespace when the --namespace-mapping flag is used when creating a restore with Velero. ([#565](https://github.com/vmware-tanzu/velero-plugin-for-vsphere/pull/565), [@varunsrinivasan2](https://github.com/varunsrinivasan2))
+- With this change, when a Go special character is in the password, they will have to escape the character just as they would for vSphere CSI plugin. ([#564](https://github.com/vmware-tanzu/velero-plugin-for-vsphere/pull/564), [@varunsrinivasan2](https://github.com/varunsrinivasan2))
+
+## Dependencies
+
+### Added
+- gopkg.in/gcfg.v1: v1.2.3
+- gopkg.in/warnings.v0: v0.1.2
+
+### Changed
+- golang.org/x/crypto: v0.14.0 → v0.17.0
+- golang.org/x/sys: v0.13.0 → v0.15.0
+- golang.org/x/term: v0.13.0 → v0.15.0
+- golang.org/x/text: v0.13.0 → v0.14.0
+
+### Removed
+_Nothing has changed._
+
 ## v1.5.2
 
 Date: 2023-11-2

diff --git a/docs/guest.md b/docs/guest.md
@@ -16,6 +16,7 @@ This document discusses the velero vSphere plugin installation process in a **Ta
 
 | Velero Plugin for vSphere Version | vSphere Version    | Kubernetes Version | vSphere CSI Driver Version | Velero Version | vSphere Plugin Deprecated | vSphere Plugin EOL Date      |
 |-----------------------------------|--------------------|--------------------|----------------------------|----------------|------------|---------------|
+1.5.3                             | 8.0U2b               | 1.25-1.26          | Bundled with TKGS          | 1.13.1          | No         | N/A           |
  1.5.1                             | 8.0P02/8.0U2               | 1.23-1.25          | Bundled with TKGS          | 1.11.1          | No         | N/A           |
 | 1.5.1                             | 8.0U1               | 1.24          | Bundled with TKGS          | 1.10.2          | No         | N/A           |
 | 1.5.1                             | 8.0c                | 1.24          | Bundled with TKGS          | 1.10.2          | No         | N/A           |

diff --git a/docs/supervisor-notes.md b/docs/supervisor-notes.md
@@ -84,6 +84,15 @@ The default list of blocked resources in configmap is:
  	nsxlocks.nsx.vmware.com
  	nsxnetworkconfigurations.nsx.vmware.com
  	nsxnetworkinterfaces.nsx.vmware.com
+ 	vpcnetworkconfigurations.nsx.vmware.com
+ 	networkinfos.nsx.vmware.com
+ 	subnets.nsx.vmware.com
+ 	subnetsets.nsx.vmware.com
+ 	subnetports.nsx.vmware.com
+ 	staticroutes.nsx.vmware.com
+ 	ippools.nsx.vmware.com
+ 	securitypolicies.nsx.vmware.com
+ 	nsxserviceaccounts.nsx.vmware.com
  	orders.acme.cert-manager.io
  	persistenceinstanceinfoes.psp.wcp.vmware.com
  	persistenceserviceconfigurations.psp.wcp.vmware.com
@@ -140,6 +149,9 @@ The following resources are handled during the restore on the Supervisor Cluster
     * vmware-system-image-references
     * vmware-system-vm-moid
     * vmware-system-vm-uuid
+    * vmware-system-network
+    * nsx.vmware.com/attachment
+    * nsx.vmware.com/mac
 
 ## vSphere Plugin resources
 

diff --git a/docs/supervisor.md b/docs/supervisor.md
@@ -13,6 +13,7 @@
 
 | Velero Plugin for vSphere Version | vSphere Version     | Kubernetes Version                                                | vSphere CSI Driver Version | Velero Version | Velero vSphere Operator Version | Data Manager Version | vSphere Plugin Deprecated | vSphere Plugin EOL Date      |
 |-----------------------------------|---------------------|-------------------------------------------------------------------|----------------------------|----------------|---------------------------------|---------------|------------|---------------|
+| 1.5.3                             | 8.0U2b                  | Bundled with vSphere (1.25-1.27)                                 | Bundled with vSphere       | 1.13.1          | 1.6.0                           | 1.2.0        | No         | N/A           |
 | 1.5.1                             | 8.0P02/8.0U2                  | Bundled with vSphere (1.24-1.26)                                 | Bundled with vSphere       | 1.11.1          | 1.5.0                           | 1.2.0        | No         | N/A           |
 | 1.5.1                             | 8.0U1                  | Bundled with vSphere (1.24)                                 | Bundled with vSphere       | 1.10.2          | 1.4.0                           | 1.2.0        | No         | N/A           |
 | 1.5.1                             | 8.0c                  | Bundled with vSphere (1.24)                                 | Bundled with vSphere       | 1.10.2          | 1.4.0                           | 1.2.0        | No         | N/A           |

diff --git a/docs/vanilla.md b/docs/vanilla.md
@@ -78,6 +78,19 @@ port = "443"
 % kubectl -n <velero-namespace> create secret generic velero-vsphere-config-secret --from-file=csi-vsphere.conf
 ```
 
+**NOTE:** If the configuration values contain [Golang escape characters](https://yourbasic.org/golang/multiline-string/), please ensure it is properly escaped. See example below.
+
+If your VC password is `pwd\123`, the configuration file's password key-value should be `password = "pwd\\123"`.
+
+Examples:
+
+- VC password: `pwd\123`
+  - Config file: `password = "pwd\\123"`
+- VC password: `pwd\nWithNewline`
+  - Config file: `password = "password\\nWithNewLine""`
+- VC password: `Admin!23\'"`
+  - Config file: `password = "Admin!23\\'\""`
+
 ### Create Velero vSphere Plugin Config
 
 The config map provides information about the cluster flavor and VC Credential Secret created in the previous step during
@@ -157,6 +170,7 @@ port = "443"
 % kubectl -n <velero-namespace> create secret generic velero-vsphere-config-secret --from-file=csi-vsphere.conf
 ```
 
+
 ### Create Velero vSphere Plugin Configuration
 
 The config map provides information about the cluster flavor and VC Credential Secret created in the previous step during

diff --git a/go.mod b/go.mod
@@ -135,13 +135,13 @@ require (
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
 	go.uber.org/zap v1.21.0 // indirect
-	golang.org/x/crypto v0.17.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
 	golang.org/x/exp v0.0.0-20210916165020-5cb4fee858ee // indirect
-	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/net v0.23.0 // indirect
 	golang.org/x/oauth2 v0.7.0 // indirect
 	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
-	golang.org/x/term v0.15.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/term v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
@@ -150,7 +150,7 @@ require (
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
 	google.golang.org/grpc v1.56.3 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.66.2 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect

diff --git a/go.sum b/go.sum
@@ -940,8 +940,8 @@ golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
-golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1041,8 +1041,8 @@ golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
-golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
-golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
+golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1157,13 +1157,13 @@ golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
-golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
+golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
+golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1379,8 +1379,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
@@ -270,7 +270,15 @@ var ResourcesToBlock = map[string]bool{
 	//"nsxloadbalancermonitors.vmware.com":                    true, // DO NOT ADD IT BACK
 	"nsxlocks.nsx.vmware.com":                                 true,
 	"nsxnetworkinterfaces.nsx.vmware.com":                     true,
+	"vpcnetworkconfigurations.nsx.vmware.com":                 true,
+	"networkinfos.nsx.vmware.com":                             true,
+	"subnets.nsx.vmware.com":                                  true,
+	"subnetsets.nsx.vmware.com":                               true,
+	"subnetports.nsx.vmware.com":                              true,
+	"staticroutes.nsx.vmware.com":                             true,
+	"securitypolicies.nsx.vmware.com":                         true,
 	"nsxnetworkconfigurations.nsx.vmware.com":                 true,
+	"nsxserviceaccounts.nsx.vmware.com":                       true,
 	"orders.acme.cert-manager.io":                             true,
 	"persistenceinstanceinfoes.psp.wcp.vmware.com":            true,
 	"persistenceserviceconfigurations.psp.wcp.vmware.com":     true,
@@ -359,6 +367,9 @@ var PodAnnotationsToSkip = map[string]bool{
 	"vmware-system-image-references":    true,
 	"vmware-system-vm-moid":             true,
 	"vmware-system-vm-uuid":             true,
+	"vmware-system-network":             true,
+	"nsx.vmware.com/attachment":         true,
+	"nsx.vmware.com/mac":                true,
 }
 
 // UUID of the VM on Supervisor Cluster