diff --git a/pkg/controllers/dashboard/fleetcharts/controller.go b/pkg/controllers/dashboard/fleetcharts/controller.go index 01a39bc64e77bff7653ba55908be337470af6852..649ff1cc87de1dd12c12520b8de983db45c1da22 100644 --- a/pkg/controllers/dashboard/fleetcharts/controller.go +++ b/pkg/controllers/dashboard/fleetcharts/controller.go @@ -2,7 +2,6 @@ package fleetcharts import ( "context" - "os" "sync" v3 "github.com/rancher/rancher/pkg/apis/management.cattle.io/v3" @@ -62,25 +61,10 @@ func (h *handler) onSetting(key string, setting *v3.Setting) (*v3.Setting, error "systemDefaultRegistry": settings.SystemDefaultRegistry.Get(), }, } - - fleetChartValues := map[string]interface{}{ - "apiServerURL": settings.ServerURL.Get(), - "apiServerCA": settings.CACerts.Get(), - "global": systemGlobalRegistry, - } - - gitjobChartValues := make(map[string]interface{}) - - if envVal, ok := os.LookupEnv("HTTP_PROXY"); ok { - gitjobChartValues["proxy"] = envVal - } - if envVal, ok := os.LookupEnv("NO_PROXY"); ok { - gitjobChartValues["noProxy"] = envVal - } - - if len(gitjobChartValues) > 0 { - fleetChartValues["gitjob"] = gitjobChartValues - } - - return setting, h.manager.Ensure(fleetChart.ReleaseNamespace, fleetChart.ChartName, fleetChartValues) + return setting, h.manager.Ensure(fleetChart.ReleaseNamespace, fleetChart.ChartName, + map[string]interface{}{ + "apiServerURL": settings.ServerURL.Get(), + "apiServerCA": settings.CACerts.Get(), + "global": systemGlobalRegistry, + }) }