test pr

Author: ebattat

cloud_governance/main/environment_variables.py

@@ -408,6 +408,7 @@ def environment_variables_dict(self):
 
 
 environment_variables = EnvironmentVariables()
+
 # env vars examples
 # os.environ['AWS_DEFAULT_REGION'] = 'us-east-2'
 # os.environ['AWS_DEFAULT_REGION'] = 'all'

cloud_governance/policy/aws/zombie_cluster_resource.py

@@ -983,5 +983,5 @@ def zombie_cluster_s3_bucket(self, cluster_stamp: str = 'image-registry'):
 
         return zombies, cluster_left_out_days
 
-# zombie_cluster_resources = ZombieClusterResources(cluster_prefix='kubernetes.io/cluster/', delete=False, region='us-east-2')
+# zombie_cluster_resources = ZombieClusterResources(cluster_prefix=["kubernetes.io/cluster", "sigs.k8s.io/cluster-api-provider-aws/cluster"], delete=False, region='us-east-2')
 # print(zombie_cluster_resources.zombie_cluster_subnet())

tests/integration/cloud_governance/aws/zombie_cluster/test_ec2_zombie_delete.py

@@ -26,7 +26,7 @@ def test_ec2_zombie_vpc_exists():
     :return:
     """
     create_vpc()
-    zombie_cluster_resources = ZombieClusterResources(cluster_prefix='kubernetes.io/cluster/', delete=False,
+    zombie_cluster_resources = ZombieClusterResources(cluster_prefix=["kubernetes.io/cluster", "sigs.k8s.io/cluster-api-provider-aws/cluster"], delete=False,
                                                       cluster_tag='kubernetes.io/cluster/integration-test-cluster',
                                                       region='us-east-2',
                                                       resource_name='zombie_cluster_vpc')
@@ -38,7 +38,7 @@ def test_ec2_zombie_vpc_delete():
     This method tests the zombie vpc delete
     :return:
     """
-    zombie_cluster_resources = ZombieClusterResources(cluster_prefix='kubernetes.io/cluster/', delete=True,
+    zombie_cluster_resources = ZombieClusterResources(cluster_prefix=["kubernetes.io/cluster", "sigs.k8s.io/cluster-api-provider-aws/cluster"], delete=True,
                                                       cluster_tag='kubernetes.io/cluster/integration-test-cluster',
                                                       region='us-east-2',
                                                       resource_name='zombie_cluster_vpc', force_delete=True)

tests/integration/cloud_governance/aws/zombie_cluster/test_iam_zombie_delete.py

@@ -22,11 +22,11 @@
 #     ]
 #     try:
 #         iam_resource.create_user(UserName=USER_NAME, Tags=tags)
-#         zombie_cluster_resources = ZombieClusterResources(cluster_prefix='kubernetes.io/cluster/', delete=False,
+#         zombie_cluster_resources = ZombieClusterResources(cluster_prefix=["kubernetes.io/cluster", "sigs.k8s.io/cluster-api-provider-aws/cluster"], delete=False,
 #                                                           cluster_tag=f'kubernetes.io/cluster/{USER_NAME}',
 #                                                           resource_name='zombie_cluster_user', force_delete=True)
 #         assert len(zombie_cluster_resources.zombie_cluster_user()) >= 1
-#         zombie_cluster_resources = ZombieClusterResources(cluster_prefix='kubernetes.io/cluster/', delete=True,
+#         zombie_cluster_resources = ZombieClusterResources(cluster_prefix=["kubernetes.io/cluster", "sigs.k8s.io/cluster-api-provider-aws/cluster"], delete=True,
 #                                                           cluster_tag=f'kubernetes.io/cluster/{USER_NAME}',
 #                                                           resource_name='zombie_cluster_user', force_delete=True)
 #         zombie_cluster_resources.zombie_cluster_user()

tests/integration/cloud_governance/aws/zombie_cluster/test_s3_zombie_delete.py

@@ -42,7 +42,7 @@ def test_s3_zombie_bucket_exists():
     :return:
     """
     create_s3_bucket()
-    zombie_cluster_resources = ZombieClusterResources(cluster_prefix='kubernetes.io/cluster/', delete=True,
+    zombie_cluster_resources = ZombieClusterResources(cluster_prefix=["kubernetes.io/cluster", "sigs.k8s.io/cluster-api-provider-aws/cluster"], delete=True,
                                                       cluster_tag=f'kubernetes.io/cluster/{BUCKET_NAME}',
                                                       resource_name='zombie_cluster_s3_bucket', force_delete=True)
 
@@ -54,7 +54,7 @@ def test_s3_zombie_bucket_delete():
     This method delete the s3 zombie bucket
     :return:
     """
-    zombie_cluster_resources = ZombieClusterResources(cluster_prefix='kubernetes.io/cluster/', delete=True,
+    zombie_cluster_resources = ZombieClusterResources(cluster_prefix=["kubernetes.io/cluster", "sigs.k8s.io/cluster-api-provider-aws/cluster"], delete=True,
                                                       cluster_tag=f'kubernetes.io/cluster/{BUCKET_NAME}',
                                                       resource_name='zombie_cluster_s3_bucket', force_delete=True)
 

tests/unittest/cloud_governance/aws/tag_cluster/test_tag_cluster_resources.py

@@ -7,7 +7,7 @@
 
 from cloud_governance.policy.policy_operations.aws.tag_cluster.tag_cluster_resouces import TagClusterResources
 
-cluster_prefix = 'kubernetes.io/cluster/'
+cluster_prefix = ["kubernetes.io/cluster", "sigs.k8s.io/cluster-api-provider-aws/cluster"]
 cluster_name = ''
 # cluster_name = 'ocs-test-jlhpd'
 # cluster_name = 'opc464-k7jml'

tests/unittest/cloud_governance/aws/zombie_cluster/test_zombie_cluster_resources.py

@@ -3,7 +3,7 @@
 # TEST DRY RUN: delete=False
 from cloud_governance.policy.aws.zombie_cluster_resource import ZombieClusterResources
 
-zombie_cluster_resources = ZombieClusterResources(cluster_prefix='kubernetes.io/cluster/', delete=False,
+zombie_cluster_resources = ZombieClusterResources(cluster_prefix=["kubernetes.io/cluster", "sigs.k8s.io/cluster-api-provider-aws/cluster"], delete=False,
                                                   region='us-east-2')