github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename google-containers to google_containers in image names

pull/6/head
Jeff Lowdermilk 2015-03-31 13:39:45 -07:00
parent fb1a8219d4
commit 506887515d
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/cluster-monitoring/heapster-controller.yaml
View File

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

4
cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
View File

@ -15,14 +15,14 @@ desiredState:
id: monitoring-influx-grafana
containers:
- name: influxdb
image: gcr.io/google-containers/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: gcr.io/google-containers/heapster_grafana:v0.5
image: gcr.io/google_containers/heapster_grafana:v0.5
env:
- name: "HTTP_USER"
value: "admin"

2
cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml
View File

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

4
cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml
View File

@ -16,7 +16,7 @@ spec:
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google-containers/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: gcr.io/google-containers/heapster_grafana:v0.5
image: gcr.io/google_containers/heapster_grafana:v0.5
ports:
- containerPort: 80
env:

4
cluster/addons/dns/kube2sky/Makefile
View File

@ -4,10 +4,10 @@ kube2sky: kube2sky.go
CGO_ENABLED=0 go build -a -installsuffix cgo --ldflags '-w' ./kube2sky.go
container: kube2sky
sudo docker build -t kubernetes/kube2sky .
sudo docker build -t gcr.io/google_containers/kube2sky .
push:
sudo docker push kubernetes/kube2sky
gcloud preview docker push gcr.io/google_containers/kube2sky
clean:
rm -f kube2sky

4
cluster/addons/dns/skydns-rc.yaml.in
View File

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

4
cluster/addons/dns/skydns/Makefile
View File

@ -4,10 +4,10 @@ skydns:
CGO_ENABLED=0 go build -a -installsuffix cgo --ldflags '-w' github.com/skynetservices/skydns
container: skydns
sudo docker build -t kubernetes/skydns .
sudo docker build -t gcr.io/google_containers/skydns .
push:
sudo docker push kubernetes/skydns
sudo gcloud preview docker push gcr.io/google_containers/skydns
clean:
rm -f skydns

8
cluster/addons/fluentd-elasticsearch/kibana-image/Makefile
View File

@ -2,8 +2,8 @@
TAG = 1.1
build:
docker build -t kubernetes/kibana:$(TAG) .
build:
docker build -t gcr.io/google_containers/kibana:$(TAG) .
push:
docker push kubernetes/kibana:$(TAG)
push:
gcloud preview docker push gcr.io/google_containers/kibana:$(TAG)

4
contrib/logging/fluentd-gcp-image/Makefile
View File

@ -8,9 +8,9 @@
TAG = 1.2
build:
build:
docker build -t gcr.io/google_containers/fluentd-gcp:$(TAG) .
push:
push:
gcloud preview docker push gcr.io/google_containers/fluentd-gcp:$(TAG)