qontract-reconcile 0.10.1rc591__py3-none-any.whl → 0.10.1rc593__py3-none-any.whl

{qontract_reconcile-0.10.1rc591.dist-info → qontract_reconcile-0.10.1rc593.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc591
+Version: 0.10.1rc593
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc591.dist-info → qontract_reconcile-0.10.1rc593.dist-info}/RECORD

@@ -118,8 +118,8 @@ reconcile/terraform_vpc_peerings.py,sha256=rnDH1u93OyzrBM8Hib0HwSnlxZtx4ScRQaZAc
 reconcile/vault_replication.py,sha256=79GZ_kCimPoQcxkdhkWTQxPOAa46E0mNhf05s_Mk5so,17385
 reconcile/vpc_peerings_validator.py,sha256=Kv22HJVlTW9l9GB2eXwjPWqdDbr_VuvQBNPttox6s5o,7177
 reconcile/aus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/aus/advanced_upgrade_service.py,sha256=DQ9FrphzhKsKaXbXeA2v3Qsg1ABXXEtPhD-R-FwUsBA,21007
-reconcile/aus/aus_label_source.py,sha256=X6FD4NYcX27llMUSmmBcCh-pG7U5FnBd0zl-0zwCj2U,4118
+reconcile/aus/advanced_upgrade_service.py,sha256=PkVcXBMrveW5euvqjEBO4e5-9KDb_6hszLI2GrWpx2w,21378
+reconcile/aus/aus_label_source.py,sha256=qoP8Fgxuu1tCuhG6ixCWve7Ll-KD6a79E2uLAmC0ifw,4184
 reconcile/aus/base.py,sha256=Qdktz7W7J9TWVCYJZHwyKoIf4sVI7W9o_WwzsOBxLfQ,44912
 reconcile/aus/cluster_version_data.py,sha256=j4UyEBi5mQuvPq5Lo7a_L_0blxvH790wJV07uAiikFU,7126
 reconcile/aus/metrics.py,sha256=fIew-rzi_kYuI5Gxn3-4bQVIr2oNibiKPyGnhB-xKU4,3538
@@ -174,8 +174,8 @@ reconcile/gql_definitions/acs/acs_instances.py,sha256=L91WW9LbhJbBSrECqShQpFtjoB
 reconcile/gql_definitions/acs/acs_policies.py,sha256=Z6Z7duvS9W4cbciBED4oK40Vg9QyYti3zXvoEXM-fak,4422
 reconcile/gql_definitions/acs/acs_rbac.py,sha256=cZsIlCWliPQdQHgmBsIMx54fJNOtkdRXLzmOKZmJNHk,3009
 reconcile/gql_definitions/advanced_upgrade_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/advanced_upgrade_service/aus_clusters.py,sha256=2-OnknXDUI2pnZknEmjzMPBXUpWStoE32lpQQStobao,4221
-reconcile/gql_definitions/advanced_upgrade_service/aus_organization.py,sha256=0gcgv4CoKJ_5DJoIIj0JuytFOyq8HVn4wJyG_iEMH_Q,3219
+reconcile/gql_definitions/advanced_upgrade_service/aus_clusters.py,sha256=z-duZbkMLU1B7P7PSzjUQYVOr2ccP6rvpQLjgzHCj-4,4244
+reconcile/gql_definitions/advanced_upgrade_service/aus_organization.py,sha256=_H8jhf_kzFj5AWa8auawXIwFmrQw3a1RK6MOi4qQ6zA,3242
 reconcile/gql_definitions/app_interface_metrics_exporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/app_interface_metrics_exporter/onboarding_status.py,sha256=uVEEqU6YYmKsNTo6EWlFnoVmqha2rvBDx-wiD64VmG0,1679
 reconcile/gql_definitions/aws_ami_cleanup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -204,7 +204,7 @@ reconcile/gql_definitions/common/app_interface_repo_settings.py,sha256=rud0rz9NI
 reconcile/gql_definitions/common/app_interface_state_settings.py,sha256=VXIK0Hmyv6GTShI86IGkjxyHGwufqUBAh617XKUAKaI,2507
 reconcile/gql_definitions/common/app_interface_vault_settings.py,sha256=w8quvdG0cSq71ZyJokPPp7MyMpoDb6-HLQ3o9JHVGRQ,1771
 reconcile/gql_definitions/common/aws_vpcs.py,sha256=Dss9dQ3xagnz3Ltg1e9mtG2PAmQGBbUzKCmmzvuN28s,1892
