Pull cluster addon images from gcr.io

pull/6/head
Jeff Lowdermilk 2015-03-26 17:30:34 -07:00
parent 367284b63b
commit 2b71857816
7 changed files with 11 additions and 11 deletions

View File

@ -12,7 +12,7 @@ desiredState:
id: monitoring-heapster
containers:
- name: heapster
image: kubernetes/heapster:v0.9
image: gcr.io/google-containers/heapster:v0.9
env:
- name: "INFLUXDB_HOST"
value: "monitoring-influxdb"

View File

@ -15,14 +15,14 @@ desiredState:
id: monitoring-influx-grafana
containers:
- name: influxdb
image: kubernetes/heapster_influxdb:v0.3
image: gcr.io/google-containers/heapster_influxdb:v0.3
ports:
- containerPort: 8083
hostPort: 8083
- containerPort: 8086
hostPort: 8086
- name: grafana
image: kubernetes/heapster_grafana:v0.5
image: gcr.io/google-containers/heapster_grafana:v0.5
env:
- name: "HTTP_USER"
value: "admin"

View File

@ -16,7 +16,7 @@ spec:
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: kubernetes/heapster:v0.9
- image: gcr.io/google-containers/heapster:v0.9
name: heapster
env:
- name: "INFLUXDB_HOST"

View File

@ -16,7 +16,7 @@ spec:
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: kubernetes/heapster_influxdb:v0.3
- image: gcr.io/google-containers/heapster_influxdb:v0.3
name: influxdb
ports:
- containerPort: 8083
@ -24,7 +24,7 @@ spec:
- containerPort: 8086
hostPort: 8086
- name: grafana
image: kubernetes/heapster_grafana:v0.5
image: gcr.io/google-containers/heapster_grafana:v0.5
ports:
- containerPort: 80
env:

View File

@ -29,13 +29,13 @@ desiredState:
"-advertise-client-urls=http://127.0.0.1:4001",
]
- name: kube2sky
image: kubernetes/kube2sky:1.1
image: gcr.io/google-containers/kube2sky:1.1
command: [
# entrypoint = "/kube2sky",
"-domain={{ pillar['dns_domain'] }}",
]
- name: skydns
image: kubernetes/skydns:2015-03-11-001
image: gcr.io/google-containers/skydns:2015-03-11-001
command: [
# entrypoint = "/skydns",
"-machines=http://localhost:4001",

View File

@ -12,7 +12,7 @@ desiredState:
id: es-log-ingestion
containers:
- name: elasticsearch-logging
image: kubernetes/elasticsearch:1.0
image: gcr.io/google-containers/elasticsearch:1.0
ports:
- name: es-port
containerPort: 9200

View File

@ -12,7 +12,7 @@ desiredState:
id: kibana-viewer
containers:
- name: kibana-logging
image: kubernetes/kibana:1.1
image: gcr.io/google-containers/kibana:1.1
ports:
- name: kibana-port
containerPort: 80
@ -21,4 +21,4 @@ desiredState:
kubernetes.io/cluster-service: "true"
labels:
name: kibana-logging
kubernetes.io/cluster-service: "true"
kubernetes.io/cluster-service: "true"