fix updater, deployer, waiter to support new architecture

CloudWebManage · Feb 3, 2024 · 9a71b40 · 9a71b40
1 parent 1e8ff89
commit 9a71b40
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/cwm_worker_operator/deployments_manager.py b/cwm_worker_operator/deployments_manager.py
@@ -266,8 +266,8 @@ def delete(self, namespace_name, deployment_type, **kwargs):
         cwm_worker_deployment.deployment.delete(namespace_name, deployment_type, **kwargs)
 
     def iterate_all_releases(self):
-        for user in json.loads(get_minio_admin().user_list()):
-            yield user
+        for username, user in json.loads(get_minio_admin().user_list()).items():
+            yield {'username': username, 'user': user}
 
     def get_prometheus_metrics(self, namespace_name):
         metrics = {}

diff --git a/cwm_worker_operator/updater.py b/cwm_worker_operator/updater.py
@@ -200,20 +200,18 @@ def run_single_iteration(domains_config, metrics, deployments_manager, cwm_api_m
     updater_metrics = metrics
     instances_updates = get_instances_updates(domains_config, cwm_api_manager)
     updated_instances = set()
-    # all_releases = {release["namespace"]: release for release in deployments_manager.iterate_all_releases()}
-    # for release in all_releases.values():
-    #     updated_instances.add(namespace_name)
-    #     namespace_name = release["namespace"]
-    #     datestr, timestr, *_ = release["updated"].split(" ")
-    #     last_updated = common.strptime("{}T{}".format(datestr, timestr.split(".")[0]), "%Y-%m-%dT%H:%M:%S")
-    #     status = release["status"]
-    #     # app_version = release["app_version"]
-    #     revision = int(release["revision"])
-    #     start_time = common.now()
-    #     worker_id = common.get_worker_id_from_namespace_name(namespace_name)
-    #     instance_update = instances_updates.get(worker_id)
-    #     multiprocessor.process(domains_config, updater_metrics, namespace_name, last_updated, status, revision,
-    #                            worker_id, instance_update, start_time, cwm_api_manager)
+    all_releases = {release["username"]: release for release in deployments_manager.iterate_all_releases()}
+    for release in all_releases.values():
+        namespace_name = release["username"]
+        updated_instances.add(namespace_name)
+        last_updated = common.strptime(release['user']['updatedAt'].split('.')[0], "%Y-%m-%dT%H:%M:%S")
+        start_time = common.now()
+        worker_id = common.get_worker_id_from_namespace_name(namespace_name)
+        instance_update = instances_updates.get(worker_id)
+        status = 'deployed'
+        revision = 3
+        multiprocessor.process(domains_config, updater_metrics, namespace_name, last_updated, status, revision,
+                               worker_id, instance_update, start_time, cwm_api_manager)
     for namespace_name, operation in instances_updates.items():
         if operation == 'update' and namespace_name not in updated_instances:
             start_time = common.now()