github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Fix broken redis example e2e tests

Browse Source
This commit is contained in:
Janet Kuo 2016-06-17 16:10:58 -07:00
parent 8dee2b4293
commit 14d9863665
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/redis/redis-controller.yaml
View File

@ -13,7 +13,7 @@ spec:
spec: spec:
containers: containers:
- name: redis - name: redis
image: kubernetes/redis:v2 image: kubernetes/redis:v1
ports: ports:
- containerPort: 6379 - containerPort: 6379
resources: resources:

4
examples/redis/redis-master.yaml
View File

@ -9,7 +9,7 @@ metadata:
spec: spec:
containers: containers:
- name: master - name: master
image: kubernetes/redis:v2 image: kubernetes/redis:v1
env: env:
- name: MASTER - name: MASTER
value: "true" value: "true"
@ -22,7 +22,7 @@ spec:
- mountPath: /redis-master-data - mountPath: /redis-master-data
name: data name: data
- name: sentinel - name: sentinel
image: kubernetes/redis:v2 image: kubernetes/redis:v1
env: env:
- name: SENTINEL - name: SENTINEL
value: "true" value: "true"

2
examples/redis/redis-sentinel-controller.yaml
View File

@ -15,7 +15,7 @@ spec:
spec: spec:
containers: containers:
- name: sentinel - name: sentinel
image: kubernetes/redis:v2 image: kubernetes/redis:v1
env: env:
- name: SENTINEL - name: SENTINEL
value: "true" value: "true"

14
test/e2e/examples.go
View File

@ -91,7 +91,7 @@ var _ = framework.KubeDescribe("[Feature:Example]", func() {
framework.RunKubectlOrDie("create", "-f", sentinelServiceYaml, nsFlag) framework.RunKubectlOrDie("create", "-f", sentinelServiceYaml, nsFlag)
framework.RunKubectlOrDie("create", "-f", sentinelControllerYaml, nsFlag) framework.RunKubectlOrDie("create", "-f", sentinelControllerYaml, nsFlag)
framework.RunKubectlOrDie("create", "-f", controllerYaml, nsFlag) framework.RunKubectlOrDie("create", "-f", controllerYaml, nsFlag)
label := labels.SelectorFromSet(labels.Set(map[string]string{"name": sentinelRC})) label := labels.SelectorFromSet(labels.Set(map[string]string{sentinelRC: "true"}))
err = framework.WaitForPodsWithLabelRunning(c, ns, label) err = framework.WaitForPodsWithLabelRunning(c, ns, label)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
label = labels.SelectorFromSet(labels.Set(map[string]string{"name": redisRC})) label = labels.SelectorFromSet(labels.Set(map[string]string{"name": redisRC}))
@ -106,13 +106,21 @@ var _ = framework.KubeDescribe("[Feature:Example]", func() {
By("checking up the services") By("checking up the services")
checkAllLogs := func() { checkAllLogs := func() {
forEachPod("name", "redis", func(pod api.Pod) { selectorKey, selectorValue := "name", redisRC
label := labels.SelectorFromSet(labels.Set(map[string]string{selectorKey: selectorValue}))
err = framework.WaitForPodsWithLabelRunning(c, ns, label)
Expect(err).NotTo(HaveOccurred())
forEachPod(selectorKey, selectorValue, func(pod api.Pod) {
if pod.Name != bootstrapPodName { if pod.Name != bootstrapPodName {
_, err := framework.LookForStringInLog(ns, pod.Name, "redis", expectedOnServer, serverStartTimeout) _, err := framework.LookForStringInLog(ns, pod.Name, "redis", expectedOnServer, serverStartTimeout)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
} }
}) })
forEachPod("name", "redis-sentinel", func(pod api.Pod) { selectorKey, selectorValue = sentinelRC, "true"
label = labels.SelectorFromSet(labels.Set(map[string]string{selectorKey: selectorValue}))
err = framework.WaitForPodsWithLabelRunning(c, ns, label)
Expect(err).NotTo(HaveOccurred())
forEachPod(selectorKey, selectorValue, func(pod api.Pod) {
if pod.Name != bootstrapPodName { if pod.Name != bootstrapPodName {
_, err := framework.LookForStringInLog(ns, pod.Name, "sentinel", expectedOnSentinel, serverStartTimeout) _, err := framework.LookForStringInLog(ns, pod.Name, "sentinel", expectedOnSentinel, serverStartTimeout)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())

2
test/e2e/framework/util.go
View File

@ -3913,7 +3913,7 @@ func WaitForIngressAddress(c *client.Client, ns, ingName string, timeout time.Du
// Looks for the given string in the log of a specific pod container // Looks for the given string in the log of a specific pod container
func LookForStringInLog(ns, podName, container, expectedString string, timeout time.Duration) (result string, err error) { func LookForStringInLog(ns, podName, container, expectedString string, timeout time.Duration) (result string, err error) {
return LookForString(expectedString, timeout, func() string { return LookForString(expectedString, timeout, func() string {
return RunKubectlOrDie("log", podName, container, fmt.Sprintf("--namespace=%v", ns)) return RunKubectlOrDie("logs", podName, container, fmt.Sprintf("--namespace=%v", ns))
}) })
} }