qontract-reconcile 0.9.1rc298__py3-none-any.whl → 0.10.1.dev1203__py3-none-any.whl

reconcile/gql_definitions/terraform_tgw_attachments/aws_accounts.py

@@ -0,0 +1,119 @@
+"""
+Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
+"""
+from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
+from datetime import datetime  # noqa: F401 # pylint: disable=W0611
+from enum import Enum  # noqa: F401 # pylint: disable=W0611
+from typing import (  # noqa: F401 # pylint: disable=W0611
+    Any,
+    Optional,
+    Union,
+)
+
+from pydantic import (  # noqa: F401 # pylint: disable=W0611
+    BaseModel,
+    Extra,
+    Field,
+    Json,
+)
+
+from reconcile.gql_definitions.fragments.aws_account_common import AWSAccountCommon
+from reconcile.gql_definitions.fragments.terraform_state import TerraformState
+
+
+DEFINITION = """
+fragment AWSAccountCommon on AWSAccount_v1 {
+  path
+  name
+  description
+  uid
+  terraformUsername
+  consoleUrl
+  resourcesDefaultRegion
+  supportedDeploymentRegions
+  providerVersion
+  accountOwners {
+    name
+    email
+  }
+  automationToken {
+    ... VaultSecret
+  }
+  garbageCollection
+  enableDeletion
+  deletionApprovals {
+    type
+    name
+    expiration
+  }
+  disable {
+    integrations
+  }
+  deleteKeys
+  premiumSupport
+  partition
+}
+
+fragment TerraformState on TerraformStateAWS_v1 {
+  provider
+  bucket
+  region
+  integrations {
+    key
+    integration
+  }
+}
+
+fragment VaultSecret on VaultSecret_v1 {
+    path
+    field
+    version
+    format
+}
+
+query AWSAccounts($name: String) {
+  accounts: awsaccounts_v1
+  (
+    name: $name
+  )
+  {
+    ... AWSAccountCommon
+    terraformState {
+      ... TerraformState
+    }
+  }
+}
+"""
+
+
+class ConfiguredBaseModel(BaseModel):
+    class Config:
+        smart_union=True
+        extra=Extra.forbid
+
+
+class AWSAccountV1(AWSAccountCommon):
+    terraform_state: Optional[TerraformState] = Field(..., alias="terraformState")
+
+
+class AWSAccountsQueryData(ConfiguredBaseModel):
+    accounts: Optional[list[AWSAccountV1]] = Field(..., alias="accounts")
+
+
+def query(query_func: Callable, **kwargs: Any) -> AWSAccountsQueryData:
+    """
+    This is a convenience function which queries and parses the data into
+    concrete types. It should be compatible with most GQL clients.
+    You do not have to use it to consume the generated data classes.
+    Alternatively, you can also mime and alternate the behavior
+    of this function in the caller.
+
+    Parameters:
+        query_func (Callable): Function which queries your GQL Server
+        kwargs: optional arguments that will be passed to the query function
+
+    Returns:
+        AWSAccountsQueryData: queried data parsed into generated classes
+    """
+    raw_data: dict[Any, Any] = query_func(DEFINITION, **kwargs)
+    return AWSAccountsQueryData(**raw_data)

reconcile/gql_definitions/unleash_feature_toggles/feature_toggles.py

