github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-11 06:02:18 +00:00
Code Issues Projects Releases Wiki Activity

Run cluster level logging e2e test in its own namesapce

Browse Source
This commit is contained in:
Satnam Singh
2015-03-20 11:26:34 -07:00
parent 7f02e110f4
commit f2980a3f13
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/e2e/util.go
View File

@@ -97,9 +97,9 @@ func waitForPodNotPending(c *client.Client, ns, podName string) error {
})
}
// waitForPodSuccess returns nil if the pod reached state success, or an error if it reached failure or ran too long.
func waitForPodSuccess(c *client.Client, podName string, contName string) error {
return waitForPodCondition(c, api.NamespaceDefault, podName, "success or failure", func(pod *api.Pod) (bool, error) {
// waitForPodSuccessInNamespace returns nil if the pod reached state success, or an error if it reached failure or ran too long.
func waitForPodSuccessInNamespace(c *client.Client, podName string, contName string, namespace string) error {
return waitForPodCondition(c, namespace, podName, "success or failure", func(pod *api.Pod) (bool, error) {
// Cannot use pod.Status.Phase == api.PodSucceeded/api.PodFailed due to #2632
ci, ok := pod.Status.Info[contName]
if !ok {
@@ -112,15 +112,21 @@ func waitForPodSuccess(c *client.Client, podName string, contName string) error
} else {
return true, fmt.Errorf("pod %s terminated with failure: %+v", podName, ci.State.Termination)
}
Logf("Waiting for pod %q status to be success or failure", podName)
Logf("Waiting for pod %q in namespace %s status to be success or failure", podName, namespace)
} else {
Logf("Nil State.Termination for container %s in pod %s so far", contName, podName)
Logf("Nil State.Termination for container %s in pod %s in namespace %s so far", contName, podName, namespace)
}
}
return false, nil
})
}
// waitForPodSuccess returns nil if the pod reached state success, or an error if it reached failure or ran too long.
// The default namespace is used to identify pods.
func waitForPodSuccess(c *client.Client, podName string, contName string) error {
return waitForPodSuccessInNamespace(c, podName, contName, api.NamespaceDefault)
}
func loadConfig() (*client.Config, error) {
switch {
case testContext.kubeConfig != "":