diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml index b3bd4a0e..6e934050 100644 --- a/zuul.d/base.yaml +++ b/zuul.d/base.yaml @@ -119,15 +119,17 @@ 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 - helm_version: "v3.15.4" + metallb_setup: false + metallb_version: "0.13.12" + helm_version: "v3.14.0" crictl_version: "v1.30.1" zuul_osh_relative_path: ../../openstack/openstack-helm zuul_osh_infra_relative_path: ../../openstack/openstack-helm-infra @@ -138,10 +140,10 @@ osh_params: container_distro_name: ubuntu container_distro_version: jammy - HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz - HTK_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b - OSH_INFRA_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b - OSH_COMMIT: 540df5cb0dbdaed63c202e2d6f2b7891062f8203 + HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.16.4-linux-amd64.tar.gz + HTK_COMMIT: 3a4fb2185dec899a2f77e6ff46a04947ac89cd6c + OSH_INFRA_COMMIT: 3a4fb2185dec899a2f77e6ff46a04947ac89cd6c + OSH_COMMIT: 450f355bc7dd68c449700c8c5f3ff89d45103474 gate_scripts: - ./tools/deployment/002-build-charts.sh - ./tools/deployment/003-prepare-k8s.sh @@ -220,15 +222,17 @@ 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 - helm_version: "v3.15.4" + metallb_setup: false + metallb_version: "0.13.12" + helm_version: "v3.14.0" crictl_version: "v1.30.1" zuul_osh_relative_path: ../../openstack/openstack-helm zuul_osh_infra_relative_path: ../../openstack/openstack-helm-infra @@ -239,10 +243,10 @@ osh_params: container_distro_name: ubuntu container_distro_version: jammy - HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz - HTK_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b - OSH_INFRA_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b - OSH_COMMIT: 540df5cb0dbdaed63c202e2d6f2b7891062f8203 + HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.16.4-linux-amd64.tar.gz + HTK_COMMIT: 3a4fb2185dec899a2f77e6ff46a04947ac89cd6c + OSH_INFRA_COMMIT: 3a4fb2185dec899a2f77e6ff46a04947ac89cd6c + OSH_COMMIT: 450f355bc7dd68c449700c8c5f3ff89d45103474 gate_scripts: - ./tools/deployment/002-build-charts.sh - ./tools/deployment/003-prepare-k8s.sh @@ -354,15 +358,17 @@ 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 - helm_version: "v3.15.4" + metallb_setup: false + metallb_version: "0.13.12" + helm_version: "v3.14.0" crictl_version: "v1.30.1" zuul_osh_relative_path: ../../openstack/openstack-helm zuul_osh_infra_relative_path: ../../openstack/openstack-helm-infra @@ -373,10 +379,10 @@ osh_params: container_distro_name: ubuntu container_distro_version: jammy - HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.15.4-linux-amd64.tar.gz - HTK_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b - OSH_INFRA_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b - OSH_COMMIT: 540df5cb0dbdaed63c202e2d6f2b7891062f8203 + HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.16.4-linux-amd64.tar.gz + HTK_COMMIT: 3a4fb2185dec899a2f77e6ff46a04947ac89cd6c + OSH_INFRA_COMMIT: 3a4fb2185dec899a2f77e6ff46a04947ac89cd6c + OSH_COMMIT: 450f355bc7dd68c449700c8c5f3ff89d45103474 gate_scripts: - ./tools/deployment/002-build-charts.sh - ./tools/deployment/003-prepare-k8s.sh