C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix "Prevent inventory.py from configuring an even number of nodes in etcd" #4399 (#4465)

Browse source 
by making clusters with fewer than 3 nodes have only 1 etcd node
This commit is contained in:
Remous-Aris Koutsiamanis 2019-04-10 14:52:14 +02:00 committed by Kubernetes Prow Robot
parent 353afa7cb0
commit 27958e4247
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
contrib/inventory_builder/inventory.py
View file

@ -93,14 +93,15 @@ class KubesprayInventory(object):
self.purge_invalid_hosts(self.hosts.keys(), PROTECTED_NAMES) self.purge_invalid_hosts(self.hosts.keys(), PROTECTED_NAMES)
self.set_all(self.hosts) self.set_all(self.hosts)
self.set_k8s_cluster() self.set_k8s_cluster()
self.set_etcd(list(self.hosts.keys())[:3]) etcd_hosts_count = 3 if len(self.hosts.keys()) >= 3 else 1
self.set_etcd(list(self.hosts.keys())[:etcd_hosts_count])
if len(self.hosts) >= SCALE_THRESHOLD: if len(self.hosts) >= SCALE_THRESHOLD:
self.set_kube_master(list(self.hosts.keys())[3:5]) self.set_kube_master(list(self.hosts.keys())[etcd_hosts_count:5])
else: else:
self.set_kube_master(list(self.hosts.keys())[:2]) self.set_kube_master(list(self.hosts.keys())[:2])
self.set_kube_node(self.hosts.keys()) self.set_kube_node(self.hosts.keys())
if len(self.hosts) >= SCALE_THRESHOLD: if len(self.hosts) >= SCALE_THRESHOLD:
self.set_calico_rr(list(self.hosts.keys())[:3]) self.set_calico_rr(list(self.hosts.keys())[:etcd_hosts_count])
else: # Show help if no options else: # Show help if no options
self.show_help() self.show_help()
sys.exit(0) sys.exit(0)