Skip to content

Commit e4b43ee

Browse files
author
OpenShift Bot
authored
Merge pull request #12483 from csrwng/clusterup_proxy
Merged by openshift-bot
2 parents 0d637fe + a837c86 commit e4b43ee

File tree

11 files changed

+243
-30
lines changed

11 files changed

+243
-30
lines changed

‎contrib/completions/bash/oc

+6
Original file line numberDiff line numberDiff line change
@@ -5613,6 +5613,10 @@ _oc_cluster_up()
56135613
local_nonpersistent_flags+=("--host-pv-dir=")
56145614
flags+=("--host-volumes-dir=")
56155615
local_nonpersistent_flags+=("--host-volumes-dir=")
5616+
flags+=("--http-proxy=")
5617+
local_nonpersistent_flags+=("--http-proxy=")
5618+
flags+=("--https-proxy=")
5619+
local_nonpersistent_flags+=("--https-proxy=")
56165620
flags+=("--image=")
56175621
local_nonpersistent_flags+=("--image=")
56185622
flags+=("--image-streams=")
@@ -5621,6 +5625,8 @@ _oc_cluster_up()
56215625
local_nonpersistent_flags+=("--logging")
56225626
flags+=("--metrics")
56235627
local_nonpersistent_flags+=("--metrics")
5628+
flags+=("--no-proxy=")
5629+
local_nonpersistent_flags+=("--no-proxy=")
56245630
flags+=("--public-hostname=")
56255631
local_nonpersistent_flags+=("--public-hostname=")
56265632
flags+=("--routing-suffix=")

‎contrib/completions/bash/openshift

+6
Original file line numberDiff line numberDiff line change
@@ -10411,6 +10411,10 @@ _openshift_cli_cluster_up()
1041110411
local_nonpersistent_flags+=("--host-pv-dir=")
1041210412
flags+=("--host-volumes-dir=")
1041310413
local_nonpersistent_flags+=("--host-volumes-dir=")
10414+
flags+=("--http-proxy=")
10415+
local_nonpersistent_flags+=("--http-proxy=")
10416+
flags+=("--https-proxy=")
10417+
local_nonpersistent_flags+=("--https-proxy=")
1041410418
flags+=("--image=")
1041510419
local_nonpersistent_flags+=("--image=")
1041610420
flags+=("--image-streams=")
@@ -10419,6 +10423,8 @@ _openshift_cli_cluster_up()
1041910423
local_nonpersistent_flags+=("--logging")
1042010424
flags+=("--metrics")
1042110425
local_nonpersistent_flags+=("--metrics")
10426+
flags+=("--no-proxy=")
10427+
local_nonpersistent_flags+=("--no-proxy=")
1042210428
flags+=("--public-hostname=")
1042310429
local_nonpersistent_flags+=("--public-hostname=")
1042410430
flags+=("--routing-suffix=")

‎contrib/completions/zsh/oc

+6
Original file line numberDiff line numberDiff line change
@@ -5761,6 +5761,10 @@ _oc_cluster_up()
57615761
local_nonpersistent_flags+=("--host-pv-dir=")
57625762
flags+=("--host-volumes-dir=")
57635763
local_nonpersistent_flags+=("--host-volumes-dir=")
5764+
flags+=("--http-proxy=")
5765+
local_nonpersistent_flags+=("--http-proxy=")
5766+
flags+=("--https-proxy=")
5767+
local_nonpersistent_flags+=("--https-proxy=")
57645768
flags+=("--image=")
57655769
local_nonpersistent_flags+=("--image=")
57665770
flags+=("--image-streams=")
@@ -5769,6 +5773,8 @@ _oc_cluster_up()
57695773
local_nonpersistent_flags+=("--logging")
57705774
flags+=("--metrics")
57715775
local_nonpersistent_flags+=("--metrics")
5776+
flags+=("--no-proxy=")
5777+
local_nonpersistent_flags+=("--no-proxy=")
57725778
flags+=("--public-hostname=")
57735779
local_nonpersistent_flags+=("--public-hostname=")
57745780
flags+=("--routing-suffix=")

