Merge branch 'BANS-226' into 'rc-5.2.6'
Fix logic of starting k8s after restore it from recycle bin See merge request rudecs/dev/decort-ansible!29
This commit is contained in:
@@ -260,8 +260,10 @@ class decort_k8s(DecortController):
|
||||
self.k8s_should_exist = False
|
||||
return
|
||||
|
||||
def action(self,disared_state,started=True):
|
||||
|
||||
def action(self, disared_state, started=True, preupdate: bool = False):
|
||||
if preupdate:
|
||||
# K8s info updating
|
||||
self.k8s_info = self.k8s_get_by_id(k8s_id=self.k8s_id)
|
||||
#k8s state
|
||||
self.k8s_state(self.k8s_info, disared_state, started)
|
||||
self.k8s_id,self.k8s_info = self.k8s_find(k8s_id=self.amodule.params['id'],
|
||||
@@ -392,7 +394,8 @@ def main():
|
||||
elif subj.k8s_info['status'] == "DELETED":
|
||||
if amodule.params['state'] in ('disabled', 'enabled', 'present'):
|
||||
subj.k8s_restore(subj.k8s_id)
|
||||
subj.action(amodule.params['state'])
|
||||
subj.action(disared_state=amodule.params['state'],
|
||||
preupdate=True)
|
||||
if amodule.params['state'] == 'absent':
|
||||
if amodule.params['permanent']:
|
||||
subj.destroy()
|
||||
|
||||
Reference in New Issue
Block a user