Merge pull request #43643 from rmmh/redis

Automatic merge from submit-queue (batch tested with PRs 43726, 43643)

Make a smaller redis image for testing, based on Alpine.

**What this PR does / why we need it**:
This shrinks gcr.io/google_containers/redis from 400MB to 5MB, which should reduce flakes.

**Which issue this PR fixes**:
fixes #43631

**Release note**:
```release-note
NONE
```

test/e2e/daemon_set.go

@@ -94,7 +94,7 @@ var _ = framework.KubeDescribe("Daemon set [Serial]", func() {
 	f = framework.NewDefaultFramework("daemonsets")
 
 	image := "gcr.io/google_containers/serve_hostname:v1.4"
-	redisImage := "gcr.io/google_containers/redis:e2e"
+	redisImage := "gcr.io/k8s-testimages/redis:e2e"
 	dsName := "daemon-set"
 
 	var ns string

test/e2e/deployment.go

@@ -50,7 +50,7 @@ const (
 
 	// nginxImage defined in kubectl.go
 	nginxImageName = "nginx"
-	redisImage     = "gcr.io/google_containers/redis:e2e"
+	redisImage     = "gcr.io/k8s-testimages/redis:e2e"
 	redisImageName = "redis"
 )
 

test/e2e/testing-manifests/kubectl/redis-master-controller.json

@@ -25,7 +25,7 @@
             "containers":[
                {
                   "name":"redis-master",
-		  "image": "gcr.io/google_containers/redis:e2e",
+		  "image": "gcr.io/k8s-testimages/redis:e2e",
                   "ports":[
                      {
                         "name":"redis-server",

test/images/redis/Dockerfile

@@ -0,0 +1,24 @@
+# Copyright 2017 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM alpine:3.5
+
+RUN apk add --no-cache redis
+
+COPY redis.conf /etc/redis.conf
+
+EXPOSE 6379
+VOLUME /data
+
+CMD ["redis-server", "/etc/redis.conf"]

test/images/redis/Makefile

@@ -0,0 +1,26 @@
+# Copyright 2017 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+TAG ?= e2e
+PREFIX ?= gcr.io/k8s-testimages
+
+all: push
+
+image:
+	docker build --pull -t $(PREFIX)/redis:$(TAG) .
+
+push: image
+	gcloud docker -- push $(PREFIX)/redis:$(TAG)
+
+clean:

test/images/redis/redis.conf

@@ -0,0 +1,2 @@
+bind 0.0.0.0
+dir /data