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

Update to the latest istio/istio (#6881) 

There were changes to the test framework that required a few tweaks.
This commit is contained in:
Nathan Mittler 2020-03-16 07:08:02 -07:00 committed by GitHub
parent 546a3c8379
commit 404cbd180d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -13,7 +13,7 @@ replace github.com/docker/docker => github.com/docker/engine v1.4.2-0.2019101121
require (
github.com/Masterminds/semver v1.4.2
github.com/jstemmer/go-junit-report v0.9.1 // indirect
istio.io/istio v0.0.0-20200304151407-a11761a19432
istio.io/istio v0.0.0-20200314140522-cbeb7a9d4e9f
)
replace github.com/Azure/go-autorest/autorest => github.com/Azure/go-autorest/autorest v0.9.0

4
go.sum
View File

@ -909,6 +909,8 @@ istio.io/api v0.0.0-20200218013118-7fd43ea7fc2b h1:9m5PCO7B94jCHne9O49k1v7RUMZ75
istio.io/api v0.0.0-20200218013118-7fd43ea7fc2b/go.mod h1:bcY3prusO/6vA6zGHz4PNG2v79clPyTw06Xx3fprJSQ=
istio.io/api v0.0.0-20200303115641-9fc7ffee081d h1:QN18qPK2ww4d5MsqJ6HjzNlpAL9WrzJbsFaskDRpTfk=
istio.io/api v0.0.0-20200303115641-9fc7ffee081d/go.mod h1:bcY3prusO/6vA6zGHz4PNG2v79clPyTw06Xx3fprJSQ=
istio.io/api v0.0.0-20200313095255-feb6af7f7b9e h1:+0tK+0KYEVXwATXoAKsHtrZc8gD/LZdYYjKudJPQsy0=
istio.io/api v0.0.0-20200313095255-feb6af7f7b9e/go.mod h1:bcY3prusO/6vA6zGHz4PNG2v79clPyTw06Xx3fprJSQ=
istio.io/gogo-genproto v0.0.0-20190930162913-45029607206a/go.mod h1:OzpAts7jljZceG4Vqi5/zXy/pOg1b209T3jb7Nv5wIs=
istio.io/gogo-genproto v0.0.0-20200122005450-9b171d92064b h1:IGfxOYlHvdE5UeSCGvOFNHVQcPGJYAAUQ5iJm2Z7i18=
istio.io/gogo-genproto v0.0.0-20200122005450-9b171d92064b/go.mod h1:OzpAts7jljZceG4Vqi5/zXy/pOg1b209T3jb7Nv5wIs=
@ -920,6 +922,8 @@ istio.io/istio v0.0.0-20200219230945-34ee61d95048 h1:3tv6JUn3gVcF/XdRb0tKCL84mGT
istio.io/istio v0.0.0-20200219230945-34ee61d95048/go.mod h1:+l6TTXlWyn+jycoK5K1T3YO379mEZgd9307u0R8N+Nc=
istio.io/istio v0.0.0-20200304151407-a11761a19432 h1:uCuVbV8QSt50YugqJWhat82Bx6jUXUQEme1Xy+QfVDw=
istio.io/istio v0.0.0-20200304151407-a11761a19432/go.mod h1:x0U/KPVWuw52Yo91asmKduaZwAP6jJ8xQkyxBKnsVcM=
istio.io/istio v0.0.0-20200314140522-cbeb7a9d4e9f h1:S2hGCPQXyazSxhr++JJhjcs35E46wRnojIPVmJI/89U=
istio.io/istio v0.0.0-20200314140522-cbeb7a9d4e9f/go.mod h1:x/D9l78LqWTJZoXdroQ2bHAHKtBvJJkTVXUJfGdl2Xw=
istio.io/pkg v0.0.0-20200131182711-9ba13e0e34bb h1:ZEOEfPpz4ooW3lhX5qi+XA6dTO1Mb72EFaRniUb6Mvc=
istio.io/pkg v0.0.0-20200131182711-9ba13e0e34bb/go.mod h1:pwGaxLUDLobzL/WvWV94z72LvBbB1dr2UUUyPuasfIU=
istio.io/pkg v0.0.0-20200227125209-63966175aa01 h1:aiO57C3tGvBUWKMu1WrM5lUn3cC7ZIgR8YOUXaVPeoQ=

6
pkg/test/istioio/pod.go
View File

@ -27,7 +27,7 @@ type PodWait func(ctx Context) kube.PodFetchFunc
func (s PodWait) run(ctx Context) {
ctx.Helper()
if _, err := ctx.KubeEnv().WaitUntilPodsAreReady(s(ctx)); err != nil {
if _, err := ctx.KubeEnv().KubeClusters[0].WaitUntilPodsAreReady(s(ctx)); err != nil {
ctx.Fatal("failed waiting for pods to start: %v", err)
}
}
@ -36,7 +36,7 @@ func (s PodWait) run(ctx Context) {
func SinglePodWait(namespace string, selectors ...string) PodWait {
return func(ctx Context) kube.PodFetchFunc {
ctx.Helper()
return ctx.KubeEnv().NewSinglePodFetch(namespace, selectors...)
return ctx.KubeEnv().KubeClusters[0].NewSinglePodFetch(namespace, selectors...)
}
}
@ -44,6 +44,6 @@ func SinglePodWait(namespace string, selectors ...string) PodWait {
func MultiPodWait(namespace string, selectors ...string) PodWait {
return func(ctx Context) kube.PodFetchFunc {
ctx.Helper()
return ctx.KubeEnv().NewPodFetch(namespace, selectors...)
return ctx.KubeEnv().KubeClusters[0].NewPodFetch(namespace, selectors...)
}
}

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

@ -26,7 +26,7 @@ import (
"strconv"
"strings"
"istio.io/istio/pkg/test/framework/components/environment"
"istio.io/istio/pkg/test/framework/resource/environment"
"istio.io/istio/pkg/test/scopes"
)
@ -460,7 +460,7 @@ func (s Script) getEnv(ctx Context) []string {
testOutputDirEnvVar: ctx.WorkDir(),
}
ctx.Environment().Case(environment.Kube, func() {
customVars[kubeConfigEnvVar] = ctx.KubeEnv().Settings().KubeConfig
customVars[kubeConfigEnvVar] = ctx.KubeEnv().Settings().KubeConfig[0]
})
for k, v := range s.Env {
customVars[k] = v

2
pkg/test/istioio/subtest.go
View File

@ -16,8 +16,8 @@ package istioio
import (
"istio.io/istio/pkg/test/framework"
"istio.io/istio/pkg/test/framework/components/environment"
"istio.io/istio/pkg/test/framework/label"
"istio.io/istio/pkg/test/framework/resource/environment"
)
var _ Step = Subtest{}

2
tests/configuration/main_test.go
View File

@ -18,9 +18,9 @@ import (
"testing"
"istio.io/istio/pkg/test/framework"
"istio.io/istio/pkg/test/framework/components/environment"
"istio.io/istio/pkg/test/framework/components/istio"
"istio.io/istio/pkg/test/framework/label"
"istio.io/istio/pkg/test/framework/resource/environment"
)
var (

2
tests/examples/main_test.go
View File

@ -18,9 +18,9 @@ import (
"testing"
"istio.io/istio/pkg/test/framework"
"istio.io/istio/pkg/test/framework/components/environment"
"istio.io/istio/pkg/test/framework/components/istio"
"istio.io/istio/pkg/test/framework/label"
"istio.io/istio/pkg/test/framework/resource/environment"
)
var (

2
tests/policies/main_test.go
View File

@ -18,8 +18,8 @@ import (
"testing"
"istio.io/istio/pkg/test/framework"
"istio.io/istio/pkg/test/framework/components/environment"
"istio.io/istio/pkg/test/framework/components/istio"
"istio.io/istio/pkg/test/framework/resource/environment"
)
var (

2
tests/security/main_test.go
View File

@ -18,9 +18,9 @@ import (
"testing"
"istio.io/istio/pkg/test/framework"
"istio.io/istio/pkg/test/framework/components/environment"
"istio.io/istio/pkg/test/framework/components/istio"
"istio.io/istio/pkg/test/framework/label"
"istio.io/istio/pkg/test/framework/resource/environment"
)
var (

2
tests/trafficmanagement/ingress/main_test.go
View File

@ -18,9 +18,9 @@ import (
"testing"
"istio.io/istio/pkg/test/framework"
"istio.io/istio/pkg/test/framework/components/environment"
"istio.io/istio/pkg/test/framework/components/istio"
"istio.io/istio/pkg/test/framework/label"
"istio.io/istio/pkg/test/framework/resource/environment"
)
var (

2
tests/trafficmanagement/main_test.go
View File

@ -18,8 +18,8 @@ import (
"testing"
"istio.io/istio/pkg/test/framework"
"istio.io/istio/pkg/test/framework/components/environment"
"istio.io/istio/pkg/test/framework/components/istio"
"istio.io/istio/pkg/test/framework/resource/environment"
)
var (