Skip to content

Commit

Permalink
add support for k8s 1.25.0
Browse files Browse the repository at this point in the history
We have dropped the requirement for the kubernetes-cni version because
that is already defined as a requirement for the kubeadm package.

Signed-off-by: André Martins <andre@cilium.io>
  • Loading branch information
aanm committed Aug 26, 2022
1 parent 90f41f0 commit ce69afd
Show file tree
Hide file tree
Showing 327 changed files with 11,769 additions and 5,864 deletions.
12 changes: 6 additions & 6 deletions Documentation/concepts/kubernetes/compatibility.rst
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, 1.22, 1.23, 1.24 | * `networking.k8s.io/v1`_ | :term:`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, 1.23, 1.24, 1.25 | * `networking.k8s.io/v1`_ | :term:`CustomResourceDefinition` |
+------------------------------------------------------------+---------------------------+----------------------------------+

Cilium CRD schema validation
============================
Expand Down
1 change: 1 addition & 0 deletions Documentation/concepts/kubernetes/requirements.rst
Expand Up @@ -27,6 +27,7 @@ backward compatibility offered by Kubernetes.
* 1.22
* 1.23
* 1.24
* 1.25

System Requirements
===================
Expand Down
1 change: 1 addition & 0 deletions Documentation/contributing/testing/e2e.rst
Expand Up @@ -138,6 +138,7 @@ The Kubernetes tests support the following Kubernetes versions:
* 1.22
* 1.23
* 1.24
* 1.25

By default, the Vagrant VMs are provisioned with Kubernetes 1.23. To run with any other
supported version of Kubernetes, run the test suite with the following format:
Expand Down
2 changes: 1 addition & 1 deletion Documentation/installation/istio.rst
Expand Up @@ -92,7 +92,7 @@ Download the `cilium enhanced istioctl version 1.10.6-1 <https://github.com/cili
.. note::

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

Deploy the default Istio configuration profile onto Kubernetes:
Expand Down
1 change: 0 additions & 1 deletion contrib/vagrant/scripts/02-install-kubernetes-master.sh
Expand Up @@ -74,7 +74,6 @@ ExecStart=/usr/bin/kube-apiserver \\
--etcd-certfile='/var/lib/kubernetes/etcd-k8s-api-server.pem' \\
--etcd-keyfile='/var/lib/kubernetes/etcd-k8s-api-server-key.pem' \\
--etcd-servers=https://${controllers_ips[0]}:2379 \\
--feature-gates=EndpointSlice=true \\
--feature-gates=EndpointSliceTerminatingCondition=true \\
--kubelet-certificate-authority='/var/lib/kubernetes/ca-kubelet.pem' \\
--kubelet-client-certificate='/var/lib/kubernetes/k8s-api-server.pem' \\
Expand Down
2 changes: 1 addition & 1 deletion contrib/vagrant/scripts/helpers.bash
Expand Up @@ -67,7 +67,7 @@ cluster_dns_ipv6=${K8S_CLUSTER_DNS_IPV6:-"FD03::A"}
cluster_api_server_ipv4=${K8S_CLUSTER_API_SERVER_IPV4:-"172.20.0.1"}
cluster_api_server_ipv6=${K8S_CLUSTER_API_SERVER_IPV6:-"FD03::1"}

k8s_version="v1.24.2"
k8s_version="v1.25.0"
etcd_version="v3.5.4"

function restore_flag {
Expand Down
26 changes: 13 additions & 13 deletions go.mod
Expand Up @@ -99,14 +99,14 @@ require (
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
gopkg.in/ini.v1 v1.67.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.24.2
k8s.io/apiextensions-apiserver v0.24.2
k8s.io/apimachinery v0.24.2
k8s.io/client-go v0.24.2
k8s.io/code-generator v0.24.2
k8s.io/klog/v2 v2.60.1
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
k8s.io/api v0.25.0
k8s.io/apiextensions-apiserver v0.25.0
k8s.io/apimachinery v0.25.0
k8s.io/client-go v0.25.0
k8s.io/code-generator v0.25.0
k8s.io/klog/v2 v2.70.1
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
sigs.k8s.io/controller-tools v0.6.2
sigs.k8s.io/yaml v1.3.0
)
Expand Down Expand Up @@ -141,14 +141,14 @@ require (
github.com/docker/go-units v0.4.0 // indirect
github.com/eapache/channels v1.1.0 // indirect
github.com/eapache/queue v1.1.0 // indirect
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/envoyproxy/protoc-gen-validate v0.6.2 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/go-kit/kit v0.12.0 // indirect
github.com/go-kit/log v0.2.0 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/go-logr/logr v1.2.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-openapi/analysis v0.21.4 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
Expand Down Expand Up @@ -225,8 +225,8 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
k8s.io/klog v1.0.0 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)

replace (
Expand All @@ -235,7 +235,7 @@ replace (

go.universe.tf/metallb => github.com/cilium/metallb v0.1.1-0.20220713202445-9066eee9e0be

k8s.io/client-go => github.com/cilium/client-go v0.0.0-20220808211112-706606a736d5
k8s.io/client-go => github.com/cilium/client-go v0.0.0-20220824093223-b6557c021e53

// Using private fork of controller-tools. See commit msg for more context
// as to why we are using a private fork.
Expand Down

0 comments on commit ce69afd

Please sign in to comment.