From 795a2dc309c37e741738b3b1c92c266cbc62f93e Mon Sep 17 00:00:00 2001 From: ChengHao Yang <17496418+tico88612@users.noreply.github.com> Date: Mon, 25 Nov 2024 21:38:56 +0800 Subject: [PATCH] Bump: OpenStack Cloud Controller Manager to v1.31.1 (#11738) * Refactor: replace registry.k8s.io with kube_image_repo variable Signed-off-by: ChengHao Yang <17496418+tico88612@users.noreply.github.com> * Bump: OpenStack Cloud Controller Manager upgrade to v1.31.1 Signed-off-by: ChengHao Yang <17496418+tico88612@users.noreply.github.com> * Refactor: remove occm image tag from sample inventory Signed-off-by: ChengHao Yang <17496418+tico88612@users.noreply.github.com> --------- Signed-off-by: ChengHao Yang <17496418+tico88612@users.noreply.github.com> --- inventory/sample/group_vars/all/openstack.yml | 3 --- roles/kubespray-defaults/defaults/main/download.yml | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/inventory/sample/group_vars/all/openstack.yml b/inventory/sample/group_vars/all/openstack.yml index 20c8e9940..2f5205316 100644 --- a/inventory/sample/group_vars/all/openstack.yml +++ b/inventory/sample/group_vars/all/openstack.yml @@ -41,9 +41,6 @@ # external_openstack_application_credential_id: # external_openstack_application_credential_secret: -## The tag of the external OpenStack Cloud Controller image -# external_openstack_cloud_controller_image_tag: "v1.28.2" - ## Tags for the Cinder CSI images ## registry.k8s.io/sig-storage/csi-attacher # cinder_csi_attacher_image_tag: "v4.4.2" diff --git a/roles/kubespray-defaults/defaults/main/download.yml b/roles/kubespray-defaults/defaults/main/download.yml index 81c49a40f..104b9f205 100644 --- a/roles/kubespray-defaults/defaults/main/download.yml +++ b/roles/kubespray-defaults/defaults/main/download.yml @@ -279,8 +279,8 @@ kube_router_image_repo: "{{ docker_image_repo }}/cloudnativelabs/kube-router" kube_router_image_tag: "{{ kube_router_version }}" multus_image_repo: "{{ github_image_repo }}/k8snetworkplumbingwg/multus-cni" multus_image_tag: "{{ multus_version }}" -external_openstack_cloud_controller_image_repo: "registry.k8s.io/provider-os/openstack-cloud-controller-manager" -external_openstack_cloud_controller_image_tag: "v1.30.0" +external_openstack_cloud_controller_image_repo: "{{ kube_image_repo }}/provider-os/openstack-cloud-controller-manager" +external_openstack_cloud_controller_image_tag: "v1.31.1" kube_vip_image_repo: "{{ github_image_repo }}/kube-vip/kube-vip" kube_vip_image_tag: v0.8.0