diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml index 4a909b055..f7d19464a 100644 --- a/.zuul.d/base.yaml +++ b/.zuul.d/base.yaml @@ -46,7 +46,7 @@ - kuryr-tempest-plugin devstack_localrc: CONTAINER_ENGINE: crio - CRIO_VERSION: "1.22" + CRIO_VERSION: "1.25" ENABLE_TLS: true ETCD_USE_RAMDISK: true KURYR_ENABLED_HANDLERS: vif,endpoints,service,namespace,pod_label,policy,kuryrnetworkpolicy,kuryrnetwork,kuryrport,kuryrloadbalancer diff --git a/.zuul.d/k8s-np-e2e.yaml b/.zuul.d/k8s-np-e2e.yaml index 6210bc38a..831395fae 100644 --- a/.zuul.d/k8s-np-e2e.yaml +++ b/.zuul.d/k8s-np-e2e.yaml @@ -43,7 +43,7 @@ - tag-ports-during-bulk-creation devstack_localrc: CONTAINER_ENGINE: crio - CRIO_VERSION: "1.22" + CRIO_VERSION: "1.25" ETCD_USE_RAMDISK: true KURYR_ENABLED_HANDLERS: vif,endpoints,service,namespace,pod_label,policy,kuryrnetworkpolicy,kuryrnetwork,kuryrport,kuryrloadbalancer KURYR_ENFORCE_SG_RULES: false diff --git a/.zuul.d/tempest-multinode-jobs.yaml b/.zuul.d/tempest-multinode-jobs.yaml index dba7a3c0f..54785ae01 100644 --- a/.zuul.d/tempest-multinode-jobs.yaml +++ b/.zuul.d/tempest-multinode-jobs.yaml @@ -54,7 +54,7 @@ stats_update_threads: 2 devstack_localrc: CONTAINER_ENGINE: crio - CRIO_VERSION: "1.22" + CRIO_VERSION: "1.25" KURYR_ENABLED_HANDLERS: vif,endpoints,service,namespace,pod_label,policy,kuryrnetworkpolicy,kuryrnetwork,kuryrport,kuryrloadbalancer KURYR_ENFORCE_SG_RULES: false KURYR_EP_DRIVER_OCTAVIA_PROVIDER: ovn @@ -126,7 +126,7 @@ q-svc: false devstack_localrc: CONTAINER_ENGINE: crio - CRIO_VERSION: "1.22" + CRIO_VERSION: "1.25" KURYR_ENABLED_HANDLERS: vif,endpoints,service,namespace,pod_label,policy,kuryrnetworkpolicy,kuryrnetwork,kuryrport,kuryrloadbalancer KURYR_ENFORCE_SG_RULES: true KURYR_SG_DRIVER: policy diff --git a/devstack/lib/kubernetes b/devstack/lib/kubernetes index cb4f84e63..c39684365 100644 --- a/devstack/lib/kubernetes +++ b/devstack/lib/kubernetes @@ -2,7 +2,8 @@ # Ugly hack for the image repository. Kubernetes team switched to new registry # starting from 1.25 version. -# TODO(gryf): Remove this when kubernetes version will be bumped beyond 1.24. +# TODO(gryf): Remove this when kubernetes version will be bumped beyond 1.24 +# and we drop docker support, as it is pinned to 1.23. MINOR=${KURYR_KUBERNETES_VERSION#*.} MINOR=${MINOR%.*} diff --git a/devstack/local.conf.ovs.sample b/devstack/local.conf.ovs.sample index 688086b69..179b0f68e 100644 --- a/devstack/local.conf.ovs.sample +++ b/devstack/local.conf.ovs.sample @@ -85,7 +85,7 @@ enable_service o-hk enable_plugin devstack-plugin-container https://opendev.org/openstack/devstack-plugin-container # We are using CRI-O by default. The version should match K8s version: CONTAINER_ENGINE="crio" -CRIO_VERSION="1.22" +CRIO_VERSION="1.25" # Etcd # ==== diff --git a/devstack/local.conf.sample b/devstack/local.conf.sample index f75ee63d3..aa423a1c9 100644 --- a/devstack/local.conf.sample +++ b/devstack/local.conf.sample @@ -80,7 +80,7 @@ enable_plugin ovn-octavia-provider https://opendev.org/openstack/ovn-octavia-pro enable_plugin devstack-plugin-container https://opendev.org/openstack/devstack-plugin-container # We are using CRI-O by default. The version should match K8s version: CONTAINER_ENGINE="crio" -CRIO_VERSION="1.22" +CRIO_VERSION="1.25" # Etcd # ====