-reconcile/gql_definitions/common/clusters.py,sha256=p2OCl7LDBilR8hWOwHLxj8qhjA9RU54NDXZBdFJ-Kk0,22764
+reconcile/gql_definitions/common/clusters.py,sha256=b9RLeV4H-y1aAPotySaid6IMT6-jPNE1smu70eSDYH4,23201
 reconcile/gql_definitions/common/clusters_minimal.py,sha256=yZpjS9qWyusCEiWtD8wzf0tak298uQyxiN4lC6KNo4s,4475
 reconcile/gql_definitions/common/clusters_with_peering.py,sha256=7ORLr469qEmsqescriARsZrJyQaB0JOFP6UVVlFWfk0,11548
 reconcile/gql_definitions/common/github_orgs.py,sha256=rZ0pDAA2_9hF9N-ykRZIxPtEmczTSjuA_k3nkp0k1W0,2039
@@ -243,7 +243,7 @@ reconcile/gql_definitions/fragments/resource_requests_requirements.py,sha256=TFK
 reconcile/gql_definitions/fragments/resource_values.py,sha256=-N2lNRhWp8PgocmIeX3U9f3l90Q97N2lXoq1pXdb_LE,742
 reconcile/gql_definitions/fragments/saas_target_namespace.py,sha256=y4hA73Vchi3I1UW94r7CmecZe6KoHkCMEVuoiAF2xnc,3660
 reconcile/gql_definitions/fragments/terraform_state.py,sha256=S5QuTR9YlvUObiU7hevS9ybxZEssWoRGqCR9YtGwePs,1024
-reconcile/gql_definitions/fragments/upgrade_policy.py,sha256=QrHCYqeBX8I9FrRK78KIlTAIYo9ijJZtdQn4ODiuWW4,1155
+reconcile/gql_definitions/fragments/upgrade_policy.py,sha256=cVza8zfra1E3yBsHiS-hKbys17fvv572GFnKshJjluE,1246
 reconcile/gql_definitions/fragments/user.py,sha256=84RGYYSYnZmyrwHlCX89-EgAu7UaLFOTMQXobmHCfz8,939
 reconcile/gql_definitions/fragments/vault_secret.py,sha256=8xoQJNx1jKw_1yradq1iLEYWzuOHra1bEHHU7WHKxqo,833
 reconcile/gql_definitions/gitlab_members/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -437,7 +437,7 @@ reconcile/test/test_openshift_resources_base.py,sha256=LtlR9x3o7KkSEw0JN0fZhinFe
 reconcile/test/test_openshift_saas_deploy.py,sha256=YLJGkc--u5aP0UkQ-b9ZGEFGS2gw25jjcSgknQdI3Ic,5892
 reconcile/test/test_openshift_saas_deploy_change_tester.py,sha256=1yVe54Hx9YdVjn6qdnKge5Sa_s732c-8uZqCnuT1gGI,12871
 reconcile/test/test_openshift_tekton_resources.py,sha256=RtRWsdm51S13OSkENC9nY_rOH0QELSCaO5tjF0XqIDI,11222
