qontract-reconcile 0.10.2.dev503__tar.gz → 0.10.2.dev505__tar.gz

{qontract_reconcile-0.10.2.dev503 → qontract_reconcile-0.10.2.dev505}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev503
+Version: 0.10.2.dev505
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile
@@ -302,9 +302,6 @@ OpenShift templates can be found [here](/openshift/qontract-reconcile.yaml). In
   template-validator              Test app-interface templates.
   terraform-aws-route53           Manage AWS Route53 resources using
                                   Terraform.
-  terraform-cloudflare-dns        Manage Cloudflare DNS using Terraform.
-  terraform-cloudflare-resources  Manage Cloudflare Resources using Terraform.
-  terraform-cloudflare-users      Manage Cloudflare Users using Terraform.
   terraform-init                  Initialize AWS accounts for Terraform usage.
   terraform-repo                  Manages raw HCL Terraform from a separate
                                   repository.

{qontract_reconcile-0.10.2.dev503 → qontract_reconcile-0.10.2.dev505}/README.md

@@ -235,9 +235,6 @@ OpenShift templates can be found [here](/openshift/qontract-reconcile.yaml). In
   template-validator              Test app-interface templates.
   terraform-aws-route53           Manage AWS Route53 resources using
                                   Terraform.
-  terraform-cloudflare-dns        Manage Cloudflare DNS using Terraform.
-  terraform-cloudflare-resources  Manage Cloudflare Resources using Terraform.
-  terraform-cloudflare-users      Manage Cloudflare Users using Terraform.
   terraform-init                  Initialize AWS accounts for Terraform usage.
   terraform-repo                  Manages raw HCL Terraform from a separate
                                   repository.

{qontract_reconcile-0.10.2.dev503 → qontract_reconcile-0.10.2.dev505}/reconcile/cli.py

@@ -364,12 +364,6 @@ def account_name(function: Callable) -> Callable:
     return function
 
 
