Skip to content

Commit 2749ea6

Browse files
author
hechao
committed
[feature][disaggregated] Support configuration of username and password and multi secret
1 parent f4753f2 commit 2749ea6

File tree

2 files changed

+8
-20
lines changed

2 files changed

+8
-20
lines changed

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -360,16 +360,10 @@ func (dcgs *DisaggregatedComputeGroupsController) newSpecificEnvs(ddc *dv1.Doris
360360

361361
// add user and password envs
362362
if ddc.Spec.AdminUser != nil {
363-
cgEnvs = append(cgEnvs, corev1.EnvVar{
364-
Name: resource.ADMIN_USER,
365-
Value: ddc.Spec.AdminUser.Name,
366-
})
367-
if ddc.Spec.AdminUser.Password != "" {
368-
cgEnvs = append(cgEnvs, corev1.EnvVar{
369-
Name: resource.ADMIN_PASSWD,
370-
Value: ddc.Spec.AdminUser.Password,
371-
})
372-
}
363+
cgEnvs = append(cgEnvs,
364+
corev1.EnvVar{Name: resource.ADMIN_USER, Value: ddc.Spec.AdminUser.Name},
365+
corev1.EnvVar{Name: resource.ADMIN_PASSWD, Value: ddc.Spec.AdminUser.Password},
366+
)
373367
}
374368

375369
return cgEnvs

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -313,16 +313,10 @@ func (dfc *DisaggregatedFEController) newSpecificEnvs(ddc *v1.DorisDisaggregated
313313

314314
// add user and password envs
315315
if ddc.Spec.AdminUser != nil {
316-
feEnvs = append(feEnvs, corev1.EnvVar{
317-
Name: resource.ADMIN_USER,
318-
Value: ddc.Spec.AdminUser.Name,
319-
})
320-
if ddc.Spec.AdminUser.Password != "" {
321-
feEnvs = append(feEnvs, corev1.EnvVar{
322-
Name: resource.ADMIN_PASSWD,
323-
Value: ddc.Spec.AdminUser.Password,
324-
})
325-
}
316+
feEnvs = append(feEnvs,
317+
corev1.EnvVar{Name: resource.ADMIN_USER, Value: ddc.Spec.AdminUser.Name},
318+
corev1.EnvVar{Name: resource.ADMIN_PASSWD, Value: ddc.Spec.AdminUser.Password},
319+
)
326320
}
327321

328322
return feEnvs

0 commit comments

Comments
 (0)