Merge pull request #517 from vexxhost/switch-to-jsonpatch

fix: Cluster upgrade uses the right calls

Author: mnaser

Cargo.lock

@@ -5,14 +5,17 @@ edition = "2021"
 
 [dependencies]
 kube = { version = "0.98.0", features = ["runtime", "derive"] }
-k8s-openapi = { version = "0.24.0", features = ["latest"] }
-tokio = { version = "1.43.0", features = ["rt-multi-thread"] }
+k8s-openapi = { version = "0.24.0", features = ["schemars", "latest"] }
+tokio = { version = "1.43.0", features = ["macros", "rt-multi-thread"] }
 once_cell = "1.20.3"
 serde_json = "1.0.138"
 pythonize = "0.23.0"
 thiserror = "2.0.11"
-kube-core = "0.98.0"
 backoff = { version = "0.4.0", features = ["tokio"] }
+schemars = "0.8.21"
+serde = "1.0.218"
+pyo3-log = "0.12.1"
+log = "0.4.26"
 
 [dependencies.pyo3]
 version = "0.23.1"

Cargo.toml

@@ -109,6 +109,7 @@ def _create_cluster(self, context, cluster: magnum_objects.Cluster):
             cluster,
             skip_auto_scaling_release=True,
         )
+        resources.Cluster(context, self.kube_client, self.k8s_api, cluster).apply(),
 
     def _get_cluster_status_reason(self, capi_cluster):
         capi_cluster_status_reason = ""
@@ -385,6 +386,13 @@ def upgrade_cluster(
         resources.apply_cluster_from_magnum_cluster(
             context, self.kube_client, self.k8s_api, cluster
         )
+        self.kube_client.update_cluster(
+            "magnum-system",
+            cluster.stack_id,
+            resources.Cluster(
+                context, self.kube_client, self.k8s_api, cluster
+            ).get_object(),
+        )
 
         # NOTE(mnaser): We do not save the cluster object here because the Magnum driver
         #               will save the object that it passed to us here.

magnum_cluster_api/driver.py

@@ -3043,7 +3043,6 @@ def apply_cluster_from_magnum_cluster(
     ClusterServerGroups(context, cluster).apply()
     ClusterResourcesConfigMap(context, api, pykube_api, cluster).apply()
     ClusterResourceSet(api, cluster).apply()
-    Cluster(context, api, pykube_api, cluster).apply()
 
     if not skip_auto_scaling_release and utils.get_auto_scaling_enabled(cluster):
         ClusterAutoscalerHelmRelease(api, cluster).apply()