Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Proxy small fixes #7102

Merged
merged 3 commits into from
Jan 7, 2021
Merged

Proxy small fixes #7102

merged 3 commits into from
Jan 7, 2021

Conversation

champtar
Copy link
Contributor

@champtar champtar commented Jan 5, 2021

What type of PR is this?
/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes:
This improves #7100, but is not a full fix IMO

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

Add svc,svc.{{ dns_domain }} to no_proxy

@champtar
Improve how we set 'proxy=' in yum.conf or dnf.conf
242b33f 
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
@champtar
Fixup spaces in no_proxy
40f1ac2 
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
@champtar
Add svc,svc.{{ dns_domain }} to no_proxy
c311ab4 
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 5, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @champtar. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jan 5, 2021
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 5, 2021
@EppO
Copy link
Contributor

EppO commented Jan 5, 2021

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 5, 2021
floryut
floryut approved these changes Jan 6, 2021
View reviewed changes
Copy link
Member

@floryut floryut left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: champtar, floryut

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:

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 6, 2021
@floryut floryut added this to the 2.15 milestone Jan 6, 2021
oomichi
oomichi reviewed Jan 7, 2021
View reviewed changes
Copy link
Contributor

@oomichi oomichi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for answering my question on the slack.

/lgtm

roles/bootstrap-os/tasks/bootstrap-centos.yml
@@ -4,6 +4,17 @@
gather_subset: '!all'
filter: ansible_distribution_*version

- name: Add proxy to yum.conf or dnf.conf if http_proxy is defined
ini_file:
path: "{{ ( (ansible_distribution_major_version | int) < 8) | ternary('/etc/yum.conf','/etc/dnf/dnf.conf') }}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note for me: dnf is newer package management system than yum and it is available on centos8.

roles/bootstrap-os/tasks/bootstrap-fedora.yml
option: proxy
value: "{{ http_proxy | default(omit) }}"
state: "{{ http_proxy | default(False) | ternary('present', 'absent') }}"
no_extra_spaces: true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

consistent configuration way as the same as centos one.

roles/kubespray-defaults/tasks/no_proxy.yml
@@ -22,7 +22,7 @@
{%- if additional_no_proxy is defined -%}
{{ additional_no_proxy }},
{%- endif -%}
127.0.0.1,localhost,{{ kube_service_addresses }},{{ kube_pods_subnet }}
127.0.0.1,localhost,{{ kube_service_addresses }},{{ kube_pods_subnet }},svc,svc.{{ dns_domain }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note: this additional svc non_proxy configuration is for avoiding http proxy on k8s internal communication.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 7, 2021
@k8s-ci-robot k8s-ci-robot merged commit ab2bfd7 into kubernetes-sigs:master Jan 7, 2021
@champtar champtar deleted the proxy_small_fixes branch January 7, 2021 19:06
@floryut floryut mentioned this pull request Jan 8, 2021
Closed
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Jan 17, 2021
@champtar @LuckySB
Proxy small fixes (kubernetes-sigs#7102)
d1e193b 
* Improve how we set 'proxy=' in yum.conf or dnf.conf

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>

* Fixup spaces in no_proxy

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>

* Add svc,svc.{{ dns_domain }} to no_proxy

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oomichi oomichi oomichi left review comments

@floryut floryut floryut approved these changes

@bozzo bozzo Awaiting requested review from bozzo

@holmsten holmsten Awaiting requested review from holmsten

Assignees

@oomichi oomichi

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
2.15
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@champtar @k8s-ci-robot @EppO @oomichi @floryut