-
Notifications
You must be signed in to change notification settings - Fork 2.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix the PROXY variables, once and for all #4762
Conversation
Moving the hacky test script into this gist https://gist.github.com/tbielawa/7276903c31ad3dfb0f2759d72f2c5547 |
27c46f1
to
b142cea
Compare
Squashed. |
[test] |
aos-ci-test |
inventory/byo/hosts.origin.example
Outdated
# | ||
# Hosts in the openshift_no_proxy list will NOT use any globally | ||
# configured HTTP(S)_PROXYs. openshift_no_proxy accepts domains | ||
# (.example.com), hosts (example.com), and CIDR ranges (10.1.0.0/16) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But certain implementation's don't support CIDR ranges. Docker doesn't. OpenShift does.
# | ||
# For example, having hosts with FQDNs: m1.ex.com, n1.ex.com, and | ||
# n2.ex.com, one would simply add '.ex.com' to the openshift_no_proxy | ||
# variable (above) and set this value to False |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
raw_no_proxy_list = [] | ||
|
||
# Automatic 3.6 NO_PROXY additions if a proxy is in use | ||
svc_cluster_name = ['.svc', '.' + common['dns_domain'], common['hostname']] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just verifying, but dns_domain
can never fall back to be an IP address, correct? By it's name I'd assume not but just in case ...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think we do anything to ensure that someone doesn't set it to an ip address but I'd never expect that to work. It's always used as a dns suffix so I'd expect everything to blow up violently if it weren't a suffix.
# Automatic 3.6 NO_PROXY additions if a proxy is in use | ||
svc_cluster_name = ['.svc', '.' + common['dns_domain'], common['hostname']] | ||
|
||
# auto_hosts: Added to NO_PROXY list if any proxy params are |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: Since this logic only is used if generate_no_proxy_hosts
is True
it may be worth moving it to line 1692 so it only is generated and stored if it's used.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Discussed on IRC. Implications of leaving the definition in place are negligible. Going to leave as is.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nits but nothing to block over.
[merge][severity:blocker] |
@openshift/team-documentation , @adellape this PR introduces and solidifies behavior which is new in 3.6 and may differ slightly from the existing documentation
May want to reflect explicitly in the online documentation that if any of
are set, then all cluster hosts will have an automatically generated Setting the Setting |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
1ad834a
to
bdbc7d9
Compare
aos-ci-test |
flake openshift/origin#10162 |
[merge][severity:blocker] |
flake openshift/origin#8571 |
flake openshift/origin#10162 |
…I think they default it to an empty list if its not found.
aos-ci-test |
Evaluated for openshift ansible test up to b99b554 |
I think other parts of the openshift-ansible API were expecting |
continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_openshift_ansible/343/) (Base Commit: da7551b) (PR Branch Commit: b99b554) |
@tbielawa - Thanks Tim. Added a card to our Trello board to make these updates in the docs and tagged @adellape to it. https://trello.com/c/7IsRsDEo/596-updates-for-proxy-variables |
[merge][severity:blocker] |
Evaluated for openshift ansible merge up to b99b554 |
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_openshift_ansible/706/) (Base Commit: 69d3800) (PR Branch Commit: b99b554) (Extended Tests: blocker) |
"once and for all" lol |
This will fix a myriad of proxy setting related bugs. At the very least it will impact these:
* https://bugzilla.redhat.com/show_bug.cgi?id=1466783(just kidding, this needs some separate work)