fixed reverseproxy envs

dell · Dec 6, 2024 · e9e6a63 · e9e6a63
1 parent 1958691
commit e9e6a63
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 31 deletions.
diff --git a/pkg/drivers/powermax.go b/pkg/drivers/powermax.go
@@ -97,34 +97,10 @@ func PrecheckPowerMax(ctx context.Context, cr *csmv1.ContainerStorageModule, ope
 	}
 	if !foundRevProxy {
 		// if we are here then it's minimal yaml
-		log.Infof("Reverse proxy module not found adding it with default config")
-		components := make([]csmv1.ContainerTemplate, 0)
-		components = append(components, csmv1.ContainerTemplate{
-			Name: "csipowermax-reverseproxy",
-		})
-
-		components[0].Envs = append(components[0].Envs, corev1.EnvVar{
-			Name:  "X_CSI_REVPROXY_TLS_SECRET",
-			Value: "csirevproxy-tls-secret",
-		})
-		components[0].Envs = append(components[0].Envs, corev1.EnvVar{
-			Name:  "X_CSI_REVPROXY_PORT",
-			Value: "2222",
-		})
-		components[0].Envs = append(components[0].Envs, corev1.EnvVar{
-			Name:  "X_CSI_CONFIG_MAP_NAME",
-			Value: "powermax-reverseproxy-config",
-		})
-		components[0].Envs = append(components[0].Envs, corev1.EnvVar{
-			Name:  "DeployAsSidecar",
-			Value: "true",
-		})
-
+		log.Infof("Reverse proxy module not found adding it")
 		cr.Spec.Modules = append(cr.Spec.Modules, csmv1.Module{
-			Name:              csmv1.ReverseProxy,
-			Enabled:           true,
-			ForceRemoveModule: true,
-			Components:        components,
+			Name:    csmv1.ReverseProxy,
+			Enabled: true,
 		})
 	}
 

diff --git a/pkg/modules/reverseproxy.go b/pkg/modules/reverseproxy.go
@@ -49,7 +49,7 @@ const (
 
 // var used in deploying reverseproxy
 var (
-	deployAsSidecar            bool
+	deployAsSidecar            = true
 	CSIPmaxRevProxyServiceName = "X_CSI_POWERMAX_PROXY_SERVICE_NAME"
 	CSIPmaxRevProxyPort        = "X_CSI_POWERMAX_SIDECAR_PROXY_PORT"
 	RevProxyDefaultPort        = "2222"
@@ -118,9 +118,9 @@ func ReverseProxyPrecheck(ctx context.Context, op utils.OperatorConfig, revproxy
 // ReverseProxyServer - apply/delete deployment objects
 func ReverseProxyServer(ctx context.Context, isDeleting bool, op utils.OperatorConfig, cr csmv1.ContainerStorageModule, ctrlClient crclient.Client) error {
 	log := logger.GetLogger(ctx)
-	log.Infof("Checking if DeployAsSidar is false...\n")
+	log.Infof("Checking if DeployAsSidecar is false...\n")
 	if deployAsSidecar {
-		log.Infof("DeployAsSidar is true...csi-reverseproxy will be installed as sidecar\n")
+		log.Infof("DeployAsSidecar is true...csi-reverseproxy will be installed as sidecar\n")
 		log.Infof("exiting ReverseProxyServer...\n")
 		return nil
 	}
@@ -204,7 +204,7 @@ func getReverseProxyService(op utils.OperatorConfig, cr csmv1.ContainerStorageMo
 	}
 
 	yamlString = string(buf)
-	var proxyPort string
+	proxyPort := "2222"
 	for _, component := range revProxy.Components {
 		if component.Name == ReverseProxyServerComponent {
 			for _, env := range component.Envs {
@@ -320,6 +320,25 @@ func ReverseProxyInjectDeployment(dp v1.DeploymentApplyConfiguration, cr csmv1.C
 	if err != nil {
 		return nil, err
 	}
+	if revProxyModule.Components == nil {
+		revProxyModule = &csmv1.Module{
+			Name:              csmv1.ReverseProxy,
+			ForceRemoveModule: true,
+			Enabled:           true,
+			Components: []csmv1.ContainerTemplate{
+				{
+					Image: csmv1.ImageType(op.K8sVersion.Images.CSIRevProxy),
+					Name:  "csipowermax-reverseproxy",
+					Envs: []corev1.EnvVar{
+						{Name: "X_CSI_REVPROXY_TLS_SECRET", Value: "csirevproxy-tls-secret"},
+						{Name: "X_CSI_REVPROXY_PORT", Value: "2222"},
+						{Name: "X_CSI_CONFIG_MAP_NAME", Value: "powermax-reverseproxy-config"},
+						{Name: "DeployAsSidecar", Value: "true"},
+					},
+				},
+			},
+		}
+	}
 	container := *containerPtr
 	// update the image
 	for _, side := range revProxyModule.Components {