Elgato_dark/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd synced 2026-05-24 09:50:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fixed KustomizeBuildOptions not getting synced (#2714)

Browse source
This commit is contained in:
Simon Behar 2019-11-13 09:31:37 -08:00 committed by Alex Collins
parent 455837f3e8
commit b233563e29
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
util/settings/settings.go
View file

@ -199,8 +199,8 @@ const (
resourceInclusionsKey = "resource.inclusions"
// configManagementPluginsKey is the key to the list of config management plugins
configManagementPluginsKey = "configManagementPlugins"
// kustomizeBuildOptions is a string of kustomize build parameters
kustomizeBuildOptions = "kustomize.buildOptions"
// kustomizeBuildOptionsKey is a string of kustomize build parameters
kustomizeBuildOptionsKey = "kustomize.buildOptions"
// anonymousUserEnabledKey is the key which enables or disables anonymous user
anonymousUserEnabledKey = "users.anonymous.enabled"
)
@ -341,7 +341,7 @@ func (mgr *SettingsManager) GetKustomizeBuildOptions() (string, error) {
if err != nil {
return "", err
}
return argoCDCM.Data[kustomizeBuildOptions], nil
return argoCDCM.Data[kustomizeBuildOptionsKey], nil
}
// DEPRECATED. Helm repository credentials are now managed using RepoCredentials
@ -563,6 +563,7 @@ func updateSettingsFromConfigMap(settings *ArgoCDSettings, argoCDCM *apiv1.Confi
settings.DexConfig = argoCDCM.Data[settingDexConfigKey]
settings.OIDCConfigRAW = argoCDCM.Data[settingsOIDCConfigKey]
settings.URL = argoCDCM.Data[settingURLKey]
settings.KustomizeBuildOptions = argoCDCM.Data[kustomizeBuildOptionsKey]
settings.StatusBadgeEnabled = argoCDCM.Data[statusBadgeEnabledKey] == "true"
settings.AnonymousUserEnabled = argoCDCM.Data[anonymousUserEnabledKey] == "true"
}