From 2323d961a36f4e62e32a2e00c51f30408982efac Mon Sep 17 00:00:00 2001
From: okozachenko1203 <okozachenko1203@users.noreply.github.com>
Date: Thu, 22 Aug 2024 17:41:08 +1000
Subject: [PATCH] feat: upgrade capi & capo version

capi 1.6 -> 1.8.1
capo 0.9 -> v0.10.4

To support workload cluster 1.31, need to upgrade capi to 1.8.x
To support workload cluster 1.30, need to upgrade capi to 1.7.x
---
 hack/setup-capo.sh              | 4 ++--
 magnum_cluster_api/resources.py | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/hack/setup-capo.sh b/hack/setup-capo.sh
index 08c0e760..38e9406c 100755
--- a/hack/setup-capo.sh
+++ b/hack/setup-capo.sh
@@ -19,8 +19,8 @@
 export GOPROXY=off
 
 # Versions to test
-CAPI_VERSION=${CAPI_VERSION:-v1.6.0}
-CAPO_VERSION=${CAPO_VERSION:-v0.9.0}
+CAPI_VERSION=${CAPI_VERSION:-vv1.8.1}
+CAPO_VERSION=${CAPO_VERSION:-v0.10.4}
 
 # Install the `clusterctl` CLI
 sudo curl -Lo /usr/local/bin/clusterctl https://github.com/kubernetes-sigs/cluster-api/releases/download/${CAPI_VERSION}/clusterctl-linux-amd64
diff --git a/magnum_cluster_api/resources.py b/magnum_cluster_api/resources.py
index df847727..8c9ac27d 100644
--- a/magnum_cluster_api/resources.py
+++ b/magnum_cluster_api/resources.py
@@ -827,8 +827,9 @@ def get_object(self) -> objects.OpenStackClusterTemplate:
                     "template": {
                         "spec": {
                             "cloudName": "default",
-                            "managedSecurityGroups": True,
-                            "allowAllInClusterTraffic": True,
+                            "managedSecurityGroups": {
+                                "allowAllInClusterTraffic": True,
+                            },
                         },
                     },
                 },