-reconcile/test/test_openshift_upgrade_watcher.py,sha256=na5Q5l88c0ZHMh82gvNpYheoMOAzEZRG0ZvzzDhafYE,7100
+reconcile/test/test_openshift_upgrade_watcher.py,sha256=0GDQ_YFHIX8DbkbDYSuLv9uZeeg4NwP1vlOqvSaZvN4,7183
 reconcile/test/test_prometheus_rules_tester.py,sha256=Qc9J4k0lSVie361lGr_cOy0EaBTD5LDqGZf7CYVFKr8,5677
 reconcile/test/test_quay_membership.py,sha256=e29Giz5S9ckFgjpTO8PBo8qVPocIQmy4WqsRhgTFd9A,2643
 reconcile/test/test_quay_mirror.py,sha256=UBLQDtet5WkWnh98ev5cI3yAflQl07awg2dXTefqoUk,6311
@@ -534,7 +534,7 @@ reconcile/typed_queries/terraform_tgw_attachments/aws_accounts.py,sha256=T5HSeyB
 reconcile/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/aggregated_list.py,sha256=pkYoBj7WwmaNgEefETqEOFTnQMcUzHE3mdsVdzGYj60,3372
 reconcile/utils/amtool.py,sha256=JV5-to_e_FaIcvJWTKYA9d6L3LwzwijM0MjUWn83eD4,2204
-reconcile/utils/aws_api.py,sha256=gB0rBj40oDyt7Z1d9EVNIsF1E0CViQpN6vbl9AlzCos,68612
+reconcile/utils/aws_api.py,sha256=Wy040GBQ3HrWmtxe1QAx3zl1I3phVDVjXEx_OITEcOw,69191
 reconcile/utils/aws_helper.py,sha256=E8NHkStoHRmvLVjRll2f5kGtU3i3f7ekp5V6nrn7B_M,1691
 reconcile/utils/binary.py,sha256=3IBnwjKakHM367skPPvG6yVSQYjKt5muQlFNdoa63DU,2352
 reconcile/utils/config.py,sha256=aId5zrPjM_84u_T4yTRE_Psu3zo5-5_JCR6_7Wgv5UQ,990
@@ -682,7 +682,7 @@ tools/app_interface_metrics_exporter.py,sha256=zkwkxdAUAxjdc-pzx2_oJXG25fo0Fnyd5
 tools/app_interface_reporter.py,sha256=upA-J-n-HXHKVDINRuMR7vTt-iJvQORKUVi9D3leQto,17738
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
-tools/qontract_cli.py,sha256=KWZz7eO-GeO_37bx4_rjJVKiq3VcuSheLBCr5-FwNFI,107516
+tools/qontract_cli.py,sha256=X6F63x-1m7iuPvnrxRqkav3ZUaU-tC4fmaouhVGy1TQ,107850
 tools/sd_app_sre_alert_report.py,sha256=e9vAdyenUz2f5c8-z-5WY0wv-SJ9aePKDH2r4IwB6pc,5063
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/gpg_encrypt.py,sha256=w8hl4jIEWk5wKbEFN6fVEOwUJGmdlvOqYodW3XSN7mU,4978
@@ -693,8 +693,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=OvalpVRfY4pNmpMaWHHYqBjV68b1eGQjX8SCyTAXb1w,3501
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc591.dist-info/METADATA,sha256=DqTA90B8RVSkuAVNCozScXLowFwyT2wVkm0p8K3hxdY,2349
-qontract_reconcile-0.10.1rc591.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-qontract_reconcile-0.10.1rc591.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
-qontract_reconcile-0.10.1rc591.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc591.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc593.dist-info/METADATA,sha256=Lfkt4RPQCrWJAcp1p0WBo6W__DgrMYySGwnLQTWNFUw,2349
+qontract_reconcile-0.10.1rc593.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+qontract_reconcile-0.10.1rc593.dist-info/entry_points.txt,sha256=rTjAv28I_CHLM8ID3OPqMI_suoQ9s7tFbim4aYjn9kk,376
+qontract_reconcile-0.10.1rc593.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc593.dist-info/RECORD,,

reconcile/aus/advanced_upgrade_service.py

@@ -364,6 +364,9 @@ class ClusterUpgradePolicyLabelSet(BaseModel):
     mutexes: Optional[CSV] = Field(alias=aus_label_key("mutexes"))
     sector: Optional[str] = Field(alias=aus_label_key("sector"))
     blocked_versions: Optional[CSV] = Field(alias=aus_label_key("blocked-versions"))
