Merge pull request #707 from shiftstack/merge-bot-master

Merge https://opendev.org/openstack/kuryr-kubernetes:master into master
openshift · Oct 26, 2022 · 92b9be2 · 92b9be2
2 parents e51d274 + 9ac8d88
commit 92b9be2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/.zuul.d/tempest-jobs.yaml b/.zuul.d/tempest-jobs.yaml
@@ -183,6 +183,7 @@
     vars:
       devstack_localrc:
         CONTAINER_ENGINE: docker
+        KURYR_KUBERNETES_VERSION: 1.23.13
     voting: true
 
 - job:

diff --git a/devstack/lib/kubernetes b/devstack/lib/kubernetes
@@ -91,6 +91,7 @@ networking:
   serviceSubnet: "$(IFS=, ; echo "${cluster_ip_ranges[*]}")"
 apiServer:
   extraArgs:
+    endpoint-reconciler-type: "none"
     min-request-timeout: "300"
     allow-privileged: "true"
     v: "$(get_k8s_log_level)"

diff --git a/devstack/settings b/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.22.3}
+KURYR_KUBERNETES_VERSION=${KURYR_KUBERNETES_VERSION:-1.25.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}"}