diff --git a/roles/deploy-env/defaults/main.yaml b/roles/deploy-env/defaults/main.yaml index ae9804a0c..156a63677 100644 --- a/roles/deploy-env/defaults/main.yaml +++ b/roles/deploy-env/defaults/main.yaml @@ -10,19 +10,19 @@ # See the License for the specific language governing permissions and # limitations under the License. --- -kube_version_repo: "v1.29" +kube_version_repo: "v1.30" # the list of k8s package versions are available here # https://pkgs.k8s.io/core:/stable:/{{ kube_version_repo }}/deb/Packages -kube_version: "1.29.5-1.1" -helm_version: "v3.6.3" -crictl_version: "v1.26.1" +kube_version: "1.30.3-1.1" +helm_version: "v3.14.0" +crictl_version: "v1.30.1" calico_setup: true -calico_version: "v3.27.0" +calico_version: "v3.27.4" calico_manifest_url: "https://raw.githubusercontent.com/projectcalico/calico/{{ calico_version }}/manifests/calico.yaml" cilium_setup: false -cilium_version: "1.15.6" +cilium_version: "1.16.0" flannel_setup: false flannel_version: v0.25.4 diff --git a/tools/deployment/common/ingress.sh b/tools/deployment/common/ingress.sh index 753a167c5..c199c7839 100755 --- a/tools/deployment/common/ingress.sh +++ b/tools/deployment/common/ingress.sh @@ -14,7 +14,7 @@ set -xe -: ${HELM_INGRESS_NGINX_VERSION:="4.8.3"} +: ${HELM_INGRESS_NGINX_VERSION:="4.11.1"} helm repo add ingress-nginx https://kubernetes.github.io/ingress-nginx diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index aaa70b55a..87e6ad491 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -101,15 +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.29" - kube_version: "1.29.5-1.1" + kube_version_repo: "v1.30" + kube_version: "1.30.3-1.1" calico_setup: true - calico_version: "v3.27.0" + calico_version: "v3.27.4" cilium_setup: false - cilium_version: "1.15.6" - helm_version: "v3.6.3" - yq_version: "v4.6.0" - crictl_version: "v1.26.1" + cilium_version: "1.16.0" + flannel_setup: false + flannel_version: v0.25.4 + helm_version: "v3.14.0" + crictl_version: "v1.30.1" zuul_osh_infra_relative_path: ../openstack-helm-infra gate_scripts_relative_path: ../openstack-helm-infra run_helm_tests: "no"