‎contrib/completions/zsh/openshift

+6
Original file line numberDiff line numberDiff line change
@@ -10559,6 +10559,10 @@ _openshift_cli_cluster_up()
1055910559
local_nonpersistent_flags+=("--host-pv-dir=")
1056010560
flags+=("--host-volumes-dir=")
1056110561
local_nonpersistent_flags+=("--host-volumes-dir=")
10562+
flags+=("--http-proxy=")
10563+
local_nonpersistent_flags+=("--http-proxy=")
10564+
flags+=("--https-proxy=")
10565+
local_nonpersistent_flags+=("--https-proxy=")
1056210566
flags+=("--image=")
1056310567
local_nonpersistent_flags+=("--image=")
1056410568
flags+=("--image-streams=")
@@ -10567,6 +10571,8 @@ _openshift_cli_cluster_up()
1056710571
local_nonpersistent_flags+=("--logging")
1056810572
flags+=("--metrics")
1056910573
local_nonpersistent_flags+=("--metrics")
10574+
flags+=("--no-proxy=")
10575+
local_nonpersistent_flags+=("--no-proxy=")
1057010576
flags+=("--public-hostname=")
1057110577
local_nonpersistent_flags+=("--public-hostname=")
1057210578
flags+=("--routing-suffix=")

‎docs/man/man1/oc-cluster-up.1

+12
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,14 @@ A public hostname can also be specified for the server with the \-\-public\-host
6161
\fB\-\-host\-volumes\-dir\fP="/var/lib/origin/openshift.local.volumes"
6262
Directory on Docker host for OpenShift volumes
6363

64+
.PP
65+
\fB\-\-http\-proxy\fP=""
66+
HTTP proxy to use for master and builds
67+
68+
.PP
69+
\fB\-\-https\-proxy\fP=""
70+
HTTPS proxy to use for master and builds
71+
6472
.PP
6573
\fB\-\-image\fP="openshift/origin"
6674
Specify the images to use for OpenShift
@@ -77,6 +85,10 @@ A public hostname can also be specified for the server with the \-\-public\-host
7785
\fB\-\-metrics\fP=false
7886
If true, install metrics (experimental)
7987

88+
.PP
89+
\fB\-\-no\-proxy\fP=[]
90+
List of hosts or subnets for which a proxy should not be used
91+
8092
.PP
8193
\fB\-\-public\-hostname\fP=""
8294
Public hostname for OpenShift cluster

‎docs/man/man1/openshift-cli-cluster-up.1

+12
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,14 @@ A public hostname can also be specified for the server with the \-\-public\-host
6161
\fB\-\-host\-volumes\-dir\fP="/var/lib/origin/openshift.local.volumes"
6262
Directory on Docker host for OpenShift volumes
6363

64+
.PP
65+
\fB\-\-http\-proxy\fP=""
66+
HTTP proxy to use for master and builds
67+
68+
.PP
69+
\fB\-\-https\-proxy\fP=""
70+
HTTPS proxy to use for master and builds
71+
6472
.PP
6573
\fB\-\-image\fP="openshift/origin"
6674
Specify the images to use for OpenShift
@@ -77,6 +85,10 @@ A public hostname can also be specified for the server with the \-\-public\-host
7785
\fB\-\-metrics\fP=false
7886
If true, install metrics (experimental)
7987

88+
.PP
89+
\fB\-\-no\-proxy\fP=[]
90+
List of hosts or subnets for which a proxy should not be used
91+
8092
.PP
8193
\fB\-\-public\-hostname\fP=""
8294
Public hostname for OpenShift cluster

‎pkg/bootstrap/docker/dockerhelper/helper.go

+29-7
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313