@@ -0,0 +1,113 @@
+"""
+Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
+"""
+from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
+from datetime import datetime  # noqa: F401 # pylint: disable=W0611
+from enum import Enum  # noqa: F401 # pylint: disable=W0611
+from typing import (  # noqa: F401 # pylint: disable=W0611
+    Any,
+    Optional,
+    Union,
+)
+
+from pydantic import (  # noqa: F401 # pylint: disable=W0611
+    BaseModel,
+    Extra,
+    Field,
+    Json,
+)
+
+from reconcile.gql_definitions.fragments.vault_secret import VaultSecret
+
+
+DEFINITION = """
+fragment VaultSecret on VaultSecret_v1 {
+    path
+    field
+    version
+    format
+}
+
+query UnleashFeatureToggles {
+  instances: unleash_instances_v1 {
+    name
+    description
+    url
+    adminToken {
+      ...VaultSecret
+    }
+    allowUnmanagedFeatureToggles
+    projects {
+      name
+      feature_toggles {
+        name
+        description
+        delete
+        provider
+        unleash {
+          type
+          impressionData
+          environments
+        }
+      }
+    }
+  }
+}
+"""
+
+
+class ConfiguredBaseModel(BaseModel):
+    class Config:
+        smart_union=True
+        extra=Extra.forbid
+
+
+class UnleashFeatureToggleV1(ConfiguredBaseModel):
+    q_type: Optional[str] = Field(..., alias="type")
+    impression_data: Optional[bool] = Field(..., alias="impressionData")
+    environments: Optional[Json] = Field(..., alias="environments")
+
+
+class FeatureToggleUnleashV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    description: str = Field(..., alias="description")
+    delete: Optional[bool] = Field(..., alias="delete")
+    provider: str = Field(..., alias="provider")
+    unleash: UnleashFeatureToggleV1 = Field(..., alias="unleash")
+
+
+class UnleashProjectV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    feature_toggles: Optional[list[FeatureToggleUnleashV1]] = Field(..., alias="feature_toggles")
+
+
+class UnleashInstanceV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    description: str = Field(..., alias="description")
+    url: str = Field(..., alias="url")
+    admin_token: Optional[VaultSecret] = Field(..., alias="adminToken")
+    allow_unmanaged_feature_toggles: Optional[bool] = Field(..., alias="allowUnmanagedFeatureToggles")
+    projects: Optional[list[UnleashProjectV1]] = Field(..., alias="projects")
+
+
+class UnleashFeatureTogglesQueryData(ConfiguredBaseModel):
+    instances: Optional[list[UnleashInstanceV1]] = Field(..., alias="instances")
+
+
+def query(query_func: Callable, **kwargs: Any) -> UnleashFeatureTogglesQueryData:
+    """
+    This is a convenience function which queries and parses the data into
+    concrete types. It should be compatible with most GQL clients.
+    You do not have to use it to consume the generated data classes.
+    Alternatively, you can also mime and alternate the behavior
+    of this function in the caller.
+
+    Parameters:
+        query_func (Callable): Function which queries your GQL Server
+        kwargs: optional arguments that will be passed to the query function
+
+    Returns:
+        UnleashFeatureTogglesQueryData: queried data parsed into generated classes
+    """
+    raw_data: dict[Any, Any] = query_func(DEFINITION, **kwargs)
+    return UnleashFeatureTogglesQueryData(**raw_data)

reconcile/gql_definitions/vault_instances/vault_instances.py

