Operator console changes to allow enabling of SFTP for tenant (#1692)

* Enable sftp for tenant from operator console

---------

Signed-off-by: Shubhendu Ram Tripathi <shubhendu@minio.io>

api/configuration-handlers.go

@@ -93,6 +93,9 @@ func parseTenantConfiguration(ctx context.Context, k8sClient K8sClientI, minTena
 		return envVars[i].Key < envVars[j].Key
 	})
 	configurationInfo := &models.TenantConfigurationResponse{EnvironmentVariables: envVars}
+	if minTenant.Spec.Features != nil && minTenant.Spec.Features.EnableSFTP != nil {
+		configurationInfo.SftpExposed = *minTenant.Spec.Features.EnableSFTP
+	}
 	return configurationInfo, nil
 }
 
@@ -161,12 +164,23 @@ func updateTenantConfigurationFile(ctx context.Context, operatorClient OperatorC
 	if err != nil {
 		return err
 	}
+
+	// Update SFTP flag
+	if tenant.Spec.Features != nil {
+		tenant.Spec.Features.EnableSFTP = &requestBody.SftpExposed
+		_, err = operatorClient.TenantUpdate(ctx, tenant, metav1.UpdateOptions{})
+		if err != nil {
+			return err
+		}
+	}
+
 	// Restart all MinIO pods at the same time for they to take the new configuration
 	err = client.deletePodCollection(ctx, namespace, metav1.DeleteOptions{}, metav1.ListOptions{
 		LabelSelector: fmt.Sprintf("%s=%s", miniov2.TenantLabel, tenant.Name),
 	})
 	if err != nil {
 		return err
 	}
+
 	return nil
 }

api/tenant-add-handlers.go

@@ -270,8 +270,8 @@ func createTenant(ctx context.Context, params operator_api.CreateTenantParams, c
 	}
 	minInst.Spec.Configuration = &corev1.LocalObjectReference{Name: tenantConfigurationName}
 
+	var features miniov2.Features
 	if tenantReq.Domains != nil {
-		var features miniov2.Features
 		var domains miniov2.TenantDomains
 
 		// tenant domains
@@ -284,9 +284,11 @@ func createTenant(ctx context.Context, params operator_api.CreateTenantParams, c
 		}
 
 		features.Domains = &domains
-
-		minInst.Spec.Features = &features
 	}
+	if tenantReq.ExposeSftp {
+		features.EnableSFTP = &tenantReq.ExposeSftp
+	}
+	minInst.Spec.Features = &features
 
 	opClient, err := GetOperatorClient(session.STSSessionToken)
 	if err != nil {

api/tenant-get-handlers.go

@@ -140,10 +140,15 @@ func getTenantDetailsResponse(session *models.Principal, params operator_api.Ten
 
 	var domains models.DomainsConfiguration
 
-	if minTenant.Spec.Features != nil && minTenant.Spec.Features.Domains != nil {
-		domains = models.DomainsConfiguration{
-			Console: minTenant.Spec.Features.Domains.Console,
-			Minio:   minTenant.Spec.Features.Domains.Minio,
+	if minTenant.Spec.Features != nil {
+		if minTenant.Spec.Features.EnableSFTP != nil {
+			info.SftpExposed = *minTenant.Spec.Features.EnableSFTP
+		}
+		if minTenant.Spec.Features.Domains != nil {
+			domains = models.DomainsConfiguration{
+				Console: minTenant.Spec.Features.Domains.Console,
+				Minio:   minTenant.Spec.Features.Domains.Minio,
+			}
 		}
 	}
 

api/tenant_update.go

@@ -60,6 +60,9 @@ func updateTenantAction(ctx context.Context, operatorClient OperatorClientI, cli
 		}
 	}
 
+	if minInst.Spec.Features != nil {
+		minInst.Spec.Features.EnableSFTP = &params.Body.SftpExposed
+	}
 	payloadBytes, err := json.Marshal(minInst)
 	if err != nil {
 		return err