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 fixes #5869

Merged
merged 3 commits into from
Apr 9, 2020
Merged

Proxy fixes #5869

merged 3 commits into from
Apr 9, 2020

Conversation

metajiji
Copy link
Contributor

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change

/kind bug

/kind cleanup
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

What this PR does / why we need it:

  • avoiding duplicate proxy lines in /etc/yum.conf
  • Fix CentOS 8 with proxy inline proxy and module_hotfixes options in rh_docker.repo and remove proxy when not defined.

Which issue(s) this PR fixes:

Fixes #3988

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

metajiji added 3 commits March 31, 2020 13:42
@metajiji
Fix proxy and module_hotfixes
b734324 
On CentOS 8 with proxy ansible render inline `proxy` and `module_hotfixes` options.

For example:

`proxy=http://127.0.0.1:3128module_hotfixes=True`

But expected result:

```
proxy=http://127.0.0.1:3128
module_hotfixes=True
```
@metajiji
Use ini_file module for work with ini files
8c6804e
@metajiji
Prevent duplicates proxy= option in /etc/yum.conf
f963189 
Module `lineinfile` is weak, use most powerful module `ini_file` and add or remove `proxy=` when `http_proxy` is defined or not.
@k8s-ci-robot k8s-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Mar 31, 2020
@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.

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.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Mar 31, 2020
@k8s-ci-robot
Copy link
Contributor

Welcome @metajiji!

It looks like this is your first PR to kubernetes-sigs/kubespray 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/kubespray has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

Hi @metajiji. 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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 31, 2020
@k8s-ci-robot k8s-ci-robot requested review from bozzo and holmsten March 31, 2020 17:59
@metajiji
Copy link
Contributor Author

I signed it

@floryut
Copy link
Member

floryut commented Apr 8, 2020 •
edited
Loading

I signed it

All good neat :)

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Apr 8, 2020
@Miouge1
Copy link
Contributor

Miouge1 commented Apr 9, 2020

Thank you @metajiji !

/lgtm
/approve

@Miouge1 Miouge1 added this to the 2.13 milestone Apr 9, 2020
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 9, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: METAJIJI, Miouge1

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 Apr 9, 2020
@k8s-ci-robot k8s-ci-robot merged commit 7d1ab33 into kubernetes-sigs:master Apr 9, 2020
erulabs added a commit to kubesail/kubespray that referenced this pull request Apr 9, 2020
@erulabs
Merge branch 'master' of https://github.com/kubernetes-sigs/kubespray
8b7dc1e 
* 'master' of https://github.com/kubernetes-sigs/kubespray: (21 commits)
  Remove hard-coded dependance to docker.service in kubelet.service file (kubernetes-sigs#5917)
  Update Calico to v3.13.2, Multus to v3.4.1. Add ConfigMap get permission to allow calico-node access to kubeadm config. (kubernetes-sigs#5912)
  Fix idempotence issue in bootstrap-os (kubernetes-sigs#5916)
  Terraform/OpenStack: Fix idempotency bug in module.network.openstack_networking_router_interface_v2.k8s[0] (kubernetes-sigs#5914)
  Add kubernetes 1.18.1 hashes (kubernetes-sigs#5915)
  Proxy fixes (kubernetes-sigs#5869)
  Remove 1.16.x flag for tf-ovh_coreos-calico (now 1.17 ready) (kubernetes-sigs#5853)
  Update docker RHEL/CentOS versions to the latest patch versions available. (kubernetes-sigs#5872)
  Fix conntrack for opensuse and docker support (kubernetes-sigs#5880)
  Add crictl 1.18.0 hashes for k8s 1.18 (kubernetes-sigs#5877)
  fix readonly flexvolume in fcos and coreos (kubernetes-sigs#5885)
  Fix scaling (kubernetes-sigs#5889)
  Fix chicken and egg problem with proxy_env not defined on the first … (kubernetes-sigs#5896)
  make explicit that doc is at kubespray.io (kubernetes-sigs#5878)
  add local-path-provosioner helper image def (kubernetes-sigs#5817)
  remove unused kubelet options (kubernetes-sigs#5903)
  Change docker.io repo to variable and upgrade alb image (kubernetes-sigs#5898)
  Replace latest tags for csi drivers (kubernetes-sigs#5899)
  CentOS 8 CI (kubernetes-sigs#5842)
  Bump requirements.txt versions / remove ansible_python_interpreter hack (kubernetes-sigs#5847)
  ...
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Apr 18, 2020
@metajiji @LuckySB
Proxy fixes (kubernetes-sigs#5869)
c5d9ed2 
* Fix proxy and module_hotfixes

On CentOS 8 with proxy ansible render inline `proxy` and `module_hotfixes` options.

For example:

`proxy=http://127.0.0.1:3128module_hotfixes=True`

But expected result:

```
proxy=http://127.0.0.1:3128
module_hotfixes=True
```

* Use ini_file module for work with ini files

* Prevent duplicates proxy= option in /etc/yum.conf

Module `lineinfile` is weak, use most powerful module `ini_file` and add or remove `proxy=` when `http_proxy` is defined or not.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bozzo bozzo Awaiting requested review from bozzo

@holmsten holmsten Awaiting requested review from holmsten

Assignees

@Miouge1 Miouge1

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. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
2.13
Development

Successfully merging this pull request may close these issues.
4 participants
@metajiji @k8s-ci-robot @floryut @Miouge1