mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Rename logging image to use google_containers
This commit is contained in:
parent
08af9dbe24
commit
73a9ab2928
@ -12,7 +12,7 @@ desiredState:
|
|||||||
id: es-log-ingestion
|
id: es-log-ingestion
|
||||||
containers:
|
containers:
|
||||||
- name: elasticsearch-logging
|
- name: elasticsearch-logging
|
||||||
image: gcr.io/google-containers/elasticsearch:1.0
|
image: gcr.io/google_containers/elasticsearch:1.0
|
||||||
ports:
|
ports:
|
||||||
- name: es-port
|
- name: es-port
|
||||||
containerPort: 9200
|
containerPort: 9200
|
||||||
|
@ -4,7 +4,7 @@ IMAGE = fluentd-elasticsearch
|
|||||||
TAG = 1.3
|
TAG = 1.3
|
||||||
|
|
||||||
build:
|
build:
|
||||||
docker build -t gcr.io/google-containers/$(IMAGE):$(TAG) .
|
docker build -t gcr.io/google_containers/$(IMAGE):$(TAG) .
|
||||||
|
|
||||||
push:
|
push:
|
||||||
gcloud preview docker push gcr.io/google-containers/$(IMAGE):$(TAG)
|
gcloud preview docker push gcr.io/google_containers/$(IMAGE):$(TAG)
|
||||||
|
@ -12,7 +12,7 @@ desiredState:
|
|||||||
id: kibana-viewer
|
id: kibana-viewer
|
||||||
containers:
|
containers:
|
||||||
- name: kibana-logging
|
- name: kibana-logging
|
||||||
image: gcr.io/google-containers/kibana:1.1
|
image: gcr.io/google_containers/kibana:1.1
|
||||||
ports:
|
ports:
|
||||||
- name: kibana-port
|
- name: kibana-port
|
||||||
containerPort: 80
|
containerPort: 80
|
||||||
|
@ -2,7 +2,7 @@ version: v1beta2
|
|||||||
id: fluentd-to-elasticsearch
|
id: fluentd-to-elasticsearch
|
||||||
containers:
|
containers:
|
||||||
- name: fluentd-es
|
- name: fluentd-es
|
||||||
image: gcr.io/google-containers/fluentd-elasticsearch:1.3
|
image: gcr.io/google_containers/fluentd-elasticsearch:1.3
|
||||||
env:
|
env:
|
||||||
- name: FLUENTD_ARGS
|
- name: FLUENTD_ARGS
|
||||||
value: -qq
|
value: -qq
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
version: v1beta2
|
version: v1beta2
|
||||||
id: fluentd-to-gcp
|
id: fluentd-to-gcp
|
||||||
containers:
|
containers:
|
||||||
- name: fluentd-gcp-container
|
- name: fluentd-gcp
|
||||||
image: gcr.io/google-containers/fluentd-gcp:1.2
|
image: gcr.io/google_containers/fluentd-gcp:1.2
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: containers
|
- name: containers
|
||||||
mountPath: /var/lib/docker/containers
|
mountPath: /var/lib/docker/containers
|
||||||
|
@ -9,8 +9,8 @@
|
|||||||
TAG = 1.2
|
TAG = 1.2
|
||||||
|
|
||||||
build:
|
build:
|
||||||
docker build -t gcr.io/google-containers/fluentd-gcp:$(TAG) .
|
docker build -t gcr.io/google_containers/fluentd-gcp:$(TAG) .
|
||||||
|
|
||||||
push:
|
push:
|
||||||
gcloud preview docker push gcr.io/google-containers/fluentd-gcp:$(TAG)
|
gcloud preview docker push gcr.io/google_containers/fluentd-gcp:$(TAG)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user