upgrade mcapi, k8s collection and capo version (#2150)

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

galaxy.yml

@@ -17,7 +17,7 @@ dependencies:
   kubernetes.core: 2.4.0
   openstack.cloud: 1.7.0
   vexxhost.ceph: 3.0.1
-  vexxhost.kubernetes: ">=1.14.3"
+  vexxhost.kubernetes: ">=2.0.1"
 tags:
   - application
   - cloud

images/magnum/Dockerfile

@@ -22,7 +22,7 @@ sed -i s/^oslo.db===.*$/oslo.db==14.1.0/ /upper-constraints.txt
 pip3 install \
     --constraint /upper-constraints.txt \
         /src/magnum \
-        magnum-cluster-api==0.22.1
+        magnum-cluster-api==0.24.0
 EOF
 
 FROM registry.atmosphere.dev/library/openstack-python-runtime:${RELEASE}

roles/defaults/vars/main.yml

@@ -36,10 +36,10 @@ _atmosphere_images:
   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

@@ -38,6 +38,10 @@ dependencies:
       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

zuul.d/project.yaml

@@ -28,8 +28,6 @@
                 soft: true
               - name: atmosphere-build-container-image-cinder
                 soft: true
-              - name: atmosphere-build-container-image-cluster-api-provider-openstack
-                soft: true
               - name: atmosphere-build-container-image-designate
                 soft: true
               - name: atmosphere-build-container-image-glance
@@ -98,8 +96,6 @@
                 soft: true
               - name: atmosphere-upload-container-image-cinder
                 soft: true
-              - name: atmosphere-upload-container-image-cluster-api-provider-openstack
-                soft: true
               - name: atmosphere-upload-container-image-designate
                 soft: true
               - name: atmosphere-upload-container-image-glance