github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #38139 from sjug/clusterverify_ns

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 37032, 38119, 38186, 38200, 38139)

New ns param for NewClusterVerification

**What this PR does / why we need it**: Allows the test to specify alternate namespaces to when waiting for pods to be in a specific state.

**Which issue this PR fixes**: fixes #38138

**Special notes for your reviewer**: Minor fix

**Release note**: None
This commit is contained in:
Kubernetes Submit Queue 2016-12-06 18:29:40 -08:00 committed by GitHub
commit f920391755
5 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/examples.go
View File

@ -48,6 +48,7 @@ var _ = framework.KubeDescribe("[Feature:Example]", func() {
// Reusable cluster state function. This won't be adversly affected by lazy initialization of framework. // Reusable cluster state function. This won't be adversly affected by lazy initialization of framework.
clusterState := func(selectorKey string, selectorValue string) *framework.ClusterVerification { clusterState := func(selectorKey string, selectorValue string) *framework.ClusterVerification {
return f.NewClusterVerification( return f.NewClusterVerification(
f.Namespace,
framework.PodStateVerification{ framework.PodStateVerification{
Selectors: map[string]string{selectorKey: selectorValue}, Selectors: map[string]string{selectorKey: selectorValue},
ValidPhases: []v1.PodPhase{v1.PodRunning}, ValidPhases: []v1.PodPhase{v1.PodRunning},

4
test/e2e/framework/framework.go
View File

@ -853,10 +853,10 @@ type ClusterVerification struct {
podState PodStateVerification podState PodStateVerification
} }
func (f *Framework) NewClusterVerification(filter PodStateVerification) *ClusterVerification { func (f *Framework) NewClusterVerification(namespace *v1.Namespace, filter PodStateVerification) *ClusterVerification {
return &ClusterVerification{ return &ClusterVerification{
f.ClientSet, f.ClientSet,
f.Namespace, namespace,
filter, filter,
} }
} }

1
test/e2e/kubectl.go
View File

@ -267,6 +267,7 @@ var _ = framework.KubeDescribe("Kubectl client", func() {
// Reustable cluster state function. This won't be adversly affected by lazy initialization of framework. // Reustable cluster state function. This won't be adversly affected by lazy initialization of framework.
clusterState := func() *framework.ClusterVerification { clusterState := func() *framework.ClusterVerification {
return f.NewClusterVerification( return f.NewClusterVerification(
f.Namespace,
framework.PodStateVerification{ framework.PodStateVerification{
Selectors: map[string]string{"app": "redis"}, Selectors: map[string]string{"app": "redis"},
ValidPhases: []v1.PodPhase{v1.PodRunning /*v1.PodPending*/}, ValidPhases: []v1.PodPhase{v1.PodRunning /*v1.PodPending*/},

1
test/e2e/logging_soak.go
View File

@ -114,6 +114,7 @@ func RunLogPodsWithSleepOf(f *framework.Framework, sleep time.Duration, podname
) )
logSoakVerification := f.NewClusterVerification( logSoakVerification := f.NewClusterVerification(
f.Namespace,
framework.PodStateVerification{ framework.PodStateVerification{
Selectors: podlables, Selectors: podlables,
ValidPhases: []v1.PodPhase{v1.PodRunning, v1.PodSucceeded}, ValidPhases: []v1.PodPhase{v1.PodRunning, v1.PodSucceeded},

1
test/e2e/networking_perf.go
View File

@ -119,6 +119,7 @@ var _ = framework.KubeDescribe("Networking IPerf [Experimental] [Slow] [Feature:
iperfResults := &IPerfResults{} iperfResults := &IPerfResults{}
iperfClusterVerification := f.NewClusterVerification( iperfClusterVerification := f.NewClusterVerification(
f.Namespace,
framework.PodStateVerification{ framework.PodStateVerification{
Selectors: iperfClientPodLabels, Selectors: iperfClientPodLabels,
ValidPhases: []v1.PodPhase{v1.PodSucceeded}, ValidPhases: []v1.PodPhase{v1.PodSucceeded},