fix merge option

magnum_cluster_api/resources.py

@@ -32,6 +32,7 @@
 from oslo_serialization import base64
 from oslo_utils import encodeutils
 
+
 from magnum_cluster_api import (
     clients,
     helm,
@@ -148,30 +149,30 @@ def apply(self) -> None:
         resource = self.get_object()
 
         # Check if resource exists
-        try:
-            existing_resource = resource.api.get(
-                **resource.api_kwargs()
-            )
-            exists = existing_resource.status_code == 200
-        except pykube.exceptions.HTTPError as e:
-            if e.response.status_code == 404:
-                exists = False  # Resource does not exist
-            else:
-                raise  # Other errors should be raised
+        existing_resource = resource.api.get(
+            **resource.api_kwargs()
+        )
+        exists = existing_resource.status_code == 200
 
         if not exists:
-            # Create new resource with POST
-            resp = resource.api.post(
+            # Create new resource with server-side apply
+            resp = resource.api.patch(
                 **resource.api_kwargs(
-                    headers={"Content-Type": "application/json"},
+                    headers={
+                        "Content-Type": "application/apply-patch+yaml",
+                    },
+                    params={
+                        "fieldManager": "atmosphere-operator",
+                        "force": True,
+                    },
                     data=json.dumps(resource.obj),
                 )
             )
         else:
             # Update existing resource with Strategic Merge Patch
             resp = resource.api.patch(
                 **resource.api_kwargs(
-                    headers={"Content-Type": "application/strategic-merge-patch+json"},
+                    headers={"Content-Type": "application/merge-patch+json"},
                     data=json.dumps(resource.obj),
                 )
             )