Skip to content

Commit

Permalink
Update k8s tests and libraries to v1.27.2
Browse files Browse the repository at this point in the history
Updating k8s libs to v1.27.2 requires updating
sigs.k8s.io/controller-runtime to the 0.15 version with
kubernetes-sigs/controller-runtime#2223 in
place. This in turn requires some additional adjustments to changed APIs
in the controller-runtime, mainly in operator/pkg/gateway-api. Specifically,
around request methods and testing.

The service.kubernetes.io/topology-aware-hints annotation got deprecated
with k8s 1.27 in favor of service.kubernetes.io/topology-mode (see
kubernetes/kubernetes#116522). This change keeps
support for the deprecated annotation. Support for the new annotation
will be added in a successive commit.

Signed-off-by: Tobias Klauser <tobias@cilium.io>
Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
  • Loading branch information
tklauser authored and sayboras committed May 29, 2023
1 parent 1b19e5f commit 434dedb
Show file tree
Hide file tree
Showing 799 changed files with 44,733 additions and 24,980 deletions.
2 changes: 1 addition & 1 deletion Documentation/contributing/development/dev_setup.rst
Expand Up @@ -609,7 +609,7 @@ Minor version
#. Provision a new dev VM to check if the provisioning scripts work correctly
with the new k8s version.
#. Run ``git add vendor/ test/provision/manifest/ Documentation/ && git commit -sam "Update k8s tests and libraries to v1.27.0-rc.0"``
#. Run ``git add vendor/ test/provision/manifest/ Documentation/ && git commit -sam "Update k8s tests and libraries to v1.28.0-rc.0"``
#. Submit all your changes into a new PR.
Expand Down
1 change: 1 addition & 0 deletions Documentation/contributing/testing/e2e.rst
Expand Up @@ -140,6 +140,7 @@ The Kubernetes tests support the following Kubernetes versions:
* 1.24
* 1.25
* 1.26
* 1.27

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/network/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, 1.24, 1.25, and 1.26.
been tested with Kubernetes releases 1.17, 1.18, 1.19, 1.20, 1.21, 1.22, 1.23, 1.24, 1.25, 1.26, and 1.27.
This Istio release does not work with Kubernetes 1.16 or older.

Deploy the default Istio configuration profile onto Kubernetes:
Expand Down
12 changes: 6 additions & 6 deletions Documentation/network/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, 1.25, 1.26 | * `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, 1.26, 1.27 | * `networking.k8s.io/v1`_ | :term:`CustomResourceDefinition` |
+------------------------------------------------------------------------+---------------------------+----------------------------------+

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

System Requirements
===================
Expand Down
4 changes: 2 additions & 2 deletions contrib/vagrant/deployments/coredns-controller.yaml
@@ -1,5 +1,5 @@
# File source with modifications to the coredns corefile
# https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.26/cluster/addons/dns/coredns/coredns.yaml.base
# https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.27/cluster/addons/dns/coredns/coredns.yaml.base
# __MACHINE_GENERATED_WARNING__

apiVersion: apps/v1
Expand Down Expand Up @@ -52,7 +52,7 @@ spec:
kubernetes.io/os: linux
containers:
- name: coredns
image: registry.k8s.io/coredns/coredns:v1.9.3
image: registry.k8s.io/coredns/coredns:v1.10.1
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down
4 changes: 2 additions & 2 deletions contrib/vagrant/scripts/helpers.bash
Expand Up @@ -67,8 +67,8 @@ 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.26.0-rc.0"
etcd_version="v3.5.5"
k8s_version="v1.27.1"
etcd_version="v3.5.7"

function restore_flag {
check_num_params "$#" "2"
Expand Down
38 changes: 19 additions & 19 deletions go.mod
Expand Up @@ -63,7 +63,7 @@ require (
github.com/miekg/dns v1.1.43
github.com/mitchellh/mapstructure v1.5.0
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.27.6
github.com/onsi/gomega v1.27.7
github.com/osrg/gobgp/v3 v3.14.0
github.com/pmezard/go-difflib v1.0.0
github.com/prometheus/client_golang v1.15.1
Expand Down Expand Up @@ -111,16 +111,16 @@ require (
google.golang.org/protobuf v1.30.0
gopkg.in/ini.v1 v1.67.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.26.0
k8s.io/apiextensions-apiserver v0.26.0
k8s.io/apimachinery v0.26.0
k8s.io/client-go v0.26.0
k8s.io/code-generator v0.26.0
k8s.io/klog/v2 v2.80.1
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
sigs.k8s.io/controller-runtime v0.14.1
sigs.k8s.io/controller-tools v0.7.0
k8s.io/api v0.27.2
k8s.io/apiextensions-apiserver v0.27.2
k8s.io/apimachinery v0.27.2
k8s.io/client-go v0.27.2
k8s.io/code-generator v0.27.2
k8s.io/klog/v2 v2.100.1
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
k8s.io/utils v0.0.0-20230209194617-a36077c30491
sigs.k8s.io/controller-runtime v0.15.0
sigs.k8s.io/controller-tools v0.11.4
sigs.k8s.io/gateway-api v0.6.1
sigs.k8s.io/yaml v1.3.0
)
Expand Down Expand Up @@ -171,11 +171,11 @@ require (
github.com/go-logr/stdr v1.2.2 // 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
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/gobuffalo/flect v0.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // indirect
github.com/gobuffalo/flect v0.3.0 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/gofuzz v1.2.0 // indirect
Expand Down Expand Up @@ -223,7 +223,7 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
github.com/rootless-containers/rootlesskit v1.1.0 // indirect
github.com/shoenig/go-m1cpu v0.1.5 // indirect
github.com/spf13/afero v1.9.5 // indirect
Expand All @@ -242,15 +242,15 @@ require (
golang.org/x/oauth2 v0.6.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/component-base v0.26.0 // indirect
k8s.io/component-base v0.27.2 // indirect
k8s.io/gengo v0.0.0-20230306165830-ab3349d207d4 // indirect
k8s.io/klog v1.0.0 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)

Expand Down

0 comments on commit 434dedb

Please sign in to comment.