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

Use docker official redis images

Browse Source
This commit is contained in:
Antonio Ojea
2019-07-13 16:59:58 +02:00
parent f9a7ca8bab
commit 33e1b1d8a5
6 changed files with 24 additions and 17 deletions
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),

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

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

@@ -234,7 +234,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"}