Merge pull request #388 from pdostal/ec2_pcw_ignore_image

Do not remove EC2 images with 'pcw_ignore' tag set to '1'
SUSE · Jun 25, 2024 · 6c2c0c3 · 6c2c0c3
2 parents 40e3e98 + 51e86da
commit 6c2c0c3
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/ocw/lib/ec2.py b/ocw/lib/ec2.py
@@ -352,8 +352,13 @@ def cleanup_images(self, valid_period_days: float) -> None:
             self.log_dbg(f"Found {len(response['Images'])} images in {region}")
             for img in response['Images']:
                 if EC2.is_outdated(parse(img['CreationDate']), valid_period_days):
-                    if self.dry_run:
-                        self.log_info(f"Image deletion {img['ImageId']} skipped due to dry run mode")
+                    tags = img.get('Tags', [])
+                    pcw_ignore_tag = next((tag for tag in tags if tag['Key'] == Instance.TAG_IGNORE), None)
+                    if pcw_ignore_tag:
+                        self.log_dbg(f"Ignoring {img['Name']} due to 'pcw_ignore' tag set to '1'")
                     else:
-                        self.log_info(f"Delete image '{img['Name']}' (ami:{img['ImageId']})")
-                        self.ec2_client(region).deregister_image(ImageId=img['ImageId'], DryRun=False)
+                        if self.dry_run:
+                            self.log_info(f"Image deletion {img['ImageId']} skipped due to dry run mode")
+                        else:
+                            self.log_info(f"Delete image '{img['Name']}' (ami:{img['ImageId']})")
+                            self.ec2_client(region).deregister_image(ImageId=img['ImageId'], DryRun=False)