From 05b919d371f2f3a34b07b5d8bc1d960eaa03dfad Mon Sep 17 00:00:00 2001 From: Yaguang Tang Date: Tue, 29 Oct 2024 11:28:35 +0800 Subject: [PATCH] [ATMOSPHERE-485] update magnum images to 1.29.6 1.30.2 1.31.1 (#1979) also update molecule magnum to use latest 1.31.1 k8s image Reviewed-by: Mohammed Naser Reviewed-by: Yaguang Tang --- molecule/aio/group_vars/all/molecule.yml | 5 +---- roles/magnum/defaults/main.yml | 11 +---------- roles/magnum/vars/main.yml | 11 +++++++++++ 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/molecule/aio/group_vars/all/molecule.yml b/molecule/aio/group_vars/all/molecule.yml index 7cb93a895..74f9925e7 100644 --- a/molecule/aio/group_vars/all/molecule.yml +++ b/molecule/aio/group_vars/all/molecule.yml @@ -212,10 +212,7 @@ magnum_helm_values: api: 1 conductor: 1 magnum_image_disk_format: qcow2 -magnum_images: - - name: ubuntu-2204-kube-v1.27.8s - url: https://object-storage.public.mtl1.vexxhost.net/swift/v1/a91f106f55e64246babde7402c21b87a/magnum-capi/ubuntu-2204-kube-v1.27.8.qcow2 - distro: ubuntu +magnum_images: "[ {{ _magnum_images[-1] }} ]" manila_helm_values: conf: diff --git a/roles/magnum/defaults/main.yml b/roles/magnum/defaults/main.yml index 05fab126f..740fbb02e 100644 --- a/roles/magnum/defaults/main.yml +++ b/roles/magnum/defaults/main.yml @@ -43,16 +43,7 @@ magnum_clusterctl_config: # List of images to load into OpenStack for Magnum magnum_image_container_format: bare magnum_image_disk_format: raw -magnum_images: - - name: ubuntu-2204-kube-v1.25.11 - url: https://object-storage.public.mtl1.vexxhost.net/swift/v1/a91f106f55e64246babde7402c21b87a/magnum-capi/ubuntu-2204-kube-v1.25.11.qcow2 - distro: ubuntu - - name: ubuntu-2204-kube-v1.26.6 - url: https://object-storage.public.mtl1.vexxhost.net/swift/v1/a91f106f55e64246babde7402c21b87a/magnum-capi/ubuntu-2204-kube-v1.26.6.qcow2 - distro: ubuntu - - name: ubuntu-2204-kube-v1.27.3 - url: https://object-storage.public.mtl1.vexxhost.net/swift/v1/a91f106f55e64246babde7402c21b87a/magnum-capi/ubuntu-2204-kube-v1.27.3.qcow2 - distro: ubuntu +magnum_images: "{{ _magnum_images }}" magnum_cluster_api_proxy_ovs_node_selector: openstack-control-plane: enabled diff --git a/roles/magnum/vars/main.yml b/roles/magnum/vars/main.yml index 78884fe0b..95582accf 100644 --- a/roles/magnum/vars/main.yml +++ b/roles/magnum/vars/main.yml @@ -95,3 +95,14 @@ _magnum_helm_values: service_ingress_api: false _magnum_registry_ingress_annotations: {} + +_magnum_images: + - name: ubuntu-2204-kube-v1.29.6 + url: https://static.atmosphere.dev/artifacts/magnum-cluster-api/ubuntu-jammy-kubernetes-1-29-6-1720107687.qcow2 + distro: ubuntu + - name: ubuntu-2204-kube-v1.30.2 + url: https://static.atmosphere.dev/artifacts/magnum-cluster-api/ubuntu-jammy-kubernetes-1-30-2-1720107688.qcow2 + distro: ubuntu + - name: ubuntu-2204-kube-v1.31.1 + url: https://static.atmosphere.dev/artifacts/magnum-cluster-api/ubuntu-jammy-kubernetes-1-31-1-1728920853.qcow2 + distro: ubuntu