istio
/
istio.io
mirror of https://github.com/istio/istio.io.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Main branch has a non release gateway API. Changes to allow that. (#13313) 

* Master has a non release gateway API. Changes to allow that.

* Grab a istio test ref from main branch

* <ove from istio.io/pkg to istio/istio/pkg

* revert one change

* update istio/api

* Run make gen

* disable failing test temporarily
This commit is contained in:
Eric Van Norman 2023-06-07 17:42:03 -05:00 committed by GitHub
parent af9705dd17
commit 91afadd482
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.core.mk
View File

@ -85,7 +85,7 @@ site:
snips:
@scripts/gen_snips.sh
gen: tidy-go format-go update-gateway-version snips
gen: tidy-go format-go snips
gen-check: gen check-clean-repo check-localization

2
content/en/boilerplates/snips/args.sh
View File

@ -21,7 +21,7 @@
####################################################################################################
! read -r -d '' bpsnip_args_gateway_api_version <<\ENDSNIP
v0.7.1-0.20230517171234-6b9b7346ca5b
6b9b7346ca5b54a50c3afb0a0573b16b1c84336a
ENDSNIP
! read -r -d '' bpsnip_args_istio_previous_version <<\ENDSNIP

2
content/en/boilerplates/snips/gateway-api-experimental.sh
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.7.1-0.20230517171234-6b9b7346ca5b" | kubectl apply -f -
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=6b9b7346ca5b54a50c3afb0a0573b16b1c84336a" | kubectl apply -f -
}

2
content/en/boilerplates/snips/gateway-api-gamma-support.sh
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.7.1-0.20230517171234-6b9b7346ca5b" | kubectl apply -f -
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=6b9b7346ca5b54a50c3afb0a0573b16b1c84336a" | kubectl apply -f -
}

2
content/en/boilerplates/snips/gateway-api-install-crds.sh
View File

@ -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=v0.7.1-0.20230517171234-6b9b7346ca5b" | kubectl apply -f -; }
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=6b9b7346ca5b54a50c3afb0a0573b16b1c84336a" | kubectl apply -f -; }
}

2
content/en/docs/setup/additional-setup/getting-started/snips.sh
View File

