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

set no proxy environment variable properly in kubelet and crio #945

Merged
merged 1 commit into from
Jan 22, 2020
Merged

set no proxy environment variable properly in kubelet and crio #945

merged 1 commit into from
Jan 22, 2020

Conversation

opuk
Copy link
Contributor

@opuk opuk commented Jan 21, 2020

the NO_PROXY variable was incorrectly set, this should fix this

$ cat /etc/systemd/system/crio.service.d/10-default-env.conf
[Service]
Environment=HTTP_PROXY=http://10.3.0.2:8118
Environment=HTTPS_PROXY=http://10.3.0.2:8118
Environment=NO_PROXY=.cluster.local,.svc,10.128.0.0/14,172.30.0.0/16,[127.0.0.1 localhost .testing 192.168.64.2]

@centos-ci
Copy link
Collaborator

Can one of the admins verify this patch?

@@ -163,8 +163,7 @@ func AddProxyToKubeletAndCriO(sshRunner *ssh.SSHRunner, proxy *network.ProxyConf
Environment=HTTP_PROXY=%s
Environment=HTTPS_PROXY=%s
Environment=NO_PROXY=.cluster.local,.svc,10.128.0.0/14,172.30.0.0/16,%s`

p := fmt.Sprintf(proxyTemplate, proxy.HttpProxy, proxy.HttpsProxy, proxy.NoProxy)
p := fmt.Sprintf(proxyTemplate, proxy.HttpProxy, proxy.HttpsProxy, strings.Join(proxy.NoProxy, ","))
Copy link
Member

Choose a reason for hiding this comment

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

👍

@praveenkumar
Copy link
Member

ok to test

@praveenkumar praveenkumar merged commit 35e214f into crc-org:master Jan 22, 2020
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.

None yet

3 participants