Unverified Commit dcd6243d authored by Dan Ramich's avatar Dan Ramich Committed by GitHub
Browse files

Revert "HTTP proxy support for Rancher Continuous Delivery (fleet)"

parent 2d92095e
Showing with 6 additions and 22 deletions
+6 -22
......@@ -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,
})
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment