github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues 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
commit 9ac3fadbad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,6 @@ type testImagesStruct struct {
AgnhostImage string
BusyBoxImage string
GBFrontendImage string
GBRedisSlaveImage string
KittenImage string
MounttestImage string
NautilusImage string
@ -85,7 +84,6 @@ func init() {
imageutils.GetE2EImage(imageutils.Agnhost),
imageutils.GetE2EImage(imageutils.BusyBox),
imageutils.GetE2EImage(imageutils.GBFrontend),
imageutils.GetE2EImage(imageutils.GBRedisSlave),
imageutils.GetE2EImage(imageutils.Kitten),
imageutils.GetE2EImage(imageutils.Mounttest),
imageutils.GetE2EImage(imageutils.Nautilus),

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")

2
test/e2e/testing-manifests/guestbook/legacy/redis-master-controller.yaml
View File

@ -17,7 +17,7 @@ spec:
spec:
containers:
- name: master
image: docker.io/library/redis:3.2.9-alpine
image: docker.io/library/redis:5.0.5-alpine
resources:
requests:
cpu: 100m

5
test/e2e/testing-manifests/guestbook/legacy/redis-slave-controller.yaml
View File

@ -17,7 +17,10 @@ spec:
spec:
containers:
- name: slave
image: gcr.io/google_samples/gb-redisslave:v1
image: docker.io/library/redis:5.0.5-alpine
# We are only implementing the dns option of:
# https://github.com/kubernetes/examples/blob/97c7ed0eb6555a4b667d2877f965d392e00abc45/guestbook/redis-slave/run.sh
command: [ "redis-server", "--slaveof", "redis-master", "6379" ]
resources:
requests:
cpu: 100m

5
test/e2e/testing-manifests/guestbook/redis-slave-deployment.yaml.in
View File

@ -18,7 +18,10 @@ spec:
spec:
containers:
- name: slave
image: {{.GBRedisSlaveImage}}
image: {{.RedisImage}}
# We are only implementing the dns option of:
# https://github.com/kubernetes/examples/blob/97c7ed0eb6555a4b667d2877f965d392e00abc45/guestbook/redis-slave/run.sh
command: [ "redis-server", "--slaveof", "redis-master", "6379" ]
resources:
requests:
cpu: 100m

5
test/fixtures/doc-yaml/user-guide/replicaset/redis-slave.yaml vendored
View File

@ -24,7 +24,10 @@ spec:
spec:
containers:
- name: slave
image: gcr.io/google-samples/gb-redisslave:v3
image: docker.io/library/redis:5.0.5-alpine
# We are only implementing the dns option of:
# https://github.com/kubernetes/examples/blob/97c7ed0eb6555a4b667d2877f965d392e00abc45/guestbook/redis-slave/run.sh
command: [ "redis-server", "--slaveof", "redis-master", "6379" ]
resources:
requests:
cpu: 100m

5
test/utils/image/manifest.go
View File

@ -134,8 +134,6 @@ const (
Etcd
// GBFrontend image
GBFrontend
// GBRedisSlave image
GBRedisSlave
// Httpd image
Httpd
// HttpdNew image
@ -214,7 +212,6 @@ func initImageConfigs() map[int]Config {
configs[EchoServer] = Config{e2eRegistry, "echoserver", "2.2"}
configs[Etcd] = Config{gcRegistry, "etcd", "3.3.10"}
configs[GBFrontend] = Config{sampleRegistry, "gb-frontend", "v6"}
configs[GBRedisSlave] = Config{sampleRegistry, "gb-redisslave", "v3"}
configs[Httpd] = Config{dockerLibraryRegistry, "httpd", "2.4.38-alpine"}
configs[HttpdNew] = Config{dockerLibraryRegistry, "httpd", "2.4.39-alpine"}
configs[Invalid] = Config{gcRegistry, "invalid-image", "invalid-tag"}
@ -234,7 +231,7 @@ func initImageConfigs() map[int]Config {
configs[Perl] = Config{dockerLibraryRegistry, "perl", "5.26"}
configs[PrometheusDummyExporter] = Config{e2eRegistry, "prometheus-dummy-exporter", "v0.1.0"}
configs[PrometheusToSd] = Config{e2eRegistry, "prometheus-to-sd", "v0.5.0"}
configs[Redis] = Config{dockerLibraryRegistry, "redis", "3.2.9-alpine"}
configs[Redis] = Config{dockerLibraryRegistry, "redis", "5.0.5-alpine"}
configs[ResourceConsumer] = Config{e2eRegistry, "resource-consumer", "1.5"}
configs[ResourceController] = Config{e2eRegistry, "resource-consumer-controller", "1.0"}
configs[SdDummyExporter] = Config{gcRegistry, "sd-dummy-exporter", "v0.2.0"}