Merge "Update k8s v1.25.6 and helm 3.10.3"

2023-02-20 14:35:32 +00:00 · 2023-02-20 14:35:32 +00:00 · 576263349f
parent 692ec77688 da52c8d062
commit 576263349f
6 changed files with 88 additions and 32 deletions
--- a/.zuul.yaml
+++ b/.zuul.yaml
@ -498,9 +498,9 @@
          KURYR_K8S_CONTAINERIZED_DEPLOYMENT: false
          KURYR_NEUTRON_DEFAULT_SUBNETPOOL_ID: shared-default-subnetpool-v4
          # NOTES:
-          # - In Atelope cycle, Kubernetes version is updated to 1.25.
+          # - In Antelope cycle, Kubernetes version is updated to 1.25.
          #   https://blueprints.launchpad.net/tacker/+spec/update-k8s-helm-prometheus
-          KURYR_KUBERNETES_VERSION: 1.25.2
+          KURYR_KUBERNETES_VERSION: 1.25.6
          CONTAINER_ENGINE: crio
          CRIO_VERSION: 1.25
          MYSQL_HOST: "{{ hostvars['controller']['nodepool']['private_ipv4'] }}"
@ -563,9 +563,9 @@
      kuryr_k8s_api_url: "https://{{ hostvars['controller-k8s']['nodepool']['private_ipv4'] }}:6443"
      k8s_ssl_verify: true
      # NOTES:
-      # - In Atelope cycle, Helm version is updated to 3.10.
+      # - In Antelope cycle, Helm version is updated to 3.10.
      #   https://blueprints.launchpad.net/tacker/+spec/update-k8s-helm-prometheus
-      helm_version: "3.10.1"
+      helm_version: "3.10.3"
      test_matrix_configs: [neutron]
      zuul_work_dir: src/opendev.org/openstack/tacker
      zuul_copy_output:
--- a/devstack/local.conf.kubernetes
+++ b/devstack/local.conf.kubernetes
@ -64,7 +64,7 @@ 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.2"
+KURYR_KUBERNETES_VERSION="1.25.6"
 CONTAINER_ENGINE="crio"
 # It is not necessary to specify the patch version
 # because it is the version used when adding the apt repository.
--- a/doc/source/install/kubernetes_vim_installation.rst
+++ b/doc/source/install/kubernetes_vim_installation.rst
@ -29,12 +29,18 @@ It deploys VMs and Kubernetes resources on the same network.

   .. code-block:: console

-     # Enable kuryr-kubernetes, docker, octavia
+     # Enable kuryr-kubernetes, crio, octavia
     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"
+     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"
     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
