From d48720fb8c19da47a7b22cd5f26af792d30fe02e Mon Sep 17 00:00:00 2001 From: dprotaso Date: Tue, 18 Jun 2024 17:32:07 -0400 Subject: [PATCH] bump istio, contour & gateway deps --- docs/test-version.md | 4 ++-- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- hack/test-env.sh | 4 ++-- vendor/modules.txt | 16 ++++++++-------- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/test-version.md b/docs/test-version.md index 2b3cab798..4208e35b6 100644 --- a/docs/test-version.md +++ b/docs/test-version.md @@ -15,5 +15,5 @@ The following Gateway API version and Ingress were tested as part of the release | Ingress | Tested version | Unavailable features | | ------- | ----------------------- | ------------------------------ | -| Istio | v1.22.0 | retry,httpoption | -| Contour | v1.29.0 | httpoption | +| Istio | v1.22.1 | retry,httpoption | +| Contour | v1.29.1 | httpoption | diff --git a/go.mod b/go.mod index b76914c51..09d2c77bf 100644 --- a/go.mod +++ b/go.mod @@ -3,10 +3,10 @@ module knative.dev/net-gateway-api go 1.22.0 replace ( - k8s.io/api => k8s.io/api v0.29.5 - k8s.io/apimachinery => k8s.io/apimachinery v0.29.5 - k8s.io/client-go => k8s.io/client-go v0.29.5 - k8s.io/code-generator => k8s.io/code-generator v0.29.5 + k8s.io/api => k8s.io/api v0.29.6 + k8s.io/apimachinery => k8s.io/apimachinery v0.29.6 + k8s.io/client-go => k8s.io/client-go v0.29.6 + k8s.io/code-generator => k8s.io/code-generator v0.29.6 ) require ( diff --git a/go.sum b/go.sum index 17fcf98d7..792a9eeb8 100644 --- a/go.sum +++ b/go.sum @@ -656,16 +656,16 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.29.5 h1:levS+umUigHCfI3riD36pMY1vQEbrzh4r1ivVWAhHaI= -k8s.io/api v0.29.5/go.mod h1:7b18TtPcJzdjk7w5zWyIHgoAtpGeRvGGASxlS7UZXdQ= +k8s.io/api v0.29.6 h1:eDxIl8+PeEpwbe2YyS5RXJ9vdn4hnKWMBf4WUJP9DQM= +k8s.io/api v0.29.6/go.mod h1:ZuUPMhJV74DJXapldbg6upaHfiOjrBb+0ffUbBi1jaw= k8s.io/apiextensions-apiserver v0.30.0 h1:jcZFKMqnICJfRxTgnC4E+Hpcq8UEhT8B2lhBcQ+6uAs= k8s.io/apiextensions-apiserver v0.30.0/go.mod h1:N9ogQFGcrbWqAY9p2mUAL5mGxsLqwgtUce127VtRX5Y= -k8s.io/apimachinery v0.29.5 h1:Hofa2BmPfpoT+IyDTlcPdCHSnHtEQMoJYGVoQpRTfv4= -k8s.io/apimachinery v0.29.5/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y= -k8s.io/client-go v0.29.5 h1:nlASXmPQy190qTteaVP31g3c/wi2kycznkTP7Sv1zPc= -k8s.io/client-go v0.29.5/go.mod h1:aY5CnqUUvXYccJhm47XHoPcRyX6vouHdIBHaKZGTbK4= -k8s.io/code-generator v0.29.5 h1:WqSdBPVV1B3jsPnKtPS39U02zj6Q7+FsjhAj1EPBJec= -k8s.io/code-generator v0.29.5/go.mod h1:7TYnI0dYItL2cKuhhgPSuF3WED9uMdELgbVXFfn/joE= +k8s.io/apimachinery v0.29.6 h1:CLjJ5b0hWW7531n/njRE3rnusw3rhVGCFftPfnG54CI= +k8s.io/apimachinery v0.29.6/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y= +k8s.io/client-go v0.29.6 h1:5E2ebuB/p0F0THuQatyvhDvPL2SIeqwTPrtnrwKob/8= +k8s.io/client-go v0.29.6/go.mod h1:jHZcrQqDplyv20v7eu+iFM4gTpglZSZoMVcKrh8sRGg= +k8s.io/code-generator v0.29.6 h1:Z8T9VMR0mr7V5GG66c6GVAZrIiEy2uFoQwbeVeWLqPA= +k8s.io/code-generator v0.29.6/go.mod h1:7TYnI0dYItL2cKuhhgPSuF3WED9uMdELgbVXFfn/joE= k8s.io/gengo v0.0.0-20240129211411-f967bbeff4b4 h1:izq7u3SJBdOAuA5YYe1/PIp9jczrih/jGlKRRt0G7bQ= k8s.io/gengo v0.0.0-20240129211411-f967bbeff4b4/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo= diff --git a/hack/test-env.sh b/hack/test-env.sh index 6e2d261e1..3de8ee1e9 100755 --- a/hack/test-env.sh +++ b/hack/test-env.sh @@ -15,9 +15,9 @@ # limitations under the License. export GATEWAY_API_VERSION="v1.1.0" -export ISTIO_VERSION="1.22.0" +export ISTIO_VERSION="1.22.1" export ISTIO_UNSUPPORTED_E2E_TESTS="retry,httpoption" -export CONTOUR_VERSION="v1.29.0" +export CONTOUR_VERSION="v1.29.1" export CONTOUR_UNSUPPORTED_E2E_TESTS="httpoption" export ENVOY_GATEWAY_VERSION="latest" diff --git a/vendor/modules.txt b/vendor/modules.txt index 9bb65fbb9..5d9150a57 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -394,7 +394,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.30.0 => k8s.io/api v0.29.5 +# k8s.io/api v0.30.0 => k8s.io/api v0.29.6 ## explicit; go 1.21 k8s.io/api/admission/v1 k8s.io/api/admissionregistration/v1 @@ -453,7 +453,7 @@ k8s.io/api/storage/v1beta1 ## explicit; go 1.22.0 k8s.io/apiextensions-apiserver/pkg/apis/apiextensions k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1 -# k8s.io/apimachinery v0.30.0 => k8s.io/apimachinery v0.29.5 +# k8s.io/apimachinery v0.30.0 => k8s.io/apimachinery v0.29.6 ## explicit; go 1.21 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -503,7 +503,7 @@ k8s.io/apimachinery/pkg/version k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/client-go v0.30.0 => k8s.io/client-go v0.29.5 +# k8s.io/client-go v0.30.0 => k8s.io/client-go v0.29.6 ## explicit; go 1.21 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -810,7 +810,7 @@ k8s.io/client-go/util/homedir k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/code-generator v0.30.0 => k8s.io/code-generator v0.29.5 +# k8s.io/code-generator v0.30.0 => k8s.io/code-generator v0.29.6 ## explicit; go 1.21 k8s.io/code-generator k8s.io/code-generator/cmd/applyconfiguration-gen @@ -1070,7 +1070,7 @@ sigs.k8s.io/structured-merge-diff/v4/value ## explicit; go 1.12 sigs.k8s.io/yaml sigs.k8s.io/yaml/goyaml.v2 -# k8s.io/api => k8s.io/api v0.29.5 -# k8s.io/apimachinery => k8s.io/apimachinery v0.29.5 -# k8s.io/client-go => k8s.io/client-go v0.29.5 -# k8s.io/code-generator => k8s.io/code-generator v0.29.5 +# k8s.io/api => k8s.io/api v0.29.6 +# k8s.io/apimachinery => k8s.io/apimachinery v0.29.6 +# k8s.io/client-go => k8s.io/client-go v0.29.6 +# k8s.io/code-generator => k8s.io/code-generator v0.29.6