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

Merge pull request #80126 from aojea/redis

Browse Source 
Use docker official redis images
This commit is contained in:
Kubernetes Prow Robot
2019-07-15 21:51:24 -07:00
committed by GitHub
parent d900746422 048f7a212b
commit 9ac3fadbad
7 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1144,7 +1144,7 @@ metadata:
waitForOrFailWithDebug(1)
forEachPod(func(pod v1.Pod) {
e2elog.Logf("wait on redis-master startup in %v ", ns)
framework.LookForStringInLog(ns, pod.Name, "redis-master", "The server is now ready to accept connections", framework.PodStartTimeout)
framework.LookForStringInLog(ns, pod.Name, "redis-master", "Ready to accept connections", framework.PodStartTimeout)
})
validateService := func(name string, servicePort int, timeout time.Duration) {
err := wait.Poll(framework.Poll, timeout, func() (bool, error) {
@@ -1323,7 +1323,7 @@ metadata:
waitForOrFailWithDebug(1)
forEachPod(func(pod v1.Pod) {
ginkgo.By("checking for a matching strings")
_, err := framework.LookForStringInLog(ns, pod.Name, containerName, "The server is now ready to accept connections", framework.PodStartTimeout)
_, err := framework.LookForStringInLog(ns, pod.Name, containerName, "Ready to accept connections", framework.PodStartTimeout)
framework.ExpectNoError(err)
ginkgo.By("limiting log lines")