airship
/
promenade
Code Issues Proposed changes

fix some issues in multi-master testing

This commit is contained in:
Mark Burnett 2017-06-23 07:57:43 -05:00
parent 595e0ef4a9
commit a9784b4c83
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
promenade/generator.py
View File

@ -203,7 +203,8 @@ def _master_etcd_config(cluster_name, genesis_hostname, hostname, masters):
'auxiliary-etcd-0=https://%s:12380' % genesis_hostname,
'auxiliary-etcd-1=https://%s:22380' % genesis_hostname,
])
return _etcd_config(cluster_name, name='master-etcd',
return _etcd_config(cluster_name, alias='master-etcd',
name='master-etcd:%s' % hostname,
target=hostname,
initial_cluster=initial_cluster,
initial_cluster_state='existing')
@ -215,19 +216,21 @@ def _genesis_etcd_config(cluster_name, hostname):
'auxiliary-etcd-0=https://%s:12380' % hostname,
'auxiliary-etcd-1=https://%s:22380' % hostname,
]
return _etcd_config(cluster_name, name='genesis-etcd',
return _etcd_config(cluster_name, alias='genesis-etcd',
name='master-etcd:%s' % hostname,
target=hostname,
initial_cluster=initial_cluster,
initial_cluster_state='new')
def _etcd_config(cluster_name, *, name, target,
def _etcd_config(cluster_name, *, alias, name, target,
initial_cluster, initial_cluster_state):
return config.Document({
'apiVersion': 'promenade/v1',
'kind': 'Etcd',
'metadata': {
'cluster': cluster_name,
'alias': alias,
'name': name,
'target': target,
},
@ -284,6 +287,7 @@ def _master_config(hostname, host_data, masters, network, keys):
docs.extend(keys.generate_certificate(
alias='controller-manager',
config_name='system:kube-controller-manager:%s' % hostname,
name='system:kube-controller-manager',
ca_name='cluster',
hosts=[
@ -295,6 +299,7 @@ def _master_config(hostname, host_data, masters, network, keys):
docs.extend(keys.generate_certificate(
alias='scheduler',
config_name='system:kube-scheduler:%s' % hostname,
name='system:kube-scheduler',
ca_name='cluster',
hosts=[