openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "Bump kubernetes to version 1.27."

This commit is contained in:
Zuul 2023-08-03 13:58:11 +00:00 committed by Gerrit Code Review
parent cf560896e3 fa62887fe1
commit 4993c7a4b2
7 changed files with 7 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.26"
CRIO_VERSION: "1.27"
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.26"
CRIO_VERSION: "1.27"
ETCD_USE_RAMDISK: true
KURYR_ENABLED_HANDLERS: vif,endpoints,service,namespace,pod_label,policy,kuryrnetworkpolicy,kuryrnetwork,kuryrport,kuryrloadbalancer
KURYR_ENFORCE_SG_RULES: false

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

@ -54,7 +54,7 @@
stats_update_threads: 2
devstack_localrc:
CONTAINER_ENGINE: crio
CRIO_VERSION: "1.26"
CRIO_VERSION: "1.27"
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

2
devstack/lib/kubernetes
View File

@ -163,7 +163,7 @@ function kubeadm_join {
# TODO(gryf): take care of cri-o case aswell
rm -f ${output_dir}/kubeadm-join.yaml
cat >> ${output_dir}/kubeadm-join.yaml << EOF
apiVersion: kubeadm.k8s.io/v1beta2
apiVersion: kubeadm.k8s.io/v1beta3
discovery:
bootstrapToken:
apiServerEndpoint: ${SERVICE_HOST}:${KURYR_K8S_API_PORT}

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.26"
CRIO_VERSION="1.27"
# 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.26"
CRIO_VERSION="1.27"
# Etcd
# ====

2
devstack/settings
View File

@ -27,7 +27,7 @@ ETCD_PORT=${ETCD_PORT:-2379}
# KUBERNETES
KURYR_KUBERNETES_DATA_DIR=${KURYR_KUBERNETES_DATA_DIR:-${DATA_DIR}/kubernetes}
KURYR_KUBERNETES_VERSION=${KURYR_KUBERNETES_VERSION:-1.26.6}
KURYR_KUBERNETES_VERSION=${KURYR_KUBERNETES_VERSION:-1.27.3}
KURYR_K8S_API_PORT=${KURYR_K8S_API_PORT:-6443}
# NOTE(dulek): [kubernetes]api_root option will use LB IP instead.
KURYR_K8S_API_URL=${KURYR_K8S_API_URL:-"https://${SERVICE_HOST}:${KURYR_K8S_API_PORT}"}