1414
"github.com/blang/semver"
1515
dockerclient "github.com/docker/engine-api/client"
16+
dockertypes "github.com/docker/engine-api/types"
1617
"github.com/docker/engine-api/types/registry"
1718
docker "github.com/fsouza/go-dockerclient"
1819
"github.com/golang/glog"
@@ -28,6 +29,7 @@ const openShiftInsecureCIDR = "172.30.0.0/16"
2829
type Helper struct {
2930
client *docker.Client
3031
engineAPIClient *dockerclient.Client
32+
info *dockertypes.Info
3133
}
3234

3335
// NewHelper creates a new Helper
@@ -55,21 +57,33 @@ func hasCIDR(cidr string, listOfCIDRs []*registry.NetIPNet) bool {
5557
return false
5658
}
5759

58-
// HasInsecureRegistryArg checks whether the docker daemon is configured with
59-
// the appropriate insecure registry argument
60-
func (h *Helper) HasInsecureRegistryArg() (bool, error) {
61-
glog.V(5).Infof("Retrieving Docker daemon info")
62-
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
60+
func (h *Helper) dockerInfo() (*dockertypes.Info, error) {
61+
if h.info != nil {
62+
return h.info, nil
63+
}
6364
if h.engineAPIClient == nil {
64-
return false, fmt.Errorf("the Docker engine API client is not initialized")
65+
return nil, fmt.Errorf("the Docker engine API client is not initialized")
6566
}
67+
glog.V(5).Infof("Retrieving Docker daemon info")
68+
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
6669
info, err := h.engineAPIClient.Info(ctx)
6770
defer cancel()
6871
if err != nil {
6972
glog.V(2).Infof("Could not retrieve Docker info: %v", err)
70-
return false, err
73+
return nil, err
7174
}
7275
glog.V(5).Infof("Docker daemon info: %#v", info)
76+
h.info = &info
77+
return h.info, nil
78+
}
79+
80+
// HasInsecureRegistryArg checks whether the docker daemon is configured with
81+
// the appropriate insecure registry argument
82+
func (h *Helper) HasInsecureRegistryArg() (bool, error) {
83+
info, err := h.dockerInfo()
84+
if err != nil {
85+
return false, err
86+
}
7387
registryConfig := info.RegistryConfig
7488
if err != nil {
7589
return false, err
@@ -109,6 +123,14 @@ func (h *Helper) Version() (*semver.Version, bool, error) {
109123
return &dockerVersion, isRedHat, nil
110124
}
111125

126+
func (h *Helper) GetDockerProxySettings() (httpProxy, httpsProxy, noProxy string, err error) {
127+
info, err := h.dockerInfo()
128+
if err != nil {
129+
return "", "", "", err
130+
}
131+
return info.HTTPProxy, info.HTTPSProxy, info.NoProxy, nil
132+
}
133+
112134
// CheckAndPull checks whether a Docker image exists. If not, it pulls it.
113135
func (h *Helper) CheckAndPull(image string, out io.Writer) error {
114136
glog.V(5).Infof("Inspecting Docker image %q", image)

‎pkg/bootstrap/docker/openshift/admin.go

+2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ const (
2929
SvcDockerRegistry = "docker-registry"
3030
SvcRouter = "router"
3131
masterConfigDir = "/var/lib/origin/openshift.local.config/master"
32+
RegistryServiceIP = "172.30.1.1"
3233
)
3334

3435
// InstallRegistry checks whether a registry is installed and installs one if not already installed
@@ -60,6 +61,7 @@ func (h *Helper) InstallRegistry(kubeClient kclientset.Interface, f *clientcmd.F
6061
Volume: "/registry",
6162
ServiceAccount: "registry",
6263
HostMount: path.Join(pvDir, "registry"),
64+
ClusterIP: RegistryServiceIP,
6365
},
6466
}
6567
cmd := registry.NewCmdRegistry(f, "", "registry", out, errout)

‎pkg/bootstrap/docker/openshift/helper.go

+64-8
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ import (
1313

1414
docker "github.com/fsouza/go-dockerclient"
1515
"github.com/golang/glog"
16+
kapi "k8s.io/kubernetes/pkg/api"
1617
"k8s.io/kubernetes/pkg/util/homedir"
1718

1819
"github.com/openshift/origin/pkg/bootstrap/docker/dockerhelper"
1920
"github.com/openshift/origin/pkg/bootstrap/docker/errors"
2021
dockerexec "github.com/openshift/origin/pkg/bootstrap/docker/exec"
2122
"github.com/openshift/origin/pkg/bootstrap/docker/host"
2223
"github.com/openshift/origin/pkg/bootstrap/docker/run"
24+
defaultsapi "github.com/openshift/origin/pkg/build/admission/defaults/api"
2325
cliconfig "github.com/openshift/origin/pkg/cmd/cli/config"
2426
configapi "github.com/openshift/origin/pkg/cmd/server/api"
2527
_ "github.com/openshift/origin/pkg/cmd/server/api/install"
@@ -64,6 +66,7 @@ type Helper struct {
6466
image string
6567
containerName string
6668
routingSuffix string
69+
serverIP string
6770
}
6871

6972
// StartOptions represent the parameters sent to the start command
@@ -84,6 +87,9 @@ type StartOptions struct {
8487
MetricsHost string
8588
LoggingHost string
8689
PortForwarding bool
90+
HTTPProxy string
91+
HTTPSProxy string
92+
NoProxy []string
8793
}
8894

8995
// NewHelper creates a new OpenShift helper
@@ -176,6 +182,9 @@ func (h *Helper) DetermineNodeHost(hostConfigDir string, names ...string) (strin
176182

177183
// ServerIP retrieves the Server ip through the openshift start command
178184
func (h *Helper) ServerIP() (string, error) {
185+
if len(h.serverIP) > 0 {
186+
return h.serverIP, nil
187+
}
179188
result, _, _, err := h.runHelper.New().Image(h.image).
180189
DiscardContainer().
181190
Privileged().
@@ -184,7 +193,8 @@ func (h *Helper) ServerIP() (string, error) {
184193
if err != nil {
185194
return "", err
186195
}
187-
return strings.TrimSpace(result), nil
196+
h.serverIP = strings.TrimSpace(result)
197+
return h.serverIP, nil
188198
}
189199

190200
// OtherIPs tries to find other IPs besides the argument IP for the Docker host
@@ -223,6 +233,15 @@ func (h *Helper) Start(opt *StartOptions, out io.Writer) (string, error) {
223233

224234
binds := openShiftContainerBinds
225235
env := []string{}
236+
if len(opt.HTTPProxy) > 0 {
237+
env = append(env, fmt.Sprintf("HTTP_PROXY=%s", opt.HTTPProxy))
238+
}
239+
if len(opt.HTTPSProxy) > 0 {
240+
env = append(env, fmt.Sprintf("HTTPS_PROXY=%s", opt.HTTPSProxy))
241+
}
242+
if len(opt.NoProxy) > 0 {
243+
env = append(env, fmt.Sprintf("NO_PROXY=%s", strings.Join(opt.NoProxy, ",")))
244+
}
226245
if opt.UseSharedVolume {
227246
binds = append(binds, fmt.Sprintf("%[1]s:%[1]s:shared", opt.HostVolumesDir))
228247
env = append(env, "OPENSHIFT_CONTAINERIZED=false")
@@ -305,7 +324,7 @@ func (h *Helper) Start(opt *StartOptions, out io.Writer) (string, error) {
305324
if err != nil {
306325
return "", errors.NewError("could not copy OpenShift configuration").WithCause(err)
307326
}
308-
err = h.updateConfig(configDir, opt.RouterIP, opt.MetricsHost, opt.LoggingHost)
327+
err = h.updateConfig(configDir, opt)
309328
if err != nil {
310329
cleanupConfig()
311330
return "", errors.NewError("could not update OpenShift configuration").WithCause(err)
@@ -494,7 +513,7 @@ func GetConfigFromContainer(client *docker.Client) (*configapi.MasterConfig, err
494513
return config, nil
495514
}
496515

497-
func (h *Helper) updateConfig(configDir, routerIP, metricsHost, loggingHost string) error {
516+
func (h *Helper) updateConfig(configDir string, opt *StartOptions) error {
498517
cfg, configPath, err := h.GetConfigFromLocalDir(configDir)
499518
if err != nil {
500519
return err
@@ -503,15 +522,52 @@ func (h *Helper) updateConfig(configDir, routerIP, metricsHost, loggingHost stri
503522
if len(h.routingSuffix) > 0 {
504523
cfg.RoutingConfig.Subdomain = h.routingSuffix
505524
} else {
506-
cfg.RoutingConfig.Subdomain = fmt.Sprintf("%s.xip.io", routerIP)
525+
cfg.RoutingConfig.Subdomain = fmt.Sprintf("%s.xip.io", opt.RouterIP)
526+
}
527+
528+
if len(opt.MetricsHost) > 0 && cfg.AssetConfig != nil {
529+
cfg.AssetConfig.MetricsPublicURL = fmt.Sprintf("https://%s/hawkular/metrics", opt.MetricsHost)
507530
}
508531

509-
if len(metricsHost) > 0 && cfg.AssetConfig != nil {
510-
cfg.AssetConfig.MetricsPublicURL = fmt.Sprintf("https://%s/hawkular/metrics", metricsHost)
532+
if len(opt.LoggingHost) > 0 && cfg.AssetConfig != nil {
533+
cfg.AssetConfig.LoggingPublicURL = fmt.Sprintf("https://%s", opt.LoggingHost)
511534
}
512535

513-
if len(loggingHost) > 0 && cfg.AssetConfig != nil {
514-
cfg.AssetConfig.LoggingPublicURL = fmt.Sprintf("https://%s", loggingHost)
536+
if len(opt.HTTPProxy) > 0 || len(opt.HTTPSProxy) > 0 || len(opt.NoProxy) > 0 {
537+
if cfg.AdmissionConfig.PluginConfig == nil {
538+
cfg.AdmissionConfig.PluginConfig = map[string]configapi.AdmissionPluginConfig{}
539+
}
540+
541+
var buildDefaults *defaultsapi.BuildDefaultsConfig
542+
buildDefaultsConfig, ok := cfg.AdmissionConfig.PluginConfig[defaultsapi.BuildDefaultsPlugin]
543+
if !ok {
544+
buildDefaultsConfig = configapi.AdmissionPluginConfig{}
545+
}
546+
if buildDefaultsConfig.Configuration != nil {
547+
buildDefaults = buildDefaultsConfig.Configuration.(*defaultsapi.BuildDefaultsConfig)
548+
}
549+
if buildDefaults == nil {
550+
buildDefaults = &defaultsapi.BuildDefaultsConfig{}
551+
buildDefaultsConfig.Configuration = buildDefaults
552+
}
553+
buildDefaults.GitHTTPProxy = opt.HTTPProxy
554+
buildDefaults.GitHTTPSProxy = opt.HTTPSProxy
555+
buildDefaults.GitNoProxy = strings.Join(opt.NoProxy, ",")
556+
varsToSet := map[string]string{
557+
"HTTP_PROXY": opt.HTTPProxy,
558+
"http_proxy": opt.HTTPProxy,
559+
"HTTPS_PROXY": opt.HTTPSProxy,
560+
"https_proxy": opt.HTTPSProxy,
561+
"NO_PROXY": strings.Join(opt.NoProxy, ","),
562+
"no_proxy": strings.Join(opt.NoProxy, ","),
563+
}
564+
for k, v := range varsToSet {
565+
buildDefaults.Env = append(buildDefaults.Env, kapi.EnvVar{
566+
Name: k,
567+
Value: v,
568+
})
569+
}
570+
cfg.AdmissionConfig.PluginConfig[defaultsapi.BuildDefaultsPlugin] = buildDefaultsConfig
515571
}
516572

517573
cfg.JenkinsPipelineConfig.TemplateName = "jenkins-persistent"

0 commit comments

Comments
 (0)