diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml b/cluster/addons/fluentd-elasticsearch/fluentd-es-ds.yaml index 7daad4f2b3..2e02cbdb5e 100644 --- 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 index 771ac2f4cf..d819ded4f5 100644 --- 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 index 37e995d443..4afbf9d1dd 100644 --- 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 index ed4445f743..06fd7bc947 100644 --- 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 index f098d96012..249d5b14cc 100644 --- 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 index c3c301b87e..0e50714562 100755 --- 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 index 8351958e9e..d967d1f5df 100644 --- 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 index 3970e1771c..1481fd7303 100644 --- 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 index 145811e275..c3c9220609 100644 --- 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 index a9d789fc4c..d1816a4fe2 100644 --- 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 index 9bd39dad2a..65db2abaaf 100644 --- 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 index 05b5038fb2..b8c42e9ffd 100644 --- 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} \ No newline at end of file + --run-duration=${LOGS_GENERATOR_DURATION} diff --git a/test/images/logs-generator/Makefile b/test/images/logs-generator/Makefile index 289d89f238..4fc9603533 100644 --- 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 index 9130ce2ceb..8f89bb4a4b 100644 --- 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)]() \ No newline at end of file +[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/test/images/logs-generator/README.md?pixel)]()