MLE-19843 Allow Using existing secret for MarkLogic Admin Credentials (#61)

pengzhouml · Peng Zhou · web-flow · commit 980b110e5c11 · 2025-02-13T08:40:01.000-08:00
* MLE-19843: Allow Using existing secret for MarkLogic Admin Credentials

* update readme

* Add E2E Test for using existing secret for Auth

---------

Co-authored-by: Peng Zhou &lt;peng.zhou@progress.com&gt;
diff --git a/api/v1alpha1/common_types.go b/api/v1alpha1/common_types.go
@@ -46,6 +46,7 @@ type VolumeMountWrapper struct {
 }
 
 type AdminAuth struct {
+	SecretName     *string `json:"secretName,omitempty"`
 	AdminUsername  *string `json:"adminUsername,omitempty"`
 	AdminPassword  *string `json:"adminPassword,omitempty"`
 	WalletPassword *string `json:"walletPassword,omitempty"`
diff --git a/api/v1alpha1/marklogicgroup_types.go b/api/v1alpha1/marklogicgroup_types.go
@@ -83,8 +83,8 @@ type MarklogicGroupSpec struct {
 
 	AdditionalVolumes      *[]corev1.Volume      `json:"additionalVolumes,omitempty"`
 	AdditionalVolumeMounts *[]corev1.VolumeMount `json:"additionalVolumeMounts,omitempty"`
-
-	Tls *Tls `json:"tls,omitempty"`
+	SecretName             string                `json:"secretName,omitempty"`
+	Tls                    *Tls                  `json:"tls,omitempty"`
 }
 
 // InternalState defines the observed state of MarklogicGroup
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/database.marklogic.com_marklogicclusters.yaml b/config/crd/bases/database.marklogic.com_marklogicclusters.yaml
@@ -2810,6 +2810,8 @@ spec:
                     type: string
                   adminUsername:
                     type: string
+                  secretName:
+                    type: string
                   walletPassword:
                     type: string
                 type: object
diff --git a/config/crd/bases/database.marklogic.com_marklogicgroups.yaml b/config/crd/bases/database.marklogic.com_marklogicgroups.yaml
@@ -2811,6 +2811,8 @@ spec:
                     type: string
                   adminUsername:
                     type: string
+                  secretName:
+                    type: string
                   walletPassword:
                     type: string
                 type: object
@@ -3804,6 +3806,8 @@ spec:
                       More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
                     type: object
                 type: object
+              secretName:
+                type: string
               securityContext:
                 default:
                   allowPrivilegeEscalation: false
diff --git a/config/samples/marklogiccluster.yaml b/config/samples/marklogiccluster.yaml
@@ -10,9 +10,10 @@ metadata:
   name: ml-cluster
 spec:
   image: "progressofficial/marklogic-db:11.3.0-ubi-rootless"
-  auth:
-    adminUsername: user
-    adminPassword: pass
+  # auth:
+    # secretName: <SECRET_NAME>
+    # adminUsername: user
+    # adminPassword: pass
 # This is the cluster level configuration that will apply to all the groups
   # storage:
   #   size: 5Gi
@@ -21,9 +22,9 @@ spec:
   ## An out of box load balancer with configured to handle cookie based session affinity that required by most MarkLogic applications.
   ## It also support multi-statement transaction and ODBC connections.  
   ## Uncomment the following lines to enable HAProxy configuration
-  haproxy:
-    enabled: true
-    pathBasedRouting: false
+  # haproxy:
+  #   enabled: true
+  #   pathBasedRouting: false
   #   frontendPort: 8080
   #   tcpPorts:
   #     enabled: true
@@ -41,9 +42,9 @@ spec:
   #     - name: "manage"
   #       port: 8002
   #       path: "/manage"
-  #   stats:
-  #     enabled: true
-  #     port: 1024
+    # stats:
+    #   enabled: true
+    #   port: 1024
   #   resources:
   #     requests:
   #       memory: "4Gi"
diff --git a/internal/controller/marklogiccluster_controller_test.go b/internal/controller/marklogiccluster_controller_test.go
@@ -170,5 +170,15 @@ var _ = Describe("MarklogicCluster Controller", func() {
 			Expect(clusterCR.Spec.Tls.CertSecretNames).Should(ContainElements("cert-secret-1", "cert-secret-2"))
 			Expect(clusterCR.Spec.Tls.CaSecretName).Should(Equal("ca-secret"))
 		})
+
+		It("Should create a secret for MarkLogic Admin User", func() {
+			// Validating if Secret is created successfully
+			secret := &corev1.Secret{}
+			secretName := clusterName + "-admin"
+			Eventually(func() bool {
+				err := k8sClient.Get(ctx, types.NamespacedName{Name: secretName, Namespace: clusterNS}, secret)
+				return err == nil
+			}, timeout, interval).Should(BeTrue())
+		})
 	})
 })
