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

fix NO_PROXY #1573

Merged
merged 2 commits into from
May 9, 2020
Merged

fix NO_PROXY #1573

merged 2 commits into from
May 9, 2020

Conversation

BenTheElder
Copy link
Member

  • inspect the correct docker network
  • include node names in no_proxy

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 8, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BenTheElder

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 requested review from aojea and neolit123 May 8, 2020 23:48
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 8, 2020
aojea
aojea reviewed May 8, 2020
View reviewed changes
pkg/cluster/internal/providers/docker/provision.go
@@ -271,18 +283,20 @@ func runArgsForLoadBalancer(cfg *config.Cluster, name string, args []string) ([]
return append(args, loadbalancer.Image), nil
}

func getProxyEnv(cfg *config.Cluster) (map[string]string, error) {
func getProxyEnv(cfg *config.Cluster, networkName string, nodeNames []string) (map[string]string, error) {
Copy link
Contributor

@aojea aojea May 8, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

should []nodeNames be in common and not provider specific?
nah, 💤 , too late for this 🙃

Copy link
Member Author

Choose a reason for hiding this comment

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

nah, there's no DNS in the others at the moment. we can DRY out later if that becomes the case

amwat
amwat reviewed May 8, 2020
View reviewed changes
Copy link
Contributor

@amwat amwat left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 8, 2020
@k8s-ci-robot
Copy link
Contributor

@BenTheElder: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
pull-kind-e2e-kubernetes e0e7724 link /test pull-kind-e2e-kubernetes

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.

@BenTheElder
Copy link
Member Author

hrm NFS flakes ... https://prow.k8s.io/view/gcs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_kind/1573/pull-kind-e2e-kubernetes/1258906611737432064

going to need to devote some time to test deflake very soon.

@BenTheElder BenTheElder merged commit a75d245 into kubernetes-sigs:master May 9, 2020
@BenTheElder BenTheElder deleted the proxy-kind-network branch May 9, 2020 00:25
@mkimuram
Copy link

@BenTheElder

Is my understanding right that in kind v0.8.x until this commit is included, or in kind v0.8.0 and v0.8.1, users need to specify NO_PROXY in a different way from what is described in the current document, when deploying kind behind a proxy?

The document asks to add "172.17.0.0/16" to NO_PROXY, however these versions seem to require to add docker network's subnet and all nodes' name, like "172.18.0.0/16,kind-control-plane". (And after this commit is included, users won't need to specify anything special to NO_PROXY for changing kind's behavior.)

I've tested with v0.8.1, v0.8.0, v0.7.0, and master branch and reached to above conclusion, which took me a bit of time. If above is correct, I think that it is worth documented in somewhere. (If next version is planed to release soon, there won't be many people confused by this, though.)

BTW, this PR is very nice work, for it removed much complexity for users in deploying kind behind a proxy. Thank you very much for your work!

@BenTheElder
Copy link
Member Author

The document asks to add "172.17.0.0/16" to NO_PROXY, however these versions seem to require to add docker network's subnet and all nodes' name, like "172.18.0.0/16,kind-control-plane". (And after this commit is included, users won't need to specify anything special to NO_PROXY for changing kind's behavior.)

That's correct, sorry about that.

The next release is tentatively due by june 1st, though we got a bit less done than I hoped so far .. https://github.com/kubernetes-sigs/kind/milestones

BTW, this PR is very nice work, for it removed much complexity for users in deploying kind behind a proxy. Thank you very much for your work!

thanks :-)

@mkimuram mkimuram mentioned this pull request Jun 8, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amwat amwat amwat left review comments

@aojea aojea aojea left review comments

@neolit123 neolit123 Awaiting requested review from neolit123

Assignees

@amwat amwat

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. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@BenTheElder @k8s-ci-robot @mkimuram @aojea @amwat