From ec5cc596962dcd773c60391c4e4adb715c12dfc1 Mon Sep 17 00:00:00 2001 From: Manuel de Brito Fontes Date: Wed, 15 Jun 2016 16:02:35 -0400 Subject: [PATCH] Remove duplicated nginx image. Use nginx-slim --- cluster/images/nginx/Dockerfile | 20 ------------- cluster/images/nginx/Makefile | 28 ------------------- cluster/images/nginx/README.md | 10 ------- cluster/images/nginx/backports.list | 1 - .../e2e-image-puller.manifest | 2 +- test/e2e/generated_clientset.go | 2 +- test/e2e/kubectl.go | 2 +- test/e2e/petset.go | 2 +- test/e2e/pods.go | 8 +++--- .../kubectl/pod-with-readiness-probe.yaml | 2 +- test/e2e_node/container_list.go | 2 +- 11 files changed, 10 insertions(+), 69 deletions(-) delete mode 100644 cluster/images/nginx/Dockerfile delete mode 100644 cluster/images/nginx/Makefile delete mode 100644 cluster/images/nginx/README.md delete mode 100644 cluster/images/nginx/backports.list diff --git a/cluster/images/nginx/Dockerfile b/cluster/images/nginx/Dockerfile deleted file mode 100644 index 145c7c1c7ae..00000000000 --- a/cluster/images/nginx/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2016 The Kubernetes Authors All rights reserved. -# -# 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 google/debian:wheezy - -COPY backports.list /etc/apt/sources.list.d/backports.list - -RUN apt-get update -RUN apt-get -t wheezy-backports -yy -q install nginx diff --git a/cluster/images/nginx/Makefile b/cluster/images/nginx/Makefile deleted file mode 100644 index f49694695d3..00000000000 --- a/cluster/images/nginx/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2016 The Kubernetes Authors All rights reserved. -# -# 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. - -### Nginx image -# This image is used to run nginx on the master. - -# Current 'live' version is v1 -# Please make sure that you update this comment if you build/push new -# versions. -VERSION=v2 - -all: - docker build -t gcr.io/google_containers/nginx:${VERSION} . - gcloud docker push gcr.io/google_containers/nginx:${VERSION} - -.PHONY: all - diff --git a/cluster/images/nginx/README.md b/cluster/images/nginx/README.md deleted file mode 100644 index e001d13ce8a..00000000000 --- a/cluster/images/nginx/README.md +++ /dev/null @@ -1,10 +0,0 @@ -### Nginx image -This image is used to run nginx on the master. - -#### Instructions -make - - - - -[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/images/nginx/README.md?pixel)]() diff --git a/cluster/images/nginx/backports.list b/cluster/images/nginx/backports.list deleted file mode 100644 index 8174be2c91f..00000000000 --- a/cluster/images/nginx/backports.list +++ /dev/null @@ -1 +0,0 @@ -deb http://gce_debian_mirror.storage.googleapis.com wheezy-backports main non-free diff --git a/cluster/saltbase/salt/e2e-image-puller/e2e-image-puller.manifest b/cluster/saltbase/salt/e2e-image-puller/e2e-image-puller.manifest index e17aefdd49b..e1a76d04a57 100644 --- a/cluster/saltbase/salt/e2e-image-puller/e2e-image-puller.manifest +++ b/cluster/saltbase/salt/e2e-image-puller/e2e-image-puller.manifest @@ -27,7 +27,7 @@ spec: command: - /bin/sh - -c - - "for i in gcr.io/google_containers/busybox gcr.io/google_containers/busybox:1.24 gcr.io/google_containers/dnsutils:e2e gcr.io/google_containers/eptest:0.1 gcr.io/google_containers/fakegitserver:0.1 gcr.io/google_containers/hostexec:1.2 gcr.io/google_containers/iperf:e2e gcr.io/google_containers/jessie-dnsutils:e2e gcr.io/google_containers/liveness:e2e gcr.io/google_containers/mounttest:0.2 gcr.io/google_containers/mounttest:0.5 gcr.io/google_containers/mounttest:0.6 gcr.io/google_containers/mounttest-user:0.3 gcr.io/google_containers/netexec:1.4 gcr.io/google_containers/netexec:1.5 gcr.io/google_containers/nettest:1.7 gcr.io/google_containers/nettest:1.8 gcr.io/google_containers/nginx:1.7.9 gcr.io/google_containers/nginx-slim:0.5 gcr.io/google_containers/n-way-http:1.0 gcr.io/google_containers/pause:2.0 gcr.io/google_containers/pause-amd64:3.0 gcr.io/google_containers/porter:cd5cb5791ebaa8641955f0e8c2a9bed669b1eaab gcr.io/google_containers/portforwardtester:1.0 gcr.io/google_containers/redis:e2e gcr.io/google_containers/resource_consumer:beta4 gcr.io/google_containers/resource_consumer/controller:beta4 gcr.io/google_containers/serve_hostname:v1.4 gcr.io/google_containers/servicelb:0.1 gcr.io/google_containers/test-webserver:e2e gcr.io/google_containers/ubuntu:14.04 gcr.io/google_containers/update-demo:kitten gcr.io/google_containers/update-demo:nautilus gcr.io/google_containers/volume-ceph:0.1 gcr.io/google_containers/volume-gluster:0.2 gcr.io/google_containers/volume-iscsi:0.1 gcr.io/google_containers/volume-nfs:0.6 gcr.io/google_containers/volume-rbd:0.1 gcr.io/google_samples/gb-redisslave:v1; do echo $(date '+%X') pulling $i; docker pull $i 1>/dev/null; done; exit 0;" + - "for i in gcr.io/google_containers/busybox gcr.io/google_containers/busybox:1.24 gcr.io/google_containers/dnsutils:e2e gcr.io/google_containers/eptest:0.1 gcr.io/google_containers/fakegitserver:0.1 gcr.io/google_containers/hostexec:1.2 gcr.io/google_containers/iperf:e2e gcr.io/google_containers/jessie-dnsutils:e2e gcr.io/google_containers/liveness:e2e gcr.io/google_containers/mounttest:0.2 gcr.io/google_containers/mounttest:0.5 gcr.io/google_containers/mounttest:0.6 gcr.io/google_containers/mounttest-user:0.3 gcr.io/google_containers/netexec:1.4 gcr.io/google_containers/netexec:1.5 gcr.io/google_containers/nettest:1.7 gcr.io/google_containers/nettest:1.8 gcr.io/google_containers/nginx-slim:0.7 gcr.io/google_containers/n-way-http:1.0 gcr.io/google_containers/pause:2.0 gcr.io/google_containers/pause-amd64:3.0 gcr.io/google_containers/porter:cd5cb5791ebaa8641955f0e8c2a9bed669b1eaab gcr.io/google_containers/portforwardtester:1.0 gcr.io/google_containers/redis:e2e gcr.io/google_containers/resource_consumer:beta4 gcr.io/google_containers/resource_consumer/controller:beta4 gcr.io/google_containers/serve_hostname:v1.4 gcr.io/google_containers/test-webserver:e2e gcr.io/google_containers/ubuntu:14.04 gcr.io/google_containers/update-demo:kitten gcr.io/google_containers/update-demo:nautilus gcr.io/google_containers/volume-ceph:0.1 gcr.io/google_containers/volume-gluster:0.2 gcr.io/google_containers/volume-iscsi:0.1 gcr.io/google_containers/volume-nfs:0.6 gcr.io/google_containers/volume-rbd:0.1 gcr.io/google_samples/gb-redisslave:v1; do echo $(date '+%X') pulling $i; docker pull $i 1>/dev/null; done; exit 0;" securityContext: privileged: true volumeMounts: diff --git a/test/e2e/generated_clientset.go b/test/e2e/generated_clientset.go index 1432144dace..78fd4b91629 100644 --- a/test/e2e/generated_clientset.go +++ b/test/e2e/generated_clientset.go @@ -47,7 +47,7 @@ func testingPod(name, value string) v1.Pod { Containers: []v1.Container{ { Name: "nginx", - Image: "gcr.io/google_containers/nginx:1.7.9", + Image: "gcr.io/google_containers/nginx-slim:0.7", Ports: []v1.ContainerPort{{ContainerPort: 80}}, LivenessProbe: &v1.Probe{ Handler: v1.Handler{ diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go index e147cbd512d..111b71d53e1 100644 --- a/test/e2e/kubectl.go +++ b/test/e2e/kubectl.go @@ -83,7 +83,7 @@ const ( pausePodName = "pause" runJobTimeout = 5 * time.Minute busyboxImage = "gcr.io/google_containers/busybox:1.24" - nginxImage = "gcr.io/google_containers/nginx:1.7.9" + nginxImage = "gcr.io/google_containers/nginx-slim:0.7" kubeCtlManifestPath = "test/e2e/testing-manifests/kubectl" redisControllerFilename = "redis-master-controller.json" redisServiceFilename = "redis-master-service.json" diff --git a/test/e2e/petset.go b/test/e2e/petset.go index d50d10b30ba..db177e4653f 100644 --- a/test/e2e/petset.go +++ b/test/e2e/petset.go @@ -737,7 +737,7 @@ func newPetSet(name, ns, governingSvcName string, replicas int, petMounts []api. Containers: []api.Container{ { Name: "nginx", - Image: "gcr.io/google_containers/nginx-slim:0.5", + Image: "gcr.io/google_containers/nginx-slim:0.7", VolumeMounts: mounts, }, }, diff --git a/test/e2e/pods.go b/test/e2e/pods.go index a7d96dc33f6..8af49303b71 100644 --- a/test/e2e/pods.go +++ b/test/e2e/pods.go @@ -281,7 +281,7 @@ var _ = framework.KubeDescribe("Pods", func() { Containers: []api.Container{ { Name: "nginx", - Image: "gcr.io/google_containers/nginx:1.7.9", + Image: "gcr.io/google_containers/nginx-slim:0.7", Ports: []api.ContainerPort{{ContainerPort: 80}}, LivenessProbe: &api.Probe{ Handler: api.Handler{ @@ -428,7 +428,7 @@ var _ = framework.KubeDescribe("Pods", func() { Containers: []api.Container{ { Name: "nginx", - Image: "gcr.io/google_containers/nginx:1.7.9", + Image: "gcr.io/google_containers/nginx-slim:0.7", Ports: []api.ContainerPort{{ContainerPort: 80}}, LivenessProbe: &api.Probe{ Handler: api.Handler{ @@ -514,7 +514,7 @@ var _ = framework.KubeDescribe("Pods", func() { Containers: []api.Container{ { Name: "nginx", - Image: "gcr.io/google_containers/nginx:1.7.9", + Image: "gcr.io/google_containers/nginx-slim:0.7", Ports: []api.ContainerPort{{ContainerPort: 80}}, LivenessProbe: &api.Probe{ Handler: api.Handler{ @@ -1351,7 +1351,7 @@ var _ = framework.KubeDescribe("Pods", func() { if err != nil { framework.Failf("failed to get pod: %v", err) } - pod.Spec.Containers[0].Image = "gcr.io/google_containers/nginx:1.7.9" + pod.Spec.Containers[0].Image = "gcr.io/google_containers/nginx-slim:0.7" pod, err = podClient.Update(pod) if err != nil { framework.Failf("error updating pod=%s/%s %v", podName, containerName, err) diff --git a/test/e2e/testing-manifests/kubectl/pod-with-readiness-probe.yaml b/test/e2e/testing-manifests/kubectl/pod-with-readiness-probe.yaml index 187a90f8036..e4a595d14a1 100644 --- a/test/e2e/testing-manifests/kubectl/pod-with-readiness-probe.yaml +++ b/test/e2e/testing-manifests/kubectl/pod-with-readiness-probe.yaml @@ -7,7 +7,7 @@ metadata: spec: containers: - name: nginx - image: gcr.io/google_containers/nginx:1.7.9 + image: gcr.io/google_containers/nginx-slim:0.7 ports: - containerPort: 80 readinessProbe: diff --git a/test/e2e_node/container_list.go b/test/e2e_node/container_list.go index 0eddc28e76f..0a75e6f265c 100644 --- a/test/e2e_node/container_list.go +++ b/test/e2e_node/container_list.go @@ -48,7 +48,7 @@ var ImageRegistry = map[int]string{ busyBoxImage: "gcr.io/google_containers/busybox:1.24", hostExecImage: "gcr.io/google_containers/hostexec:1.2", netExecImage: "gcr.io/google_containers/netexec:1.4", - nginxImage: "gcr.io/google_containers/nginx:1.7.9", + nginxImage: "gcr.io/google_containers/nginx-slim:0.7", pauseImage: framework.GetPauseImageNameForHostArch(), }