Merge https://opendev.org/openstack/kuryr-kubernetes:master into master

.zuul.d/base.yaml

@@ -46,7 +46,7 @@
         - kuryr-tempest-plugin
       devstack_localrc:
         CONTAINER_ENGINE: crio
-        CRIO_VERSION: "1.25"
+        CRIO_VERSION: "1.26"
         ENABLE_TLS: true
         ETCD_USE_RAMDISK: true
         KURYR_ENABLED_HANDLERS: vif,endpoints,service,namespace,pod_label,policy,kuryrnetworkpolicy,kuryrnetwork,kuryrport,kuryrloadbalancer

.zuul.d/k8s-np-e2e.yaml

@@ -43,7 +43,7 @@
         - tag-ports-during-bulk-creation
       devstack_localrc:
         CONTAINER_ENGINE: crio
-        CRIO_VERSION: "1.25"
+        CRIO_VERSION: "1.26"
         ETCD_USE_RAMDISK: true
         KURYR_ENABLED_HANDLERS: vif,endpoints,service,namespace,pod_label,policy,kuryrnetworkpolicy,kuryrnetwork,kuryrport,kuryrloadbalancer
         KURYR_ENFORCE_SG_RULES: false

.zuul.d/tempest-multinode-jobs.yaml

@@ -54,7 +54,7 @@
                 stats_update_threads: 2
         devstack_localrc:
           CONTAINER_ENGINE: crio
-          CRIO_VERSION: "1.25"
+          CRIO_VERSION: "1.26"
           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.25"
+          CRIO_VERSION: "1.26"
           KURYR_ENABLED_HANDLERS: vif,endpoints,service,namespace,pod_label,policy,kuryrnetworkpolicy,kuryrnetwork,kuryrport,kuryrloadbalancer
           KURYR_ENFORCE_SG_RULES: true
           KURYR_SG_DRIVER: policy

devstack/lib/kubernetes

@@ -68,7 +68,7 @@ function kubeadm_init {
     # TODO(gryf): take care of cri-o case aswell
     rm -f ${output_dir}/kubeadm-init.yaml
     cat >> ${output_dir}/kubeadm-init.yaml << EOF
-apiVersion: kubeadm.k8s.io/v1beta2
+apiVersion: kubeadm.k8s.io/v1beta3
 kind: ClusterConfiguration
 imageRepository: "${KURYR_KUBEADMIN_IMAGE_REPOSITORY}"
 etcd:
@@ -83,22 +83,19 @@ apiServer:
     min-request-timeout: "300"
     allow-privileged: "true"
     v: "$(get_k8s_log_level)"
-    logtostderr: "true"
 controllerManager:
   extraArgs:
     master: "$KURYR_K8S_API_URL"
     min-resync-period: "3m"
     v: "$(get_k8s_log_level)"
-    logtostderr: "true"
     leader-elect: "false"
 scheduler:
   extraArgs:
     master: "${KURYR_K8S_API_URL}"
     v: "$(get_k8s_log_level)"
-    logtostderr: "true"
     leader-elect: "false"
 ---
-apiVersion: kubeadm.k8s.io/v1beta2
+apiVersion: kubeadm.k8s.io/v1beta3
 kind: InitConfiguration
 bootstrapTokens:
 - token: "${KURYR_K8S_TOKEN}"

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.25"
+CRIO_VERSION="1.26"
 
 # Etcd
 # ====

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.25"
+CRIO_VERSION="1.26"
 
 # Etcd
 # ====

devstack/settings

@@ -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.25.3}
+KURYR_KUBERNETES_VERSION=${KURYR_KUBERNETES_VERSION:-1.26.6}
 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}"}