Merge "Update k8s v1.26.8 and helm 3.11.3"

.zuul.yaml

@@ -471,11 +471,11 @@
           KURYR_K8S_CONTAINERIZED_DEPLOYMENT: false
           KURYR_NEUTRON_DEFAULT_SUBNETPOOL_ID: shared-default-subnetpool-v4
           # NOTES:
-          # - In Antelope cycle, Kubernetes version is updated to 1.25.
+          # - In Bobcat cycle, Kubernetes version is updated to 1.26.
           #   https://blueprints.launchpad.net/tacker/+spec/update-k8s-helm-prometheus
-          KURYR_KUBERNETES_VERSION: 1.25.6
+          KURYR_KUBERNETES_VERSION: 1.26.8
           CONTAINER_ENGINE: crio
-          CRIO_VERSION: 1.25
+          CRIO_VERSION: 1.26
           MYSQL_HOST: "{{ hostvars['controller']['nodepool']['private_ipv4'] }}"
           OCTAVIA_AMP_IMAGE_FILE: "/tmp/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2"
           OCTAVIA_AMP_IMAGE_NAME: "test-only-amphora-x64-haproxy-ubuntu-bionic"
@@ -540,9 +540,9 @@
       kuryr_k8s_api_url: "https://{{ hostvars['controller-k8s']['nodepool']['private_ipv4'] }}:6443"
       k8s_ssl_verify: true
       # NOTES:
-      # - In Antelope cycle, Helm version is updated to 3.10.
+      # - In Bobcat cycle, Helm version is updated to 3.11.
       #   https://blueprints.launchpad.net/tacker/+spec/update-k8s-helm-prometheus
-      helm_version: "3.10.3"
+      helm_version: "3.11.3"
       test_matrix_configs: [neutron]
       zuul_work_dir: src/opendev.org/openstack/tacker
       zuul_copy_output:

devstack/local.conf.kubernetes

@@ -63,11 +63,11 @@ disable_service tempest
 KUBERNETES_VIM=True
 # It is necessary to specify the patch version
 # because it is the version used when executing "apt-get install" command.
-KURYR_KUBERNETES_VERSION="1.25.6"
+KURYR_KUBERNETES_VERSION="1.26.8"
 CONTAINER_ENGINE="crio"
 # It is not necessary to specify the patch version
 # because it is the version used when adding the apt repository.
-CRIO_VERSION="1.25"
+CRIO_VERSION="1.26"
 enable_plugin kuryr-kubernetes https://opendev.org/openstack/kuryr-kubernetes master
 enable_plugin octavia https://opendev.org/openstack/octavia master
 enable_plugin devstack-plugin-container https://opendev.org/openstack/devstack-plugin-container master

doc/source/install/kubernetes_vim_installation.rst

@@ -33,11 +33,11 @@ It deploys VMs and Kubernetes resources on the same network.
      KUBERNETES_VIM=True
      # It is necessary to specify the patch version
      # because it is the version used when executing "apt-get install" command.
-     KURYR_KUBERNETES_VERSION="1.25.6"
+     KURYR_KUBERNETES_VERSION="1.26.8"
      CONTAINER_ENGINE="crio"
      # It is not necessary to specify the patch version
      # because it is the version used when adding the apt repository.
-     CRIO_VERSION="1.25"
+     CRIO_VERSION="1.26"
      enable_plugin kuryr-kubernetes https://opendev.org/openstack/kuryr-kubernetes master
      enable_plugin octavia https://opendev.org/openstack/octavia master
      enable_plugin devstack-plugin-container https://opendev.org/openstack/devstack-plugin-container master

doc/source/user/etsi_cnf_helm_v2.rst

@@ -1120,6 +1120,10 @@ Tacker Antelope release
 
 - Helm: 3.10
 
+Tacker Bobcat release
+
+- Helm: 3.11
+
 References
 ==========
 .. [#credential] https://docs.openstack.org/tacker/latest/install/kubernetes_vim_installation.html

doc/source/user/etsi_containerized_vnf_usage_guide.rst

@@ -974,6 +974,10 @@ Tacker Antelope release
 
 - Kubernetes: 1.25
 
+Tacker Bobcat release
+
+- Kubernetes: 1.26
+
 References
 ==========
 .. [#first] https://docs.openstack.org/tacker/latest/install/kubernetes_vim_installation.html