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.

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

Update DinD image to make it possible to configure HTTP proxies #485

Merged
merged 1 commit into from
May 14, 2019

Conversation

cofyc
Copy link
Contributor

@cofyc cofyc commented May 13, 2019

What problem does this PR solve?

fixes #461

What is changed and how it works?

Check List

Tests

Manual test (add detailed scripts or steps below)

configure http proxies in docker config.json

    "proxies": {
        "default": {
            "httpProxy": "http://192.168.90.1:1087",
            "httpsProxy": "http://192.168.90.1:1087",
            "noProxy": ".svc,.local,127.0.0.1,0,1,2,3,4,5,6,7,8,9"
        }   
    }

propagate http proxies to dind containers

export DIND_PROPAGATE_HTTP_PROXY=true
manifests/local-dind/dind-cluster-v1.12.sh up

Does this PR introduce a user-facing change?:

NONE

@cofyc cofyc requested review from onlymellb and weekface May 13, 2019 04:15
@cofyc
Copy link
Contributor Author

cofyc commented May 13, 2019

"noProxy": ".svc,.local,127.0.0.1,0,1,2,3,4,5,6,7,8,9"

This is used to whitelist all internal k8s domains, local registry (e.g. http://127.0.0.1:5000) and other IP addresses.

@AstroProfundis
Copy link
Contributor

Do we need to add instructions to the doc?

@cofyc
Copy link
Contributor Author

cofyc commented May 13, 2019

@AstroProfundis sure, I'd like to add this as an alternative option to KUBE_REPO_PREFIX because it works for all blocked images.

weekface
weekface previously approved these changes May 13, 2019
@cofyc cofyc changed the title Able to configure HTTP proxies in DinD WIP: Able to configure HTTP proxies in DinD May 14, 2019
@cofyc cofyc changed the title WIP: Able to configure HTTP proxies in DinD Update DinD image to make it possible to configure HTTP proxies May 14, 2019
@cofyc
Copy link
Contributor Author

cofyc commented May 14, 2019

@onlymellb I've updated DinD image and tested it on Linux successfully.

onlymellb
onlymellb previously approved these changes May 14, 2019
Copy link
Contributor

@onlymellb onlymellb left a comment

Choose a reason for hiding this comment

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

LGTM

@cofyc cofyc force-pushed the fix461 branch 2 times, most recently from b003545 to ed72b54 Compare May 14, 2019 06:38
@cofyc
Copy link
Contributor Author

cofyc commented May 14, 2019

@weekface @onlymellb
I've rebased on the latest master. PTAL again.

@cofyc
Copy link
Contributor Author

cofyc commented May 14, 2019

/run-e2e-tests

@cofyc cofyc merged commit ea05ed9 into pingcap:master May 14, 2019
@weekface
Copy link
Contributor

This pr needs to add a release note? @cofyc

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ERROR: "Job for docker.service canceled." error when DIND*_PROXY set
4 participants