github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Use IANA ports for etcd

Browse Source 
http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=etcd

Use 2379 and 2380, not 4001 and 7001
This commit is contained in:
Eric Paris 2015-04-03 12:50:18 -04:00
parent a94d8e361e
commit 051ab346bd
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/ansible/roles/etcd/tasks/firewalld.yml
View File

@ -4,13 +4,13 @@
# in case this is also a minion where firewalld turned off # in case this is also a minion where firewalld turned off
ignore_errors: yes ignore_errors: yes
with_items: with_items:
- 4001 - 2379
- 7001 - 2380
- name: Save firewalld port for etcd - name: Save firewalld port for etcd
firewalld: port={{ item }}/tcp permanent=true state=enabled firewalld: port={{ item }}/tcp permanent=true state=enabled
# in case this is also a minion where firewalld turned off # in case this is also a minion where firewalld turned off
ignore_errors: yes ignore_errors: yes
with_items: with_items:
- 4001 - 2379
- 7001 - 2380

8
contrib/ansible/roles/etcd/tasks/iptables.yml
View File

@ -8,10 +8,10 @@
service: name=iptables enabled=yes state=started service: name=iptables enabled=yes state=started
- name: Open etcd client port with iptables - name: Open etcd client port with iptables
command: /sbin/iptables -I INPUT 1 -p tcp --dport {{ item }} -j ACCEPT -m comment --comment "etcd_client" command: /sbin/iptables -I INPUT 1 -p tcp --dport {{ item }} -j ACCEPT -m comment --comment "etcd"
when: etcd_client not in iptablesrules.stdout when: etcd not in iptablesrules.stdout
notify: notify:
- Save iptables rules - Save iptables rules
with_items: with_items:
- 4001 - 2379
- 7001 - 2380

2
contrib/ansible/roles/etcd/templates/etcd.conf.j2
View File

@ -1,4 +1,4 @@
# etcd2.0 # etcd2.0
ETCD_NAME=default ETCD_NAME=default
ETCD_DATA_DIR="/var/lib/etcd/default.etcd" ETCD_DATA_DIR="/var/lib/etcd/default.etcd"
ETCD_LISTEN_CLIENT_URLS="http://0.0.0.0:4001" ETCD_LISTEN_CLIENT_URLS="http://0.0.0.0:2379"

2
contrib/ansible/roles/master/templates/apiserver.j2
View File

@ -17,7 +17,7 @@ KUBE_API_ADDRESS="--address=0.0.0.0"
KUBE_SERVICE_ADDRESSES="--portal_net={{ kube_service_addresses }}" KUBE_SERVICE_ADDRESSES="--portal_net={{ kube_service_addresses }}"
# Location of the etcd cluster # Location of the etcd cluster
KUBE_ETCD_SERVERS="--etcd_servers=http://{{ groups['etcd'][0] }}:4001" KUBE_ETCD_SERVERS="--etcd_servers=http://{{ groups['etcd'][0] }}:2379"
# default admission control policies # default admission control policies
KUBE_ADMISSION_CONTROL="--admission_control=NamespaceAutoProvision,LimitRanger,ResourceQuota" KUBE_ADMISSION_CONTROL="--admission_control=NamespaceAutoProvision,LimitRanger,ResourceQuota"