openstack/kuryr-kubernetes
Code Issues Proposed changes

Bump cri-o version.

Browse Source 
We recently bumped Kubernetes version to 1.25.x, but we forgot to do
this on cri-o as well.

Change-Id: If57888d6f48fad904bf4c7cdd5bc6c70233b95be
Depends-On: https://review.opendev.org/c/openstack/devstack-plugin-container/+/866130
This commit is contained in:
Roman Dobosz 2022-11-25 12:02:24 +01:00
parent a874180b94
commit 5fb8104abf
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.d/base.yaml
View File

@ -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

2
.zuul.d/k8s-np-e2e.yaml
View File

@ -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

4
.zuul.d/tempest-multinode-jobs.yaml
View File

@ -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

3
devstack/lib/kubernetes
View File

@ -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%.*}

2
devstack/local.conf.ovs.sample
View File

@ -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
# ====

2
devstack/local.conf.sample
View File

@ -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
# ====