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

Add proxy support to containerd, improves no_proxy #5583

Merged
merged 2 commits into from
Jan 29, 2020

Conversation

champtar
Copy link
Contributor

What type of PR is this?
/kind bug

What this PR does / why we need it:
This PR add a systemd drop-in config to containerd to setup proxy environment variables

Which issue(s) this PR fixes:
Fixes _

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

Add proxy support to containerd, add kube_service_addresses / kube_pods_subnet to no_proxy

Signed-off-by: Etienne Champetier <[email protected]>
…no_proxy

CIDR notation in no_proxy is supported by a lot of programs/languages,
including go: golang/go#16704
Without that containerd cannot talk the the API server (kube_apiserver_ip),
but it should not go through an external proxy for the nodes/pods/services

Signed-off-by: Etienne Champetier <[email protected]>
@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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 27, 2020
@Miouge1
Copy link
Contributor

Miouge1 commented Jan 29, 2020

We don't have an easy way to test this, but it looks good to me.

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: champtar, 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 Jan 29, 2020
@k8s-ci-robot k8s-ci-robot merged commit 9f2dd09 into kubernetes-sigs:master Jan 29, 2020
erulabs added a commit to kubesail/kubespray that referenced this pull request Feb 6, 2020
* 'master' of https://github.com/kubernetes-sigs/kubespray:
  Add LuckySB as an approver (kubernetes-sigs#5584)
  Add CentOS 8 image for testing (kubernetes-sigs#5589)
  Fix typo in Multus plugin. (kubernetes-sigs#5568)
  Add proxy support to containerd, improves no_proxy (kubernetes-sigs#5583)
  Remove stale legacy yum docker repo /etc/yum.repos.d/docker.repo (kubernetes-sigs#5569)
@champtar champtar deleted the proxy branch March 6, 2020 19:52
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Mar 6, 2020
)

* containerd: add proxy support

Signed-off-by: Etienne Champetier <[email protected]>

* kubespray-defaults: add kube_service_addresses / kube_pods_subnet to no_proxy

CIDR notation in no_proxy is supported by a lot of programs/languages,
including go: golang/go#16704
Without that containerd cannot talk the the API server (kube_apiserver_ip),
but it should not go through an external proxy for the nodes/pods/services

Signed-off-by: Etienne Champetier <[email protected]>
champtar added a commit to champtar/kubespray that referenced this pull request Mar 25, 2020
)

* containerd: add proxy support

Signed-off-by: Etienne Champetier <[email protected]>

* kubespray-defaults: add kube_service_addresses / kube_pods_subnet to no_proxy

CIDR notation in no_proxy is supported by a lot of programs/languages,
including go: golang/go#16704
Without that containerd cannot talk the the API server (kube_apiserver_ip),
but it should not go through an external proxy for the nodes/pods/services

Signed-off-by: Etienne Champetier <[email protected]>
(cherry picked from commit 9f2dd09)
champtar added a commit to champtar/kubespray that referenced this pull request Mar 25, 2020
)

* containerd: add proxy support

Signed-off-by: Etienne Champetier <[email protected]>

* kubespray-defaults: add kube_service_addresses / kube_pods_subnet to no_proxy

CIDR notation in no_proxy is supported by a lot of programs/languages,
including go: golang/go#16704
Without that containerd cannot talk the the API server (kube_apiserver_ip),
but it should not go through an external proxy for the nodes/pods/services

Signed-off-by: Etienne Champetier <[email protected]>
(cherry picked from commit 9f2dd09)
k8s-ci-robot pushed a commit that referenced this pull request Mar 27, 2020
* containerd: add proxy support

Signed-off-by: Etienne Champetier <[email protected]>

* kubespray-defaults: add kube_service_addresses / kube_pods_subnet to no_proxy

CIDR notation in no_proxy is supported by a lot of programs/languages,
including go: golang/go#16704
Without that containerd cannot talk the the API server (kube_apiserver_ip),
but it should not go through an external proxy for the nodes/pods/services

Signed-off-by: Etienne Champetier <[email protected]>
(cherry picked from commit 9f2dd09)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants