qontract-reconcile 0.10.2.dev503__py3-none-any.whl → 0.10.2.dev505__py3-none-any.whl

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,

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,

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)

reconcile/utils/external_resource_spec.py

@@ -125,8 +125,7 @@ class ExternalResourceSpec:
     def output_prefix(self) -> str:
         # Adhere to DNS-1123 subdomain names spec. It's reasonable to have provider
         # names that have underscores, but without replacing them with hyphens we run
-        # into issues. Alternatively, we could change Cloudflare worker_script to
-        # worker-script and prevent the use of underscores going forward.
+        # into issues.
         #
         # More info can be found at:
         # https://kubernetes.io/docs/concepts/overview/working-with-objects/names/.

reconcile/utils/runtime/sharding.py

@@ -14,8 +14,6 @@ from reconcile.gql_definitions.fragments.minimal_ocm_organization import (
 from reconcile.gql_definitions.integrations.integrations import (
     AWSAccountShardingV1,
     AWSAccountShardSpecOverrideV1,
-    CloudflareDNSZoneShardingV1,
-    CloudflareDNSZoneShardSpecOverrideV1,
     IntegrationManagedV1,
     IntegrationShardingV1,
     IntegrationSpecV1,
@@ -31,12 +29,6 @@ from reconcile.gql_definitions.sharding import aws_accounts as sharding_aws_acco
 from reconcile.gql_definitions.sharding import (
     ocm_organization as sharding_ocm_organization,
 )
-from reconcile.gql_definitions.terraform_cloudflare_dns import (
-    terraform_cloudflare_zones,
-)
-from reconcile.gql_definitions.terraform_cloudflare_dns.terraform_cloudflare_zones import (
-    CloudflareDnsZoneV1,
-)
 from reconcile.typed_queries.clusters_minimal import get_clusters_minimal
 from reconcile.utils import gql
 from reconcile.utils.runtime.meta import IntegrationMeta
@@ -49,7 +41,6 @@ class ShardSpec(BaseModel):
     shard_spec_overrides: (
         AWSAccountShardSpecOverrideV1
         | OpenshiftClusterShardSpecOverrideV1
-        | CloudflareDNSZoneShardSpecOverrideV1
         | OCMOrganizationShardSpecOverrideV1
         | None
     ) = None
@@ -363,77 +354,6 @@ class OpenshiftClusterShardingStrategy:
         return shards
 
 
-class CloudflareDnsZoneShardingStrategy:
-    """
-    This provides a new sharding strategy that each shard is targeting a Cloudflare zone.
-    It uses the combination of the Cloudflare account name and the zone's identifier as the unique sharding key.
-    """
-
-    IDENTIFIER = "per-cloudflare-dns-zone"
-
-    def __init__(self, cloudflare_zones: Iterable[CloudflareDnsZoneV1] | None = None):
-        if not cloudflare_zones:
-            self.cloudflare_zones = (
-                terraform_cloudflare_zones.query(query_func=gql.get_api().query).zones
-                or []
-            )
-        else:
-            self.cloudflare_zones = list(cloudflare_zones)
-
-    def _get_shard_key(self, dns_zone: CloudflareDnsZoneV1) -> str:
-        return f"{dns_zone.account.name}-{dns_zone.identifier}"
-
-    def get_shard_spec_overrides(
-        self, sharding: IntegrationShardingV1 | None
-    ) -> dict[str, CloudflareDNSZoneShardSpecOverrideV1]:
-        spos: dict[str, CloudflareDNSZoneShardSpecOverrideV1] = {}
-
-        if (
-            isinstance(sharding, CloudflareDNSZoneShardingV1)
-            and sharding.shard_spec_overrides
-        ):
-            for override in sharding.shard_spec_overrides:
-                key = f"{override.shard.zone}-{override.shard.identifier}"
-                spos[key] = override
-        return spos
-
-    def check_integration_sharding_params(self, meta: IntegrationMeta) -> None:
-        if "--zone-name" not in meta.args:
-            raise ValueError(
-                f"integration {meta.name} does not support the provided argument. "
-                f"--zone-name is required by the '{self.IDENTIFIER}' sharding "
-                "strategy."
-            )
-
-    def build_shard_spec(
-        self,
-        dns_zone: CloudflareDnsZoneV1,
-        integration_spec: IntegrationSpecV1,
-        spo: CloudflareDNSZoneShardSpecOverrideV1 | None,
-    ) -> ShardSpec:
-        return ShardSpec(
-            shard_key=self._get_shard_key(dns_zone),
-            shard_name_suffix=f"-{self._get_shard_key(dns_zone)}",
-            extra_args=(integration_spec.extra_args or "")
-            + f" --zone-name {dns_zone.identifier}",
-            shard_spec_overrides=spo,
-        )
-
-    def build_integration_shards(
-        self,
-        integration_meta: IntegrationMeta,
-        integration_managed: IntegrationManagedV1,
-    ) -> list[ShardSpec]:
-        self.check_integration_sharding_params(integration_meta)
-        spos = self.get_shard_spec_overrides(integration_managed.sharding)
-        shards = []
-        for zone in self.cloudflare_zones or []:
-            spo = spos.get(self._get_shard_key(zone))
-            base_shard = self.build_shard_spec(zone, integration_managed.spec, spo)
-            shards.append(base_shard)
-        return shards
-
-
 @dataclass
 class IntegrationShardManager:
     strategies: dict[str, ShardingStrategy]

reconcile/utils/saasherder/interfaces.py

@@ -194,6 +194,7 @@ class SaasEnvironment_SaasSecretParameters(Protocol):
 @runtime_checkable
 class SaasEnvironment(HasParameters, HasSecretParameters, Protocol):
     name: str
+    labels: dict[str, str] | None
 
 
 class SaasResourceTemplateTargetNamespace(Protocol):

reconcile/utils/saasherder/models.py

@@ -290,6 +290,14 @@ class ImageAuth:
             }
 
 
+@dataclass(frozen=True)
+class ImagePatternsBlockRule:
+    """Block rule for image patterns based on environment label selectors."""
+
+    environment_label_selector: dict[str, str]
+    image_patterns: list[str]
+
+
 @dataclass
 class TargetSpec:
     saas_file: SaasFile