Skip to content

Commit

Permalink
docs: add K8s 1.22 compatibility
Browse files Browse the repository at this point in the history
Following merge of cilium#16989, we now support K8s 1.22 and the default K8s
version for Vagrant VMs is 1.21.

Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
  • Loading branch information
nbusseneau committed Nov 3, 2021
1 parent cd8f5de commit 6666c62
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
12 changes: 6 additions & 6 deletions Documentation/concepts/kubernetes/compatibility.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ with Cilium. Older Kubernetes versions not listed in this table do not have
Cilium support. Newer Kubernetes versions, while not listed, will depend on the
backward compatibility offered by Kubernetes.

+------------------------------------+---------------------------+----------------------------+
| k8s Version | k8s NetworkPolicy API | CiliumNetworkPolicy |
+------------------------------------+---------------------------+----------------------------+
| | | ``cilium.io/v2`` has a |
| 1.16, 1.17, 1.18, 1.19, 1.20, 1.21 | * `networking.k8s.io/v1`_ | `CustomResourceDefinition` |
+------------------------------------+---------------------------+----------------------------+
+------------------------------------------+---------------------------+----------------------------+
| k8s Version | k8s NetworkPolicy API | CiliumNetworkPolicy |
+------------------------------------------+---------------------------+----------------------------+
| | | ``cilium.io/v2`` has a |
| 1.16, 1.17, 1.18, 1.19, 1.20, 1.21, 1.22 | * `networking.k8s.io/v1`_ | `CustomResourceDefinition` |
+------------------------------------------+---------------------------+----------------------------+

Cilium CRD schema validation
============================
Expand Down
1 change: 1 addition & 0 deletions Documentation/concepts/kubernetes/requirements.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ backward compatibility offered by Kubernetes.
* 1.19
* 1.20
* 1.21
* 1.22

System Requirements
===================
Expand Down
3 changes: 2 additions & 1 deletion Documentation/contributing/testing/e2e.rst
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,9 @@ The Kubernetes tests support the following Kubernetes versions:
* 1.19
* 1.20
* 1.21
* 1.22

By default, the Vagrant VMs are provisioned with Kubernetes 1.20. To run with any other
By default, the Vagrant VMs are provisioned with Kubernetes 1.21. To run with any other
supported version of Kubernetes, run the test suite with the following format:

.. code-block:: shell-session
Expand Down
2 changes: 1 addition & 1 deletion Documentation/gettingstarted/istio.rst
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Download the `cilium enhanced istioctl version 1.10.4 <https://github.com/cilium
.. note::

Cilium integration, as presented in this Getting Started Guide, has
been tested with Kubernetes releases 1.17, 1.18, 1.19, 1.20 and 1.21.
been tested with Kubernetes releases 1.17, 1.18, 1.19, 1.20, 1.21 and 1.22.
This Istio release does not work with Kubernetes 1.16 or older.

Deploy the default Istio configuration profile onto Kubernetes:
Expand Down

0 comments on commit 6666c62

Please sign in to comment.