Bump cri-o version.
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:
parent
a874180b94
commit
5fb8104abf
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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%.*}
|
||||
|
||||
|
@ -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
|
||||
# ====
|
||||
|
@ -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
|
||||
# ====
|
||||
|
Loading…
Reference in New Issue
Block a user