Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
barry cho
Rancher
Commits
dcd6243d
Unverified
Commit
dcd6243d
authored
4 years ago
by
Dan Ramich
Committed by
GitHub
4 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Revert "HTTP proxy support for Rancher Continuous Delivery (fleet)"
parent
2d92095e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
pkg/controllers/dashboard/fleetcharts/controller.go
+6
-22
pkg/controllers/dashboard/fleetcharts/controller.go
with
6 additions
and
22 deletions
+6
-22
pkg/controllers/dashboard/fleetcharts/controller.go
+
6
-
22
View file @
dcd6243d
...
...
@@ -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
,
})
}
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help