-     KURYR_K8S_CLUSTER_IP_RANGE="10.0.0.0/24"

   Public network is used to launch LoadBalancer for Services in Kubernetes.
   Setting public subnet is described in [#first]_.
@ -103,9 +109,45 @@ It deploys VMs and Kubernetes resources on the same network.
   On the other hand, you're required to get required parameters with
   ``kubectl`` command if you edit the configuration from scratch.

+   * Create Secret
+
+     First, you can check whether a Secret containing a bearer token already
+     exists. If it does not exist, you can create a Secret according to the
+     following file. If it already exists, skip this step and start with
+     |get_token|_.
+
+     .. code-block:: console
+
+         $ cat default-token.yaml
+         apiVersion: v1
+         kind: Secret
+         metadata:
+           name: default-token-cfx5m
+           namespace: default
+           annotations:
+             kubernetes.io/service-account.name: "default"
+         type: kubernetes.io/service-account-token
+
+     Use ``default-token.yaml`` to create a Secret.
+
+     **Command:**
+
+     .. code-block:: console
+
+         $ kubectl apply -f default-token.yaml
+
+     **Result:**
+
+     .. code-block:: console
+
+         secret/default-token-cfx5m created
+
+   .. |get_token| replace:: Get "Bearer Token"
+   .. _get_token:
+
   * Get "Bearer Token"

-     First, you have to confirm Kubernetes Secret name which contains
+     You have to confirm Kubernetes Secret name which contains
     bearer token.

     **Command:**
--- a/doc/source/user/etsi_cnf_helm_v2.rst
+++ b/doc/source/user/etsi_cnf_helm_v2.rst
@ -1109,6 +1109,13 @@ we can append ``-A`` to the command line.
    during instantiate, the deployed resources will be instantiated
    in the corresponding namespace.

+Supported versions
+------------------
+
+Tacker Antelope release
+
+- Helm: 3.10
+
 References
 ==========
 .. [#credential] https://docs.openstack.org/tacker/latest/install/kubernetes_vim_installation.html
--- a/doc/source/user/etsi_containerized_vnf_usage_guide.rst
+++ b/doc/source/user/etsi_containerized_vnf_usage_guide.rst
@ -869,6 +869,13 @@ we can append ``-A`` to the command line.
    during instantiate, the deployed resources will be instantiated
    in the corresponding namespace.

+Supported versions
+------------------
+
+Tacker Antelope release
+
+- Kubernetes: 1.25
+
 References
 ==========
 .. [#first] https://docs.openstack.org/tacker/latest/install/kubernetes_vim_installation.html
--- a/doc/source/user/mgmt_driver_for_container_update.rst
+++ b/doc/source/user/mgmt_driver_for_container_update.rst
@ -371,9 +371,9 @@ The resources information before update:
      ...
      Containers:
        nginx:
-          Container ID:   docker://623c652c7ab71d268e18129475d0391b72c88b1a8a778bbdd3d479fad2521bc2
+          Container ID:   cri-o://623c652c7ab71d268e18129475d0391b72c88b1a8a778bbdd3d479fad2521bc2
          Image:          nginx
-          Image ID:       docker-pullable://nginx@sha256:ecc068890de55a75f1a32cc8063e79f90f0b043d70c5fcf28f1713395a4b3d49
+          Image ID:       docker.io/library/nginx@sha256:ecc068890de55a75f1a32cc8063e79f90f0b043d70c5fcf28f1713395a4b3d49
      ...
      Volumes:
        cm-volume:
@ -392,9 +392,9 @@ The resources information before update:
      ...
      Containers:
        nginx:
-          Container ID:   docker://74d38aa62097b3a1a80181195ebda3877e3773311d0273fdc3fbb27fa4b9600d
+          Container ID:   cri-o://74d38aa62097b3a1a80181195ebda3877e3773311d0273fdc3fbb27fa4b9600d
          Image:          nginx
-          Image ID:       docker-pullable://nginx@sha256:ecc068890de55a75f1a32cc8063e79f90f0b043d70c5fcf28f1713395a4b3d49
+          Image ID:       docker.io/library/nginx@sha256:ecc068890de55a75f1a32cc8063e79f90f0b043d70c5fcf28f1713395a4b3d49
      ...
      Volumes:
        cm-volume:
@ -422,9 +422,9 @@ The resources information before update:
      ...
      Containers:
        nginx:
-          Container ID:   docker://50ffc03736a03c8d4546bb60bb5815b4c8f6cbbfb7b70da4121a06c5c8d6568a
+          Container ID:   cri-o://50ffc03736a03c8d4546bb60bb5815b4c8f6cbbfb7b70da4121a06c5c8d6568a
          Image:          nginx
-          Image ID:       docker-pullable://nginx@sha256:ecc068890de55a75f1a32cc8063e79f90f0b043d70c5fcf28f1713395a4b3d49
+          Image ID:       docker.io/library/nginx@sha256:ecc068890de55a75f1a32cc8063e79f90f0b043d70c5fcf28f1713395a4b3d49
      ...
          Environment Variables from:
            cm-data      ConfigMap with prefix 'CM_'  Optional: false
@ -440,9 +440,9 @@ The resources information before update:
      ...
      Containers:
        nginx:
-          Container ID:   docker://6d7a8019984c04ab758b962a228f44fb14bfc0f4e1f525548d87a91d17b49f77
+          Container ID:   cri-o://6d7a8019984c04ab758b962a228f44fb14bfc0f4e1f525548d87a91d17b49f77
          Image:          nginx
-          Image ID:       docker-pullable://nginx@sha256:ecc068890de55a75f1a32cc8063e79f90f0b043d70c5fcf28f1713395a4b3d49
+          Image ID:       docker.io/library/nginx@sha256:ecc068890de55a75f1a32cc8063e79f90f0b043d70c5fcf28f1713395a4b3d49
      ...
          Environment Variables from:
            cm-data2      ConfigMap with prefix 'CM_'  Optional: false
@ -466,9 +466,9 @@ The resources information before update:
      ...
      Containers:
        nginx:
-          Container ID:   docker://3f392217d5f22c417fc9da24f4bd27d41e90a2165d10356a44cd1b98b6b899d9
+          Container ID:   cri-o://3f392217d5f22c417fc9da24f4bd27d41e90a2165d10356a44cd1b98b6b899d9
          Image:          nginx
-          Image ID:       docker-pullable://nginx@sha256:ecc068890de55a75f1a32cc8063e79f90f0b043d70c5fcf28f1713395a4b3d49
+          Image ID:       docker.io/library/nginx@sha256:ecc068890de55a75f1a32cc8063e79f90f0b043d70c5fcf28f1713395a4b3d49
      ...
          Environment Variables from:
            cm-data      ConfigMap with prefix 'CM_'  Optional: false
@ -494,9 +494,9 @@ The resources information before update:
      ...
      Containers:
        nginx:
-          Container ID:   docker://d8e5ea8404a8cd272b54cefac236fdf0c1963a6b0cf03b283e9f57c70fcd4eab
+          Container ID:   cri-o://d8e5ea8404a8cd272b54cefac236fdf0c1963a6b0cf03b283e9f57c70fcd4eab
          Image:          nginx
-          Image ID:       docker-pullable://nginx@sha256:ecc068890de55a75f1a32cc8063e79f90f0b043d70c5fcf28f1713395a4b3d49
+          Image ID:       docker.io/library/nginx@sha256:ecc068890de55a75f1a32cc8063e79f90f0b043d70c5fcf28f1713395a4b3d49
      ...
      Volumes:
        cm-volume:
@ -632,9 +632,9 @@ The resources information after update:
      ...
      Containers:
        nginx:
-          Container ID:   docker://77f1518b617403115163874f1ea65793b92f7c8d22f5364fe5bb299b471decb1
+          Container ID:   cri-o://77f1518b617403115163874f1ea65793b92f7c8d22f5364fe5bb299b471decb1
          Image:          cirros
-          Image ID:       docker-pullable://cirros@sha256:be6f5d1ab1e463e7991ecb29f1e71993d633ff1d190188662085ef641bdcf389
+          Image ID:       docker.io/library/cirros@sha256:be6f5d1ab1e463e7991ecb29f1e71993d633ff1d190188662085ef641bdcf389
      ...
      Volumes:
        cm-volume:
@ -653,9 +653,9 @@ The resources information after update:
      ...
      Containers:
        nginx:
-          Container ID:   docker://74d38aa62097b3a1a80181195ebda3877e3773311d0273fdc3fbb27fa4b9600d
+          Container ID:   cri-o://74d38aa62097b3a1a80181195ebda3877e3773311d0273fdc3fbb27fa4b9600d
          Image:          nginx
-          Image ID:       docker-pullable://nginx@sha256:ecc068890de55a75f1a32cc8063e79f90f0b043d70c5fcf28f1713395a4b3d49
+          Image ID:       docker.io/library/nginx@sha256:ecc068890de55a75f1a32cc8063e79f90f0b043d70c5fcf28f1713395a4b3d49
      ...
      Volumes:
        cm-volume:
@ -683,9 +683,9 @@ The resources information after update:
      ...
      Containers:
        nginx:
-          Container ID:   docker://7b8bd5a7da875fea74a0b0d54ad8a6c1e65bf08a823ae864c6bd7f16b494b990
+          Container ID:   cri-o://7b8bd5a7da875fea74a0b0d54ad8a6c1e65bf08a823ae864c6bd7f16b494b990
          Image:          cirros
-          Image ID:       docker-pullable://cirros@sha256:be6f5d1ab1e463e7991ecb29f1e71993d633ff1d190188662085ef641bdcf389
+          Image ID:       docker.io/library/cirros@sha256:be6f5d1ab1e463e7991ecb29f1e71993d633ff1d190188662085ef641bdcf389
      ...
          Environment Variables from:
            cm-data      ConfigMap with prefix 'CM_'  Optional: false
@ -701,9 +701,9 @@ The resources information after update:
      ...
      Containers:
        nginx:
-          Container ID:   docker://6d7a8019984c04ab758b962a228f44fb14bfc0f4e1f525548d87a91d17b49f77
+          Container ID:   cri-o://6d7a8019984c04ab758b962a228f44fb14bfc0f4e1f525548d87a91d17b49f77
          Image:          nginx
-          Image ID:       docker-pullable://nginx@sha256:ecc068890de55a75f1a32cc8063e79f90f0b043d70c5fcf28f1713395a4b3d49
+          Image ID:       docker.io/library/nginx@sha256:ecc068890de55a75f1a32cc8063e79f90f0b043d70c5fcf28f1713395a4b3d49
      ...
          Environment Variables from:
            cm-data2      ConfigMap with prefix 'CM_'  Optional: false
@ -727,9 +727,9 @@ The resources information after update:
      ...
      Containers:
        nginx:
-          Container ID:   docker://98712bf43f41fce1983d46cefcfab7ed72f6159f6eb18ab763d9707caf887d8c
+          Container ID:   cri-o://98712bf43f41fce1983d46cefcfab7ed72f6159f6eb18ab763d9707caf887d8c
          Image:          cirros
-          Image ID:       docker-pullable://cirros@sha256:be6f5d1ab1e463e7991ecb29f1e71993d633ff1d190188662085ef641bdcf389
+          Image ID:       docker.io/library/cirros@sha256:be6f5d1ab1e463e7991ecb29f1e71993d633ff1d190188662085ef641bdcf389
      ...
          Environment Variables from:
            cm-data      ConfigMap with prefix 'CM_'  Optional: false
@ -756,9 +756,9 @@ The resources information after update:
      ...
      Containers:
        nginx:
-          Container ID:   docker://a9cf17fd465780e5f3e557a1c5d27e0c8ccf5f31a0fd106d9dc891971fed455d
+          Container ID:   cri-o://a9cf17fd465780e5f3e557a1c5d27e0c8ccf5f31a0fd106d9dc891971fed455d
          Image:          cirros
-          Image ID:       docker-pullable://cirros@sha256:be6f5d1ab1e463e7991ecb29f1e71993d633ff1d190188662085ef641bdcf389
+          Image ID:       docker.io/library/cirros@sha256:be6f5d1ab1e463e7991ecb29f1e71993d633ff1d190188662085ef641bdcf389
      ...
      Volumes:
        cm-volume: