diff --git a/content/en/boilerplates/snips/args.sh b/content/en/boilerplates/snips/args.sh index 83ec615fd3..1db1e1d835 100644 --- a/content/en/boilerplates/snips/args.sh +++ b/content/en/boilerplates/snips/args.sh @@ -21,7 +21,7 @@ #################################################################################################### ! IFS=$'\n' read -r -d '' bpsnip_args_gateway_api_version <<\ENDSNIP -e1b774d9e0c690c73c483757457f5ba0727db1fd +v1.1.0 ENDSNIP ! IFS=$'\n' read -r -d '' bpsnip_args_istio_previous_version <<\ENDSNIP diff --git a/content/en/boilerplates/snips/gateway-api-gamma-support.sh b/content/en/boilerplates/snips/gateway-api-gamma-support.sh index 1c5db35190..0529e2a9b5 100644 --- a/content/en/boilerplates/snips/gateway-api-gamma-support.sh +++ b/content/en/boilerplates/snips/gateway-api-gamma-support.sh @@ -21,7 +21,7 @@ #################################################################################################### bpsnip_gateway_api_gamma_support_install_experimental_crds() { -kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=e1b774d9e0c690c73c483757457f5ba0727db1fd" | kubectl apply -f - +kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v1.1.0" | kubectl apply -f - } bpsnip_gateway_api_gamma_support_enable_alpha_crds() { diff --git a/content/en/boilerplates/snips/gateway-api-install-crds.sh b/content/en/boilerplates/snips/gateway-api-install-crds.sh index 01ad66ae80..03aba357a9 100644 --- a/content/en/boilerplates/snips/gateway-api-install-crds.sh +++ b/content/en/boilerplates/snips/gateway-api-install-crds.sh @@ -22,5 +22,5 @@ bpsnip_gateway_api_install_crds_install_crds() { kubectl get crd gateways.gateway.networking.k8s.io &> /dev/null || \ - { kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=e1b774d9e0c690c73c483757457f5ba0727db1fd" | kubectl apply -f -; } + { kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v1.1.0" | kubectl apply -f -; } } diff --git a/content/en/docs/ambient/getting-started/snips.sh b/content/en/docs/ambient/getting-started/snips.sh index 2159efc295..7966e774eb 100644 --- a/content/en/docs/ambient/getting-started/snips.sh +++ b/content/en/docs/ambient/getting-started/snips.sh @@ -22,7 +22,7 @@ snip_download_and_install_2() { kubectl get crd gateways.gateway.networking.k8s.io &> /dev/null || \ - { kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=e1b774d9e0c690c73c483757457f5ba0727db1fd" | kubectl apply -f -; } + { kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v1.1.0" | kubectl apply -f -; } } snip_download_and_install_3() { @@ -269,5 +269,5 @@ kubectl delete -f samples/sleep/notsleep.yaml } snip_uninstall_4() { -kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=e1b774d9e0c690c73c483757457f5ba0727db1fd" | kubectl delete -f - +kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v1.1.0" | kubectl delete -f - } diff --git a/content/en/docs/setup/additional-setup/getting-started/snips.sh b/content/en/docs/setup/additional-setup/getting-started/snips.sh index fd67e1f76d..8148e5fb5f 100644 --- a/content/en/docs/setup/additional-setup/getting-started/snips.sh +++ b/content/en/docs/setup/additional-setup/getting-started/snips.sh @@ -23,7 +23,7 @@ source "content/en/boilerplates/snips/trace-generation.sh" snip__1() { kubectl get crd gateways.gateway.networking.k8s.io &> /dev/null || \ - { kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=e1b774d9e0c690c73c483757457f5ba0727db1fd" | kubectl apply -f -; } + { kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v1.1.0" | kubectl apply -f -; } } snip_download_istio_1() { @@ -182,9 +182,9 @@ kubectl label namespace default istio-injection- } snip_uninstall_4() { -kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=e1b774d9e0c690c73c483757457f5ba0727db1fd" | kubectl delete -f - +kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v1.1.0" | kubectl delete -f - } snip_uninstall_5() { -kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=e1b774d9e0c690c73c483757457f5ba0727db1fd" | kubectl delete -f - +kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v1.1.0" | kubectl delete -f - } diff --git a/content/en/docs/setup/install/external-controlplane/snips.sh b/content/en/docs/setup/install/external-controlplane/snips.sh index 29eca220d1..59e7fc1c2e 100644 --- a/content/en/docs/setup/install/external-controlplane/snips.sh +++ b/content/en/docs/setup/install/external-controlplane/snips.sh @@ -411,7 +411,7 @@ ENDSNIP snip_install_crds() { kubectl get crd gateways.gateway.networking.k8s.io --context="${CTX_REMOTE_CLUSTER}" &> /dev/null || \ - { kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=e1b774d9e0c690c73c483757457f5ba0727db1fd" | kubectl apply -f - --context="${CTX_REMOTE_CLUSTER}"; } + { kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v1.1.0" | kubectl apply -f - --context="${CTX_REMOTE_CLUSTER}"; } } snip_configure_and_test_an_ingress_gateway_3() { diff --git a/content/en/docs/tasks/traffic-management/ingress/gateway-api/snips.sh b/content/en/docs/tasks/traffic-management/ingress/gateway-api/snips.sh index 15e24dc4a6..2dd8970658 100644 --- a/content/en/docs/tasks/traffic-management/ingress/gateway-api/snips.sh +++ b/content/en/docs/tasks/traffic-management/ingress/gateway-api/snips.sh @@ -22,7 +22,7 @@ snip_setup_1() { kubectl get crd gateways.gateway.networking.k8s.io &> /dev/null || \ - { kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=e1b774d9e0c690c73c483757457f5ba0727db1fd" | kubectl apply -f -; } + { kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v1.1.0" | kubectl apply -f -; } } snip_setup_2() { @@ -250,5 +250,5 @@ kubectl delete ns istio-system } snip_cleanup_3() { -kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=e1b774d9e0c690c73c483757457f5ba0727db1fd" | kubectl delete -f - +kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v1.1.0" | kubectl delete -f - } diff --git a/data/args.yml b/data/args.yml index bde4233d6c..235736f5d0 100644 --- a/data/args.yml +++ b/data/args.yml @@ -49,4 +49,4 @@ supported_languages: code: "zh" # Kubernetes Gateway API -k8s_gateway_api_version: "e1b774d9e0c690c73c483757457f5ba0727db1fd" +k8s_gateway_api_version: "v1.1.0" diff --git a/go.mod b/go.mod index 498c70cb65..bea7bca542 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5 require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 golang.org/x/sync v0.7.0 - istio.io/istio v0.0.0-20240505003757-dbda74e400c4 + istio.io/istio v0.0.0-20240511025857-aaf597fbfae6 k8s.io/apimachinery v0.30.0 k8s.io/client-go v0.30.0 ) @@ -197,7 +197,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect helm.sh/helm/v3 v3.14.3 // indirect istio.io/api v1.22.0-beta.0 // indirect - istio.io/client-go v1.22.0-beta.0 // indirect + istio.io/client-go v1.22.0-rc.0.0.20240511020757-412bec918d1e // indirect k8s.io/api v0.30.0 // indirect k8s.io/apiextensions-apiserver v0.30.0 // indirect k8s.io/apiserver v0.30.0 // indirect @@ -208,7 +208,7 @@ require ( k8s.io/kubectl v0.30.0 // indirect k8s.io/utils v0.0.0-20240423183400-0849a56e8f22 // indirect sigs.k8s.io/controller-runtime v0.18.0 // indirect - sigs.k8s.io/gateway-api v1.1.0-rc1.0.20240430231933-e1b774d9e0c6 // indirect + sigs.k8s.io/gateway-api v1.1.0 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect sigs.k8s.io/kustomize/kyaml v0.16.0 // indirect diff --git a/go.sum b/go.sum index 9ccaabcd90..0465a24549 100644 --- a/go.sum +++ b/go.sum @@ -930,10 +930,10 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= istio.io/api v1.22.0-beta.0 h1:dlBLCqjH6/12RZEjDU5dbM3Evwl22jS6JucFn3nJyZ0= istio.io/api v1.22.0-beta.0/go.mod h1:S3l8LWqNYS9yT+d4bH+jqzH2lMencPkW7SKM1Cu9EyM= -istio.io/client-go v1.22.0-beta.0 h1:/MHSy10yms+dZ2nb8cbzG3f/kfSmLI3ariJkYv5Bc9I= -istio.io/client-go v1.22.0-beta.0/go.mod h1:1lAPr0DOVBbnRQqLAQKxWbEaxFk6b1CJTm+ypnP7sMo= -istio.io/istio v0.0.0-20240505003757-dbda74e400c4 h1:GOtFNURsJi17kEhs3FErN2K0TBvrB2+njvBDZdLLw2c= -istio.io/istio v0.0.0-20240505003757-dbda74e400c4/go.mod h1:jcDVmkJj1E9n7TANBod+pYuS2w7C8V7GFJzhqjVlLTM= +istio.io/client-go v1.22.0-rc.0.0.20240511020757-412bec918d1e h1:scHu9YFFfu8cj56K8kY2BxQfOV8SLywqUZDIJ1iT4w4= +istio.io/client-go v1.22.0-rc.0.0.20240511020757-412bec918d1e/go.mod h1:1lAPr0DOVBbnRQqLAQKxWbEaxFk6b1CJTm+ypnP7sMo= +istio.io/istio v0.0.0-20240511025857-aaf597fbfae6 h1:F/q5U/rdLu+IGXSWICLlxhH3goxRUO5SQYC4DPnocN8= +istio.io/istio v0.0.0-20240511025857-aaf597fbfae6/go.mod h1:4itO8hs4QfELWCRgQVb0vWQg6kBMqRzOiYa+A+k0AYM= k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78= k8s.io/api v0.18.4/go.mod h1:lOIQAKYgai1+vz9J7YcDZwC26Z0zQewYOGWdyIPUUQ4= k8s.io/api v0.30.0 h1:siWhRq7cNjy2iHssOB9SCGNCl2spiF1dO3dABqZ8niA= @@ -985,8 +985,8 @@ sigs.k8s.io/controller-runtime v0.6.1/go.mod h1:XRYBPdbf5XJu9kpS84VJiZ7h/u1hF3gE sigs.k8s.io/controller-runtime v0.18.0 h1:Z7jKuX784TQSUL1TIyeuF7j8KXZ4RtSX0YgtjKcSTME= sigs.k8s.io/controller-runtime v0.18.0/go.mod h1:tuAt1+wbVsXIT8lPtk5RURxqAnq7xkpv2Mhttslg7Hw= sigs.k8s.io/controller-tools v0.3.0/go.mod h1:enhtKGfxZD1GFEoMgP8Fdbu+uKQ/cq1/WGJhdVChfvI= -sigs.k8s.io/gateway-api v1.1.0-rc1.0.20240430231933-e1b774d9e0c6 h1:Xy/M/WmBcz3zNZbQWX842vq3WRrILRiJsCss2oBq6/Q= -sigs.k8s.io/gateway-api v1.1.0-rc1.0.20240430231933-e1b774d9e0c6/go.mod h1:HdG3/Tr9DbQ3zs1/Dx5t8l+15qmSkJ9nE9Kqe+nasog= +sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM= +sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs= 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.8.1/go.mod h1:oNKTxUVPYkV9lWzY6CVMNluVq8cBsyq+UgPJdvA3uu4=