diff --git a/internal/controller/marklogicgroup_controller_test.go b/internal/controller/marklogicgroup_controller_test.go
@@ -199,16 +199,6 @@ var _ = Describe("MarkLogicGroup controller", func() {
 			}, timeout, interval).Should(BeTrue())
 		})
 
-		It("Should create a secret for MarkLogic Admin User", func() {
-			// Validating if Secret is created successfully
-			secret := &corev1.Secret{}
-			secretName := Name + "-admin"
-			Eventually(func() bool {
-				err := k8sClient.Get(ctx, types.NamespacedName{Name: secretName, Namespace: Namespace}, secret)
-				return err == nil
-			}, timeout, interval).Should(BeTrue())
-		})
-
 		It("Should update the MarklogicGroup CR", func() {
 			// Update the MarklogicGroup CR
 			createdCR := &databasev1alpha1.MarklogicGroup{}
diff --git a/pkg/k8sutil/handler.go b/pkg/k8sutil/handler.go
@@ -12,10 +12,6 @@ func (oc *OperatorContext) ReconsileMarklogicGroupHandler() (reconcile.Result, e
 	}
 	setOperatorInternalStatus(oc, "Created")
 
-	if result := oc.ReconcileSecret(); result.Completed() {
-		return result.Output()
-	}
-
 	if result := oc.ReconcileConfigMap(); result.Completed() {
 		return result.Output()
 	}
@@ -32,6 +28,9 @@ func (oc *OperatorContext) ReconsileMarklogicGroupHandler() (reconcile.Result, e
 }
 
 func (cc *ClusterContext) ReconsileMarklogicClusterHandler() (reconcile.Result, error) {
+	if result := cc.ReconcileSecret(); result.Completed() {
+		return result.Output()
+	}
 	result, err := cc.ReconsileMarklogicCluster()
 	if cc.MarklogicCluster.Spec.NetworkPolicy.Enabled {
 		if result := cc.ReconcileNetworkPolicy(); result.Completed() {
diff --git a/pkg/k8sutil/marklogicServer.go b/pkg/k8sutil/marklogicServer.go
@@ -44,6 +44,7 @@ type MarkLogicGroupParameters struct {
 	Tls                           *databasev1alpha1.Tls
 	AdditionalVolumes             *[]corev1.Volume
 	AdditionalVolumeMounts        *[]corev1.VolumeMount
+	SecretName                    string
 }
 
 type MarkLogicClusterParameters struct {
@@ -128,6 +129,7 @@ func GenerateMarkLogicGroupDef(cr *databasev1alpha1.MarklogicCluster, index int,
 			Tls:                           params.Tls,
 			AdditionalVolumes:             params.AdditionalVolumes,
 			AdditionalVolumeMounts:        params.AdditionalVolumeMounts,
+			SecretName:                    params.SecretName,
 		},
 	}
 	AddOwnerRefToObject(MarkLogicGroupDef, ownerDef)
@@ -230,7 +232,7 @@ func generateMarkLogicClusterParams(cr *databasev1alpha1.MarklogicCluster) *Mark
 }
 
 func generateMarkLogicGroupParams(cr *databasev1alpha1.MarklogicCluster, index int, clusterParams *MarkLogicClusterParameters) *MarkLogicGroupParameters {
-	MarkLogicGroupParameters := &MarkLogicGroupParameters{
+	markLogicGroupParameters := &MarkLogicGroupParameters{
 		Replicas:                      cr.Spec.MarkLogicGroups[index].Replicas,
 		Name:                          cr.Spec.MarkLogicGroups[index].Name,
 		GroupConfig:                   cr.Spec.MarkLogicGroups[index].GroupConfig,
@@ -260,50 +262,55 @@ func generateMarkLogicGroupParams(cr *databasev1alpha1.MarklogicCluster, index i
 		AdditionalVolumes:             clusterParams.AdditionalVolumes,
 	}
 
+	if cr.Spec.Auth != nil && cr.Spec.Auth.SecretName != nil && *cr.Spec.Auth.SecretName != "" {
+		markLogicGroupParameters.SecretName = *cr.Spec.Auth.SecretName
+	} else {
+		markLogicGroupParameters.SecretName = fmt.Sprintf("%s-admin", cr.ObjectMeta.Name)
+	}
 	if cr.Spec.MarkLogicGroups[index].HAProxy != nil && cr.Spec.MarkLogicGroups[index].HAProxy.PathBasedRouting != nil {
-		MarkLogicGroupParameters.PathBasedRouting = *cr.Spec.MarkLogicGroups[index].HAProxy.PathBasedRouting
+		markLogicGroupParameters.PathBasedRouting = *cr.Spec.MarkLogicGroups[index].HAProxy.PathBasedRouting
 	}
 	if cr.Spec.MarkLogicGroups[index].Image != "" {
-		MarkLogicGroupParameters.Image = cr.Spec.MarkLogicGroups[index].Image
+		markLogicGroupParameters.Image = cr.Spec.MarkLogicGroups[index].Image
 	}
 	if cr.Spec.MarkLogicGroups[index].ImagePullPolicy != "" {
-		MarkLogicGroupParameters.ImagePullPolicy = cr.Spec.MarkLogicGroups[index].ImagePullPolicy
+		markLogicGroupParameters.ImagePullPolicy = cr.Spec.MarkLogicGroups[index].ImagePullPolicy
 	}
 	if cr.Spec.MarkLogicGroups[index].ImagePullSecrets != nil {
-		MarkLogicGroupParameters.ImagePullSecrets = cr.Spec.MarkLogicGroups[index].ImagePullSecrets
+		markLogicGroupParameters.ImagePullSecrets = cr.Spec.MarkLogicGroups[index].ImagePullSecrets
 	}
 	if cr.Spec.MarkLogicGroups[index].Storage != nil {
-		MarkLogicGroupParameters.Storage = cr.Spec.MarkLogicGroups[index].Storage
+		markLogicGroupParameters.Storage = cr.Spec.MarkLogicGroups[index].Storage
 	}
 	if cr.Spec.MarkLogicGroups[index].Resources != nil {
-		MarkLogicGroupParameters.Resources = cr.Spec.MarkLogicGroups[index].Resources
+		markLogicGroupParameters.Resources = cr.Spec.MarkLogicGroups[index].Resources
 	}
 	if cr.Spec.MarkLogicGroups[index].Affinity != nil {
-		MarkLogicGroupParameters.Affinity = cr.Spec.MarkLogicGroups[index].Affinity
+		markLogicGroupParameters.Affinity = cr.Spec.MarkLogicGroups[index].Affinity
 	}
 	if cr.Spec.MarkLogicGroups[index].NodeSelector != nil {
-		MarkLogicGroupParameters.NodeSelector = cr.Spec.MarkLogicGroups[index].NodeSelector
+		markLogicGroupParameters.NodeSelector = cr.Spec.MarkLogicGroups[index].NodeSelector
 	}
 	if cr.Spec.MarkLogicGroups[index].TopologySpreadConstraints != nil {
-		MarkLogicGroupParameters.TopologySpreadConstraints = cr.Spec.MarkLogicGroups[index].TopologySpreadConstraints
+		markLogicGroupParameters.TopologySpreadConstraints = cr.Spec.MarkLogicGroups[index].TopologySpreadConstraints
 	}
 	if cr.Spec.MarkLogicGroups[index].PriorityClassName != "" {
-		MarkLogicGroupParameters.PriorityClassName = cr.Spec.MarkLogicGroups[index].PriorityClassName
+		markLogicGroupParameters.PriorityClassName = cr.Spec.MarkLogicGroups[index].PriorityClassName
 	}
 	if cr.Spec.MarkLogicGroups[index].HugePages != nil {
-		MarkLogicGroupParameters.HugePages = cr.Spec.MarkLogicGroups[index].HugePages
+		markLogicGroupParameters.HugePages = cr.Spec.MarkLogicGroups[index].HugePages
 	}
 	if cr.Spec.MarkLogicGroups[index].LogCollection != nil {
-		MarkLogicGroupParameters.LogCollection = cr.Spec.MarkLogicGroups[index].LogCollection
+		markLogicGroupParameters.LogCollection = cr.Spec.MarkLogicGroups[index].LogCollection
 	}
 	if cr.Spec.MarkLogicGroups[index].Tls != nil {
-		MarkLogicGroupParameters.Tls = cr.Spec.MarkLogicGroups[index].Tls
+		markLogicGroupParameters.Tls = cr.Spec.MarkLogicGroups[index].Tls
 	}
 	if cr.Spec.MarkLogicGroups[index].AdditionalVolumes != nil {
-		MarkLogicGroupParameters.AdditionalVolumes = cr.Spec.MarkLogicGroups[index].AdditionalVolumes
+		markLogicGroupParameters.AdditionalVolumes = cr.Spec.MarkLogicGroups[index].AdditionalVolumes
 	}
 	if cr.Spec.MarkLogicGroups[index].AdditionalVolumeMounts != nil {
-		MarkLogicGroupParameters.AdditionalVolumeMounts = cr.Spec.MarkLogicGroups[index].AdditionalVolumeMounts
+		markLogicGroupParameters.AdditionalVolumeMounts = cr.Spec.MarkLogicGroups[index].AdditionalVolumeMounts
 	}
-	return MarkLogicGroupParameters
+	return markLogicGroupParameters
 }
diff --git a/pkg/k8sutil/secret.go b/pkg/k8sutil/secret.go
@@ -8,25 +8,30 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 )
 
-func (oc *OperatorContext) ReconcileSecret() result.ReconcileResult {
-	logger := oc.ReqLogger
-	client := oc.Client
-	mlg := oc.MarklogicGroup
+func (cc *ClusterContext) ReconcileSecret() result.ReconcileResult {
+	logger := cc.ReqLogger
+	client := cc.Client
+	mlc := cc.MarklogicCluster
+
+	if mlc.Spec.Auth != nil && mlc.Spec.Auth.SecretName != nil && *mlc.Spec.Auth.SecretName != "" {
+		logger.Info("MarkLogic Secret is provided, skipping the creation")
+		return result.Continue()
+	}
 
 	logger.Info("Reconciling MarkLogic Secret")
-	labels := getMarkLogicLabels(mlg.Spec.Name)
+	labels := getMarkLogicLabels(mlc.ObjectMeta.Name)
 	annotations := map[string]string{}
-	secretName := mlg.Spec.Name + "-admin"
-	objectMeta := generateObjectMeta(secretName, mlg.Namespace, labels, annotations)
+	secretName := mlc.ObjectMeta.Name + "-admin"
+	objectMeta := generateObjectMeta(secretName, mlc.Namespace, labels, annotations)
 	nsName := types.NamespacedName{Name: objectMeta.Name, Namespace: objectMeta.Namespace}
 	secret := &corev1.Secret{}
-	err := client.Get(oc.Ctx, nsName, secret)
+	err := client.Get(cc.Ctx, nsName, secret)
 	if err != nil {
 		if errors.IsNotFound(err) {
 			logger.Info("MarkLogic admin Secret is not found, creating a new one")
-			secretData := oc.generateSecretData()
-			secretDef := generateSecretDef(objectMeta, marklogicServerAsOwner(mlg), secretData)
-			err = oc.createSecret(secretDef)
+			secretData := cc.generateSecretData()
+			secretDef := generateSecretDef(objectMeta, marklogicClusterAsOwner(mlc), secretData)
+			err = cc.createSecret(secretDef)
 			if err != nil {
 				logger.Info("MarkLogic admin Secret creation is failed")
 				return result.Error(err)
@@ -42,9 +47,9 @@ func (oc *OperatorContext) ReconcileSecret() result.ReconcileResult {
 	return result.Continue()
 }
 
-func (oc *OperatorContext) generateSecretData() map[string][]byte {
+func (cc *ClusterContext) generateSecretData() map[string][]byte {
 	// logger := oc.ReqLogger
-	spec := oc.MarklogicGroup.Spec
+	spec := cc.MarklogicCluster.Spec
 	secretData := map[string][]byte{}
 	if spec.Auth != nil && spec.Auth.AdminUsername != nil {
 		secretData["username"] = []byte(*spec.Auth.AdminUsername)
@@ -81,7 +86,7 @@ func generateSecretDef(secretMeta metav1.ObjectMeta, ownerRef metav1.OwnerRefere
 	return secret
 }
 
-func (oc *OperatorContext) createSecret(secret *corev1.Secret) error {
+func (oc *ClusterContext) createSecret(secret *corev1.Secret) error {
 	logger := oc.ReqLogger
 	client := oc.Client
 	err := client.Create(oc.Ctx, secret)
diff --git a/pkg/k8sutil/statefulset.go b/pkg/k8sutil/statefulset.go
@@ -57,6 +57,7 @@ type containerParameters struct {
 	Tls                    *databasev1alpha1.Tls
 	AdditionalVolumes      *[]corev1.Volume
 	AdditionalVolumeMounts *[]corev1.VolumeMount
+	SecretName             string
 }
 
 func (oc *OperatorContext) ReconcileStatefulset() (reconcile.Result, error) {
@@ -370,6 +371,7 @@ func generateContainerParams(cr *databasev1alpha1.MarklogicGroup) containerParam
 		Tls:                    cr.Spec.Tls,
 		AdditionalVolumes:      cr.Spec.AdditionalVolumes,
 		AdditionalVolumeMounts: cr.Spec.AdditionalVolumeMounts,
+		SecretName:             cr.Spec.SecretName,
 	}
 
 	if cr.Spec.Storage != nil {
@@ -425,7 +427,7 @@ func generateVolumes(stsName string, containerParams containerParameters) []core
 		Name: "mladmin-secrets",
 		VolumeSource: corev1.VolumeSource{
 			Secret: &corev1.SecretVolumeSource{
-				SecretName: fmt.Sprintf("%s-admin", stsName),
+				SecretName: containerParams.SecretName,
 			},
 		},
 	})
diff --git a/test/e2e/3_ml_cluster_ednode_test.go b/test/e2e/3_ml_cluster_ednode_test.go
@@ -18,6 +18,7 @@ import (
 	"sigs.k8s.io/e2e-framework/klient/wait/conditions"
 	"sigs.k8s.io/e2e-framework/pkg/envconf"
 	"sigs.k8s.io/e2e-framework/pkg/features"
+	e2eutils "sigs.k8s.io/e2e-framework/pkg/utils"
 )
 
 const (
@@ -28,6 +29,7 @@ const (
 
 var (
 	kubeconfig      *string
+	secretName      = "ml-admin-secrets"
 	home            = homedir.HomeDir()
 	initialPodCount int
 	incrReplica     = int32(2)
@@ -62,16 +64,15 @@ var (
 		Spec: databasev1alpha1.MarklogicClusterSpec{
 			Image: marklogicImage,
 			Auth: &databasev1alpha1.AdminAuth{
-				AdminUsername: &adminUsername,
-				AdminPassword: &adminPassword,
+				SecretName: &secretName,
 			},
 			MarkLogicGroups: marklogicgroups,
 		},
 	}
 )
 
 func TestMlClusterWithEdnode(t *testing.T) {
-	feature := features.New("MarklogicCluster Resource with 2 MarkLogicGroups (Ednode and dnode)")
+	feature := features.New("MarklogicCluster Resource with 2 MarkLogicGroups (Ednode and dnode)").WithLabel("type", "ednode")
 
 	// Setup for MarklogicCluster creation
 	feature.Setup(func(ctx context.Context, t *testing.T, c *envconf.Config) context.Context {
@@ -86,6 +87,11 @@ func TestMlClusterWithEdnode(t *testing.T) {
 		}
 		databasev1alpha1.AddToScheme(client.Resources(mlClusterNs).GetScheme())
 
+		p := e2eutils.RunCommand("kubectl -n ednode create secret generic ml-admin-secrets --from-literal=username=admin --from-literal=password=Admin@8001 ")
+		if p.Err() != nil {
+			t.Fatalf("Failed to create custom secret for testing: %s", p.Result())
+		}
+
 		if err := client.Resources(mlClusterNs).Create(ctx, mlcluster); err != nil {
 			t.Fatalf("Failed to create MarklogicCluster: %s", err)
 		}

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ type VolumeMountWrapper struct {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`type AdminAuth struct {`
	`49`	+ SecretName *string `json:"secretName,omitempty"`
`49`	`50`	AdminUsername *string `json:"adminUsername,omitempty"`
`50`	`51`	AdminPassword *string `json:"adminPassword,omitempty"`
`51`	`52`	WalletPassword *string `json:"walletPassword,omitempty"`
Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,8 @@ type MarklogicGroupSpec struct {`
`83`	`83`
`84`	`84`	AdditionalVolumes *[]corev1.Volume `json:"additionalVolumes,omitempty"`
`85`	`85`	AdditionalVolumeMounts *[]corev1.VolumeMount `json:"additionalVolumeMounts,omitempty"`
`86`		`-`
`87`		- Tls *Tls `json:"tls,omitempty"`
	`86`	+ SecretName string `json:"secretName,omitempty"`
	`87`	+ Tls *Tls `json:"tls,omitempty"`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`// InternalState defines the observed state of MarklogicGroup`
Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,6 @@ func (oc *OperatorContext) ReconsileMarklogicGroupHandler() (reconcile.Result, e`
`12`	`12`	`}`
`13`	`13`	`setOperatorInternalStatus(oc, "Created")`
`14`	`14`
`15`		`- if result := oc.ReconcileSecret(); result.Completed() {`
`16`		`- return result.Output()`
`17`		`- }`
`18`		`-`
`19`	`15`	`if result := oc.ReconcileConfigMap(); result.Completed() {`
`20`	`16`	`return result.Output()`
`21`	`17`	`}`
`@@ -32,6 +28,9 @@ func (oc *OperatorContext) ReconsileMarklogicGroupHandler() (reconcile.Result, e`
`32`	`28`	`}`
`33`	`29`
`34`	`30`	`func (cc *ClusterContext) ReconsileMarklogicClusterHandler() (reconcile.Result, error) {`
	`31`	`+ if result := cc.ReconcileSecret(); result.Completed() {`
	`32`	`+ return result.Output()`
	`33`	`+ }`
`35`	`34`	`result, err := cc.ReconsileMarklogicCluster()`
`36`	`35`	`if cc.MarklogicCluster.Spec.NetworkPolicy.Enabled {`
`37`	`36`	`if result := cc.ReconcileNetworkPolicy(); result.Completed() {`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ type MarkLogicGroupParameters struct {`
`44`	`44`	`Tls *databasev1alpha1.Tls`
`45`	`45`	`AdditionalVolumes *[]corev1.Volume`
`46`	`46`	`AdditionalVolumeMounts *[]corev1.VolumeMount`
	`47`	`+ SecretName string`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`type MarkLogicClusterParameters struct {`
`@@ -128,6 +129,7 @@ func GenerateMarkLogicGroupDef(cr *databasev1alpha1.MarklogicCluster, index int,`
`128`	`129`	`Tls: params.Tls,`
`129`	`130`	`AdditionalVolumes: params.AdditionalVolumes,`
`130`	`131`	`AdditionalVolumeMounts: params.AdditionalVolumeMounts,`
	`132`	`+ SecretName: params.SecretName,`
`131`	`133`	`},`
`132`	`134`	`}`
`133`	`135`	`AddOwnerRefToObject(MarkLogicGroupDef, ownerDef)`
`@@ -230,7 +232,7 @@ func generateMarkLogicClusterParams(cr databasev1alpha1.MarklogicCluster) Mark`
`230`	`232`	`}`
`231`	`233`
`232`	`234`	`func generateMarkLogicGroupParams(cr databasev1alpha1.MarklogicCluster, index int, clusterParams MarkLogicClusterParameters) *MarkLogicGroupParameters {`
`233`		`- MarkLogicGroupParameters := &MarkLogicGroupParameters{`
	`235`	`+ markLogicGroupParameters := &MarkLogicGroupParameters{`
`234`	`236`	`Replicas: cr.Spec.MarkLogicGroups[index].Replicas,`
`235`	`237`	`Name: cr.Spec.MarkLogicGroups[index].Name,`
`236`	`238`	`GroupConfig: cr.Spec.MarkLogicGroups[index].GroupConfig,`
`@@ -260,50 +262,55 @@ func generateMarkLogicGroupParams(cr *databasev1alpha1.MarklogicCluster, index i`
`260`	`262`	`AdditionalVolumes: clusterParams.AdditionalVolumes,`
`261`	`263`	`}`
`262`	`264`
	`265`	`+ if cr.Spec.Auth != nil && cr.Spec.Auth.SecretName != nil && *cr.Spec.Auth.SecretName != "" {`
	`266`	`+ markLogicGroupParameters.SecretName = *cr.Spec.Auth.SecretName`
	`267`	`+ } else {`
	`268`	`+ markLogicGroupParameters.SecretName = fmt.Sprintf("%s-admin", cr.ObjectMeta.Name)`
	`269`	`+ }`
`263`	`270`	`if cr.Spec.MarkLogicGroups[index].HAProxy != nil && cr.Spec.MarkLogicGroups[index].HAProxy.PathBasedRouting != nil {`
`264`		`- MarkLogicGroupParameters.PathBasedRouting = *cr.Spec.MarkLogicGroups[index].HAProxy.PathBasedRouting`
	`271`	`+ markLogicGroupParameters.PathBasedRouting = *cr.Spec.MarkLogicGroups[index].HAProxy.PathBasedRouting`
`265`	`272`	`}`
`266`	`273`	`if cr.Spec.MarkLogicGroups[index].Image != "" {`
`267`		`- MarkLogicGroupParameters.Image = cr.Spec.MarkLogicGroups[index].Image`
	`274`	`+ markLogicGroupParameters.Image = cr.Spec.MarkLogicGroups[index].Image`
`268`	`275`	`}`
`269`	`276`	`if cr.Spec.MarkLogicGroups[index].ImagePullPolicy != "" {`
`270`		`- MarkLogicGroupParameters.ImagePullPolicy = cr.Spec.MarkLogicGroups[index].ImagePullPolicy`
	`277`	`+ markLogicGroupParameters.ImagePullPolicy = cr.Spec.MarkLogicGroups[index].ImagePullPolicy`
`271`	`278`	`}`
`272`	`279`	`if cr.Spec.MarkLogicGroups[index].ImagePullSecrets != nil {`
`273`		`- MarkLogicGroupParameters.ImagePullSecrets = cr.Spec.MarkLogicGroups[index].ImagePullSecrets`
	`280`	`+ markLogicGroupParameters.ImagePullSecrets = cr.Spec.MarkLogicGroups[index].ImagePullSecrets`
`274`	`281`	`}`
`275`	`282`	`if cr.Spec.MarkLogicGroups[index].Storage != nil {`
`276`		`- MarkLogicGroupParameters.Storage = cr.Spec.MarkLogicGroups[index].Storage`
	`283`	`+ markLogicGroupParameters.Storage = cr.Spec.MarkLogicGroups[index].Storage`
`277`	`284`	`}`
`278`	`285`	`if cr.Spec.MarkLogicGroups[index].Resources != nil {`
`279`		`- MarkLogicGroupParameters.Resources = cr.Spec.MarkLogicGroups[index].Resources`
	`286`	`+ markLogicGroupParameters.Resources = cr.Spec.MarkLogicGroups[index].Resources`
`280`	`287`	`}`
`281`	`288`	`if cr.Spec.MarkLogicGroups[index].Affinity != nil {`
`282`		`- MarkLogicGroupParameters.Affinity = cr.Spec.MarkLogicGroups[index].Affinity`
	`289`	`+ markLogicGroupParameters.Affinity = cr.Spec.MarkLogicGroups[index].Affinity`
`283`	`290`	`}`
`284`	`291`	`if cr.Spec.MarkLogicGroups[index].NodeSelector != nil {`
`285`		`- MarkLogicGroupParameters.NodeSelector = cr.Spec.MarkLogicGroups[index].NodeSelector`
	`292`	`+ markLogicGroupParameters.NodeSelector = cr.Spec.MarkLogicGroups[index].NodeSelector`
`286`	`293`	`}`
`287`	`294`	`if cr.Spec.MarkLogicGroups[index].TopologySpreadConstraints != nil {`
`288`		`- MarkLogicGroupParameters.TopologySpreadConstraints = cr.Spec.MarkLogicGroups[index].TopologySpreadConstraints`
	`295`	`+ markLogicGroupParameters.TopologySpreadConstraints = cr.Spec.MarkLogicGroups[index].TopologySpreadConstraints`
`289`	`296`	`}`
`290`	`297`	`if cr.Spec.MarkLogicGroups[index].PriorityClassName != "" {`
`291`		`- MarkLogicGroupParameters.PriorityClassName = cr.Spec.MarkLogicGroups[index].PriorityClassName`
	`298`	`+ markLogicGroupParameters.PriorityClassName = cr.Spec.MarkLogicGroups[index].PriorityClassName`
`292`	`299`	`}`
`293`	`300`	`if cr.Spec.MarkLogicGroups[index].HugePages != nil {`
`294`		`- MarkLogicGroupParameters.HugePages = cr.Spec.MarkLogicGroups[index].HugePages`
	`301`	`+ markLogicGroupParameters.HugePages = cr.Spec.MarkLogicGroups[index].HugePages`
`295`	`302`	`}`
`296`	`303`	`if cr.Spec.MarkLogicGroups[index].LogCollection != nil {`
`297`		`- MarkLogicGroupParameters.LogCollection = cr.Spec.MarkLogicGroups[index].LogCollection`
	`304`	`+ markLogicGroupParameters.LogCollection = cr.Spec.MarkLogicGroups[index].LogCollection`
`298`	`305`	`}`
`299`	`306`	`if cr.Spec.MarkLogicGroups[index].Tls != nil {`
`300`		`- MarkLogicGroupParameters.Tls = cr.Spec.MarkLogicGroups[index].Tls`
	`307`	`+ markLogicGroupParameters.Tls = cr.Spec.MarkLogicGroups[index].Tls`
`301`	`308`	`}`
`302`	`309`	`if cr.Spec.MarkLogicGroups[index].AdditionalVolumes != nil {`
`303`		`- MarkLogicGroupParameters.AdditionalVolumes = cr.Spec.MarkLogicGroups[index].AdditionalVolumes`
	`310`	`+ markLogicGroupParameters.AdditionalVolumes = cr.Spec.MarkLogicGroups[index].AdditionalVolumes`
`304`	`311`	`}`
`305`	`312`	`if cr.Spec.MarkLogicGroups[index].AdditionalVolumeMounts != nil {`
`306`		`- MarkLogicGroupParameters.AdditionalVolumeMounts = cr.Spec.MarkLogicGroups[index].AdditionalVolumeMounts`
	`313`	`+ markLogicGroupParameters.AdditionalVolumeMounts = cr.Spec.MarkLogicGroups[index].AdditionalVolumeMounts`
`307`	`314`	`}`
`308`		`- return MarkLogicGroupParameters`
	`315`	`+ return markLogicGroupParameters`
`309`	`316`	`}`