From c6ece76483cc899dbedee3c7a98a1dd0a4a9b9eb Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Wed, 27 Nov 2024 09:53:02 -0600
Subject: [PATCH] Bump K8s to v1.31

Depends-On: I384b10ef7b2da42d2227b4134e4ece4c5f9aa6d1
Change-Id: Iae94564d3089e0a978576c7a9d48e3cd1b05a9d5
---
 README.rst       | 24 ++++++------------------
 zuul.d/base.yaml |  5 +++--
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/README.rst b/README.rst
index b9a9167313..1ee3776511 100644
--- a/README.rst
+++ b/README.rst
@@ -23,30 +23,18 @@ that are tested and proved to work.
      - Host OS
      - Image OS
      - Kubernetes version
-   * - Zed
-     - Ubuntu Focal
-     - Ubuntu Focal
-     - >=1.26,<=1.28
-   * - Zed
-     - Ubuntu Jammy
-     - Ubuntu Jammy
-     - >=1.26,<=1.28
-   * - 2023.1 (Antelope)
-     - Ubuntu Focal
-     - Ubuntu Focal
-     - >=1.26,<=1.28
-   * - 2023.1 (Antelope)
-     - Ubuntu Jammy
-     - Ubuntu Jammy
-     - >=1.26,<=1.28
    * - 2023.2 (Bobcat)
      - Ubuntu Jammy
      - Ubuntu Jammy
-     - >=1.26,<=1.28
+     - >=1.29,<=1.31
    * - 2024.1 (Caracal)
      - Ubuntu Jammy
      - Ubuntu Jammy
-     - >=1.26,<=1.28
+     - >=1.29,<=1.31
+   * - 2024.2 (Dalmatian)
+     - Ubuntu Jammy
+     - Ubuntu Jammy
+     - >=1.29,<=1.31
 
 Communication
 -------------
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index ea95910de3..a52e550b65 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -58,9 +58,10 @@
       loopback_device: /dev/loop100
       loopback_image: "/var/lib/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_version: "v3.27.4"
+      metallb_version: "0.13.12"
       helm_version: "v3.14.0"
       crictl_version: "v1.30.1"
       zuul_osh_relative_path: ../openstack-helm