qontract-reconcile 0.10.2.dev480__py3-none-any.whl → 0.10.2.dev481__py3-none-any.whl

{qontract_reconcile-0.10.2.dev480.dist-info → qontract_reconcile-0.10.2.dev481.dist-info}/METADATA

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

@@ -631,7 +631,7 @@ reconcile/utils/make.py,sha256=QaEwucrzbl8-VHS66Wfdjfo0ubmAcvt_hZGpiGsKU50,231
 reconcile/utils/metrics.py,sha256=2aqd17TUMXdU8FbsZp4YG5EyBcI8ztehdUIAS1u70p0,18506
 reconcile/utils/models.py,sha256=XqIwR-XMNhZ7m-jpfrQhuxC5TkFUMoCO5ShqUHuV3Bk,14560
 reconcile/utils/oauth2_backend_application_session.py,sha256=6W16sMpnWEPFDUX7qi5Cui2yOnmLfpgUxWtB3Ii35D0,4177
-reconcile/utils/oc.py,sha256=rZlb-6aekfKwNB3lVQ98N8AIMGdQES5xWBZs5yVTyW4,70005
+reconcile/utils/oc.py,sha256=i4nFPBUe5oS08t_73gkTX5e0SWdKqTFwh-FpH21NBDw,70167
 reconcile/utils/oc_connection_parameters.py,sha256=-H2crz0UOVKWlNrexf04ip8Vu57rE2QZLJuurvin1_c,9705
 reconcile/utils/oc_filters.py,sha256=DXIA2--jlYadPGsKynnnXW_LIZra6N2wmD0MVngir5Y,1427
 reconcile/utils/oc_map.py,sha256=ougQ-Wlsa8ymoE_lPQ7g2LlpsUOsHVeRCLYW_6fjeWU,8976
@@ -702,7 +702,7 @@ reconcile/utils/jinja2/extensions.py,sha256=7K-uo6G2eCWa98MHT8fRPYIKCLQB_5D2keqQ
 reconcile/utils/jinja2/filters.py,sha256=JfO_14APySBPidsMvHXG-8dULNPddZCE15Umjk_aSBk,4830
 reconcile/utils/jinja2/utils.py,sha256=iTwfFLWwuMIAIMuEnENrwcL7CRWw24fUmcWKLFw6jOE,9231
 reconcile/utils/jobcontroller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/utils/jobcontroller/controller.py,sha256=UyV6t7HZH5LxVf3UyGaeN1WzG-tPEPyNg_ksm6zSnUU,15362
+reconcile/utils/jobcontroller/controller.py,sha256=kRohlPS8KmtXyLmdpDEu2E8QQ85PsvZJYfZCMyTCFpE,15426
 reconcile/utils/jobcontroller/models.py,sha256=okj1zGdharGTJYW-f1XyvmWfp4F2ESTkvhYvrmzSGGE,6936
 reconcile/utils/membershipsources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/membershipsources/app_interface_resolver.py,sha256=cK4WkGRtqfdSq-RTswJ47nqQSZYiXshI3gFiKfILZe0,2014
@@ -803,7 +803,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=KcYVfa3UmJHVP_ocgrKe8NkrO5IDB9aWEDydSokPcRk,975
-qontract_reconcile-0.10.2.dev480.dist-info/METADATA,sha256=jpe2_IZtrGHSGKGrq0HZ3Fxyi933BiPjxBqUWNlP_zY,24901
-qontract_reconcile-0.10.2.dev480.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-qontract_reconcile-0.10.2.dev480.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev480.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev481.dist-info/METADATA,sha256=M9TKHf5Kbti2-70-Mj0QGQlVCAihy0yea_mC5JyNgrg,24901
+qontract_reconcile-0.10.2.dev481.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+qontract_reconcile-0.10.2.dev481.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev481.dist-info/RECORD,,

reconcile/utils/jobcontroller/controller.py

@@ -326,6 +326,7 @@ class K8sJobController:
                 self.integration,
                 self.integration_version,
             ).annotate(),
+            server_side=True,
         )
 
         # if the job defines secret data, we need to create the secret
@@ -339,6 +340,7 @@ class K8sJobController:
                     self.integration,
                     self.integration_version,
                 ).annotate(),
+                server_side=True,
             )
 
     def validate_job(self, job: V1Job) -> None:

reconcile/utils/oc.py

@@ -573,8 +573,17 @@ class OCCli:
         return json.loads(result)["items"]
 
     @OCDecorators.process_reconcile_time
-    def apply(self, namespace: str, resource: OR) -> OCProcessReconcileTimeDecoratorMsg:
-        cmd = ["apply", "-n", namespace, "-f", "-"]
+    def apply(
+        self,
+        namespace: str,
+        resource: OR,
+        server_side: bool = False,
+    ) -> OCProcessReconcileTimeDecoratorMsg:
+        cmd = (
+            ["apply"]
+            + (["--server-side"] if server_side else [])
+            + ["-n", namespace, "-f", "-"]
+        )
         self._run(cmd, stdin=resource.to_json(), apply=True)
         return self._msg_to_process_reconcile_time(namespace, resource)