Update istio test reference (#12330)

* Update istio test reference

* Update to allow modifiers for gateway api

* go mod tidy after `make clean`
This commit is contained in:
Eric Van Norman 2022-12-07 10:21:12 -06:00 committed by GitHub
parent 2ba13e8116
commit 94d90787ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 18 additions and 18 deletions

View File

@ -225,7 +225,7 @@ test_status:
@scripts/test_status.sh
update-gateway-version: tidy-go
@$(eval GATEWAY_VERSION := ${shell grep gateway-api go.mod | awk '{ print $$2 }' | cut -f1 -d'-'})
@$(eval GATEWAY_VERSION := ${shell grep gateway-api go.mod | awk '{ print $$2 }'})
@${shell sed -Ei 's|k8s_gateway_api_version: ".*"|k8s_gateway_api_version: "${GATEWAY_VERSION}"|' 'data/args.yml'}

View File

@ -21,5 +21,5 @@
####################################################################################################
bpsnip_gateway_api_experimental_install_experimental_crds() {
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v0.5.1" | kubectl apply -f -
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v0.6.0-rc1" | kubectl apply -f -
}

View File

@ -21,5 +21,5 @@
####################################################################################################
bpsnip_gateway_api_gamma_support_install_experimental_crds() {
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v0.5.1" | kubectl apply -f -
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v0.6.0-rc1" | kubectl apply -f -
}

View File

@ -22,5 +22,5 @@
bpsnip_gateway_api_support_install_crds() {
kubectl get crd gateways.gateway.networking.k8s.io || \
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.5.1" | kubectl apply -f -; }
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.6.0-rc1" | kubectl apply -f -; }
}

View File

@ -21,5 +21,5 @@
####################################################################################################
! read -r -d '' bpsnip_gateway_api_version_value <<\ENDSNIP
v0.5.1
v0.6.0-rc1
ENDSNIP

View File

@ -23,7 +23,7 @@ source "content/en/boilerplates/snips/trace-generation.sh"
snip__1() {
kubectl get crd gateways.gateway.networking.k8s.io || \
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.5.1" | kubectl apply -f -; }
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.6.0-rc1" | kubectl apply -f -; }
}
snip_download_istio_download_1() {

View File

@ -22,7 +22,7 @@
snip_setup_1() {
kubectl get crd gateways.gateway.networking.k8s.io || \
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.5.1" | kubectl apply -f -; }
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.6.0-rc1" | kubectl apply -f -; }
}
snip_setup_2() {
@ -197,5 +197,5 @@ kubectl delete ns istio-ingress
}
snip_cleanup_2() {
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.5.1" | kubectl delete -f -
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.6.0-rc1" | kubectl delete -f -
}

2
data/args.yml Normal file → Executable file
View File

@ -52,4 +52,4 @@ supported_languages:
code: "zh"
# Kubernetes Gateway API
k8s_gateway_api_version: "v0.5.1"
k8s_gateway_api_version: "v0.6.0-rc1"

6
go.mod
View File

@ -11,7 +11,7 @@ replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
require (
github.com/golang/sync v0.0.0-20180314180146-1d60e4601c6f
github.com/pmezard/go-difflib v1.0.0
istio.io/istio v0.0.0-20221126173207-ba82eda9fb9f
istio.io/istio v0.0.0-20221206063006-05425f2a523c
istio.io/pkg v0.0.0-20221115162234-5e468deffb77
k8s.io/apimachinery v0.25.3
k8s.io/client-go v0.25.3
@ -207,7 +207,7 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
helm.sh/helm/v3 v3.10.1 // indirect
istio.io/api v0.0.0-20221124135806-a39e7047c3ca // indirect
istio.io/api v0.0.0-20221205210105-82e7f2d88e02 // indirect
istio.io/client-go v1.16.0-rc.0.0.20221109202342-07ece772a919 // indirect
k8s.io/api v0.25.3 // indirect
k8s.io/apiextensions-apiserver v0.25.2 // indirect
@ -219,7 +219,7 @@ require (
k8s.io/kubectl v0.25.3 // indirect
k8s.io/utils v0.0.0-20221012122500-cfd413dd9e85 // indirect
sigs.k8s.io/controller-runtime v0.13.0 // indirect
sigs.k8s.io/gateway-api v0.5.1-0.20221110151456-3daef509bcc9 // indirect
sigs.k8s.io/gateway-api v0.6.0-rc1 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/kustomize/api v0.12.1 // indirect
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect

12
go.sum
View File

@ -1472,12 +1472,12 @@ 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=
istio.io/api v0.0.0-20221124135806-a39e7047c3ca h1:bp+NX2xw7d6BDmawcR4oPpWYjRlNJAHFsCBGNVngkg8=
istio.io/api v0.0.0-20221124135806-a39e7047c3ca/go.mod h1:oV64LW9BQmwkiP2KxXeOrktfTuLlHaV4ee3xPshNZuw=
istio.io/api v0.0.0-20221205210105-82e7f2d88e02 h1:nH5OQpMOK7N1AJPUp0jVxlydc9bNgGm6UYOEDQC54c8=
istio.io/api v0.0.0-20221205210105-82e7f2d88e02/go.mod h1:oV64LW9BQmwkiP2KxXeOrktfTuLlHaV4ee3xPshNZuw=
istio.io/client-go v1.16.0-rc.0.0.20221109202342-07ece772a919 h1:TnZQP5IcgDLp4OH0Di31/qoDNFqN+EkVPg2iMl4WOnU=
istio.io/client-go v1.16.0-rc.0.0.20221109202342-07ece772a919/go.mod h1:UV8SFeM2qNime5sobkr2m8oTCPxxVt9xCY4ol50U9YQ=
istio.io/istio v0.0.0-20221126173207-ba82eda9fb9f h1:ZNdUxkM/vFY6ZqQgQkNgSGtFkodMC/0f0MhlphpptCU=
istio.io/istio v0.0.0-20221126173207-ba82eda9fb9f/go.mod h1:nv+roovrBAcNw96h7gLmtB/ztxqglUtpZ9M2QBpWpdY=
istio.io/istio v0.0.0-20221206063006-05425f2a523c h1:XjlaBqd9O+juaAAYWXV27gTGj1ZJomD1e+bg9r9ZDAU=
istio.io/istio v0.0.0-20221206063006-05425f2a523c/go.mod h1:zOxqpRl6Y0d878ig+TSoCwnKdgMGBvTQqQN7sjBQEWw=
istio.io/pkg v0.0.0-20221115162234-5e468deffb77 h1:2l0ufc1Lj/pnzxlQMtQx9cjdt4lrvcNMSg5sy/1zjoM=
istio.io/pkg v0.0.0-20221115162234-5e468deffb77/go.mod h1:1297yENoCcROUAWFZEdwD4VFN8Qa/if1UtzwvVgah7I=
k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78=
@ -1537,8 +1537,8 @@ sigs.k8s.io/controller-runtime v0.6.1/go.mod h1:XRYBPdbf5XJu9kpS84VJiZ7h/u1hF3gE
sigs.k8s.io/controller-runtime v0.13.0 h1:iqa5RNciy7ADWnIc8QxCbOX5FEKVR3uxVxKHRMc2WIQ=
sigs.k8s.io/controller-runtime v0.13.0/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI=
sigs.k8s.io/controller-tools v0.3.0/go.mod h1:enhtKGfxZD1GFEoMgP8Fdbu+uKQ/cq1/WGJhdVChfvI=
sigs.k8s.io/gateway-api v0.5.1-0.20221110151456-3daef509bcc9 h1:DxW1glPU1tW2IGq8wdAWCmRwWfZrdJpZamyLUvUzGlk=
sigs.k8s.io/gateway-api v0.5.1-0.20221110151456-3daef509bcc9/go.mod h1:x0AP6gugkFV8fC/oTlnOMU0pnmuzIR8LfIPRVUjxSqA=
sigs.k8s.io/gateway-api v0.6.0-rc1 h1:ierhK6SIK8pSibB+gkr+aG8cWLez/M7iD9dQIqLALxU=
sigs.k8s.io/gateway-api v0.6.0-rc1/go.mod h1:+3QMzP775JFKArHqiwk/kzItMRXW9CKPXcO8QcuXvvk=
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
sigs.k8s.io/kind v0.8.1/go.mod h1:oNKTxUVPYkV9lWzY6CVMNluVq8cBsyq+UgPJdvA3uu4=