Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Apr 1, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified charts/bin/gen
View file
Open in desktop
Binary file not shown.
9 changes: 7 additions & 2 deletions charts/values/generateChartValues.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down