Skip to content
This repository was archived by the owner on Apr 17, 2019. It is now read-only.

Commit 9e57f96

Browse files
committed
Merge pull request #630 from danehans/no_proxy
Adds support for no_proxy
2 parents dc44a93 + 5d97660 commit 9e57f96

File tree

12 files changed

+12
-0
lines changed

12 files changed

+12
-0
lines changed

ansible/group_vars/all.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ insecure_registrys:
3535
# If you need a proxy for the docker daemon define these here
3636
#http_proxy: "http://proxy.example.com:3128"
3737
#https_proxy: "http://proxy.example.com:3128"
38+
#no_proxy: "127.0.0.1,localhost,docker-registry.somecorporation.com"
3839

3940
# The port that the Kubernetes apiserver component listens on.
4041
kube_master_api_port: 443

ansible/roles/etcd/tasks/github-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
environment:
1515
http_proxy: "{{ http_proxy|default('') }}"
1616
https_proxy: "{{ https_proxy|default('') }}"
17+
no_proxy: "{{ no_proxy|default('') }}"
1718

1819
- name: Extract tar file
1920
unarchive:

ansible/roles/flannel/tasks/github-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
environment:
1212
http_proxy: "{{ http_proxy|default('') }}"
1313
https_proxy: "{{ https_proxy|default('') }}"
14+
no_proxy: "{{ no_proxy|default('') }}"
1415

1516
- name: Extract tar file
1617
unarchive:

ansible/roles/kubernetes-addons/tasks/cluster-logging.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
environment:
1212
http_proxy: "{{ http_proxy|default('') }}"
1313
https_proxy: "{{ https_proxy|default('') }}"
14+
no_proxy: "{{ no_proxy|default('') }}"
1415
with_items:
1516
- es-controller.yaml
1617
- es-service.yaml

ansible/roles/kubernetes-addons/tasks/kube-dash.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
environment:
1212
http_proxy: "{{ http_proxy|default('') }}"
1313
https_proxy: "{{ https_proxy|default('') }}"
14+
no_proxy: "{{ no_proxy|default('') }}"
1415
with_items:
1516
- kube-dash-rc.yaml
1617
- kube-dash-svc.yaml

ansible/roles/kubernetes-addons/tasks/kube-ui.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
environment:
1212
http_proxy: "{{ http_proxy|default('') }}"
1313
https_proxy: "{{ https_proxy|default('') }}"
14+
no_proxy: "{{ no_proxy|default('') }}"
1415
with_items:
1516
- kube-ui-rc.yaml
1617
- kube-ui-svc.yaml

ansible/roles/kubernetes-addons/tasks/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
environment:
2121
http_proxy: "{{ http_proxy|default('') }}"
2222
https_proxy: "{{ https_proxy|default('') }}"
23+
no_proxy: "{{ no_proxy|default('') }}"
2324

2425
- include: dns.yml
2526
when: dns_setup

ansible/roles/kubernetes/tasks/download_bins.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
environment:
88
http_proxy: "{{ http_proxy|default('') }}"
99
https_proxy: "{{ https_proxy|default('') }}"
10+
no_proxy: "{{ no_proxy|default('') }}"
1011

1112
- name: Extract tar file
1213
unarchive:

ansible/roles/master/tasks/coreos.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
environment:
3030
http_proxy: "{{ http_proxy|default('') }}"
3131
https_proxy: "{{ https_proxy|default('') }}"
32+
no_proxy: "{{ no_proxy|default('') }}"
3233

3334
- name: CoreOS | Create dropin directories for Kubernetes Master services
3435
file: path=/etc/systemd/system/{{ item }}.service.d state=directory mode=0755

ansible/roles/node/tasks/coreos.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
environment:
2828
http_proxy: "{{ http_proxy|default('') }}"
2929
https_proxy: "{{ https_proxy|default('') }}"
30+
no_proxy: "{{ no_proxy|default('') }}"
3031

3132
- name: CoreOS | Create dropin directories for Kubernetes Node services
3233
file: path=/etc/systemd/system/{{ item }}.service.d state=directory mode=0755

0 commit comments

Comments
 (0)