+    version_gate_approvals: Optional[CSV] = Field(
+        alias=aus_label_key("version-gate-approvals")
+    )
     _schedule_validator = validator("schedule", allow_reuse=True)(cron_validator)
 
     def build_labels_dict(self) -> dict[str, str]:
@@ -388,6 +391,7 @@ def build_cluster_upgrade_policy_label_set(
     mutexes: Optional[list[str]] = None,
     sector: Optional[str] = None,
     blocked_versions: Optional[list[str]] = None,
+    version_gate_approvals: Optional[list[str]] = None,
 ) -> ClusterUpgradePolicyLabelSet:
     return ClusterUpgradePolicyLabelSet(**{
         aus_label_key("workloads"): ",".join(workloads),
@@ -398,6 +402,9 @@ def build_cluster_upgrade_policy_label_set(
         aus_label_key("blocked-versions"): ",".join(blocked_versions)
         if blocked_versions
         else None,
+        aus_label_key("version-gate-approvals"): ",".join(version_gate_approvals)
+        if version_gate_approvals
+        else None,
     })
 
 
@@ -410,6 +417,7 @@ def _build_policy_from_labels(labels: LabelContainer) -> ClusterUpgradePolicyV1:
     policy_labelset = build_labelset(labels, ClusterUpgradePolicyLabelSet)
     return ClusterUpgradePolicyV1(
         workloads=policy_labelset.workloads,
+        versionGateApprovals=policy_labelset.version_gate_approvals,
         schedule=policy_labelset.schedule,
         conditions=ClusterUpgradePolicyConditionsV1(
             soakDays=policy_labelset.soak_days,

reconcile/aus/aus_label_source.py

@@ -52,6 +52,7 @@ class AUSClusterUpgradePolicyLabelSource(LabelSource):
             mutexes=policy.conditions.mutexes,
             sector=policy.conditions.sector,
             blocked_versions=policy.conditions.blocked_versions,
+            version_gate_approvals=policy.version_gate_approvals,
         ).build_labels_dict()
 
 

reconcile/gql_definitions/advanced_upgrade_service/aus_clusters.py

@@ -84,6 +84,7 @@ fragment AUSOCMOrganization on OpenShiftClusterManager_v1 {
 fragment ClusterUpgradePolicyV1 on ClusterUpgradePolicy_v1 {
   workloads
   schedule
+  versionGateApprovals
   conditions {
     mutexes
     soakDays

reconcile/gql_definitions/advanced_upgrade_service/aus_organization.py

@@ -83,6 +83,7 @@ fragment AUSOCMOrganization on OpenShiftClusterManager_v1 {
 fragment ClusterUpgradePolicyV1 on ClusterUpgradePolicy_v1 {
   workloads
   schedule
+  versionGateApprovals
   conditions {
     mutexes
     soakDays

reconcile/gql_definitions/common/clusters.py

@@ -62,6 +62,7 @@ fragment AWSVPC on AWSVPC_v1 {
 fragment ClusterUpgradePolicyV1 on ClusterUpgradePolicy_v1 {
   workloads
   schedule
+  versionGateApprovals
   conditions {
     mutexes
     soakDays
@@ -186,7 +187,13 @@ query Clusters($name: String) {
         availability_zones
         oidc_endpoint_url
         account {
+          name
           uid
+          terraformUsername
+          automationToken {
+            ... VaultSecret
+          }
+          resourcesDefaultRegion
           rosa {
             ocm_environments {
               ocm {
@@ -473,7 +480,11 @@ class RosaOcmSpecV1(ConfiguredBaseModel):
 
 
 class ClusterSpecROSAV1_AWSAccountV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
     uid: str = Field(..., alias="uid")
+    terraform_username: Optional[str] = Field(..., alias="terraformUsername")
+    automation_token: VaultSecret = Field(..., alias="automationToken")
+    resources_default_region: str = Field(..., alias="resourcesDefaultRegion")
     rosa: Optional[RosaOcmSpecV1] = Field(..., alias="rosa")
 
 

reconcile/gql_definitions/fragments/upgrade_policy.py

@@ -34,4 +34,5 @@ class ClusterUpgradePolicyConditionsV1(ConfiguredBaseModel):
 class ClusterUpgradePolicyV1(ConfiguredBaseModel):
     workloads: list[str] = Field(..., alias="workloads")
     schedule: str = Field(..., alias="schedule")
+    version_gate_approvals: Optional[list[str]] = Field(..., alias="versionGateApprovals")
     conditions: ClusterUpgradePolicyConditionsV1 = Field(..., alias="conditions")

reconcile/test/test_openshift_upgrade_watcher.py

@@ -8,13 +8,14 @@ import pytest
 from reconcile import openshift_upgrade_watcher as ouw
 from reconcile.gql_definitions.common.clusters import ClusterV1
 from reconcile.test.fixtures import Fixtures
+from reconcile.utils.models import data_default_none
 
 fxt = Fixtures("openshift_upgrade_watcher")
 
 
 def load_cluster(path: str) -> ClusterV1:
     content = fxt.get_anymarkup(path)
-    return ClusterV1(**content)
+    return ClusterV1(**data_default_none(ClusterV1, content))
 
 
 @pytest.fixture

reconcile/utils/aws_api.py

@@ -50,6 +50,7 @@ if TYPE_CHECKING:
     )
     from mypy_boto3_iam import IAMClient
     from mypy_boto3_iam.type_defs import AccessKeyMetadataTypeDef
+    from mypy_boto3_organizations import OrganizationsClient
     from mypy_boto3_rds import RDSClient
     from mypy_boto3_rds.type_defs import (
         DBInstanceMessageTypeDef,
@@ -70,7 +71,9 @@ else:
         FilterTypeDef
     ) = Route53Client = ResourceRecordSetTypeDef = ResourceRecordTypeDef = (
         HostedZoneTypeDef
-    ) = RDSClient = DBInstanceMessageTypeDef = UpgradeTargetTypeDef = object
+    ) = RDSClient = DBInstanceMessageTypeDef = UpgradeTargetTypeDef = (
+        OrganizationsClient
+    ) = object
 
 
 class InvalidResourceTypeError(Exception):
@@ -350,6 +353,12 @@ class AWSApi:  # pylint: disable=too-many-public-methods
         session = self.get_session(account_name)
         return self.get_session_client(session, "logs", region_name)
 
+    def _account_organizations_client(
+        self, account_name: str, region_name: Optional[str] = None
+    ) -> OrganizationsClient:
+        session = self.get_session(account_name)
+        return self.get_session_client(session, "organizations", region_name)
+
     def init_users(self):
         self.users = {}
         for account, s in self.sessions.items():
@@ -1729,6 +1738,10 @@ class AWSApi:  # pylint: disable=too-many-public-methods
             return versions[0]["ValidUpgradeTarget"]
         return []
 
+    def get_organization_billing_account(self, account_name: str) -> str:
+        org = self._account_organizations_client(account_name)
+        return org.describe_organization()["Organization"]["MasterAccountId"]
+
 
 def aws_config_file_path() -> Optional[str]:
     config_file_path = os.path.expanduser(

tools/qontract_cli.py

@@ -1309,9 +1309,17 @@ def rosa_create_cluster_command(ctx, cluster_name):
         print("must be a rosa cluster.")
         sys.exit(1)
 
+    settings = queries.get_app_interface_settings()
+    account = cluster.spec.account
+    with AWSApi(
+        1, [account.dict(by_alias=True)], settings=settings, init_users=False
+    ) as aws_api:
+        billing_account = aws_api.get_organization_billing_account(account.name)
+
     print(
         " ".join([
             "rosa create cluster",
+            f"--billing-account {billing_account}",
             f"--cluster-name {cluster.name}",
             "--sts",
             ("--private" if cluster.spec.private else ""),