admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4551 from chaunceyjiang/fix_4548

Browse Source 
upgrade ingress nginx version
This commit is contained in:
KubeSphere CI Bot
2021-12-28 11:52:28 +08:00
committed by GitHub
parent d5260109d8 a80c94e352
commit e9a62896f7
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/controller/helm/helm_controller.go
View File

@@ -59,7 +59,7 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
r, err := reconciler.New(
reconciler.WithChart(*w.Chart),
reconciler.WithGroupVersionKind(w.GroupVersionKind),
reconciler.WithOverrideValues(r.defaultConfiguration()),
reconciler.WithOverrideValues(r.defaultConfiguration(w.OverrideValues)),
reconciler.SkipDependentWatches(w.WatchDependentResources != nil && !*w.WatchDependentResources),
reconciler.WithMaxConcurrentReconciles(maxConcurrentReconciles),
reconciler.WithReconcilePeriod(reconcilePeriod),
@@ -78,8 +78,7 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
return nil
}
func (r *Reconciler) defaultConfiguration() map[string]string {
var overrideValues = make(map[string]string)
func (r *Reconciler) defaultConfiguration(overrideValues map[string]string) map[string]string {
if r.GatewayOptions.Repository != "" {
overrideValues["controller.image.repository"] = r.GatewayOptions.Repository
}