qontract-reconcile 0.10.1rc935__py3-none-any.whl → 0.10.1rc937__py3-none-any.whl

{qontract_reconcile-0.10.1rc935.dist-info → qontract_reconcile-0.10.1rc937.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc935
+Version: 0.10.1rc937
 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.1rc935.dist-info → qontract_reconcile-0.10.1rc937.dist-info}/RECORD

@@ -332,7 +332,7 @@ reconcile/gql_definitions/membershipsources/__init__.py,sha256=47DEQpj8HBSa-_TIm
 reconcile/gql_definitions/membershipsources/roles.py,sha256=d3nv3GLsj_eKgwB1glsiK6smpC4i16WO3dU5rIdRg94,3678
 reconcile/gql_definitions/ocm_labels/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/ocm_labels/clusters.py,sha256=K0DaTnOEdCZAziDbmq3Ktrxzzmzy6sdb3-9kIDk6yao,2932
-reconcile/gql_definitions/ocm_labels/organizations.py,sha256=mmYB5C5Fp_nPzwBDKdKG4qWiLre2VkZ26U_2O-jRKC4,2001
+reconcile/gql_definitions/ocm_labels/organizations.py,sha256=ylNna62pG3XidrLQtMwu0LIOsKh6qyC2QImCbur2tV4,2252
 reconcile/gql_definitions/ocm_oidc_idp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/openshift_cluster_bots/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/openshift_cluster_bots/clusters.py,sha256=QshhCQeFRu_o0DLpD-4ltT5X_xZHjsCLc5jB3an3UXs,3688
@@ -402,7 +402,7 @@ reconcile/ocm/types.py,sha256=vbHUUnD4CLR4TKFrVjWQtdCjPTI4A3h0Xodt3WlIsEo,2370
 reconcile/ocm_internal_notifications/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/ocm_internal_notifications/integration.py,sha256=FIFHGJSjk_22A32ajJ-W-zsPM0w01kUmGPA8MVYWMPE,4364
 reconcile/ocm_labels/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/ocm_labels/integration.py,sha256=Pvc6ZNCisJ4Q26V-lAaCJEGkulLHxiHjU4KECAtuci0,15186
+reconcile/ocm_labels/integration.py,sha256=iM1yiapZIlRfCbzf3NJm5eghS_T4jMLZ0VKjTDGHwuc,15285
 reconcile/oum/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/oum/base.py,sha256=rkWsPO50fDiAuPjlEY3dvtMlSsSJmpxzXE8AFJB1zJA,13559
 reconcile/oum/labelset.py,sha256=f5kDndbaIT4iNYxTRPSELTUgj_aMlzEJDPzooAkG2mE,2154
@@ -458,8 +458,8 @@ reconcile/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 reconcile/templates/aws_access_key_email.j2,sha256=2MUr1ERmyISzKgHqsWYLd-1Wbl-peUa-FsGUS-JLUFc,238
 reconcile/templates/email.yml.j2,sha256=OZgczNRgXPj2gVYTgwQyHAQrMGu7xp-e4W1rX19GcrU,690
 reconcile/templates/jira-checkpoint-missinginfo.j2,sha256=c_Vvg-lEENsB3tgxm9B6Y9igCUQhCnFDYh6xw-zcIbU,570
-reconcile/templates/rosa-classic-cluster-creation.sh.j2,sha256=FVBmnR2FmVModhqOYNBInhF8zk0Qnj9og9KHK5-X9v0,2361
-reconcile/templates/rosa-hcp-cluster-creation.sh.j2,sha256=2wTdv9qvapCvT8NSi_hq8sXhpFSaxRX-V6Cao1diCI8,2393
+reconcile/templates/rosa-classic-cluster-creation.sh.j2,sha256=zqMMlKWV-aUDMtA-Xu5kl5pYLilewDClnKM0c807nNA,2146
+reconcile/templates/rosa-hcp-cluster-creation.sh.j2,sha256=DdnABKA-vu2x420JBBrr200bK8GE62GSzY9lBr2k7v8,2178
 reconcile/templating/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/templating/renderer.py,sha256=4Uo0HHRhXyXQNCMAEv3MiSL_R_B_DQ3MD7wtYcDzL9w,12951
 reconcile/templating/validator.py,sha256=5f9f35PCHOOdjb7KZquL2YdabyuAUokPDa4xutSEHIQ,5360
@@ -842,8 +842,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 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.1rc935.dist-info/METADATA,sha256=nG4Alh2q6Ov9z5xVFf0kauA15MoWAQNm-Cc-C8bNA1Y,2262
-qontract_reconcile-0.10.1rc935.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc935.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc935.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc935.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc937.dist-info/METADATA,sha256=8KTnlUXYacfNTzrqBJ0MjSeIMzLKdieRUziuZRbfDZY,2262
+qontract_reconcile-0.10.1rc937.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc937.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc937.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc937.dist-info/RECORD,,

reconcile/gql_definitions/ocm_labels/organizations.py

@@ -26,6 +26,9 @@ query OcmOrganizations {
     environment {
       name
     }
+    disable {
+      integrations
+    }
   }
 }
 """
@@ -41,10 +44,15 @@ class OpenShiftClusterManagerEnvironmentV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
 
 
+class DisableClusterAutomationsV1(ConfiguredBaseModel):
+    integrations: Optional[list[str]] = Field(..., alias="integrations")
+
+
 class OpenShiftClusterManagerV1(ConfiguredBaseModel):
     org_id: str = Field(..., alias="orgId")
     name: str = Field(..., alias="name")
     environment: OpenShiftClusterManagerEnvironmentV1 = Field(..., alias="environment")
+    disable: Optional[DisableClusterAutomationsV1] = Field(..., alias="disable")
 
 
 class OcmOrganizationsQueryData(ConfiguredBaseModel):

reconcile/ocm_labels/integration.py

@@ -91,7 +91,11 @@ class OcmLabelsIntegration(QontractReconcileIntegration[OcmLabelsIntegrationPara
     def get_organizations(
         self, query_func: Callable
     ) -> list[OpenShiftClusterManagerV1]:
-        return organization_query(query_func).organizations or []
+        return [
+            o
+            for o in organization_query(query_func).organizations or []
+            if integration_is_enabled(self.name, o)
+        ]
 
     def get_environments(self, query_func: Callable) -> list[OCMEnvironment]:
         return ocm_environment_query(query_func).environments

reconcile/templates/rosa-classic-cluster-creation.sh.j2

@@ -3,12 +3,6 @@
 set -e
 set -o pipefail
 
-CURRENT_CLUSTER_COUNT=$(rosa list clusters -o json | jq 'length')
-if (( CURRENT_CLUSTER_COUNT > 0 )); then
-  echo "Error: This account already has a cluster. Only one cluster per account is supported."
-  exit 1
-fi
-
 rosa init
 rosa create ocm-role --admin -y -m auto
 rosa create account-roles --classic -y -m auto

reconcile/templates/rosa-hcp-cluster-creation.sh.j2

@@ -3,12 +3,6 @@
 set -e
 set -o pipefail
 
-CURRENT_CLUSTER_COUNT=$(rosa list clusters -o json | jq 'length')
-if (( CURRENT_CLUSTER_COUNT > 0 )); then
-  echo "Error: This account already has a cluster. Only one cluster per account is supported."
-  exit 1
-fi
-
 rosa init
 rosa create ocm-role --admin -y -m auto
 rosa create account-roles --hosted-cp -y -m auto