Skip to content

Commit

Permalink
Revert "Update k8s tests and libraries to v1.27.0"
Browse files Browse the repository at this point in the history
This reverts commit a19558d.

The k8s-upstream CI job is consistently failing since we merged this.
Let's revert.

Signed-off-by: Paul Chaignon <paul@cilium.io>
  • Loading branch information
pchaigno committed Apr 26, 2023
1 parent 1ac56d3 commit 40de910
Show file tree
Hide file tree
Showing 782 changed files with 23,973 additions and 43,513 deletions.
2 changes: 1 addition & 1 deletion Documentation/contributing/development/dev_setup.rst
Original file line number Diff line number Diff line change
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.28.0-rc.0"``
#. Run ``git add vendor/ test/provision/manifest/ Documentation/ && git commit -sam "Update k8s tests and libraries to v1.27.0-rc.0"``
#. Submit all your changes into a new PR.
Expand Down
1 change: 0 additions & 1 deletion Documentation/contributing/testing/e2e.rst
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ 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
Original file line number Diff line number Diff line change
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, 1.26, and 1.27.
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.
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
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, 1.22, 1.23, 1.24, 1.25, 1.26, 1.27 | * `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 | * `networking.k8s.io/v1`_ | :term:`CustomResourceDefinition` |
+------------------------------------------------------------------+---------------------------+----------------------------------+

Cilium CRD schema validation
============================
Expand Down
1 change: 0 additions & 1 deletion Documentation/network/kubernetes/requirements.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ 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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# File source with modifications to the coredns corefile
# https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.27/cluster/addons/dns/coredns/coredns.yaml.base
# https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.26/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.10.1
image: registry.k8s.io/coredns/coredns:v1.9.3
imagePullPolicy: IfNotPresent
resources:
limits:
Expand Down
4 changes: 2 additions & 2 deletions contrib/vagrant/scripts/helpers.bash
Original file line number Diff line number Diff line change
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.27.0"
etcd_version="v3.5.7"
k8s_version="v1.26.0-rc.0"
etcd_version="v3.5.5"

function restore_flag {
check_num_params "$#" "2"
Expand Down
36 changes: 18 additions & 18 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,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.2
github.com/osrg/gobgp/v3 v3.13.0
github.com/pmezard/go-difflib v1.0.0
github.com/prometheus/client_golang v1.15.0
Expand Down Expand Up @@ -110,16 +110,16 @@ require (
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
gopkg.in/ini.v1 v1.67.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.27.0
k8s.io/apiextensions-apiserver v0.27.0
k8s.io/apimachinery v0.27.0
k8s.io/client-go v0.27.0
k8s.io/code-generator v0.27.0
k8s.io/klog/v2 v2.90.1
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a
k8s.io/utils v0.0.0-20230209194617-a36077c30491
sigs.k8s.io/controller-runtime v0.13.1-0.20230412014630-a33d038b84d0
sigs.k8s.io/controller-tools v0.11.3
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
sigs.k8s.io/gateway-api v0.6.0
sigs.k8s.io/yaml v1.3.0
)
Expand Down Expand Up @@ -165,15 +165,15 @@ require (
github.com/go-kit/kit v0.12.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/logr v1.2.3 // indirect
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.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // 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/godbus/dbus/v5 v5.1.0 // indirect
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
github.com/golang-jwt/jwt/v4 v4.2.0 // 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 @@ -222,7 +222,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.10.0 // indirect
github.com/rogpeppe/go-internal v1.9.0 // indirect
github.com/rootless-containers/rootlesskit v1.1.0 // indirect
github.com/spf13/afero v1.9.5 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
Expand All @@ -245,10 +245,10 @@ require (
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.27.0 // indirect
k8s.io/component-base v0.26.0 // indirect
k8s.io/gengo v0.0.0-20230306165830-ab3349d207d4 // indirect
k8s.io/klog v1.0.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)

Expand Down

0 comments on commit 40de910

Please sign in to comment.