Cherry pick commits from c9022c3 to 5003041 (#3582)

* enable creating vdpp workload on deployment with multiple cluster per zone (#3538)

* fix panic in createSnapshotWithTransaction (#3542)

* condtional check for GC only (#3544)

* RWX VMService VM testcases and utils automation (#3476)

* Use the PVCClaim in vm spec instead of volumename to fetch volumes (#3532)

* vsan stretch vm service vm test for Immediate and Late Binding mode (#3525)

* Remove gitlab ci yaml (#3535)

* tkg test code fixes (#3546)

* Read volume requested topology from the PVC being created (#3552)

Signed-off-by: Deepak Kinni <[email protected]>

* adding tkg test scenarios to UTS CF column (#3559)

* Minor test fix for policy driven allocation tests (#3547)

* stopped service list updated for vc (#3555)

* Tests to run in CF UTS (#3558)

* Revert FSS config for volume-extend/health (#3557)

* Revert FSS config for volume-extend/health

* 1.32 yaml

* Enable "sv-pvc-snapshot-protection-finalizer" FSS (#3527)

* cf-wcp label update (#3562)

* Changed WcpCapabilitiesMap from regular map to sync map to handle concurrent access (#3526)

* test code to describe CNSRegisterVolume (#3568)

* EF and PQ labels to wcp snapshot tests (#3571)

* adding testcases to ef column in uts (#3569)

* Add validation to ensure storageClassName on existing PVC matches the one associated with volume being registered with CNS (#3556)

* cf-file-vanilla-tags (#3573)

* Updated CNSNodeVMAttachment reconciler to prevent unnecessary generation creation (#3561)

Update CNSNodeVMAttachment reconciler to use generation changed predicate

* Add cf labels to block vanilla tests (#3572)

* Use capability for file volumes with VM service VMs feature (#3570)

* timeout fixes (#3578)

* fix testdataFile variable value assignment (#3579)

fix testdataFile variable value assignment

* upgrade to vm operator api version a1alpha5 (#3567)

* labels for vmsvc and stretched-svc (#3577)

* Change batch attach validation to not allow DiskMode and SharingMode for RWX volumes (#3550)

* Ensure that for RWX volumes for VMFS, clusteredVmdk is enabled (#3551)

---------

Signed-off-by: Deepak Kinni <[email protected]>
Co-authored-by: Divyen Patel <[email protected]>
Co-authored-by: Raj Kumar Gupta <[email protected]>
Co-authored-by: Aishwarya-Hebbar <[email protected]>
Co-authored-by: sipriyaa <[email protected]>
Co-authored-by: Chethan Venkatesh <[email protected]>
Co-authored-by: Deepak Kinni <[email protected]>
Co-authored-by: kavyashree-r <[email protected]>
Co-authored-by: John Cho <[email protected]>
Co-authored-by: Akanksha Panse <[email protected]>
Co-authored-by: Vipul Kotkar <[email protected]>
Co-authored-by: Xing Yang <[email protected]>
Co-authored-by: Satyanarayana Kolluri <[email protected]>
Co-authored-by: skogta <[email protected]>
Co-authored-by: rk015135 <[email protected]>

Author: 15 people

.gitlab-ci.yml

@@ -23,7 +23,7 @@ require (
 	github.com/pkg/sftp v1.13.6
 	github.com/prometheus/client_golang v1.22.0
 	github.com/stretchr/testify v1.10.0
-	github.com/vmware-tanzu/vm-operator/api v1.8.7-0.20250729185616-b3910fb93c83
+	github.com/vmware-tanzu/vm-operator/api v1.8.7-0.20250820184450-53a697d52f9c
 	github.com/vmware-tanzu/vm-operator/external/byok v0.0.0-20250509154507-b93e51fc90fa
 	github.com/vmware/govmomi v0.52.0-alpha.0.0.20250807230438-0eee109f1f2c
 	go.uber.org/zap v1.27.0

go.mod

@@ -289,8 +289,8 @@ github.com/thecodeteam/gofsutil v0.1.2 h1:FL87mBzZeeuDMZm8hpYLFcYylQdq6bbm8UQ1oc
 github.com/thecodeteam/gofsutil v0.1.2/go.mod h1:7bDOpr2aMnmdm9RTdxBEeqdOr+8RpnQhsB/VUEI3DgM=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk=
-github.com/vmware-tanzu/vm-operator/api v1.8.7-0.20250729185616-b3910fb93c83 h1:EvjDjVpO5x4W/ITTjkfzdABa0NHxaqXGaasvOQfCJ2g=
-github.com/vmware-tanzu/vm-operator/api v1.8.7-0.20250729185616-b3910fb93c83/go.mod h1:f2zOJg30nPEsBBF0SlSw5hin1cZs2L5lDdB1t0gzqnc=
+github.com/vmware-tanzu/vm-operator/api v1.8.7-0.20250820184450-53a697d52f9c h1:+lECoxyxQcMsxU2CJ53YvaLEwqfGduS/3yQaLLRDYDo=
+github.com/vmware-tanzu/vm-operator/api v1.8.7-0.20250820184450-53a697d52f9c/go.mod h1:hkc/QZCSHcosWWMPS6VWWR12WenZcNE3BaTJ/8A8sNE=
 github.com/vmware-tanzu/vm-operator/external/byok v0.0.0-20250509154507-b93e51fc90fa h1:4MKu14YJ7J54O6QKmT4ds5EUpysWLLtQRMff73cVkmU=
 github.com/vmware-tanzu/vm-operator/external/byok v0.0.0-20250509154507-b93e51fc90fa/go.mod h1:8tiuyYslzjLIUmOlXZuGKQdQP2ZgWGCVhVeyptmZYnk=
 github.com/vmware/govmomi v0.52.0-alpha.0.0.20250807230438-0eee109f1f2c h1:1nMVFr1CBMSNLLjsfx3QPfZ5k0R1/O29QX/A2X0w3RQ=

go.sum

@@ -547,7 +547,7 @@ data:
   "tkgs-ha": "true"
   "cnsmgr-suspend-create-volume": "true"
   "workload-domain-isolation": "false"
-  "sv-pvc-snapshot-protection-finalizer": "false"
+  "sv-pvc-snapshot-protection-finalizer": "true"
 kind: ConfigMap
 metadata:
   name: internal-feature-states.csi.vsphere.vmware.com

manifests/guestcluster/1.29/pvcsi.yaml

@@ -547,7 +547,7 @@ data:
   "tkgs-ha": "true"
   "cnsmgr-suspend-create-volume": "true"
   "workload-domain-isolation": "false"
-  "sv-pvc-snapshot-protection-finalizer": "false"
+  "sv-pvc-snapshot-protection-finalizer": "true"
 kind: ConfigMap
 metadata:
   name: internal-feature-states.csi.vsphere.vmware.com

manifests/guestcluster/1.30/pvcsi.yaml

@@ -689,7 +689,7 @@ data:
   "cnsmgr-suspend-create-volume": "true"
   "csi-windows-support": "true"
   "workload-domain-isolation": "true"
-  "sv-pvc-snapshot-protection-finalizer": "false"
+  "sv-pvc-snapshot-protection-finalizer": "true"
   "linked-clone-support": "false"
 kind: ConfigMap
 metadata:

manifests/guestcluster/1.31/pvcsi.yaml

@@ -687,7 +687,7 @@ data:
   "cnsmgr-suspend-create-volume": "true"
   "csi-windows-support": "true"
   "workload-domain-isolation": "true"
-  "sv-pvc-snapshot-protection-finalizer": "false"
+  "sv-pvc-snapshot-protection-finalizer": "true"
   "linked-clone-support": "false"
 kind: ConfigMap
 metadata:

manifests/guestcluster/1.32/pvcsi.yaml

@@ -668,7 +668,7 @@ data:
   "cnsmgr-suspend-create-volume": "true"
   "csi-windows-support": "true"
   "workload-domain-isolation": "true"
-  "sv-pvc-snapshot-protection-finalizer": "false"
+  "sv-pvc-snapshot-protection-finalizer": "true"
   "linked-clone-support": "false"
 kind: ConfigMap
 metadata:

manifests/guestcluster/1.33/pvcsi.yaml

@@ -744,7 +744,7 @@ data:
   "cnsmgr-suspend-create-volume": "true"
   "csi-windows-support": "true"
   "workload-domain-isolation": "true"
-  "sv-pvc-snapshot-protection-finalizer": "false"
+  "sv-pvc-snapshot-protection-finalizer": "true"
   "linked-clone-support": "false"
 kind: ConfigMap
 metadata:

manifests/guestcluster/1.34/pvcsi.yaml

@@ -49,7 +49,7 @@ rules:
     resources: ["cnsvolumemetadatas", "cnsfileaccessconfigs"]
     verbs: ["get", "list", "watch", "update"]
   - apiGroups: ["cns.vmware.com"]
-    resources: ["cnsnodevmattachments", "cnsnodevmbatchattachments", "cnsnodevmbatchattachments/status"]
+    resources: ["cnsnodevmattachments", "cnsnodevmbatchattachments", "cnsnodevmbatchattachments/status", "cnsnodevmattachments/status"]
     verbs: ["get", "list", "watch", "update", "patch"]
   - apiGroups: ["cns.vmware.com"]
     resources: ["cnscsisvfeaturestates"]
@@ -564,6 +564,8 @@ spec:
 ---
 apiVersion: v1
 data:
+  "volume-extend": "true"
+  "volume-health": "true"
   "online-volume-extend": "true"
   "file-volume": "true"
   "trigger-csi-fullsync": "false"
@@ -578,8 +580,7 @@ data:
   "vdpp-on-stretched-supervisor": "true"
   "cns-unregister-volume": "false"
   "workload-domain-isolation": "false"
-  "sv-pvc-snapshot-protection-finalizer": "false"
-  "file-volume-with-vm-service": "false"
+  "sv-pvc-snapshot-protection-finalizer": "true"
 kind: ConfigMap
 metadata:
   name: csi-feature-states