@ -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=v0.7.1-0.20230517171234-6b9b7346ca5b" | kubectl apply -f -; }
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=6b9b7346ca5b54a50c3afb0a0573b16b1c84336a" | kubectl apply -f -; }
}
snip_download_istio_1() {

2
content/en/docs/setup/install/external-controlplane/snips.sh
View File

@ -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=v0.7.1-0.20230517171234-6b9b7346ca5b" | kubectl apply -f - --context="${CTX_REMOTE_CLUSTER}"; }
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=6b9b7346ca5b54a50c3afb0a0573b16b1c84336a" | kubectl apply -f - --context="${CTX_REMOTE_CLUSTER}"; }
}
snip_configure_and_test_an_ingress_gateway_3() {

0
content/en/docs/tasks/observability/metrics/telemetry-api/test.sh → content/en/docs/tasks/observability/metrics/telemetry-api/test-disabled.sh
View File

4
content/en/docs/tasks/traffic-management/ingress/gateway-api/snips.sh
View File

@ -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=v0.7.1-0.20230517171234-6b9b7346ca5b" | kubectl apply -f -; }
{ kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=6b9b7346ca5b54a50c3afb0a0573b16b1c84336a" | kubectl apply -f -; }
}
snip_setup_2() {
@ -246,5 +246,5 @@ kubectl delete ns istio-ingress
}
snip_cleanup_2() {
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=v0.7.1-0.20230517171234-6b9b7346ca5b" | kubectl delete -f -
kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd?ref=6b9b7346ca5b54a50c3afb0a0573b16b1c84336a" | kubectl delete -f -
}

2
data/args.yml
View File

@ -49,4 +49,4 @@ supported_languages:
code: "zh"
# Kubernetes Gateway API
k8s_gateway_api_version: "v0.7.1-0.20230517171234-6b9b7346ca5b"
k8s_gateway_api_version: "6b9b7346ca5b54a50c3afb0a0573b16b1c84336a"

13
go.mod
View File

@ -11,8 +11,7 @@ replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.5
require (
github.com/pmezard/go-difflib v1.0.0
golang.org/x/sync v0.2.0
istio.io/istio v0.0.0-20230607134503-11148ad1bfb9
istio.io/pkg v0.0.0-20230524020242-1015535057be
istio.io/istio v0.0.0-20230607172303-3fe364b8d48a
k8s.io/apimachinery v0.27.2
k8s.io/client-go v0.27.2
)
@ -58,7 +57,6 @@ require (
github.com/fatih/camelcase v1.0.0 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/fvbommel/sortorder v1.0.2 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
@ -97,7 +95,6 @@ require (
github.com/huandu/xstrings v1.4.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jonboulle/clockwork v0.3.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.16.5 // indirect
@ -130,7 +127,6 @@ require (
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/onsi/ginkgo/v2 v2.9.5 // indirect
github.com/onsi/gomega v1.27.7 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0-rc3 // indirect
github.com/openshift/api v0.0.0-20200713203337-b2494ecb17dd // indirect
@ -162,7 +158,6 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.16.0 // indirect
github.com/stoewer/go-strcase v1.3.0 // indirect
github.com/stretchr/testify v1.8.3 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
github.com/vbatts/tar-split v0.11.3 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
@ -187,8 +182,6 @@ require (
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.9.1 // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
gomodules.xyz/jsonpatch/v3 v3.0.1 // indirect
gomodules.xyz/orderedmap v0.1.0 // indirect
google.golang.org/api v0.125.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
@ -203,8 +196,8 @@ require (
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
helm.sh/helm/v3 v3.12.0 // indirect
istio.io/api v0.0.0-20230607073504-af2e5a74b2a4 // indirect
istio.io/client-go v1.18.0-rc.0.0.20230607074103-2c9a1bf5428c // indirect
istio.io/api v0.0.0-20230606222603-870636f5ccc4 // indirect
istio.io/client-go v1.18.0-alpha.0.0.20230606223103-319b844413b2 // indirect
k8s.io/api v0.27.2 // indirect
k8s.io/apiextensions-apiserver v0.27.2 // indirect
k8s.io/apiserver v0.27.2 // indirect

25
go.sum
View File

@ -31,7 +31,7 @@ cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGB
cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k=
cloud.google.com/go/iam v1.0.1 h1:lyeCAU6jpnVNrE9zGQkTl3WgNgK/X+uWwaw0kynZJMU=
cloud.google.com/go/logging v1.7.0 h1:CJYxlNNNNAMkHp9em/YEXcfJg+rPDg7YfwoRpMU+t5I=
cloud.google.com/go/logging v1.7.0/go.mod h1:3xjP2CjkM3ZkO73aj4ASA5wRPGGCRrPIAeNqVNkzY8M=
cloud.google.com/go/longrunning v0.4.2 h1:WDKiiNXFTaQ6qz/G8FCOkuY9kJmOJGY67wPUC1M2RbE=
@ -222,8 +222,6 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
github.com/fvbommel/sortorder v1.0.2 h1:mV4o8B2hKboCdkJm+a7uX/SIpZob4JzUpc5GGnM45eo=
github.com/fvbommel/sortorder v1.0.2/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
@ -463,8 +461,6 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
github.com/jonboulle/clockwork v0.3.0 h1:9BSCMi8C+0qdApAp4auwX0RkLGUjs956h0EkuQymUhg=
github.com/jonboulle/clockwork v0.3.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
@ -597,7 +593,6 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU=
github.com/onsi/gomega v1.27.7/go.mod h1:1p8OOlwo2iUUDsHnOrjE5UKYJ+e3W8eQ3qSlRahPmr4=
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/opencontainers/image-spec v1.1.0-rc3 h1:fzg1mXZFj8YdPeNkRXMg+zb88BFV0Ys52cJydRwBkb8=
@ -1127,10 +1122,6 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T
gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU=
gomodules.xyz/jsonpatch/v2 v2.3.0 h1:8NFhfS6gzxNqjLIYnZxg319wZ5Qjnx4m/CcX+Klzazc=
gomodules.xyz/jsonpatch/v2 v2.3.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
gomodules.xyz/jsonpatch/v3 v3.0.1 h1:Te7hKxV52TKCbNYq3t84tzKav3xhThdvSsSp/W89IyI=
gomodules.xyz/jsonpatch/v3 v3.0.1/go.mod h1:CBhndykehEwTOlEfnsfJwvkFQbSN8YZFr9M+cIHAJto=
gomodules.xyz/orderedmap v0.1.0 h1:fM/+TGh/O1KkqGR5xjTKg6bU8OKBkg7p0Y+x/J9m8Os=
gomodules.xyz/orderedmap v0.1.0/go.mod h1:g9/TPUCm1t2gwD3j3zfV8uylyYhVdCNSi+xCEIu7yTU=
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@ -1298,14 +1289,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-20230607073504-af2e5a74b2a4 h1:5edcqBv4rCDILgM759fx1O0gNRptkqEEDJtzIOE89s4=
istio.io/api v0.0.0-20230607073504-af2e5a74b2a4/go.mod h1:dDMe1TsOtrRoUlBzdxqNolWXpXPQjLfbcXvqPMtQ6eo=
istio.io/client-go v1.18.0-rc.0.0.20230607074103-2c9a1bf5428c h1:4uFhKbR8Du90Zur0tQu7RmHIIoUCRinazb5HF5GV7ew=
istio.io/client-go v1.18.0-rc.0.0.20230607074103-2c9a1bf5428c/go.mod h1:IxC0aLTTQUu7TakBtCepv1H1JcbqyVGLeQFVS5jQlw4=
istio.io/istio v0.0.0-20230607134503-11148ad1bfb9 h1:oRPq+jr3nvyfPxHPUxqEes/TmRizcNHb/8LdLkYXWIU=
istio.io/istio v0.0.0-20230607134503-11148ad1bfb9/go.mod h1:KERpkw4+ffgGszcWnIbr16weaULgo5QB4zITUZ8bJoI=
istio.io/pkg v0.0.0-20230524020242-1015535057be h1:H+ww/6ysv++W5na8wIVNfoE01shRez0rXZXzLGoMIvg=
istio.io/pkg v0.0.0-20230524020242-1015535057be/go.mod h1:ZcwaaLCBsaAszynqi6s8Bs6VL3yeTtuXDon9QuzSD5E=
istio.io/api v0.0.0-20230606222603-870636f5ccc4 h1:XCDn0730dEArm9wOLqDpcmfFSRE9ZLlf77D4id0YSeE=
istio.io/api v0.0.0-20230606222603-870636f5ccc4/go.mod h1:dDMe1TsOtrRoUlBzdxqNolWXpXPQjLfbcXvqPMtQ6eo=
istio.io/client-go v1.18.0-alpha.0.0.20230606223103-319b844413b2 h1:WcecVmYifRFRXVZNtdUapQfEJ4YYhYsPaHehAqAsIlg=
istio.io/client-go v1.18.0-alpha.0.0.20230606223103-319b844413b2/go.mod h1:gViL8carXmDN2n2+nyVxqz+KcZ3egrEAMt/PPBTYYtc=
istio.io/istio v0.0.0-20230607172303-3fe364b8d48a h1:d0/pUNCkomxD5d1M6p/OwpN1b3ReHpof7bKGPbx+xtU=
istio.io/istio v0.0.0-20230607172303-3fe364b8d48a/go.mod h1:K+g7/l0qqxxUPo0O4aoyWzNUqP5T86P32nlzwmVdROY=
k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78=
k8s.io/api v0.18.3/go.mod h1:UOaMwERbqJMfeeeHc8XJKawj4P9TgDRnViIqqBeH2QA=
k8s.io/api v0.18.4/go.mod h1:lOIQAKYgai1+vz9J7YcDZwC26Z0zQewYOGWdyIPUUQ4=

4
pkg/test/istioio/script.go
View File

@ -24,9 +24,9 @@ import (
"strings"
"time"
"istio.io/istio/pkg/log"
"istio.io/istio/pkg/test/framework"
"istio.io/istio/pkg/test/scopes"
"istio.io/pkg/log"
)
const (
@ -36,7 +36,7 @@ const (
)
// Logging scope for the script output.
var scriptLog = log.RegisterScope("script", "output of test scripts", 0)
var scriptLog = log.RegisterScope("script", "output of test scripts")
var _ Step = Script{}