Update images that use ubuntu-slim base image to :0.6

kubernetes · Jan 11, 2017 · 1c2ea28 · 1c2ea28
1 parent 330c922
commit 1c2ea28
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 21 deletions.
diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml
@@ -1,23 +1,23 @@
 apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
-  name: fluentd-es-v1.20
+  name: fluentd-es-v1.22
   namespace: kube-system
   labels:
     k8s-app: fluentd-es
     kubernetes.io/cluster-service: "true"
-    version: v1.20
+    version: v1.22
 spec:
   template:
     metadata:
       labels:
         k8s-app: fluentd-es
         kubernetes.io/cluster-service: "true"
-        version: v1.20
+        version: v1.22
     spec:
       containers:
       - name: fluentd-es
-        image: gcr.io/google_containers/fluentd-elasticsearch:1.20
+        image: gcr.io/google_containers/fluentd-elasticsearch:1.22
         command:
           - '/bin/sh'
           - '-c'

diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
@@ -22,7 +22,7 @@
 # Please see http://docs.fluentd.org/articles/install-by-deb for more
 # information about installing fluentd using deb package.
 
-FROM gcr.io/google_containers/ubuntu-slim:0.4
+FROM gcr.io/google_containers/ubuntu-slim:0.6
 
 # Ensure there are enough file descriptors for running Fluentd.
 RUN ulimit -n 65536

diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Makefile
@@ -16,7 +16,7 @@
 
 PREFIX = gcr.io/google_containers
 IMAGE = fluentd-elasticsearch
-TAG = 1.21
+TAG = 1.22
 
 build:
 	docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .

diff --git a/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml b/cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: kibana-logging
-        image: gcr.io/google_containers/kibana:v4.6.1
+        image: gcr.io/google_containers/kibana:v4.6.1-1
         resources:
           # keep request = limit to keep this container in guaranteed class
           limits:

diff --git a/cluster/addons/fluentd-elasticsearch/kibana-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/kibana-image/Dockerfile
@@ -15,7 +15,7 @@
 # A Dockerfile for creating a Kibana container that is designed
 # to work with Kubernetes logging.
 
-FROM gcr.io/google_containers/ubuntu-slim:0.4
+FROM gcr.io/google_containers/ubuntu-slim:0.6
 
 
 ENV DEBIAN_FRONTEND noninteractive

diff --git a/cluster/addons/fluentd-elasticsearch/kibana-image/Makefile b/cluster/addons/fluentd-elasticsearch/kibana-image/Makefile
@@ -14,7 +14,7 @@
 
 .PHONY:	build push
 
-TAG = v4.6.1
+TAG = v4.6.1-1
 PREFIX = gcr.io/google_containers
 
 build:

diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: fluentd-gcp
-        image: gcr.io/google_containers/fluentd-gcp:1.31
+        image: gcr.io/google_containers/fluentd-gcp:1.32
         # If fluentd consumes its own logs, the following situation may happen:
         # fluentd fails to send a chunk to the server => writes it to the log =>
         # tries to send this message to the server => fails to send a chunk and so on.

diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile
@@ -20,7 +20,7 @@
 # scope and that the Logging API has been enabled for the project
 # in the Google Developer Console.
 
-FROM gcr.io/google_containers/ubuntu-slim:0.4
+FROM gcr.io/google_containers/ubuntu-slim:0.6
 
 
 # Disable prompts from apt

diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Makefile
@@ -26,7 +26,7 @@
 .PHONY:	build push
 
 PREFIX=gcr.io/google_containers
-TAG = 1.31
+TAG = 1.32
 
 build:
 	docker build --pull -t $(PREFIX)/fluentd-gcp:$(TAG) .

diff --git a/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml b/cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml
@@ -10,7 +10,7 @@ spec:
   dnsPolicy: Default
   containers:
   - name: fluentd-cloud-logging
-    image: gcr.io/google_containers/fluentd-gcp:1.31
+    image: gcr.io/google_containers/fluentd-gcp:1.32
     # If fluentd consumes its own logs, the following situation may happen:
     # fluentd fails to send a chunk to the server => writes it to the log =>
     # tries to send this message to the server => fails to send a chunk and so on.

diff --git a/test/images/iperf/Dockerfile b/test/images/iperf/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/google_containers/ubuntu-slim:0.2
+FROM gcr.io/google_containers/ubuntu-slim:0.6
 RUN apt-get update && apt-get install -y --no-install-recommends iperf bash \
   && apt-get clean -y \
   && rm -rf /var/lib/apt/lists/* \

diff --git a/test/images/logs-generator/Dockerfile b/test/images/logs-generator/Dockerfile
@@ -12,11 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM gcr.io/google_containers/ubuntu-slim:0.4
+FROM gcr.io/google_containers/ubuntu-slim:0.6
 
 
 COPY logs-generator /
 
 CMD /logs-generator --logtostderr \
   --log-lines-total=${LOGS_GENERATOR_LINES_TOTAL} \
-  --run-duration=${LOGS_GENERATOR_DURATION}
+  --run-duration=${LOGS_GENERATOR_DURATION}
diff --git a/test/images/logs-generator/Makefile b/test/images/logs-generator/Makefile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-TAG = v0.1.0
+TAG = v0.1.1
 PREFIX = gcr.io/google_containers
 
 all: build

diff --git a/test/images/logs-generator/README.md b/test/images/logs-generator/README.md
@@ -33,7 +33,7 @@ line in a given run of the container.
 Image is located in the public repository of Google Container Registry under the name
 
 ```
-gcr.io/google_containers/logs-generator:v0.1.0
+gcr.io/google_containers/logs-generator:v0.1.1
 ```
 
 ## Examples
@@ -42,16 +42,16 @@ gcr.io/google_containers/logs-generator:v0.1.0
 docker run -i \
   -e "LOGS_GENERATOR_LINES_TOTAL=10" \
   -e "LOGS_GENERATOR_DURATION=1s" \
-  gcr.io/google_containers/logs-generator:v0.1.0
+  gcr.io/google_containers/logs-generator:v0.1.1
 ```
 
 ```
 kubectl run logs-generator \
   --generator=run-pod/v1 \
-  --image=gcr.io/google_containers/logs-generator:v0.1.0 \
+  --image=gcr.io/google_containers/logs-generator:v0.1.1 \
   --restart=Never \
   --env "LOGS_GENERATOR_LINES_TOTAL=1000" \
   --env "LOGS_GENERATOR_DURATION=1m"
 ```
 
-[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/test/images/logs-generator/README.md?pixel)]()
+[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/test/images/logs-generator/README.md?pixel)]()