fix(installer): generate admin password value wrongly (#1820)

tkestack · Apr 1, 2022 · 3e94139 · 3e94139
1 parent 6abe23f
commit 3e94139
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/charts/bin/gen b/charts/bin/gen
diff --git a/charts/values/generateChartValues.go b/charts/values/generateChartValues.go
@@ -262,10 +262,15 @@ func (customConfig *CustomConfig) GenerateAuthChartValuesYaml(oIDCClientSecret s
 	if len(originAuthCustomConfig.Controller.Image) == 0 {
 		return errors.New("auth custom config api image nil")
 	}
-	if len(originAuthCustomConfig.Controller.AdminUsername) == 0 {
+	if len(originAuthCustomConfig.Controller.AdminUsername) == 0 && len(originAuthCustomConfig.Controller.AdminPassword) == 0 {
 		originAuthCustomConfig.Controller.AdminUsername = "admin"
+		originAuthCustomConfig.Controller.AdminPassword = base64.StdEncoding.EncodeToString([]byte(originAuthCustomConfig.Controller.AdminUsername))
+	} else if len(originAuthCustomConfig.Controller.AdminUsername) == 0 {
+		return errors.New("auth controller admin userName empty when admin password exists")
+	} else if len(originAuthCustomConfig.Controller.AdminPassword) == 0 {
+		return errors.New("auth controller admin password empty when admin userName exists")
 	}
-	originAuthCustomConfig.Controller.AdminPassword = base64.StdEncoding.EncodeToString([]byte(originAuthCustomConfig.Controller.AdminUsername))
+
 	obj.TKEAuth = *originAuthCustomConfig
 
 	bytes, errMarshal := yaml.Marshal(obj)