@@ -31,6 +31,7 @@ fragment VaultSecret on VaultSecret_v1 {
 query VaultInstances {
   vault_instances: vault_instances_v1 {
     name
+    description
     address
     auth {
       provider
@@ -118,8 +119,8 @@ query VaultInstances {
 
 class ConfiguredBaseModel(BaseModel):
     class Config:
-        smart_union = True
-        extra = Extra.forbid
+        smart_union=True
+        extra=Extra.forbid
 
 
 class VaultInstanceAuthV1(ConfiguredBaseModel):
@@ -137,9 +138,7 @@ class VaultReplicationConfigV1_VaultInstanceV1_VaultInstanceAuthV1(ConfiguredBas
     secret_engine: str = Field(..., alias="secretEngine")
 
 
-class VaultReplicationConfigV1_VaultInstanceV1_VaultInstanceAuthV1_VaultInstanceAuthApproleV1(
-    VaultReplicationConfigV1_VaultInstanceV1_VaultInstanceAuthV1
-):
+class VaultReplicationConfigV1_VaultInstanceV1_VaultInstanceAuthV1_VaultInstanceAuthApproleV1(VaultReplicationConfigV1_VaultInstanceV1_VaultInstanceAuthV1):
     role_id: VaultSecret = Field(..., alias="roleID")
     secret_id: VaultSecret = Field(..., alias="secretID")
 
@@ -147,10 +146,7 @@ class VaultReplicationConfigV1_VaultInstanceV1_VaultInstanceAuthV1_VaultInstance
 class VaultReplicationConfigV1_VaultInstanceV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
     address: str = Field(..., alias="address")
-    auth: Union[
-        VaultReplicationConfigV1_VaultInstanceV1_VaultInstanceAuthV1_VaultInstanceAuthApproleV1,
-        VaultReplicationConfigV1_VaultInstanceV1_VaultInstanceAuthV1,
-    ] = Field(..., alias="auth")
+    auth: Union[VaultReplicationConfigV1_VaultInstanceV1_VaultInstanceAuthV1_VaultInstanceAuthApproleV1, VaultReplicationConfigV1_VaultInstanceV1_VaultInstanceAuthV1] = Field(..., alias="auth")
 
 
 class VaultReplicationConfigV1_VaultInstanceAuthV1(ConfiguredBaseModel):
@@ -158,9 +154,7 @@ class VaultReplicationConfigV1_VaultInstanceAuthV1(ConfiguredBaseModel):
     secret_engine: str = Field(..., alias="secretEngine")
 
 
-class VaultReplicationConfigV1_VaultInstanceAuthV1_VaultInstanceAuthApproleV1(
-    VaultReplicationConfigV1_VaultInstanceAuthV1
-):
+class VaultReplicationConfigV1_VaultInstanceAuthV1_VaultInstanceAuthApproleV1(VaultReplicationConfigV1_VaultInstanceAuthV1):
     role_id: VaultSecret = Field(..., alias="roleID")
     secret_id: VaultSecret = Field(..., alias="secretID")
 
@@ -170,9 +164,7 @@ class VaultInstanceV1_VaultReplicationConfigV1_VaultInstanceAuthV1(ConfiguredBas
     secret_engine: str = Field(..., alias="secretEngine")
 
 
-class VaultInstanceV1_VaultReplicationConfigV1_VaultInstanceAuthV1_VaultInstanceAuthApproleV1(
-    VaultInstanceV1_VaultReplicationConfigV1_VaultInstanceAuthV1
-):
+class VaultInstanceV1_VaultReplicationConfigV1_VaultInstanceAuthV1_VaultInstanceAuthApproleV1(VaultInstanceV1_VaultReplicationConfigV1_VaultInstanceAuthV1):
     role_id: VaultSecret = Field(..., alias="roleID")
     secret_id: VaultSecret = Field(..., alias="secretID")
 
@@ -208,55 +200,30 @@ class VaultReplicationPolicyV1_VaultPolicyV1_VaultInstanceV1(ConfiguredBaseModel
 
 class VaultReplicationPolicyV1_VaultPolicyV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
-    instance: VaultReplicationPolicyV1_VaultPolicyV1_VaultInstanceV1 = Field(
-        ..., alias="instance"
-    )
+    instance: VaultReplicationPolicyV1_VaultPolicyV1_VaultInstanceV1 = Field(..., alias="instance")
 
 
 class VaultReplicationPolicyV1(VaultReplicationPathsV1):
-    policy: Optional[VaultReplicationPolicyV1_VaultPolicyV1] = Field(
-        ..., alias="policy"
-    )
+    policy: Optional[VaultReplicationPolicyV1_VaultPolicyV1] = Field(..., alias="policy")
 
 
 class VaultReplicationConfigV1(ConfiguredBaseModel):
-    vault_instance: VaultReplicationConfigV1_VaultInstanceV1 = Field(
-        ..., alias="vaultInstance"
-    )
-    source_auth: Union[
-        VaultReplicationConfigV1_VaultInstanceAuthV1_VaultInstanceAuthApproleV1,
-        VaultReplicationConfigV1_VaultInstanceAuthV1,
-    ] = Field(..., alias="sourceAuth")
-    dest_auth: Union[
-        VaultInstanceV1_VaultReplicationConfigV1_VaultInstanceAuthV1_VaultInstanceAuthApproleV1,
-        VaultInstanceV1_VaultReplicationConfigV1_VaultInstanceAuthV1,
-    ] = Field(..., alias="destAuth")
-    paths: Optional[
-        list[
-            Union[
-                VaultReplicationJenkinsV1,
-                VaultReplicationPolicyV1,
-                VaultReplicationPathsV1,
-            ]
-        ]
-    ] = Field(..., alias="paths")
+    vault_instance: VaultReplicationConfigV1_VaultInstanceV1 = Field(..., alias="vaultInstance")
+    source_auth: Union[VaultReplicationConfigV1_VaultInstanceAuthV1_VaultInstanceAuthApproleV1, VaultReplicationConfigV1_VaultInstanceAuthV1] = Field(..., alias="sourceAuth")
+    dest_auth: Union[VaultInstanceV1_VaultReplicationConfigV1_VaultInstanceAuthV1_VaultInstanceAuthApproleV1, VaultInstanceV1_VaultReplicationConfigV1_VaultInstanceAuthV1] = Field(..., alias="destAuth")
+    paths: Optional[list[Union[VaultReplicationJenkinsV1, VaultReplicationPolicyV1, VaultReplicationPathsV1]]] = Field(..., alias="paths")
 
 
 class VaultInstanceV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
+    description: str = Field(..., alias="description")
     address: str = Field(..., alias="address")
-    auth: Union[VaultInstanceAuthApproleV1, VaultInstanceAuthV1] = Field(
-        ..., alias="auth"
-    )
-    replication: Optional[list[VaultReplicationConfigV1]] = Field(
-        ..., alias="replication"
-    )
+    auth: Union[VaultInstanceAuthApproleV1, VaultInstanceAuthV1] = Field(..., alias="auth")
+    replication: Optional[list[VaultReplicationConfigV1]] = Field(..., alias="replication")
 
 
 class VaultInstancesQueryData(ConfiguredBaseModel):
-    vault_instances: Optional[list[VaultInstanceV1]] = Field(
-        ..., alias="vault_instances"
-    )
+    vault_instances: Optional[list[VaultInstanceV1]] = Field(..., alias="vault_instances")
 
 
 def query(query_func: Callable, **kwargs: Any) -> VaultInstancesQueryData:

reconcile/gql_definitions/vault_policies/vault_policies.py

@@ -33,8 +33,8 @@ query VaultPolicies {
 
 class ConfiguredBaseModel(BaseModel):
     class Config:
-        smart_union = True
-        extra = Extra.forbid
+        smart_union=True
+        extra=Extra.forbid
 
 
 class VaultInstanceV1(ConfiguredBaseModel):

reconcile/gql_definitions/vpc_peerings_validator/vpc_peerings_validator.py

@@ -17,14 +17,15 @@ from pydantic import (  # noqa: F401 # pylint: disable=W0611
     Json,
 )
 
-from reconcile.gql_definitions.vpc_peerings_validator.vpc_peerings_validator_peered_cluster_fragment import (
-    VpcPeeringsValidatorPeeredCluster,
-)
+from reconcile.gql_definitions.vpc_peerings_validator.vpc_peerings_validator_peered_cluster_fragment import VpcPeeringsValidatorPeeredCluster
 
 
 DEFINITION = """
 fragment VpcPeeringsValidatorPeeredCluster on Cluster_v1 {
   name
+  network {
+    vpc
+  }
   spec {
     private
   }
@@ -34,6 +35,9 @@ fragment VpcPeeringsValidatorPeeredCluster on Cluster_v1 {
 query VpcPeeringsValidator {
   clusters: clusters_v1 {
     name
+    network {
+      vpc
+    }
     spec {
       private
     }
@@ -41,6 +45,20 @@ query VpcPeeringsValidator {
     peering {
       connections {
         provider
+        ... on ClusterPeeringConnectionAccount_v1 {
+          vpc {
+            cidr_block
+            name
+          }
+        }
+        ... on ClusterPeeringConnectionAccountVPCMesh_v1{
+          name
+          account {
+            name
+            uid
+          }
+          tags
+        }
         ... on ClusterPeeringConnectionClusterRequester_v1 {
           cluster {
             ... VpcPeeringsValidatorPeeredCluster
@@ -60,8 +78,12 @@ query VpcPeeringsValidator {
 
 class ConfiguredBaseModel(BaseModel):
     class Config:
-        smart_union = True
-        extra = Extra.forbid
+        smart_union=True
+        extra=Extra.forbid
+
+
+class ClusterNetworkV1(ConfiguredBaseModel):
+    vpc: str = Field(..., alias="vpc")
 
 
 class ClusterSpecV1(ConfiguredBaseModel):
@@ -72,6 +94,26 @@ class ClusterPeeringConnectionV1(ConfiguredBaseModel):
     provider: str = Field(..., alias="provider")
 
 
+class AWSVPCV1(ConfiguredBaseModel):
+    cidr_block: str = Field(..., alias="cidr_block")
+    name: str = Field(..., alias="name")
+
+
+class ClusterPeeringConnectionAccountV1(ClusterPeeringConnectionV1):
+    vpc: AWSVPCV1 = Field(..., alias="vpc")
+
+
+class AWSAccountV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    uid: str = Field(..., alias="uid")
+
+
+class ClusterPeeringConnectionAccountVPCMeshV1(ClusterPeeringConnectionV1):
+    name: str = Field(..., alias="name")
+    account: AWSAccountV1 = Field(..., alias="account")
+    tags: Optional[Json] = Field(..., alias="tags")
+
+
 class ClusterPeeringConnectionClusterRequesterV1(ClusterPeeringConnectionV1):
     cluster: VpcPeeringsValidatorPeeredCluster = Field(..., alias="cluster")
 
@@ -81,17 +123,12 @@ class ClusterPeeringConnectionClusterAccepterV1(ClusterPeeringConnectionV1):
 
 
 class ClusterPeeringV1(ConfiguredBaseModel):
-    connections: list[
-        Union[
-            ClusterPeeringConnectionClusterRequesterV1,
-            ClusterPeeringConnectionClusterAccepterV1,
-            ClusterPeeringConnectionV1,
-        ]
-    ] = Field(..., alias="connections")
+    connections: list[Union[ClusterPeeringConnectionAccountVPCMeshV1, ClusterPeeringConnectionAccountV1, ClusterPeeringConnectionClusterRequesterV1, ClusterPeeringConnectionClusterAccepterV1, ClusterPeeringConnectionV1]] = Field(..., alias="connections")
 
 
 class ClusterV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
+    network: Optional[ClusterNetworkV1] = Field(..., alias="network")
     spec: Optional[ClusterSpecV1] = Field(..., alias="spec")
     internal: Optional[bool] = Field(..., alias="internal")
     peering: Optional[ClusterPeeringV1] = Field(..., alias="peering")

reconcile/gql_definitions/vpc_peerings_validator/vpc_peerings_validator_peered_cluster_fragment.py

@@ -20,8 +20,12 @@ from pydantic import (  # noqa: F401 # pylint: disable=W0611
 
 class ConfiguredBaseModel(BaseModel):
     class Config:
-        smart_union = True
-        extra = Extra.forbid
+        smart_union=True
+        extra=Extra.forbid
+
+
+class ClusterNetworkV1(ConfiguredBaseModel):
+    vpc: str = Field(..., alias="vpc")
 
 
 class ClusterSpecV1(ConfiguredBaseModel):
@@ -30,5 +34,6 @@ class ClusterSpecV1(ConfiguredBaseModel):
 
 class VpcPeeringsValidatorPeeredCluster(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
+    network: Optional[ClusterNetworkV1] = Field(..., alias="network")
     spec: Optional[ClusterSpecV1] = Field(..., alias="spec")
     internal: Optional[bool] = Field(..., alias="internal")

reconcile/integrations_manager.py

@@ -6,10 +6,7 @@ from collections.abc import (
     Mapping,
     Sequence,
 )
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any
 
 from github import Github
 from pydantic import BaseModel
@@ -44,6 +41,7 @@ from reconcile.utils.runtime.sharding import (
     AWSAccountShardingStrategy,
     CloudflareDnsZoneShardingStrategy,
     IntegrationShardManager,
+    OCMOrganizationShardingStrategy,
     OpenshiftClusterShardingStrategy,
     ShardSpec,
     StaticShardingStrategy,
@@ -56,6 +54,8 @@ QONTRACT_INTEGRATION_VERSION = make_semver(0, 1, 0)
 IMAGE_DEFAULT = "quay.io/app-sre/qontract-reconcile"
 UPSTREAM_DEFAULT = "https://github.com/app-sre/qontract-reconcile"
 
+INTEGRATION_UPSTREAM_REPOS_PARAM = "INTEGRATION_UPSTREAM_REPOS"
+
 
 def get_image_tag_from_ref(ref: str, upstream: str) -> str:
     gh_prefix = "https://github.com/"
@@ -73,7 +73,7 @@ def collect_parameters(
     environment: EnvironmentV1,
     upstream: str,
     image: str,
-    image_tag_from_ref: Optional[Mapping[str, str]],
+    image_tag_from_ref: Mapping[str, str] | None,
 ) -> dict[str, Any]:
     parameters: dict[str, Any] = {}
     if environment.parameters:
@@ -87,6 +87,17 @@ def collect_parameters(
             if p["name"] in os.environ
         }
         parameters.update(tp_env_vars)
+
+    # overwrite image and imtage tag from environment parameter
+    for upstream_config in (environment.parameters or {}).get(
+        INTEGRATION_UPSTREAM_REPOS_PARAM, []
+    ):
+        if upstream_config.get("repo") == upstream:
+            parameters["IMAGE_TAG"] = get_image_tag_from_ref(
+                upstream_config.get("ref"), upstream
+            )
+
+    # overwrite image tag from cli parameters
     if image_tag_from_ref:
         for e, r in image_tag_from_ref.items():
             if environment.name == e:
@@ -123,14 +134,15 @@ class HelmValues(BaseModel):
     cronjobs: list[HelmIntegrationSpec] = []
 
 
-def build_helm_values(specs: Iterable[HelmIntegrationSpec]):
+def build_helm_values(specs: Iterable[HelmIntegrationSpec]) -> dict:
     values = HelmValues()
     for s in specs:
         if s.cron:
             values.cronjobs.append(s)
         else:
             values.integrations.append(s)
-    return values
+
+    return values.dict(exclude_none=True, by_alias=True)
 
 
 class IntegrationsEnvironment(BaseModel):
@@ -143,7 +155,6 @@ def collect_integrations_environment(
     environment_name: str,
     shard_manager: IntegrationShardManager,
 ) -> list[IntegrationsEnvironment]:
-
     int_envs: dict[str, IntegrationsEnvironment] = {}
 
     for i in integrations:
@@ -166,13 +177,12 @@ def construct_oc_resources(
     integrations_environment: IntegrationsEnvironment,
     upstream: str,
     image: str,
-    image_tag_from_ref: Optional[Mapping[str, str]],
+    image_tag_from_ref: Mapping[str, str] | None,
 ) -> list[OpenshiftResource]:
-
     # Generate the openshift template with the helm chart. The resulting template
     # contains all the integrations in the environment
     values = build_helm_values(integrations_environment.integration_specs)
-    template = helm.template(values.dict(exclude_none=True, by_alias=True))
+    template = helm.template(values)
 
     parameters = collect_parameters(
         template,
@@ -200,7 +210,7 @@ def fetch_desired_state(
     ri: ResourceInventory,
     upstream: str,
     image: str,
-    image_tag_from_ref: Optional[Mapping[str, str]],
+    image_tag_from_ref: Mapping[str, str] | None,
 ):
     for ie in integrations_environments:
         oc_resources = construct_oc_resources(ie, upstream, image, image_tag_from_ref)
@@ -211,7 +221,7 @@ def fetch_desired_state(
 
 
 def filter_integrations(
-    integrations: Iterable[IntegrationV1], upstream: Optional[str] = None
+    integrations: Iterable[IntegrationV1], upstream: str | None = None
 ) -> list[IntegrationV1]:
     if upstream is None:
         return list(integrations)
@@ -247,6 +257,7 @@ def run(
             AWSAccountShardingStrategy.IDENTIFIER: AWSAccountShardingStrategy(),
             OpenshiftClusterShardingStrategy.IDENTIFIER: OpenshiftClusterShardingStrategy(),
             CloudflareDnsZoneShardingStrategy.IDENTIFIER: CloudflareDnsZoneShardingStrategy(),
+            OCMOrganizationShardingStrategy.IDENTIFIER: OCMOrganizationShardingStrategy(),
         },
         integration_runtime_meta=integration_runtime_meta,
     )
@@ -289,6 +300,7 @@ def run(
         integration_environments, ri, upstream, image, image_tag_from_ref
     )
 
+    ob.publish_metrics(ri, QONTRACT_INTEGRATION)
     if use_upstream:
         ob.realize_data(dry_run, oc_map, ri, thread_pool_size, caller=upstream)
     else:

reconcile/jenkins/types.py

@@ -21,7 +21,11 @@ class SSHHostKeyVerificationStrategy(Enum):
 
 class SSHConnector(BaseModel):
     credentials_id: str = Field(..., alias="credentialsId")
-    port: int = 22
+    launch_timeout_seconds: int | None = Field(None, alias="launchTimeoutSeconds")
+    max_num_retries: int | None = Field(None, alias="maxNumRetries")
+    retry_wait_time: int | None = Field(None, alias="retryWaitTime")
+    port: int | None = 22
+    jvm_options: str | None = Field(None, alias="jvmOptions")
     ssh_host_key_verification_strategy: SSHHostKeyVerificationStrategy = Field(
         SSHHostKeyVerificationStrategy.NON_VERIFYING_KEY_VERIFICATION_STRATEGY,
         alias="sshHostKeyVerificationStrategy",

reconcile/jenkins_base.py

@@ -0,0 +1,36 @@
+from reconcile import queries
+from reconcile.utils import gql
+from reconcile.utils.jenkins_api import JenkinsApi
+from reconcile.utils.secret_reader import SecretReader
+
+INSTANCES_QUERY = """
+{
+  instances: jenkins_instances_v1 {
+    name
+    token {
+      path
+      field
+      version
+      format
+    }
+  }
+}
+"""
+
+
+def get_jenkins_map() -> dict[str, JenkinsApi]:
+    gqlapi = gql.get_api()
+    jenkins_instances = gqlapi.query(INSTANCES_QUERY)["instances"]
+    secret_reader = SecretReader(queries.get_secret_reader_settings())
+
+    jenkins_map = {}
+    for instance in jenkins_instances:
+        instance_name = instance["name"]
+        if instance_name in jenkins_map:
+            continue
+
+        token = instance["token"]
+        jenkins = JenkinsApi.init_jenkins_from_secret(secret_reader, token)
+        jenkins_map[instance_name] = jenkins
+
+    return jenkins_map