-def cloudflare_zone_name(function: Callable) -> Callable:
-    function = click.option("--zone-name", default=None)(function)
-
-    return function
-
-
 def account_name_multiple(function: Callable) -> Callable:
     """This option can be used when more than one account needs to be passed as argument"""
     function = click.option(
@@ -2337,108 +2331,6 @@ def terraform_resources(
     )
 
 
-@integration.command(short_help="Manage Cloudflare Resources using Terraform.")
-@print_to_file
-@enable_deletion(default=False)
-@threaded()
-@binary(["terraform"])
-@binary_version("terraform", ["version"], TERRAFORM_VERSION_REGEX, TERRAFORM_VERSION)
-@account_name
-@vault_output_path
-@use_jump_host()
-@internal()
-@click.pass_context
-def terraform_cloudflare_resources(
-    ctx: click.Context,
-    print_to_file: str | None,
-    enable_deletion: bool,
-    thread_pool_size: int,
-    account_name: str | None,
-    vault_output_path: str,
-    internal: bool,
-    use_jump_host: bool,
-) -> None:
-    import reconcile.terraform_cloudflare_resources
-
-    run_integration(
-        reconcile.terraform_cloudflare_resources,
-        ctx,
-        print_to_file,
-        enable_deletion,
-        thread_pool_size,
-        account_name,
-        vault_output_path,
-        internal,
-        use_jump_host,
-    )
-
-
-@integration.command(short_help="Manage Cloudflare DNS using Terraform.")
-@print_to_file
-@enable_deletion(default=False)
-@threaded()
-@binary(["terraform"])
-@binary_version("terraform", ["version"], TERRAFORM_VERSION_REGEX, TERRAFORM_VERSION)
-@account_name
-@cloudflare_zone_name
-@click.pass_context
-def terraform_cloudflare_dns(
-    ctx: click.Context,
-    print_to_file: str | None,
-    enable_deletion: bool,
-    thread_pool_size: int,
-    account_name: str | None,
-    zone_name: str | None,
-) -> None:
-    from reconcile import terraform_cloudflare_dns
-
-    run_class_integration(
-        integration=terraform_cloudflare_dns.TerraformCloudflareDNSIntegration(
-            terraform_cloudflare_dns.TerraformCloudflareDNSIntegrationParams(
-                print_to_file=print_to_file,
-                enable_deletion=enable_deletion,
-                thread_pool_size=thread_pool_size,
-                selected_account=account_name,
-                selected_zone=zone_name,
-            )
-        ),
-        ctx=ctx,
-    )
-
-
-@integration.command(short_help="Manage Cloudflare Users using Terraform.")
-@print_to_file
-@binary(["terraform"])
-@threaded()
-@binary_version("terraform", ["version"], TERRAFORM_VERSION_REGEX, TERRAFORM_VERSION)
-@account_name
-@enable_deletion(default=True)
-@click.pass_context
-def terraform_cloudflare_users(
-    ctx: click.Context,
-    print_to_file: str | None,
-    account_name: str | None,
-    thread_pool_size: int,
-    enable_deletion: bool,
-) -> None:
-    from reconcile.terraform_cloudflare_users import (
-        TerraformCloudflareUsers,
-        TerraformCloudflareUsersParams,
-    )
-
-    run_class_integration(
-        TerraformCloudflareUsers(
-            TerraformCloudflareUsersParams(
-                print_to_file=print_to_file,
-                account_name=account_name,
-                thread_pool_size=thread_pool_size,
-                enable_deletion=enable_deletion,
-            )
-        ),
-        ctx,
-    )
-
-
 @integration.command(short_help="Manage auto-promotions defined in SaaS files")
 @threaded()
 @click.option("--env-name", default=None, help="environment to filter saas files by")

{qontract_reconcile-0.10.2.dev503 → qontract_reconcile-0.10.2.dev505}/reconcile/gql_definitions/common/saasherder_settings.py

@@ -23,6 +23,10 @@ query SaasherderSettings {
   settings: app_interface_settings_v1 {
     repoUrl
     hashLength
+    imagePatternsBlockRules {
+      environmentLabelSelector
+      imagePatterns
+    }
   }
 }
 """
@@ -34,9 +38,15 @@ class ConfiguredBaseModel(BaseModel):
     )
 
 
+class ImagePatternsBlockV1(ConfiguredBaseModel):
+    environment_label_selector: Json = Field(..., alias="environmentLabelSelector")
+    image_patterns: list[str] = Field(..., alias="imagePatterns")
+
+
 class AppInterfaceSettingsV1(ConfiguredBaseModel):
     repo_url: str = Field(..., alias="repoUrl")
     hash_length: int = Field(..., alias="hashLength")
+    image_patterns_block_rules: Optional[list[ImagePatternsBlockV1]] = Field(..., alias="imagePatternsBlockRules")
 
 
 class SaasherderSettingsQueryData(ConfiguredBaseModel):

{qontract_reconcile-0.10.2.dev503 → qontract_reconcile-0.10.2.dev505}/reconcile/gql_definitions/integrations/integrations.py

@@ -174,20 +174,6 @@ query Integrations {
             }
           }
         }
-
-        ... on CloudflareDNSZoneSharding_v1 {
-          shardSpecOverrides {
-            shard {
-              zone
-              identifier
-            }
-            imageRef
-            disabled
-            resources {
-              ...DeployResourcesFields
-            }
-          }
-        }
       }
     }
   }
@@ -323,26 +309,10 @@ class AWSAccountShardingV1(IntegrationShardingV1):
     shard_spec_overrides: Optional[list[AWSAccountShardSpecOverrideV1]] = Field(..., alias="shardSpecOverrides")
 
 
-class CloudflareDnsZoneV1(ConfiguredBaseModel):
-    zone: str = Field(..., alias="zone")
-    identifier: str = Field(..., alias="identifier")
-
-
-class CloudflareDNSZoneShardSpecOverrideV1(ConfiguredBaseModel):
-    shard: CloudflareDnsZoneV1 = Field(..., alias="shard")
-    image_ref: Optional[str] = Field(..., alias="imageRef")
-    disabled: Optional[bool] = Field(..., alias="disabled")
-    resources: Optional[DeployResourcesFields] = Field(..., alias="resources")
-
-
-class CloudflareDNSZoneShardingV1(IntegrationShardingV1):
-    shard_spec_overrides: Optional[list[CloudflareDNSZoneShardSpecOverrideV1]] = Field(..., alias="shardSpecOverrides")
-
-
 class IntegrationManagedV1(ConfiguredBaseModel):
     namespace: NamespaceV1 = Field(..., alias="namespace")
     spec: IntegrationSpecV1 = Field(..., alias="spec")
-    sharding: Optional[Union[StaticShardingV1, OpenshiftClusterShardingV1, OCMOrganizationShardingV1, AWSAccountShardingV1, CloudflareDNSZoneShardingV1, IntegrationShardingV1]] = Field(..., alias="sharding")
+    sharding: Optional[Union[StaticShardingV1, OpenshiftClusterShardingV1, OCMOrganizationShardingV1, AWSAccountShardingV1, IntegrationShardingV1]] = Field(..., alias="sharding")
 
 
 class IntegrationV1(ConfiguredBaseModel):

{qontract_reconcile-0.10.2.dev503 → qontract_reconcile-0.10.2.dev505}/reconcile/gql_definitions/introspection.json

@@ -4567,21 +4567,11 @@
                             "name": "QuayInstance_v1",
                             "ofType": null
                         },
-                        {
-                            "kind": "OBJECT",
-                            "name": "PermissionQuayOrgTeam_v1",
-                            "ofType": null
-                        },
                         {
                             "kind": "OBJECT",
                             "name": "AppEscalationPolicy_v1",
                             "ofType": null
                         },
-                        {
-                            "kind": "OBJECT",
-                            "name": "PermissionSlackUsergroup_v1",
-                            "ofType": null
-                        },
                         {
                             "kind": "OBJECT",
                             "name": "SlackWorkspace_v1",
@@ -4697,11 +4687,6 @@
                             "name": "AutomatedActionsInstance_v1",
                             "ofType": null
                         },
-                        {
-                            "kind": "OBJECT",
-                            "name": "PermissionAutomatedActions_v1",
-                            "ofType": null
-                        },
                         {
                             "kind": "OBJECT",
                             "name": "AWSVPC_v1",
@@ -4732,11 +4717,6 @@
                             "name": "VaultAuth_v1",
                             "ofType": null
                         },
-                        {
-                            "kind": "OBJECT",
-                            "name": "PermissionGithubOrgTeam_v1",
-                            "ofType": null
-                        },
                         {
                             "kind": "OBJECT",
                             "name": "VaultPolicy_v1",
@@ -4792,11 +4772,6 @@
                             "name": "UnleashProject_v1",
                             "ofType": null
                         },
-                        {
-                            "kind": "OBJECT",
-                            "name": "FeatureToggleUnleash_v1",
-                            "ofType": null
-                        },
                         {
                             "kind": "OBJECT",
                             "name": "ResourceTemplateTest_v1",
@@ -4882,95 +4857,10 @@
                             "name": "SaasResourceTemplateTargetReference_v2",
                             "ofType": null
                         },
-                        {
-                            "kind": "OBJECT",
-                            "name": "PipelinesProviderTekton_v1",
-                            "ofType": null
-                        },
                         {
                             "kind": "OBJECT",
                             "name": "PipelinesProviderTektonProviderDefaults_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "OBJECT",
-                            "name": "OidcPermissionVault_v1",
-                            "ofType": null
-                        },
-                        {
-                            "kind": "OBJECT",
-                            "name": "OidcPermissionAcs_v1",
-                            "ofType": null
-                        },
-                        {
-                            "kind": "OBJECT",
-                            "name": "PermissionGithubOrg_v1",
-                            "ofType": null
-                        },
-                        {
-                            "kind": "OBJECT",
-                            "name": "PermissionJenkinsRole_v1",
-                            "ofType": null
-                        },
-                        {
-                            "kind": "OBJECT",
-                            "name": "PermissionGitlabGroupMembership_v1",
-                            "ofType": null
-                        },
-                        {
-                            "kind": "OBJECT",
-                            "name": "EndpointMonitoringProviderBlackboxExporter_v1",
-                            "ofType": null
-                        },
-                        {
-                            "kind": "OBJECT",
-                            "name": "EndpointMonitoringProviderSignalFx_v1",
-                            "ofType": null
-                        },
-                        {
-                            "kind": "OBJECT",
-                            "name": "AutomatedActionActionList_v1",
-                            "ofType": null
-                        },
-                        {
-                            "kind": "OBJECT",
-                            "name": "AutomatedActionCreateToken_v1",
-                            "ofType": null
-                        },
-                        {
-                            "kind": "OBJECT",
-                            "name": "AutomatedActionExternalResourceFlushElastiCache_v1",
-                            "ofType": null
-                        },
-                        {
-                            "kind": "OBJECT",
-                            "name": "AutomatedActionExternalResourceRdsReboot_v1",
-                            "ofType": null
-                        },
-                        {
-                            "kind": "OBJECT",
-                            "name": "AutomatedActionExternalResourceRdsSnapshot_v1",
-                            "ofType": null
-                        },
-                        {
-                            "kind": "OBJECT",
-                            "name": "AutomatedActionNoOp_v1",
-                            "ofType": null
-                        },
-                        {
-                            "kind": "OBJECT",
-                            "name": "AutomatedActionOpenshiftTriggerCronjob_v1",
-                            "ofType": null
-                        },
-                        {
-                            "kind": "OBJECT",
-                            "name": "AutomatedActionOpenshiftWorkloadDelete_v1",
-                            "ofType": null
-                        },
-                        {
-                            "kind": "OBJECT",
-                            "name": "AutomatedActionOpenshiftWorkloadRestart_v1",
-                            "ofType": null
                         }
                     ]
                 },
@@ -18583,11 +18473,6 @@
                             "kind": "INTERFACE",
                             "name": "Permission_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "INTERFACE",
-                            "name": "DatafileObject_v1",
-                            "ofType": null
                         }
                     ],
                     "enumValues": null,
@@ -19184,11 +19069,6 @@
                             "kind": "INTERFACE",
                             "name": "Permission_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "INTERFACE",
-                            "name": "DatafileObject_v1",
-                            "ofType": null
                         }
                     ],
                     "enumValues": null,
@@ -27985,11 +27865,6 @@
                             "kind": "INTERFACE",
                             "name": "Permission_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "INTERFACE",
-                            "name": "DatafileObject_v1",
-                            "ofType": null
                         }
                     ],
                     "enumValues": null,
@@ -29551,11 +29426,6 @@
                             "kind": "INTERFACE",
                             "name": "Permission_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "INTERFACE",
-                            "name": "DatafileObject_v1",
-                            "ofType": null
                         }
                     ],
                     "enumValues": null,
@@ -32224,11 +32094,6 @@
                             "kind": "INTERFACE",
                             "name": "FeatureToggle_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "INTERFACE",
-                            "name": "DatafileObject_v1",
-                            "ofType": null
                         }
                     ],
                     "enumValues": null,
@@ -51163,11 +51028,6 @@
                             "kind": "INTERFACE",
                             "name": "PipelinesProvider_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "INTERFACE",
-                            "name": "DatafileObject_v1",
-                            "ofType": null
                         }
                     ],
                     "enumValues": null,
@@ -51903,11 +51763,6 @@
                             "kind": "INTERFACE",
                             "name": "OidcPermission_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "INTERFACE",
-                            "name": "DatafileObject_v1",
-                            "ofType": null
                         }
                     ],
                     "enumValues": null,
@@ -52073,11 +51928,6 @@
                             "kind": "INTERFACE",
                             "name": "OidcPermission_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "INTERFACE",
-                            "name": "DatafileObject_v1",
-                            "ofType": null
                         }
                     ],
                     "enumValues": null,
@@ -52215,11 +52065,6 @@
                             "kind": "INTERFACE",
                             "name": "Permission_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "INTERFACE",
-                            "name": "DatafileObject_v1",
-                            "ofType": null
                         }
                     ],
                     "enumValues": null,
@@ -52377,11 +52222,6 @@
                             "kind": "INTERFACE",
                             "name": "Permission_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "INTERFACE",
-                            "name": "DatafileObject_v1",
-                            "ofType": null
                         }
                     ],
                     "enumValues": null,
@@ -52563,11 +52403,6 @@
                             "kind": "INTERFACE",
                             "name": "Permission_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "INTERFACE",
-                            "name": "DatafileObject_v1",
-                            "ofType": null
                         }
                     ],
                     "enumValues": null,
@@ -53651,11 +53486,6 @@
                             "kind": "INTERFACE",
                             "name": "EndpointMonitoringProvider_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "INTERFACE",
-                            "name": "DatafileObject_v1",
-                            "ofType": null
                         }
                     ],
                     "enumValues": null,
@@ -53876,11 +53706,6 @@
                             "kind": "INTERFACE",
                             "name": "EndpointMonitoringProvider_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "INTERFACE",
-                            "name": "DatafileObject_v1",
-                            "ofType": null
                         }
                     ],
                     "enumValues": null,
@@ -54769,11 +54594,6 @@
                             "kind": "INTERFACE",
                             "name": "AutomatedAction_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "INTERFACE",
-                            "name": "DatafileObject_v1",
-                            "ofType": null
                         }
                     ],
                     "enumValues": null,
@@ -54946,11 +54766,6 @@
                             "kind": "INTERFACE",
                             "name": "AutomatedAction_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "INTERFACE",
-                            "name": "DatafileObject_v1",
-                            "ofType": null
                         }
                     ],
                     "enumValues": null,
@@ -55112,11 +54927,6 @@
                             "kind": "INTERFACE",
                             "name": "AutomatedAction_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "INTERFACE",
-                            "name": "DatafileObject_v1",
-                            "ofType": null
                         }
                     ],
                     "enumValues": null,
@@ -55321,11 +55131,6 @@
                             "kind": "INTERFACE",
                             "name": "AutomatedAction_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "INTERFACE",
-                            "name": "DatafileObject_v1",
-                            "ofType": null
                         }
                     ],
                     "enumValues": null,
@@ -55487,11 +55292,6 @@
                             "kind": "INTERFACE",
                             "name": "AutomatedAction_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "INTERFACE",
-                            "name": "DatafileObject_v1",
-                            "ofType": null
                         }
                     ],
                     "enumValues": null,
@@ -55629,11 +55429,6 @@
                             "kind": "INTERFACE",
                             "name": "AutomatedAction_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "INTERFACE",
-                            "name": "DatafileObject_v1",
-                            "ofType": null
                         }
                     ],
                     "enumValues": null,
@@ -55795,11 +55590,6 @@
                             "kind": "INTERFACE",
                             "name": "AutomatedAction_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "INTERFACE",
-                            "name": "DatafileObject_v1",
-                            "ofType": null
                         }
                     ],
                     "enumValues": null,
@@ -56004,11 +55794,6 @@
                             "kind": "INTERFACE",
                             "name": "AutomatedAction_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "INTERFACE",
-                            "name": "DatafileObject_v1",
-                            "ofType": null
                         }
                     ],
                     "enumValues": null,
@@ -56241,11 +56026,6 @@
                             "kind": "INTERFACE",
                             "name": "AutomatedAction_v1",
                             "ofType": null
-                        },
-                        {
-                            "kind": "INTERFACE",
-                            "name": "DatafileObject_v1",
-                            "ofType": null
                         }
                     ],
                     "enumValues": null,

{qontract_reconcile-0.10.2.dev503 → qontract_reconcile-0.10.2.dev505}/reconcile/integrations_manager.py

@@ -41,7 +41,6 @@ from reconcile.utils.openshift_resource import (
 from reconcile.utils.runtime.meta import IntegrationMeta
 from reconcile.utils.runtime.sharding import (
     AWSAccountShardingStrategy,
-    CloudflareDnsZoneShardingStrategy,
     IntegrationShardManager,
     OCMOrganizationShardingStrategy,
     OpenshiftClusterShardingStrategy,
@@ -257,7 +256,6 @@ def run(
             StaticShardingStrategy.IDENTIFIER: StaticShardingStrategy(),
             AWSAccountShardingStrategy.IDENTIFIER: AWSAccountShardingStrategy(),
             OpenshiftClusterShardingStrategy.IDENTIFIER: OpenshiftClusterShardingStrategy(),
-            CloudflareDnsZoneShardingStrategy.IDENTIFIER: CloudflareDnsZoneShardingStrategy(),
             OCMOrganizationShardingStrategy.IDENTIFIER: OCMOrganizationShardingStrategy(),
         },
         integration_runtime_meta=integration_runtime_meta,

{qontract_reconcile-0.10.2.dev503 → qontract_reconcile-0.10.2.dev505}/reconcile/openshift_saas_deploy.py

@@ -30,6 +30,7 @@ from reconcile.utils.gitlab_api import GitLabApi
 from reconcile.utils.json import json_dumps
 from reconcile.utils.openshift_resource import ResourceInventory
 from reconcile.utils.saasherder import SaasHerder
+from reconcile.utils.saasherder.models import ImagePatternsBlockRule
 from reconcile.utils.secret_reader import create_secret_reader
 from reconcile.utils.semver_helper import make_semver
 from reconcile.utils.slack_api import SlackApi
@@ -211,6 +212,13 @@ def run(
         jenkins_map=jenkins_map,
         state=init_state(integration=QONTRACT_INTEGRATION, secret_reader=secret_reader),
         all_saas_files=saas_file_list.saas_files,
+        image_patterns_block_rules=[
+            ImagePatternsBlockRule(
+                environment_label_selector=rule.environment_label_selector or {},
+                image_patterns=rule.image_patterns,
+            )
+            for rule in (saasherder_settings.image_patterns_block_rules or [])
+        ],
     )
     if defer:
         defer(saasherder.cleanup)