Add proxy configuration to bootstrap node #1832

jcpowermac · 2019-06-07T21:06:27Z

Modification of bootstrapTemplateData struct to include proxy requirements.
Modification of getTemplateData and addStorageFiles to support proxy

Added:

/etc/profile.d/proxy.sh.template
/etc/systemd/system.conf.d/10-default-env.conf.template

jcpowermac · 2019-06-07T21:11:12Z

Tested with squid using basic auth.

proxy:
  httpsProxy: "jcallen:foo@1.1.1.1:3128"
  httpProxy: "jcallen:foo@1.1.1.1:3128"
  noProxy: "devcluster.openshift.com,127.0.0.1,10.128.0.0/14,10.0.0.0/16,172.30.0.0/16"

Proxy for podman:
https://access.redhat.com/solutions/3939131
https://bugzilla.redhat.com/show_bug.cgi?id=1682970

This needs @patrickdillon PR: #1827

abhinavdahiya · 2019-06-11T01:01:06Z

pkg/asset/ignition/bootstrap/bootstrap.go

 	}, nil
 }

 func (a *Bootstrap) addStorageFiles(base string, uri string, templateData *bootstrapTemplateData) (err error) {
+	proxy := map[string]struct{}{


is it possible to move this to the call-site for this function ie in the Generate for bootstrap ignition asset...?

staebler · 2019-06-11T19:15:39Z

pkg/asset/ignition/bootstrap/bootstrap.go

@@ -218,6 +225,11 @@ func (a *Bootstrap) addStorageFiles(base string, uri string, templateData *boots
 	}

 	name := info.Name()
+	if _, ok := proxy[name]; ok {


If you make proxy a map[string]bool and populate it with true values, then you can right this expression as the more simple if proxy[name] {.

staebler · 2019-06-11T19:26:14Z

data/data/bootstrap/files/etc/profile.d/proxy.sh.template

@@ -0,0 +1,5 @@
+{{if .Proxy}}


I don't know that we care, but this will result in empty lines in the file.

To do it without empty lines,

{{ if .Proxy -}} {{ if .Proxy.HTTPProxy -}} export HTTP_PROXY="{{ .Proxy.HTTPProxy }}" {{ end -}} ... {{ end -}}

jcpowermac · 2019-06-13T16:35:56Z

/retest

jcpowermac · 2019-06-13T18:51:45Z

/retest

jcpowermac · 2019-06-19T16:47:49Z

/test e2e-openstack

danehans · 2019-06-19T20:56:29Z

/test e2e-aws-scaleup-rhel7

abhinavdahiya · 2019-06-19T21:16:47Z

pkg/asset/ignition/bootstrap/bootstrap.go

@@ -183,10 +185,15 @@ func (a *Bootstrap) getTemplateData(installConfig *types.InstallConfig) (*bootst
 		PullSecret:   installConfig.PullSecret,
 		ReleaseImage: releaseImage,
 		EtcdCluster:  strings.Join(etcdEndpoints, ","),
+		Proxy:        installConfig.Proxy,


This should not be the install-config, but the status from object from #1866

abhinavdahiya · 2019-06-19T21:18:09Z

pkg/asset/ignition/bootstrap/bootstrap.go

 	}, nil
 }

 func (a *Bootstrap) addStorageFiles(base string, uri string, templateData *bootstrapTemplateData) (err error) {
+	proxy := map[string]bool{


the files will automatically be empty if proxy is not set, right?

Is it a problem if we write empty file to disk? If is not a problem, I think it will be cleaner to always write those file, even though they might be empty..?

No issues were caused by having the files empty. The cluster installed normally. Updated the PR to remove this section.

Modification of `bootstrapTemplateData` struct to include proxy requirements. Modification of `getTemplateData` and `addStorageFiles` to support proxy Modification of proxy manifests Added: - /etc/profile.d/proxy.sh.template - /etc/systemd/system.conf.d/10-default-env.conf.template

abhinavdahiya · 2019-06-24T23:55:47Z

docs/dev/proxy.md

+```yaml
+---
+apiVersion: v1
+baseDomain: devcluster.openshift.com


include ... so that people know there's more that's required.

abhinavdahiya · 2019-06-24T23:57:35Z

/lgtm

openshift-ci-robot · 2019-06-24T23:57:47Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhinavdahiya, jcpowermac

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [abhinavdahiya]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-bot · 2019-06-25T00:40:26Z

/retest

Please review the full test history for this PR and help us cut down flakes.

openshift-ci-robot · 2019-06-25T01:51:55Z

@jcpowermac: The following test failed, say /retest to rerun them all:

Test name	Commit	Details	Rerun command
ci/prow/e2e-aws-scaleup-rhel7	`e7edbf7`	link	`/test e2e-aws-scaleup-rhel7`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

This is a bit more accessible than pointing folks at Godocs, since it allows us to focus on the YAML property names (while Godocs understandably focus on Go property names) and YAML renderings. Also break up our old "one big example" install-config.yaml into a minimal per-platform example and a series of small extentions excercising groups of properties. The vSphere docs are based heavily on [1]. Also drop proxy.md. It was added in e7edbf7 (Add proxy configuration to bootstrap node, 2019-06-24, openshift#1832), but: * Proxy testing and Squid configuration information belongs in openshift/release, not in the installer repository. * docs/user/customization.md now contains a more complete proxy-config fragment. [1]: https://github.com/openshift/openshift-docs/blob/enterprise-4.2/modules/installation-vsphere-config-yaml.adoc Last touched by commit openshift/openshift-docs@25afc76 , 2019-08-19

This is a bit more accessible than pointing folks at Godocs, since it allows us to focus on the YAML property names (while Godocs understandably focus on Go property names) and YAML renderings. Also break up our old "one big example" install-config.yaml into a minimal per-platform example and a series of small extentions excercising groups of properties. The vSphere docs are based heavily on [1]. Also drop proxy.md. It was added in e7edbf7 (Add proxy configuration to bootstrap node, 2019-06-24, openshift#1832), but: * Proxy testing and Squid configuration information belongs in openshift/release, not in the installer repository. * docs/user/customization.md now contains a more complete proxy-config fragment. OpenStack computeFlavor precedence is based on [2]. [1]: https://github.com/openshift/openshift-docs/blob/enterprise-4.2/modules/installation-vsphere-config-yaml.adoc Last touched by commit openshift/openshift-docs@25afc76 , 2019-08-19 [2]: openshift#2162 (comment)

openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 7, 2019

openshift-ci-robot requested review from jstuever and patrickdillon June 7, 2019 21:16

abhinavdahiya reviewed Jun 11, 2019

View reviewed changes

staebler reviewed Jun 11, 2019

View reviewed changes

jcpowermac force-pushed the CORS-1076 branch from 987e211 to d951177 Compare June 12, 2019 13:47

openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 12, 2019

jcpowermac changed the title ~~[WIP] Add proxy configuration to bootstrap node~~ Add proxy configuration to bootstrap node Jun 13, 2019

openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 13, 2019

abhinavdahiya reviewed Jun 19, 2019

View reviewed changes

jcpowermac force-pushed the CORS-1076 branch from d951177 to 27769b1 Compare June 24, 2019 19:48

jcpowermac force-pushed the CORS-1076 branch from 27769b1 to e7edbf7 Compare June 24, 2019 19:50

abhinavdahiya reviewed Jun 24, 2019

View reviewed changes

openshift-ci-robot assigned abhinavdahiya Jun 24, 2019

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 24, 2019

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 24, 2019

openshift-merge-robot merged commit 2b9afc6 into openshift:master Jun 25, 2019

jcpowermac deleted the CORS-1076 branch June 27, 2019 19:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add proxy configuration to bootstrap node #1832

Add proxy configuration to bootstrap node #1832

jcpowermac commented Jun 7, 2019

jcpowermac commented Jun 7, 2019

abhinavdahiya Jun 11, 2019 •

edited

Loading

staebler Jun 11, 2019

staebler Jun 11, 2019

jcpowermac commented Jun 13, 2019

jcpowermac commented Jun 13, 2019

jcpowermac commented Jun 19, 2019

danehans commented Jun 19, 2019

abhinavdahiya Jun 19, 2019

abhinavdahiya Jun 19, 2019

jcpowermac Jun 24, 2019

abhinavdahiya Jun 24, 2019

abhinavdahiya commented Jun 24, 2019

openshift-ci-robot commented Jun 24, 2019

openshift-bot commented Jun 25, 2019

openshift-ci-robot commented Jun 25, 2019

Add proxy configuration to bootstrap node #1832

Add proxy configuration to bootstrap node #1832

Conversation

jcpowermac commented Jun 7, 2019

jcpowermac commented Jun 7, 2019

abhinavdahiya Jun 11, 2019 • edited Loading

Choose a reason for hiding this comment

staebler Jun 11, 2019

Choose a reason for hiding this comment

staebler Jun 11, 2019

Choose a reason for hiding this comment

jcpowermac commented Jun 13, 2019

jcpowermac commented Jun 13, 2019

jcpowermac commented Jun 19, 2019

danehans commented Jun 19, 2019

abhinavdahiya Jun 19, 2019

Choose a reason for hiding this comment

abhinavdahiya Jun 19, 2019

Choose a reason for hiding this comment

jcpowermac Jun 24, 2019

Choose a reason for hiding this comment

abhinavdahiya Jun 24, 2019

Choose a reason for hiding this comment

abhinavdahiya commented Jun 24, 2019

openshift-ci-robot commented Jun 24, 2019

openshift-bot commented Jun 25, 2019

openshift-ci-robot commented Jun 25, 2019

abhinavdahiya Jun 11, 2019 •

edited

Loading