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.

Sign up for GitHub

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

Jump to bottom

Prevent cluster from starting when Vault is pending #57

Merged
merged 1 commit into from
Sep 18, 2019
Merged

Prevent cluster from starting when Vault is pending #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions reactive/kubernetes_master.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,22 @@ def set_app_version():
hookenv.application_version_set(version.split(b' v')[-1].rstrip())


@hookenv.atstart
def check_vault_pending():
try:
goal_state = hookenv.goal_state()
except NotImplementedError:
goal_state = {}
vault_kv_goal = 'vault-kv' in goal_state.get('relations', {})
vault_kv_connected = is_state('vault-kv.connected')
vault_kv_related = vault_kv_goal or vault_kv_connected
vault_kv_ready = is_state('layer.vault-kv.ready')
if vault_kv_related and not vault_kv_ready:
set_flag('kubernetes-master.vault-kv.pending')
else:
clear_flag('kubernetes-master.vault-kv.pending')


@hookenv.atexit
def set_final_status():
''' Set the final status of the charm as we leave hook execution '''
Expand Down Expand Up @@ -581,9 +597,7 @@ def set_final_status():
hookenv.status_set('blocked', msg)
return

vault_kv_related = 'vault-kv' in goal_state.get('relations', {})
vault_kv_ready = is_state('layer.vault-kv.ready')
if vault_kv_related and not vault_kv_ready:
if is_state('kubernetes-master.vault-kv.pending'):
hookenv.status_set('waiting', 'Waiting for encryption info from Vault '
'to secure secrets')
return
Expand Down Expand Up @@ -749,6 +763,7 @@ def add_systemd_file_watcher():
@when_not('kubernetes-master.components.started',
'kubernetes-master.cloud.pending',
'kubernetes-master.cloud.blocked',
'kubernetes-master.vault-kv.pending',
'tls_client.certs.changed',
'tls_client.ca.written')
def start_master():
Expand Down