resolve conflict

vexxhost · Mar 29, 2024 · 2cb9e40 · 2cb9e40
1 parent fc82ddf
commit 2cb9e40
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/magnum_cluster_api/resources.py b/magnum_cluster_api/resources.py
@@ -2318,16 +2318,12 @@ def __init__(
     def labels(self) -> dict:
         labels = {}
         if self.cluster.cluster_template.network_driver == "calico":
-            cni_version = self.cluster.labels.get(
-                "calico_tag", CALICO_TAG
-            )
+            cni_version = self.cluster.labels.get("calico_tag", CALICO_TAG)
             labels = {
                 "cni": f"calico-{cni_version}",
             }
         if self.cluster.cluster_template.network_driver == "cilium":
-            cni_version = self.cluster.labels.get(
-                "cilium_tag", CILIUM_TAG
-            )
+            cni_version = self.cluster.labels.get("cilium_tag", CILIUM_TAG)
             labels = {
                 "cni": f"cilium-{cni_version}",
             }