Pull cluster addon images from gcr.io

This commit is contained in:
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 id: monitoring-heapster
containers: containers:
- name: heapster - name: heapster
image: kubernetes/heapster:v0.9 image: gcr.io/google-containers/heapster:v0.9
env: env:
- name: "INFLUXDB_HOST" - name: "INFLUXDB_HOST"
value: "monitoring-influxdb" value: "monitoring-influxdb"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -12,7 +12,7 @@ desiredState:
id: kibana-viewer id: kibana-viewer
containers: containers:
- name: kibana-logging - name: kibana-logging
image: kubernetes/kibana:1.1 image: gcr.io/google-containers/kibana:1.1
ports: ports:
- name: kibana-port - name: kibana-port
containerPort: 80 containerPort: 80