From 7fddc1a8d3b04eacf891f74391b258f066061067 Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Mon, 2 Dec 2024 10:54:33 -0600
Subject: [PATCH] Bump K8s to v1.31

Change-Id: I384b10ef7b2da42d2227b4134e4ece4c5f9aa6d1
---
 README.rst                          | 5 -----
 roles/deploy-env/defaults/main.yaml | 5 +++--
 roles/deploy-env/tasks/metallb.yaml | 1 +
 zuul.d/jobs.yaml                    | 6 ++++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/README.rst b/README.rst
index 4294a73a7..11eb9113c 100644
--- a/README.rst
+++ b/README.rst
@@ -17,11 +17,6 @@ Communication
 
 * Join us on `IRC <irc://chat.oftc.net/openstack-helm>`_:
   #openstack-helm on oftc
-* Community `IRC Meetings
-  <http://eavesdrop.openstack.org/#OpenStack-Helm_Team_Meeting>`_:
-  [Every Tuesday @ 3PM UTC], #openstack-meeting-alt on oftc
-* Meeting Agenda Items: `Agenda
-  <https://etherpad.openstack.org/p/openstack-helm-meeting-agenda>`_
 * Join us on `Slack <https://kubernetes.slack.com/messages/C3WERB7DE/>`_
   - #openstack-helm
 
diff --git a/roles/deploy-env/defaults/main.yaml b/roles/deploy-env/defaults/main.yaml
index 156a63677..d60897fce 100644
--- a/roles/deploy-env/defaults/main.yaml
+++ b/roles/deploy-env/defaults/main.yaml
@@ -10,10 +10,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ---
-kube_version_repo: "v1.30"
+kube_version_repo: "v1.31"
 # the list of k8s package versions are available here
 # https://pkgs.k8s.io/core:/stable:/{{ kube_version_repo }}/deb/Packages
-kube_version: "1.30.3-1.1"
+kube_version: "1.31.3-1.1"
 helm_version: "v3.14.0"
 crictl_version: "v1.30.1"
 
@@ -50,6 +50,7 @@ loopback_image_size: 12G
 coredns_resolver_setup: true
 
 metallb_setup: false
+metallb_version: "0.13.12"
 metallb_pool_cidr: "172.24.128.0/24"
 metallb_openstack_endpoint_cidr: "172.24.128.100/24"
 
diff --git a/roles/deploy-env/tasks/metallb.yaml b/roles/deploy-env/tasks/metallb.yaml
index 9be2a32ad..d2f167c2e 100644
--- a/roles/deploy-env/tasks/metallb.yaml
+++ b/roles/deploy-env/tasks/metallb.yaml
@@ -24,6 +24,7 @@
       kubernetes.core.helm:
         name: metallb
         chart_ref: metallb/metallb
+        chart_version: "{{ metallb_version }}"
         namespace: metallb-system
         create_namespace: true
 
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 91e3c4ee8..5cce701fd 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -101,14 +101,16 @@
       loopback_device: /dev/loop100
       loopback_image: "/opt/ext_vol/openstack-helm/ceph-loop.img"
       ceph_osd_data_device: /dev/loop100
-      kube_version_repo: "v1.30"
-      kube_version: "1.30.3-1.1"
+      kube_version_repo: "v1.31"
+      kube_version: "1.31.3-1.1"
       calico_setup: true
       calico_version: "v3.27.4"
       cilium_setup: false
       cilium_version: "1.16.0"
       flannel_setup: false
       flannel_version: v0.25.4
+      metallb_setup: false
+      metallb_version: "0.13.12"
       helm_version: "v3.14.0"
       crictl_version: "v1.30.1"
       zuul_osh_infra_relative_path: ../openstack-helm-infra