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

pull/6/head
Jeff Grafton 2017-01-11 15:07:04 -08:00
parent 330c922706
commit 1c2ea28080
14 changed files with 21 additions and 21 deletions

View File

@ -1,23 +1,23 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: DaemonSet kind: DaemonSet
metadata: metadata:
name: fluentd-es-v1.20 name: fluentd-es-v1.22
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: fluentd-es k8s-app: fluentd-es
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
version: v1.20 version: v1.22
spec: spec:
template: template:
metadata: metadata:
labels: labels:
k8s-app: fluentd-es k8s-app: fluentd-es
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
version: v1.20 version: v1.22
spec: spec:
containers: containers:
- name: fluentd-es - name: fluentd-es
image: gcr.io/google_containers/fluentd-elasticsearch:1.20 image: gcr.io/google_containers/fluentd-elasticsearch:1.22
command: command:
- '/bin/sh' - '/bin/sh'
- '-c' - '-c'

View File

@ -22,7 +22,7 @@
# Please see http://docs.fluentd.org/articles/install-by-deb for more # Please see http://docs.fluentd.org/articles/install-by-deb for more
# information about installing fluentd using deb package. # 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. # Ensure there are enough file descriptors for running Fluentd.
RUN ulimit -n 65536 RUN ulimit -n 65536

View File

@ -16,7 +16,7 @@
PREFIX = gcr.io/google_containers PREFIX = gcr.io/google_containers
IMAGE = fluentd-elasticsearch IMAGE = fluentd-elasticsearch
TAG = 1.21 TAG = 1.22
build: build:
docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) . docker build --pull -t $(PREFIX)/$(IMAGE):$(TAG) .

View File

@ -18,7 +18,7 @@ spec:
spec: spec:
containers: containers:
- name: kibana-logging - name: kibana-logging
image: gcr.io/google_containers/kibana:v4.6.1 image: gcr.io/google_containers/kibana:v4.6.1-1
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
limits: limits:

View File

@ -15,7 +15,7 @@
# A Dockerfile for creating a Kibana container that is designed # A Dockerfile for creating a Kibana container that is designed
# to work with Kubernetes logging. # 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 ENV DEBIAN_FRONTEND noninteractive

View File

@ -14,7 +14,7 @@
.PHONY: build push .PHONY: build push
TAG = v4.6.1 TAG = v4.6.1-1
PREFIX = gcr.io/google_containers PREFIX = gcr.io/google_containers
build: build:

View File

@ -18,7 +18,7 @@ spec:
spec: spec:
containers: containers:
- name: fluentd-gcp - 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: # 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 => # 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. # tries to send this message to the server => fails to send a chunk and so on.

View File

@ -20,7 +20,7 @@
# scope and that the Logging API has been enabled for the project # scope and that the Logging API has been enabled for the project
# in the Google Developer Console. # 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 # Disable prompts from apt

View File

@ -26,7 +26,7 @@
.PHONY: build push .PHONY: build push
PREFIX=gcr.io/google_containers PREFIX=gcr.io/google_containers
TAG = 1.31 TAG = 1.32
build: build:
docker build --pull -t $(PREFIX)/fluentd-gcp:$(TAG) . docker build --pull -t $(PREFIX)/fluentd-gcp:$(TAG) .

View File

@ -10,7 +10,7 @@ spec:
dnsPolicy: Default dnsPolicy: Default
containers: containers:
- name: fluentd-cloud-logging - 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: # 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 => # 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. # tries to send this message to the server => fails to send a chunk and so on.

View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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 \ RUN apt-get update && apt-get install -y --no-install-recommends iperf bash \
&& apt-get clean -y \ && apt-get clean -y \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \

View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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 / COPY logs-generator /

View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
TAG = v0.1.0 TAG = v0.1.1
PREFIX = gcr.io/google_containers PREFIX = gcr.io/google_containers
all: build all: build

View File

@ -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 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 ## Examples
@ -42,13 +42,13 @@ gcr.io/google_containers/logs-generator:v0.1.0
docker run -i \ docker run -i \
-e "LOGS_GENERATOR_LINES_TOTAL=10" \ -e "LOGS_GENERATOR_LINES_TOTAL=10" \
-e "LOGS_GENERATOR_DURATION=1s" \ -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 \ kubectl run logs-generator \
--generator=run-pod/v1 \ --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 \ --restart=Never \
--env "LOGS_GENERATOR_LINES_TOTAL=1000" \ --env "LOGS_GENERATOR_LINES_TOTAL=1000" \
--env "LOGS_GENERATOR_DURATION=1m" --env "LOGS_GENERATOR_DURATION=1m"