Handle Late enbalement of shared disk capability (#3746)

Author: skogta

pkg/csi/service/common/commonco/k8sorchestrator/k8sorchestrator_test.go

@@ -25,8 +25,15 @@ import (
 
 	cnstypes "github.com/vmware/govmomi/cns/types"
 	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 
+	"github.com/stretchr/testify/assert"
+	"k8s.io/apimachinery/pkg/runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+	wcpcapv1alph1 "sigs.k8s.io/vsphere-csi-driver/v3/pkg/apis/wcpcapabilities/v1alpha1"
 	cnsconfig "sigs.k8s.io/vsphere-csi-driver/v3/pkg/common/config"
+	"sigs.k8s.io/vsphere-csi-driver/v3/pkg/csi/service/common"
 )
 
 var (
@@ -319,3 +326,45 @@ func TestIsFileVolume(t *testing.T) {
 		})
 	}
 }
+
+func TestSetWcpCapabilitiesMap_Success(t *testing.T) {
+	ctx := context.Background()
+	WcpCapabilitiesMap = nil
+
+	scheme := runtime.NewScheme()
+	gvk := schema.GroupVersionKind{
+		Group:   "wcp.vmware.com",
+		Version: "v1alpha1",
+		Kind:    "Capabilities",
+	}
+
+	scheme.AddKnownTypeWithName(
+		gvk,
+		&wcpcapv1alph1.Capabilities{},
+	)
+	cap := &wcpcapv1alph1.Capabilities{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: common.WCPCapabilitiesCRName,
+		},
+		Status: wcpcapv1alph1.CapabilitiesStatus{
+			Supervisor: map[wcpcapv1alph1.CapabilityName]wcpcapv1alph1.CapabilityStatus{
+				"CapabilityA": {Activated: true},
+				"CapabilityB": {Activated: false},
+			},
+		},
+	}
+
+	cl := fake.NewClientBuilder().
+		WithScheme(scheme).
+		WithObjects(cap).
+		Build()
+
+	err := SetWcpCapabilitiesMap(ctx, cl)
+	assert.NoError(t, err)
+
+	val, _ := WcpCapabilitiesMap.Load("CapabilityA")
+	assert.Equal(t, true, val)
+
+	val, _ = WcpCapabilitiesMap.Load("CapabilityB")
+	assert.Equal(t, false, val)
+}

pkg/csi/service/wcp/controller.go

@@ -173,6 +173,11 @@ func (c *controller) Init(config *cnsconfig.Config, version string) error {
 			return logger.LogNewErrorf(log, "failed to start zone informer. Error: %v", err)
 		}
 	}
+	if !commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx,
+		common.SharedDiskFss) {
+		go commonco.ContainerOrchestratorUtility.HandleLateEnablementOfCapability(ctx, cnstypes.CnsClusterFlavorWorkload,
+			common.SharedDiskFss, "", "")
+	}
 	if idempotencyHandlingEnabled {
 		log.Info("CSI Volume manager idempotency handling feature flag is enabled.")
 		operationStore, err = cnsvolumeoperationrequest.InitVolumeOperationRequestInterface(ctx,

pkg/syncer/admissionhandler/admissionhandler.go

@@ -157,6 +157,10 @@ func StartWebhookServer(ctx context.Context, enableWebhookClientCertVerification
 			go containerOrchestratorUtility.HandleLateEnablementOfCapability(ctx, cnstypes.CnsClusterFlavorWorkload,
 				common.LinkedCloneSupport, "", "")
 		}
+		if !featureIsSharedDiskEnabled {
+			go containerOrchestratorUtility.HandleLateEnablementOfCapability(ctx, cnstypes.CnsClusterFlavorWorkload,
+				common.SharedDiskFss, "", "")
+		}
 		if err := startCNSCSIWebhookManager(ctx, enableWebhookClientCertVerification,
 			containerOrchestratorUtility); err != nil {
 			return fmt.Errorf("unable to run the webhook manager: %w", err)

pkg/syncer/metadatasyncer.go

@@ -359,6 +359,10 @@ func InitMetadataSyncer(ctx context.Context, clusterFlavor cnstypes.CnsClusterFl
 			go commonco.ContainerOrchestratorUtility.HandleLateEnablementOfCapability(ctx, clusterFlavor,
 				common.WCPMobilityNonDisruptiveImport, "", "")
 		}
+		if !isSharedDiskEabled {
+			go commonco.ContainerOrchestratorUtility.HandleLateEnablementOfCapability(ctx,
+				clusterFlavor, common.SharedDiskFss, "", "")
+		}
 	}
 
 	if metadataSyncer.clusterFlavor == cnstypes.CnsClusterFlavorGuest {