diff --git a/Documentation/network/servicemesh/gateway-api/gateway-api.rst b/Documentation/network/servicemesh/gateway-api/gateway-api.rst index 4d3d19bd6366a..f6c2ae326e27d 100644 --- a/Documentation/network/servicemesh/gateway-api/gateway-api.rst +++ b/Documentation/network/servicemesh/gateway-api/gateway-api.rst @@ -23,7 +23,7 @@ See the `Gateway API site `__ for more details Cilium Gateway API Support ########################## -Cilium supports Gateway API v1.1.0 for below resources, all the Core conformance +Cilium supports Gateway API v1.2.0 for below resources, all the Core conformance tests are passed. - `GatewayClass `_ @@ -60,7 +60,7 @@ Cilium's Gateway API features: splitting header -More examples can be found in the `upstream repository `_. +More examples can be found in the `upstream repository `_. Troubleshooting ############### diff --git a/Documentation/network/servicemesh/gateway-api/installation.rst b/Documentation/network/servicemesh/gateway-api/installation.rst index ebb3b2d00163f..5552223e2cd4b 100644 --- a/Documentation/network/servicemesh/gateway-api/installation.rst +++ b/Documentation/network/servicemesh/gateway-api/installation.rst @@ -7,7 +7,7 @@ Prerequisites replacement `. * Cilium must be configured with the L7 proxy enabled using ``l7Proxy=true`` (enabled by default). -* The below CRDs from Gateway API v1.1.0 ``must`` be pre-installed. +* The below CRDs from Gateway API v1.2.0 ``must`` be pre-installed. Please refer to this `docs `_ for installation steps. Alternatively, the below snippet could be used. @@ -26,16 +26,16 @@ Prerequisites .. code-block:: shell-session - $ kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.1.0/config/crd/standard/gateway.networking.k8s.io_gatewayclasses.yaml - $ kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.1.0/config/crd/standard/gateway.networking.k8s.io_gateways.yaml - $ kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.1.0/config/crd/standard/gateway.networking.k8s.io_httproutes.yaml - $ kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.1.0/config/crd/standard/gateway.networking.k8s.io_referencegrants.yaml - $ kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.1.0/config/crd/standard/gateway.networking.k8s.io_grpcroutes.yaml + $ kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.2.0/config/crd/standard/gateway.networking.k8s.io_gatewayclasses.yaml + $ kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.2.0/config/crd/standard/gateway.networking.k8s.io_gateways.yaml + $ kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.2.0/config/crd/standard/gateway.networking.k8s.io_httproutes.yaml + $ kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.2.0/config/crd/standard/gateway.networking.k8s.io_referencegrants.yaml + $ kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.2.0/config/crd/standard/gateway.networking.k8s.io_grpcroutes.yaml And add TLSRoute with this snippet. .. code-block:: shell-session - $ kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.1.0/config/crd/experimental/gateway.networking.k8s.io_tlsroutes.yaml + $ kubectl apply -f https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v1.2.0/config/crd/experimental/gateway.networking.k8s.io_tlsroutes.yaml * By default, the Gateway API controller creates a service of LoadBalancer type, so your environment will need to support this. Alternatively, since Cilium 1.16+, diff --git a/README.rst b/README.rst index aa6772c635dbb..fa2b2f539a371 100644 --- a/README.rst +++ b/README.rst @@ -400,9 +400,9 @@ and the `2-Clause BSD License `__ :alt: FOSSA Status :target: https://app.fossa.com/projects/custom%2B162%2Fgit%40github.com%3Acilium%2Fcilium.git?ref=badge_shield -.. |gateway-api| image:: https://img.shields.io/badge/Gateway%20API%20Conformance%20v1.1.0-Cilium-green +.. |gateway-api| image:: https://img.shields.io/badge/Gateway%20API%20Conformance%20v1.2.0-Cilium-green :alt: Gateway API Status - :target: https://github.com/kubernetes-sigs/gateway-api/tree/main/conformance/reports/v1.1.0/cilium-cilium + :target: https://github.com/kubernetes-sigs/gateway-api/tree/main/conformance/reports/v1.2.0/cilium-cilium .. |codespaces| image:: https://img.shields.io/badge/Open_in_GitHub_Codespaces-gray?logo=github :alt: Github Codespaces diff --git a/go.mod b/go.mod index 13a60c78929a6..b63987567c925 100644 --- a/go.mod +++ b/go.mod @@ -133,7 +133,7 @@ require ( k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 sigs.k8s.io/controller-runtime v0.19.0 sigs.k8s.io/controller-tools v0.16.3 - sigs.k8s.io/gateway-api v1.2.0-rc2 + sigs.k8s.io/gateway-api v1.2.0 sigs.k8s.io/mcs-api v0.1.1-0.20240919125245-7bbb5990134a sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index f4ca29377f28d..7bdede89e4f98 100644 --- a/go.sum +++ b/go.sum @@ -1132,8 +1132,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsA sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q= sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4= -sigs.k8s.io/gateway-api v1.2.0-rc2 h1:v7V7JzaBuzwOLWWyyqlkqiqBi3ANBuZGV+uyyKzwmE8= -sigs.k8s.io/gateway-api v1.2.0-rc2/go.mod h1:EpNfEXNjiYfUJypf0eZ0P5iXA9ekSGWaS1WgPaM42X0= +sigs.k8s.io/gateway-api v1.2.0 h1:LrToiFwtqKTKZcZtoQPTuo3FxhrrhTgzQG0Te+YGSo8= +sigs.k8s.io/gateway-api v1.2.0/go.mod h1:EpNfEXNjiYfUJypf0eZ0P5iXA9ekSGWaS1WgPaM42X0= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/kind v0.23.0 h1:8fyDGWbWTeCcCTwA04v4Nfr45KKxbSPH1WO9K+jVrBg= diff --git a/vendor/modules.txt b/vendor/modules.txt index 812805d3ec4b9..8393eeaa95057 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2657,7 +2657,7 @@ sigs.k8s.io/controller-tools/pkg/schemapatcher sigs.k8s.io/controller-tools/pkg/schemapatcher/internal/yaml sigs.k8s.io/controller-tools/pkg/version sigs.k8s.io/controller-tools/pkg/webhook -# sigs.k8s.io/gateway-api v1.2.0-rc2 +# sigs.k8s.io/gateway-api v1.2.0 ## explicit; go 1.22.0 sigs.k8s.io/gateway-api/apis/v1 sigs.k8s.io/gateway-api/apis/v1alpha2 diff --git a/vendor/sigs.k8s.io/gateway-api/conformance/tests/gateway-infrastructure.go b/vendor/sigs.k8s.io/gateway-api/conformance/tests/gateway-infrastructure.go index 5fc79bd1a1b66..5a51dc9cf7ffb 100644 --- a/vendor/sigs.k8s.io/gateway-api/conformance/tests/gateway-infrastructure.go +++ b/vendor/sigs.k8s.io/gateway-api/conformance/tests/gateway-infrastructure.go @@ -43,6 +43,7 @@ var GatewayInfrastructure = suite.ConformanceTest{ features.SupportGateway, features.SupportGatewayInfrastructurePropagation, }, + Provisional: true, Manifests: []string{ "tests/gateway-infrastructure.yaml", }, diff --git a/vendor/sigs.k8s.io/gateway-api/pkg/consts/consts.go b/vendor/sigs.k8s.io/gateway-api/pkg/consts/consts.go index 1d171fdbd3d09..bf81e153daec7 100644 --- a/vendor/sigs.k8s.io/gateway-api/pkg/consts/consts.go +++ b/vendor/sigs.k8s.io/gateway-api/pkg/consts/consts.go @@ -27,9 +27,9 @@ const ( // BundleVersion is the value used for the "gateway.networking.k8s.io/bundle-version" annotation. // These value must be updated during the release process. - BundleVersion = "v1.2.0-rc2" + BundleVersion = "v1.2.0" // ApprovalLink is the value used for the "api-approved.kubernetes.io" annotation. // These value must be updated during the release process. - ApprovalLink = "https://github.com/kubernetes-sigs/gateway-api/pull/2997" + ApprovalLink = "https://github.com/kubernetes-sigs/gateway-api/pull/3328" )