commit 4df54795492fd04fa3eb74341d03d71b6bd02f70
author Oleksandr K. <okozachenko@vexxhost.com> Thu Nov 28 21:53:04 2024 -0800
committer GitHub <noreply@github.com> Fri Nov 29 05:53:04 2024 +0000
tree ab731b667cf579038a453d1b31a1336f0c79bde3
parent 4c5b71dc04699f832a2b2d168676a63e957cb015

[stable/2023.2] upgrade mcapi, k8s collection and capo version (#2150) (#2174)

mcapi 0.22.1 -> 0.24.0 https://github.com/vexxhost/magnum-cluster-api/releases/tag/v0.24.0 k8s collection 0.14.3 -> 0.15.0 https://github.com/vexxhost/ansible-collection-kubernetes/releases/tag/v1.15.0

Reviewed-by: Mohammed Naser <mnaser@vexxhost.com>

roles/defaults/vars/main.yml

diff --git a/roles/defaults/vars/main.yml b/roles/defaults/vars/main.yml
index 0d06a77..79a13f5 100644
--- a/roles/defaults/vars/main.yml
+++ b/roles/defaults/vars/main.yml
@@ -36,10 +36,10 @@
   cinder_storage_init: "registry.atmosphere.dev/library/cinder:{{ atmosphere_release }}"
   cinder_volume_usage_audit: "registry.atmosphere.dev/library/cinder:{{ atmosphere_release }}"
   cinder_volume: "registry.atmosphere.dev/library/cinder:{{ atmosphere_release }}"
-  cluster_api_controller: registry.k8s.io/cluster-api/cluster-api-controller:v1.6.0
-  cluster_api_kubeadm_bootstrap_controller: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.6.0
-  cluster_api_kubeadm_control_plane_controller: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.6.0
-  cluster_api_openstack_controller: registry.k8s.io/capi-openstack/capi-openstack-controller:v0.9.0
+  cluster_api_controller: registry.k8s.io/cluster-api/cluster-api-controller:v1.8.4
+  cluster_api_kubeadm_bootstrap_controller: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.8.4
+  cluster_api_kubeadm_control_plane_controller: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.8.4
+  cluster_api_openstack_controller: registry.k8s.io/capi-openstack/capi-openstack-controller:v0.11.2
   csi_node_driver_registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
   csi_rbd_attacher: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
   csi_rbd_plugin: quay.io/cephcsi/cephcsi:v3.11.0

roles/magnum/meta/main.yml

diff --git a/roles/magnum/meta/main.yml b/roles/magnum/meta/main.yml
index a992fbc..3a45f47 100644
--- a/roles/magnum/meta/main.yml
+++ b/roles/magnum/meta/main.yml
@@ -38,6 +38,10 @@
       upload_helm_chart_dest: "{{ magnum_helm_chart_ref }}"
   - role: vexxhost.kubernetes.cluster_api
     vars:
+      clusterctl_version: 1.8.4
       clusterctl_config: "{{ magnum_clusterctl_config }}"
+      cluster_api_version: 1.8.4
+      cluster_api_infrastructure_provider: openstack
+      cluster_api_infrastructure_version: 0.11.2
       cluster_api_node_selector:
         openstack-control-plane: enabled