[feature][disaggregated] Support configuration of username and password and multi secret

Author: hechao

pkg/common/utils/resource/pod.go

@@ -500,23 +500,8 @@ func buildEnvFromPod() []corev1.EnvVar {
 	}
 }
 
-func GetPodDefaultEnv(ddc *dv1.DorisDisaggregatedCluster) []corev1.EnvVar {
-	defaultEnvs := buildEnvFromPod()
-
-	if ddc.Spec.AdminUser != nil {
-		defaultEnvs = append(defaultEnvs, corev1.EnvVar{
-			Name:  ADMIN_USER,
-			Value: ddc.Spec.AdminUser.Name,
-		})
-		if ddc.Spec.AdminUser.Password != "" {
-			defaultEnvs = append(defaultEnvs, corev1.EnvVar{
-				Name:  ADMIN_PASSWD,
-				Value: ddc.Spec.AdminUser.Password,
-			})
-		}
-	}
-
-	return defaultEnvs
+func GetPodDefaultEnv() []corev1.EnvVar {
+	return buildEnvFromPod()
 }
 
 func getCommand(componentType v1.ComponentType) (commands []string, args []string) {

pkg/controller/sub_controller/disaggregated_cluster/computegroups/statefulset.go

@@ -139,7 +139,7 @@ func (dcgs *DisaggregatedComputeGroupsController) NewCGContainer(ddc *dv1.DorisD
 
 	c.Ports = resource.GetDisaggregatedContainerPorts(cvs, dv1.DisaggregatedBE)
 	c.Env = cg.CommonSpec.EnvVars
-	c.Env = append(c.Env, resource.GetPodDefaultEnv(ddc)...)
+	c.Env = append(c.Env, resource.GetPodDefaultEnv()...)
 	c.Env = append(c.Env, dcgs.newSpecificEnvs(ddc, cg)...)
 
 	resource.BuildDisaggregatedProbe(&c, &cg.CommonSpec, dv1.DisaggregatedBE)
@@ -152,11 +152,6 @@ func (dcgs *DisaggregatedComputeGroupsController) NewCGContainer(ddc *dv1.DorisD
 		c.VolumeMounts = append(c.VolumeMounts, cmvms...)
 	}
 
-	if len(cg.Secrets) != 0 {
-		_, secretVolumeMounts := resource.GetMultiSecretVolumeAndVolumeMountWithCommonSpec(&cg.CommonSpec)
-		c.VolumeMounts = append(c.VolumeMounts, secretVolumeMounts...)
-	}
-
 	// add basic auth secret volumeMount
 	if ddc.Spec.AuthSecret != "" {
 		c.VolumeMounts = append(c.VolumeMounts, corev1.VolumeMount{
@@ -165,6 +160,11 @@ func (dcgs *DisaggregatedComputeGroupsController) NewCGContainer(ddc *dv1.DorisD
 		})
 	}
 
+	if len(cg.Secrets) != 0 {
+		_, secretVolumeMounts := resource.GetMultiSecretVolumeAndVolumeMountWithCommonSpec(&cg.CommonSpec)
+		c.VolumeMounts = append(c.VolumeMounts, secretVolumeMounts...)
+	}
+
 	return c
 }
 
@@ -357,5 +357,20 @@ func (dcgs *DisaggregatedComputeGroupsController) newSpecificEnvs(ddc *dv1.Doris
 		corev1.EnvVar{Name: resource.COMPUTE_GROUP_NAME, Value: ddc.GetCGName(cg)},
 		corev1.EnvVar{Name: resource.ENV_FE_ADDR, Value: feAddr},
 		corev1.EnvVar{Name: resource.ENV_FE_PORT, Value: fqpStr})
+
+	// add user and password envs
+	if ddc.Spec.AdminUser != nil {
+		cgEnvs = append(cgEnvs, corev1.EnvVar{
+			Name:  resource.ADMIN_USER,
+			Value: ddc.Spec.AdminUser.Name,
+		})
+		if ddc.Spec.AdminUser.Password != "" {
+			cgEnvs = append(cgEnvs, corev1.EnvVar{
+				Name:  resource.ADMIN_PASSWD,
+				Value: ddc.Spec.AdminUser.Password,
+			})
+		}
+	}
+
 	return cgEnvs
 }

pkg/controller/sub_controller/disaggregated_cluster/disaggregated_fe/statefulset.go

@@ -136,7 +136,7 @@ func (dfc *DisaggregatedFEController) NewFEContainer(ddc *v1.DorisDisaggregatedC
 
 	c.Ports = resource.GetDisaggregatedContainerPorts(cvs, v1.DisaggregatedFE)
 	c.Env = ddc.Spec.FeSpec.CommonSpec.EnvVars
-	c.Env = append(c.Env, resource.GetPodDefaultEnv(ddc)...)
+	c.Env = append(c.Env, resource.GetPodDefaultEnv()...)
 	c.Env = append(c.Env, dfc.newSpecificEnvs(ddc)...)
 
 	if ddc.Spec.FeSpec.ElectionNumber != nil {
@@ -156,11 +156,6 @@ func (dfc *DisaggregatedFEController) NewFEContainer(ddc *v1.DorisDisaggregatedC
 		c.VolumeMounts = append(c.VolumeMounts, cmvms...)
 	}
 
-	if len(ddc.Spec.FeSpec.Secrets) != 0 {
-		_, secretVolumeMounts := resource.GetMultiSecretVolumeAndVolumeMountWithCommonSpec(&ddc.Spec.FeSpec.CommonSpec)
-		c.VolumeMounts = append(c.VolumeMounts, secretVolumeMounts...)
-	}
-
 	// add basic auth secret volumeMount
 	if ddc.Spec.AuthSecret != "" {
 		c.VolumeMounts = append(c.VolumeMounts, corev1.VolumeMount{
@@ -169,6 +164,11 @@ func (dfc *DisaggregatedFEController) NewFEContainer(ddc *v1.DorisDisaggregatedC
 		})
 	}
 
+	if len(ddc.Spec.FeSpec.Secrets) != 0 {
+		_, secretVolumeMounts := resource.GetMultiSecretVolumeAndVolumeMountWithCommonSpec(&ddc.Spec.FeSpec.CommonSpec)
+		c.VolumeMounts = append(c.VolumeMounts, secretVolumeMounts...)
+	}
+
 	return c
 }
 
@@ -310,5 +310,20 @@ func (dfc *DisaggregatedFEController) newSpecificEnvs(ddc *v1.DorisDisaggregated
 		corev1.EnvVar{Name: resource.ENV_FE_ADDR, Value: ddc.GetFEVIPAddresss()},
 		corev1.EnvVar{Name: resource.ENV_FE_ELECT_NUMBER, Value: strconv.FormatInt(int64(ddc.GetElectionNumber()), 10)},
 	)
+
+	// add user and password envs
+	if ddc.Spec.AdminUser != nil {
+		feEnvs = append(feEnvs, corev1.EnvVar{
+			Name:  resource.ADMIN_USER,
+			Value: ddc.Spec.AdminUser.Name,
+		})
+		if ddc.Spec.AdminUser.Password != "" {
+			feEnvs = append(feEnvs, corev1.EnvVar{
+				Name:  resource.ADMIN_PASSWD,
+				Value: ddc.Spec.AdminUser.Password,
+			})
+		}
+	}
+
 	return feEnvs
 }

pkg/controller/sub_controller/disaggregated_cluster/metaservice/statefulset.go

@@ -203,7 +203,7 @@ func (dms *DisaggregatedMSController) NewMSContainer(ddc *v1.DorisDisaggregatedC
 
 	c.Ports = resource.GetDisaggregatedContainerPorts(cvs, v1.DisaggregatedMS)
 	c.Env = ddc.Spec.MetaService.CommonSpec.EnvVars
-	c.Env = append(c.Env, resource.GetPodDefaultEnv(ddc)...)
+	c.Env = append(c.Env, resource.GetPodDefaultEnv()...)
 	c.Env = append(c.Env, dms.newSpecificEnvs(ddc)...)
 	resource.BuildDisaggregatedProbe(&c, &ddc.Spec.MetaService.CommonSpec, v1.DisaggregatedMS)
 	_, vms, _ := dms.buildVolumesVolumeMountsAndPVCs(cvs, &ddc.Spec.MetaService)