Commit 08893075 authored by Alex Robinson's avatar Alex Robinson

Update the fluentd-gcp images to include their latest Dockerfile changes.

Their Dockerfiles were changed in #11768.
parent 08146691
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
.PHONY: kbuild kpush .PHONY: kbuild kpush
TAG = 1.8 TAG = 1.9
# Rules for building the test image for deployment to Dockerhub with user kubernetes. # Rules for building the test image for deployment to Dockerhub with user kubernetes.
......
...@@ -6,7 +6,7 @@ metadata: ...@@ -6,7 +6,7 @@ metadata:
spec: spec:
containers: containers:
- name: fluentd-cloud-logging - name: fluentd-cloud-logging
image: gcr.io/google_containers/fluentd-gcp:1.8 image: gcr.io/google_containers/fluentd-gcp:1.9
resources: resources:
limits: limits:
cpu: 100m cpu: 100m
......
.PHONY: build push .PHONY: build push
TAG = 1.2 TAG = 1.3
build: build:
docker build -t gcr.io/google_containers/fluentd-sidecar-gcp:$(TAG) . docker build -t gcr.io/google_containers/fluentd-sidecar-gcp:$(TAG) .
......
...@@ -9,7 +9,7 @@ This shouldn't be necessary if your container writes its logs to stdout or stder ...@@ -9,7 +9,7 @@ This shouldn't be necessary if your container writes its logs to stdout or stder
In order to make this work, you have to add a few things to your pod config: In order to make this work, you have to add a few things to your pod config:
1. A second container, using the `gcr.io/google_containers/fluentd-sidecar-gcp:1.2` image to send the logs to Google Cloud Logging. We recommend attaching resource constraints of `100m` CPU and `200Mi` memory to this container, as in the example. 1. A second container, using the `gcr.io/google_containers/fluentd-sidecar-gcp:1.3` image to send the logs to Google Cloud Logging. We recommend attaching resource constraints of `100m` CPU and `200Mi` memory to this container, as in the example.
2. A volume for the two containers to share. The emptyDir volume type is a good choice for this because we only want the volume to exist for the lifetime of the pod. 2. A volume for the two containers to share. The emptyDir volume type is a good choice for this because we only want the volume to exist for the lifetime of the pod.
3. Mount paths for the volume in each container. In your primary container, this should be the path that the applications log files are written to. In the secondary container, this can be just about anything, so we put it under /mnt/log to keep it out of the way of the rest of the filesystem. 3. Mount paths for the volume in each container. In your primary container, this should be the path that the applications log files are written to. In the secondary container, this can be just about anything, so we put it under /mnt/log to keep it out of the way of the rest of the filesystem.
4. The `FILES_TO_COLLECT` environment variable in the sidecar container, telling it which files to collect logs from. These paths should always be in the mounted volume. 4. The `FILES_TO_COLLECT` environment variable in the sidecar container, telling it which files to collect logs from. These paths should always be in the mounted volume.
......
...@@ -13,7 +13,7 @@ spec: ...@@ -13,7 +13,7 @@ spec:
- name: log-storage - name: log-storage
mountPath: /var/log mountPath: /var/log
- name: sidecar-log-collector - name: sidecar-log-collector
image: gcr.io/google_containers/fluentd-sidecar-gcp:1.2 image: gcr.io/google_containers/fluentd-sidecar-gcp:1.3
resources: resources:
limits: limits:
cpu: 100m cpu: 100m
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment