qontract-reconcile 0.10.2.dev288__py3-none-any.whl → 0.10.2.dev290__py3-none-any.whl

{qontract_reconcile-0.10.2.dev288.dist-info → qontract_reconcile-0.10.2.dev290.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev288
+Version: 0.10.2.dev290
 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

{qontract_reconcile-0.10.2.dev288.dist-info → qontract_reconcile-0.10.2.dev290.dist-info}/RECORD

@@ -504,8 +504,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=MknE9rEeVRCvyh1JnelQ5dBtiV0CPPq9dqu_N7WsEms,682
 reconcile/templates/jira-checkpoint-missinginfo.j2,sha256=c_Vvg-lEENsB3tgxm9B6Y9igCUQhCnFDYh6xw-zcIbU,570
-reconcile/templates/rosa-classic-cluster-creation.sh.j2,sha256=zqMMlKWV-aUDMtA-Xu5kl5pYLilewDClnKM0c807nNA,2146
-reconcile/templates/rosa-hcp-cluster-creation.sh.j2,sha256=hQ-WapiBNV3oEKQ813W3bD4HwQ4gADRPy80z9OLtW3Y,2317
+reconcile/templates/rosa-classic-cluster-creation.sh.j2,sha256=M-nzp-GtkQNRe8rdoDAndSKJSJhcJwNFKeql-JP2W7M,2094
+reconcile/templates/rosa-hcp-cluster-creation.sh.j2,sha256=eeT7xUhmz7Q_HtJOQALF5snZE8cUPGkIh6WUlcBHhhs,2349
 reconcile/templating/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/templating/renderer.py,sha256=VA_lMMtsyEFc0Cwf0jehQdv3tMEJtfyZMzBgA5us5ME,14856
 reconcile/templating/validator.py,sha256=5f9f35PCHOOdjb7KZquL2YdabyuAUokPDa4xutSEHIQ,5360
@@ -770,7 +770,7 @@ tools/app_sre_tekton_access_reporter.py,sha256=5qmkevJdlb2j_lpGC5Pu1Pmo0eomX5Zxz
 tools/app_sre_tekton_access_revalidation.py,sha256=vwL1o_j7oSTOhrHNH1znpgjA2LHGzb8yc5iG3aaY4m0,2684
 tools/glitchtip_access_reporter.py,sha256=wnaiDGW4MkYONV_erltnJ6nGkEj0kQrAiv04NNnOS0k,2859
 tools/glitchtip_access_revalidation.py,sha256=jjeLO53LTbz_LfQw3G2Cs8lVLO_6xqU39BYyTH3cEPE,2764
-tools/qontract_cli.py,sha256=WcQY3UFC6m4J7yjs12lR48e-hMWLUePSbzizoXS23EA,159355
+tools/qontract_cli.py,sha256=S6TorZiixrXe1nd9m9QhP-uUS3_gOy45_y6wP7X0z80,159520
 tools/template_validation.py,sha256=Xn9X4sGFznx-rvBDnq9Kq16rfET8V3bqH1EwavsGBac,3335
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/container_images_report.py,sha256=8mAjCS6XR0yD7k0mfiVBlt6xbYU47q_ftdYNi5o5VKE,5566
@@ -796,7 +796,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=uQv2QJAmUXP1g2GPIH30WTlvL9soY6m9lefpZEVDM5w,3965
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev288.dist-info/METADATA,sha256=8IMN433WCAjuTZtj2FO6F1k9M3EyrAvDxfL13NL3AGY,24916
-qontract_reconcile-0.10.2.dev288.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev288.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev288.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev290.dist-info/METADATA,sha256=OkooQLfmjUCTbTsLhPmSlTukOpNLXnYwmZsiBwfv5Rs,24916
+qontract_reconcile-0.10.2.dev290.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev290.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev290.dist-info/RECORD,,

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

@@ -33,8 +33,6 @@ rosa create cluster -y --cluster-name={{ cluster_name }} \
     --sts \
     {% if cluster.spec.private -%}
     --private \
-    {% endif -%}
-    {% if cluster.spec.private -%}
     --private-link \
     {% endif -%}
     {% if cluster.spec.multi_az -%}

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

@@ -51,6 +51,7 @@ rosa create cluster --cluster-name={{ cluster_name }} \
     --compute-machine-type {{ cluster.machine_pools[0].instance_type }} \
     {% if cluster.spec.private -%}
     --private \
+    --default-ingress-private \
     {% endif -%}
     {% if cluster.spec.disable_user_workload_monitoring -%}
     --disable-workload-monitoring \

tools/qontract_cli.py

@@ -1587,13 +1587,18 @@ def rosa_create_cluster_command(ctx: click.Context, cluster_name: str) -> None:
             f"--billing-account {billing_account}",
             f"--cluster-name {cluster.name}",
             "--sts",
-            ("--private" if cluster.spec.private else ""),
             ("--hosted-cp" if cluster.spec.hypershift else ""),
+            ("--private" if cluster.spec.private else ""),
             (
                 "--private-link"
                 if cluster.spec.private and not cluster.spec.hypershift
                 else ""
             ),
+            (
+                "--default-ingress-private"
+                if cluster.spec.private and cluster.spec.hypershift
+                else ""
+            ),
             (
                 "--multi-az"
                 if cluster.spec.multi_az and not cluster.spec.hypershift