qontract-reconcile 0.10.2.dev114__py3-none-any.whl → 0.10.2.dev116__py3-none-any.whl

{qontract_reconcile-0.10.2.dev114.dist-info → qontract_reconcile-0.10.2.dev116.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev114
+Version: 0.10.2.dev116
 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.dev114.dist-info → qontract_reconcile-0.10.2.dev116.dist-info}/RECORD

@@ -61,7 +61,7 @@ reconcile/ocm_groups.py,sha256=nz6n4a0ZVDClpm1HbPfcwJ8fw3AYg7o4DCH-SBItVbs,3389
 reconcile/ocm_machine_pools.py,sha256=iiqReJMdzmvl9Ae0X1nT48WyROAoLS4pcI4Wk9NdWE0,16637
 reconcile/ocm_update_recommended_version.py,sha256=Vi3Y2sX-OQxx1mv_xiPQXnmrpsZzGIE38No0yBcTaD4,4204
 reconcile/ocm_upgrade_scheduler_org_updater.py,sha256=aLgyInt9oIWAg0XtCiwJRUSwdPx3masKV8kHzkyEEOQ,4282
-reconcile/openshift_base.py,sha256=A_QP43K0S8W8YcA7C3g5d0VGZ6GZAH_4Q7Sl62J9zOo,52606
+reconcile/openshift_base.py,sha256=u8txhSciKi0ptsjzDplNMa4ykUcdlDu5gG-qU04Qiwc,52829
 reconcile/openshift_cluster_bots.py,sha256=AmCLCrlsZ_Wd5qMPzlv-O01i47WGJuojEc-Jgt2n77c,10942
 reconcile/openshift_clusterrolebindings.py,sha256=sDgHi_t2ayE3O6zZ5CLao7uBmihxRK8K70w2GSADz-w,5822
 reconcile/openshift_groups.py,sha256=2crqdhTOMw-21VMNhsOnKySyAWLxqAwGfiVLxL7ejx8,9329
@@ -769,7 +769,7 @@ tools/sd_app_sre_alert_report.py,sha256=jQpJdXVID68bSNtJNOGDh0-ei1CfEUS4Itr4MAaB
 tools/template_validation.py,sha256=qpKYaTgk0GOPGa2Ct5_5sKdwIHtCAKIBGzsMPuJU5fw,3371
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/container_images_report.py,sha256=SXh6sZ1dXXzd-2R5eeBufCtW3J4-Y55--0MZLdo4lr8,5409
-tools/cli_commands/erv2.py,sha256=VxUlNXllo947UwmtvS-42IeI9x_t_X3MHrrSI3K_GRo,23274
+tools/cli_commands/erv2.py,sha256=qojYCTope8ao-NBQVITs5Kd4mJBjRLNZwfvrV-Eov9w,23770
 tools/cli_commands/gpg_encrypt.py,sha256=JWwds_Qg7KhSJMIGUh8TfI5-Jf17iUtmaEi4kWJxfVE,4907
 tools/cli_commands/systems_and_tools.py,sha256=EMHOF1AtUDaoSk0bbjl6oUKYAz4rTZjIBaF-6E6GspM,16816
 tools/cli_commands/cost_report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -791,7 +791,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 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.dev114.dist-info/METADATA,sha256=47y9PHHGLYoNtOBWDmFYOIpvSOOtwueDj-VZZ5_dRt8,24566
-qontract_reconcile-0.10.2.dev114.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev114.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev114.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev116.dist-info/METADATA,sha256=MlYTARHmyM7Bmlh6v0xryMyrI4J5ggUbY_I9vlBYjpM,24566
+qontract_reconcile-0.10.2.dev116.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev116.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev116.dist-info/RECORD,,

reconcile/openshift_base.py

@@ -443,6 +443,11 @@ def apply(
             # spec.selector changes
             current_resource = oc.get(namespace, resource_type, resource.name)
 
+            if current_resource["spec"]["strategy"]["type"] == "Recreate":
+                oc.delete(namespace, resource_type, resource.name)
+                oc.create(namespace, resource=annotated)
+                return
+
             # check update strategy
             if current_resource["spec"]["strategy"]["type"] != "RollingUpdate":
                 logging.error(

tools/cli_commands/erv2.py

@@ -266,6 +266,12 @@ class Erv2Cli:
                 [
                     "docker",
                     "run",
+                    "-e",
+                    "TERRAFORM_MODULE_WORK_DIR=/tmp/migration",
+                    "-e",
+                    "BACKEND_TF_FILE=/tmp/migration/backend.tf",
+                    "-e",
+                    "TF_VARS_FILE=/tmp/migration/terraform.tfvars.json",
                     "--name",
                     "erv2-unlock",
                     "--rm",
@@ -279,7 +285,11 @@ class Erv2Cli:
                     "/bin/bash",
                     self.image,
                     "-c",
-                    f"cdktf synth && cd cdktf.out/stacks/CDKTF/ && terraform init && terraform force-unlock -force '{lock_id}'",
+                    "mkdir -p $TERRAFORM_MODULE_WORK_DIR;"
+                    "cp -rf module/* $TERRAFORM_MODULE_WORK_DIR;"
+                    "generate-tf-config && "
+                    "terraform -chdir=$TERRAFORM_MODULE_WORK_DIR init && "
+                    f"terraform -chdir=$TERRAFORM_MODULE_WORK_DIR force-unlock -force '{lock_id}'",
                 ],
                 check=True,
             )