github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored pod-related functions from framework/util.go

Browse Source 
This a refactoring of framework/utils.go into framework/pod.

Signed-off-by: Jorge Alarcon Ochoa <alarcj137@gmail.com>
This commit is contained in:
Jorge Alarcon Ochoa
2019-05-07 20:09:50 -04:00
committed by alejandrox1
parent b3981a2f9a
commit 4969a05327
125 changed files with 2009 additions and 1511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/instrumentation/logging/elasticsearch/BUILD
View File

@@ -21,6 +21,7 @@ go_library(
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//test/e2e/framework:go_default_library",
"//test/e2e/framework/log:go_default_library",
"//test/e2e/framework/pod:go_default_library",
"//test/e2e/instrumentation/common:go_default_library",
"//test/e2e/instrumentation/logging/utils:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library",

3
test/e2e/instrumentation/logging/elasticsearch/kibana.go
View File

@@ -24,6 +24,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/kubernetes/test/e2e/framework"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common"
"github.com/onsi/ginkgo"
@@ -76,7 +77,7 @@ func ClusterLevelLoggingWithKibana(f *framework.Framework) {
pods, err := f.ClientSet.CoreV1().Pods(metav1.NamespaceSystem).List(options)
framework.ExpectNoError(err)
for _, pod := range pods.Items {
err = framework.WaitForPodRunningInNamespace(f.ClientSet, &pod)
err = e2epod.WaitForPodRunningInNamespace(f.ClientSet, &pod)
framework.ExpectNoError(err)
}

3
test/e2e/instrumentation/logging/elasticsearch/utils.go
View File

@@ -27,6 +27,7 @@ import (
api "k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/test/e2e/framework"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
"k8s.io/kubernetes/test/e2e/instrumentation/logging/utils"
)
@@ -79,7 +80,7 @@ func (p *esLogProvider) Init() error {
return err
}
for _, pod := range pods.Items {
err = framework.WaitForPodRunningInNamespace(f.ClientSet, &pod)
err = e2epod.WaitForPodRunningInNamespace(f.ClientSet, &pod)
if err != nil {
return err
}