mirror of https://github.com/k3s-io/k3s
Merge pull request #22074 from a-robinson/images
Update the logging images to parse sub-second docker timestamps.pull/6/head
commit
29eb6020fb
|
@ -15,7 +15,7 @@
|
|||
.PHONY: build push
|
||||
|
||||
IMAGE = fluentd-elasticsearch
|
||||
TAG = 1.14
|
||||
TAG = 1.15
|
||||
|
||||
build:
|
||||
docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
.PHONY: kbuild kpush
|
||||
|
||||
TAG = 1.16
|
||||
TAG = 1.17
|
||||
|
||||
# Rules for building the test image for deployment to Dockerhub with user kubernetes.
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@ metadata:
|
|||
spec:
|
||||
containers:
|
||||
- name: fluentd-elasticsearch
|
||||
image: gcr.io/google_containers/fluentd-elasticsearch:1.14
|
||||
image: gcr.io/google_containers/fluentd-elasticsearch:1.15
|
||||
resources:
|
||||
limits:
|
||||
cpu: 100m
|
||||
|
|
|
@ -9,7 +9,7 @@ spec:
|
|||
dnsPolicy: Default
|
||||
containers:
|
||||
- name: fluentd-cloud-logging
|
||||
image: gcr.io/google_containers/fluentd-gcp:1.16
|
||||
image: gcr.io/google_containers/fluentd-gcp:1.17
|
||||
resources:
|
||||
limits:
|
||||
cpu: 100m
|
||||
|
|
|
@ -173,7 +173,7 @@ spec:
|
|||
dnsPolicy: Default
|
||||
containers:
|
||||
- name: fluentd-cloud-logging
|
||||
image: gcr.io/google_containers/fluentd-gcp:1.16
|
||||
image: gcr.io/google_containers/fluentd-gcp:1.17
|
||||
resources:
|
||||
limits:
|
||||
cpu: 100m
|
||||
|
|
Loading…
Reference in New Issue