Merge pull request #249 from ilausuch/increase_logs_k8s

Increase the number of logs for K8s operations
SUSE · May 17, 2023 · 23704a8 · 23704a8
2 parents be8b3af + 0af5a40
commit 23704a8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/ocw/lib/aks.py b/ocw/lib/aks.py
@@ -65,6 +65,8 @@ def kubectl_client(self, resource_group: str, cluster_name: str):
 
     def cleanup_k8s_jobs(self):
         clusters = PCWConfig.get_k8s_clusters_for_provider(self._namespace, "azure")
+        self.log_info(f"Cleanup k8s jobs in AKS clusters. {len(clusters)}  will be queried ")
         for cluster in clusters:
+            self.log_info(f"Cleanup k8s jobs in AKS cluster {cluster['cluster_name']}")
             client = self.kubectl_client(cluster["resource_group"], cluster["cluster_name"])
             clean_jobs(self, client, cluster["cluster_name"])
diff --git a/ocw/lib/eks.py b/ocw/lib/eks.py
@@ -141,10 +141,11 @@ def delete_all_clusters(self) -> None:
                         self.eks_client(region).delete_cluster(name=cluster)
 
     def cleanup_k8s_jobs(self):
+        self.log_info("Cleanup k8s jobs in EKS clusters")
         for region in self.__cluster_regions:
             self.log_dbg(f"Region {region}")
             clusters = self.eks_client(region).list_clusters()['clusters']
             for cluster_name in clusters:
-                self.log_dbg(f"Clean up of cluster {cluster_name} in region {region}")
+                self.log_info(f"Cleanup k8s jobs in EKS cluster {cluster_name} in region {region}")
                 client = self.kubectl_client(region, cluster_name)
                 clean_jobs(self, client, cluster_name)
diff --git a/ocw/lib/gke.py b/ocw/lib/gke.py
@@ -57,10 +57,11 @@ def get_clusters(self, zone):
         return []
 
     def cleanup_k8s_jobs(self):
+        self.log_info("Cleanup k8s jobs in GKE clusters")
         for region in self.list_regions():
             for zone in self.list_zones(region):
                 for cluster in self.get_clusters(zone):
                     cluster_name = cluster["name"]
-                    self.log_dbg(f"Clean up of cluster {cluster_name} in zone {zone}")
+                    self.log_info(f"Cleanup k8s jobs in GKE cluster {cluster_name} in zone {zone}")
                     client = self.kubectl_client(zone, cluster)
                     clean_jobs(self, client, cluster_name)