Remove Extra Fields From Minimal CR

api/v1/types.go

@@ -177,14 +177,15 @@ type Driver struct {
 
 	// CSIDriverSpec is the specification for CSIDriver
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="CSI Driver Spec"
-	CSIDriverSpec CSIDriverSpec `json:"csiDriverSpec" yaml:"csiDriverSpec"`
+	CSIDriverSpec *CSIDriverSpec `json:"csiDriverSpec" yaml:"csiDriverSpec"`
 
 	// ConfigVersion is the configuration version of the driver
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Config Version"
 	ConfigVersion string `json:"configVersion" yaml:"configVersion"`
 
 	// Replicas is the count of controllers for Controller plugin
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Controller count"
+	// +kubebuilder:default=2
 	Replicas int32 `json:"replicas" yaml:"replicas"`
 
 	// DNSPolicy is the dnsPolicy of the daemonset for Node plugin
@@ -193,15 +194,15 @@ type Driver struct {
 
 	// Common is the common specification for both controller and node plugins
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Common specification"
-	Common ContainerTemplate `json:"common" yaml:"common"`
+	Common *ContainerTemplate `json:"common" yaml:"common"`
 
 	// Controller is the specification for Controller plugin only
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Controller Specification"
-	Controller ContainerTemplate `json:"controller,omitempty" yaml:"controller"`
+	Controller *ContainerTemplate `json:"controller,omitempty" yaml:"controller"`
 
 	// Node is the specification for Node plugin only
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Node specification"
-	Node ContainerTemplate `json:"node,omitempty" yaml:"node"`
+	Node *ContainerTemplate `json:"node,omitempty" yaml:"node"`
 
 	// SideCars is the specification for CSI sidecar containers
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="CSI SideCars specification"

controllers/csm_controller.go

@@ -737,15 +737,15 @@ func (r *ContainerStorageModuleReconciler) SyncCSM(ctx context.Context, cr csmv1
 	}
 
 	// Create/Update Reverseproxy Server
-	if reverseProxyEnabled, _ := utils.IsModuleEnabled(ctx, cr, csmv1.ReverseProxy); reverseProxyEnabled {
+	if reverseProxyEnabled, _ := utils.IsModuleEnabled(ctx, cr, csmv1.ReverseProxy); reverseProxyEnabled && !modules.IsReverseProxySidecar() {
 		log.Infow("Trying Create/Update reverseproxy...")
-		if err := r.reconcileReverseProxy(ctx, false, operatorConfig, cr, ctrlClient); err != nil {
+		if err := r.reconcileReverseProxyServer(ctx, false, operatorConfig, cr, ctrlClient); err != nil {
 			return fmt.Errorf("failed to deploy reverseproxy proxy server: %v", err)
 		}
 	}
 
 	// Get Driver resources
-	driverConfig, err := getDriverConfig(ctx, cr, operatorConfig)
+	driverConfig, err := getDriverConfig(ctx, cr, operatorConfig, ctrlClient)
 	if err != nil {
 		return err
 	}
@@ -765,6 +765,25 @@ func (r *ContainerStorageModuleReconciler) SyncCSM(ctx context.Context, cr csmv1
 	node := driverConfig.Node
 	controller := driverConfig.Controller
 
+	if cr.GetDriverType() == csmv1.PowerMax {
+		if !modules.IsReverseProxySidecar() {
+			log.Infof("DeployAsSidar is false...csi-reverseproxy should be present as deployement\n")
+			log.Infof("adding proxy service name...\n")
+			modules.AddReverseProxyServiceName(&controller.Deployment)
+		} else {
+			log.Info("Starting CSI ReverseProxy Service")
+			if err := modules.ReverseProxyStartService(ctx, false, operatorConfig, cr, ctrlClient); err != nil {
+				return fmt.Errorf("unable to reconcile reverse-proxy service: %v", err)
+			}
+			log.Info("Injecting CSI ReverseProxy")
+			dp, err := modules.ReverseProxyInjectDeployment(controller.Deployment, cr, operatorConfig)
+			if err != nil {
+				return fmt.Errorf("injecting replication into deployment: %v", err)
+			}
+			controller.Deployment = *dp
+		}
+	}
+
 	replicationEnabled, clusterClients, err := utils.GetDefaultClusters(ctx, cr, r)
 	if err != nil {
 		return err
@@ -833,13 +852,6 @@ func (r *ContainerStorageModuleReconciler) SyncCSM(ctx context.Context, cr csmv1
 				}
 
 				controller.Rbac.ClusterRole = *clusterRole
-			case csmv1.ReverseProxy:
-				log.Info("Injecting CSI ReverseProxy")
-				dp, err := modules.ReverseProxyInjectDeployment(controller.Deployment, cr, operatorConfig)
-				if err != nil {
-					return fmt.Errorf("injecting replication into deployment: %v", err)
-				}
-				controller.Deployment = *dp
 			}
 		}
 	}
@@ -1101,6 +1113,7 @@ func (r *ContainerStorageModuleReconciler) reconcileAppMobility(ctx context.Cont
 func getDriverConfig(ctx context.Context,
 	cr csmv1.ContainerStorageModule,
 	operatorConfig utils.OperatorConfig,
+	ctrlClient client.Client,
 ) (*DriverConfig, error) {
 	var (
 		err        error
@@ -1135,7 +1148,7 @@ func getDriverConfig(ctx context.Context,
 		return nil, fmt.Errorf("getting %s CSIDriver: %v", driverType, err)
 	}
 
-	node, err = drivers.GetNode(ctx, cr, operatorConfig, driverType, NodeYaml)
+	node, err = drivers.GetNode(ctx, cr, operatorConfig, driverType, NodeYaml, ctrlClient)
 	if err != nil {
 		return nil, fmt.Errorf("getting %s node: %v", driverType, err)
 	}
@@ -1153,16 +1166,13 @@ func getDriverConfig(ctx context.Context,
 	}, nil
 }
 
-// reconcileReverseProxy - deploy reverse proxy server
-func (r *ContainerStorageModuleReconciler) reconcileReverseProxy(ctx context.Context, isDeleting bool, op utils.OperatorConfig, cr csmv1.ContainerStorageModule, ctrlClient client.Client) error {
+// reconcileReverseProxyServer - deploy reverse proxy server
+func (r *ContainerStorageModuleReconciler) reconcileReverseProxyServer(ctx context.Context, isDeleting bool, op utils.OperatorConfig, cr csmv1.ContainerStorageModule, ctrlClient client.Client) error {
 	log := logger.GetLogger(ctx)
 	log.Infow("Reconcile reverseproxy proxy")
 	if err := modules.ReverseProxyServer(ctx, isDeleting, op, cr, ctrlClient); err != nil {
 		return fmt.Errorf("unable to reconcile reverse-proxy server: %v", err)
 	}
-	if err := modules.ReverseProxyStartService(ctx, isDeleting, op, cr, ctrlClient); err != nil {
-		return fmt.Errorf("unable to reconcile reverse-proxy service: %v", err)
-	}
 	return nil
 }
 
@@ -1250,7 +1260,7 @@ func (r *ContainerStorageModuleReconciler) removeDriver(ctx context.Context, ins
 	log := logger.GetLogger(ctx)
 
 	// Get Driver resources
-	driverConfig, err := getDriverConfig(ctx, instance, operatorConfig)
+	driverConfig, err := getDriverConfig(ctx, instance, operatorConfig, r.Client)
 	if err != nil {
 		log.Error("error in getDriverConfig")
 		return err
@@ -1287,6 +1297,12 @@ func (r *ContainerStorageModuleReconciler) removeDriver(ctx context.Context, ins
 			}
 		}
 
+		if instance.GetDriverType() == csmv1.PowerMax && modules.IsReverseProxySidecar() {
+			log.Info("Removing CSI ReverseProxy Service")
+			if err := modules.ReverseProxyStartService(ctx, true, operatorConfig, instance, cluster.ClusterCTRLClient); err != nil {
+				return fmt.Errorf("unable to reconcile reverse-proxy service: %v", err)
+			}
+		}
 	}
 
 	return nil
@@ -1309,9 +1325,9 @@ func (r *ContainerStorageModuleReconciler) removeModule(ctx context.Context, ins
 			return err
 		}
 	}
-	if reverseproxyEnabled, _ := utils.IsModuleEnabled(ctx, instance, csmv1.ReverseProxy); reverseproxyEnabled {
+	if reverseproxyEnabled, _ := utils.IsModuleEnabled(ctx, instance, csmv1.ReverseProxy); reverseproxyEnabled && !modules.IsReverseProxySidecar() {
 		log.Infow("Deleting ReverseProxy")
-		if err := r.reconcileReverseProxy(ctx, true, operatorConfig, instance, ctrlClient); err != nil {
+		if err := r.reconcileReverseProxyServer(ctx, true, operatorConfig, instance, ctrlClient); err != nil {
 			return err
 		}
 	}

controllers/csm_controller_test.go

@@ -273,6 +273,17 @@ func (suite *CSMControllerTestSuite) TestReverseProxyReconcile() {
 	suite.runFakeCSMManager("", true)
 }
 
+func (suite *CSMControllerTestSuite) TestReverseProxySidecarReconcile() {
+	revProxy := getReverseProxyModule()
+	deploAsSidecar := corev1.EnvVar{Name: "DeployAsSidecar", Value: "true"}
+	revProxy[0].Components[0].Envs = append(revProxy[0].Components[0].Envs, deploAsSidecar)
+	modules.IsReverseProxySidecar = func() bool { return true }
+	suite.makeFakeRevProxyCSM(csmName, suite.namespace, true, revProxy, string(v1.PowerMax))
+	suite.runFakeCSMManager("", false)
+	suite.deleteCSM(csmName)
+	suite.runFakeCSMManager("", true)
+}
+
 func (suite *CSMControllerTestSuite) TestReverseProxyPreCheckError() {
 	suite.makeFakeRevProxyCSM(csmName, suite.namespace, false, getReverseProxyModule(), "badVersion")
 	reconciler := suite.createReconciler()
@@ -287,7 +298,7 @@ func (suite *CSMControllerTestSuite) TestReconcileReverseProxyError() {
 	csm := shared.MakeCSM(csmName, suite.namespace, shared.PmaxConfigVersion)
 	csm.Spec.Modules = getReverseProxyModule()
 	reconciler := suite.createReconciler()
-	err := reconciler.reconcileReverseProxy(ctx, false, badOperatorConfig, csm, suite.fakeClient)
+	err := reconciler.reconcileReverseProxyServer(ctx, false, badOperatorConfig, csm, suite.fakeClient)
 	assert.NotNil(suite.T(), err)
 }
 
@@ -300,7 +311,7 @@ func (suite *CSMControllerTestSuite) TestReconcileReverseProxyServiceError() {
 	reconciler := suite.createReconciler()
 	_ = modules.ReverseProxyPrecheck(ctx, operatorConfig, revProxy[0], csm, reconciler)
 	revProxy[0].ConfigVersion = ""
-	err := reconciler.reconcileReverseProxy(ctx, false, badOperatorConfig, csm, suite.fakeClient)
+	err := reconciler.reconcileReverseProxyServer(ctx, false, badOperatorConfig, csm, suite.fakeClient)
 	assert.NotNil(suite.T(), err)
 }
 
@@ -738,7 +749,8 @@ func (suite *CSMControllerTestSuite) TestRemoveDriver() {
 	csmBadType.Spec.Driver.CSIDriverType = "wrongdriver"
 	csmWoType := shared.MakeCSM(csmName, suite.namespace, configVersion)
 	csm := shared.MakeCSM(csmName, suite.namespace, configVersion)
-	csm.Spec.Driver.CSIDriverType = "powerscale"
+	csm.Spec.Driver.CSIDriverType = csmv1.PowerMax
+	modules.IsReverseProxySidecar = func() bool { return true }
 
 	removeDriverTests := []struct {
 		name          string
@@ -801,6 +813,7 @@ func (suite *CSMControllerTestSuite) TestSyncCSM() {
 	appMobCSM.Spec.Modules = getAppMob()
 	reverseProxyServerCSM := shared.MakeCSM(csmName, suite.namespace, configVersion)
 	reverseProxyServerCSM.Spec.Modules = getReverseProxyModule()
+	modules.IsReverseProxySidecar = func() bool { return false }
 
 	syncCSMTests := []struct {
 		name        string
@@ -861,6 +874,9 @@ func (suite *CSMControllerTestSuite) TestRemoveModule() {
 				}
 				*tt.errorInjector = true
 			}
+			if tt.csm.HasModule(csmv1.ReverseProxy) {
+				modules.IsReverseProxySidecar = func() bool { return false }
+			}
 			err := r.removeModule(ctx, tt.csm, operatorConfig, r.Client)
 			if tt.expectedErr == "" {
 				assert.Nil(t, err)
@@ -926,7 +942,7 @@ func (suite *CSMControllerTestSuite) TestOldStandAloneModuleCleanup() {
 			if errorInjector != nil {
 				*errorInjector = true
 			}
-			driverConfig, _ := getDriverConfig(ctx, *csm, operatorConfig)
+			driverConfig, _ := getDriverConfig(ctx, *csm, operatorConfig, r.Client)
 			err := r.oldStandAloneModuleCleanup(ctx, csm, operatorConfig, driverConfig)
 
 			if expectedErr == "" {