Skip to content

Commit 4501c35

Browse files
Matthew Fishercarmstrong
authored andcommitted
chore(contrib): bump coreos to v343.0.0
``` core@deis-1 ~ $ docker version Client version: 1.0.0 Client API version: 1.12 Go version (client): go1.2 Git commit (client): 63fe64c Server version: 1.0.0 Server API version: 1.12 Go version (server): go1.2 Git commit (server): 63fe64c core@deis-1 ~ $ fleetctl --version fleetctl version 0.4.0 core@deis-1 ~ $ etcdctl --version etcdctl version 0.4.3 ```
1 parent 54266b4 commit 4501c35

4 files changed

Lines changed: 13 additions & 13 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ define deis_units
1919
sed -n 's/\(deis-.*\.service\).*/\1/p' | tr '\n' ' ')
2020
endef
2121

22-
# TODO: re-evaluate the fragile start order now that we're on fleet 0.3.2.
22+
# TODO: re-evaluate the fragile start order
2323
COMPONENTS=builder cache controller database logger registry
2424
ALL_COMPONENTS=$(COMPONENTS) router
2525
START_COMPONENTS=registry logger cache database

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Upgrading from a previous Deis release? See [Upgrading Deis](http://docs.deis.io
2020
## Install prerequisites
2121
On your workstation:
2222
* Install [Vagrant](http://www.vagrantup.com/downloads.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads)
23-
* Install the fleetctl client: Install v0.3.2 from the [fleet GitHub page](https://github.com/coreos/fleet/releases).
23+
* Install the fleetctl client: Install v0.4.0 from the [fleet GitHub page](https://github.com/coreos/fleet/releases).
2424
* Install the Docker client if you want to run Docker commands locally (optional)
2525

2626
## Additional setup for a multi-node cluster

Vagrantfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ else
1212
end
1313

1414
Vagrant.configure("2") do |config|
15-
config.vm.box = "coreos-324.2.0"
16-
config.vm.box_url = "http://storage.core-os.net/coreos/amd64-usr/324.2.0/coreos_production_vagrant.box"
15+
config.vm.box = "coreos-343.0.0"
16+
config.vm.box_url = "http://storage.core-os.net/coreos/amd64-usr/343.0.0/coreos_production_vagrant.box"
1717

1818
config.vm.provider :vmware_fusion do |vb, override|
19-
override.vm.box_url = "http://storage.core-os.net/coreos/amd64-usr/324.2.0/coreos_production_vagrant_vmware_fusion.box"
19+
override.vm.box_url = "http://storage.core-os.net/coreos/amd64-usr/343.0.0/coreos_production_vagrant_vmware_fusion.box"
2020
end
2121

2222
config.vm.provider :virtualbox do |vb, override|

contrib/ec2/deis.template

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,28 @@
44
"Mappings" : {
55
"RegionMap" : {
66
"ap-northeast-1" : {
7-
"AMI" : "ami-25175a24"
7+
"AMI" : "ami-03c08f02"
88
},
99
"sa-east-1" : {
10-
"AMI" : "ami-b96fc3a4"
10+
"AMI" : "ami-fb08a4e6"
1111
},
1212
"ap-southeast-2" : {
13-
"AMI" : "ami-792ab043"
13+
"AMI" : "ami-07b9dc3d"
1414
},
1515
"ap-southeast-1" : {
16-
"AMI" : "ami-58c9940a"
16+
"AMI" : "ami-0a732f58"
1717
},
1818
"us-east-1" : {
19-
"AMI" : "ami-8a53a6e2"
19+
"AMI" : "ami-908172f8"
2020
},
2121
"us-west-2" : {
22-
"AMI" : "ami-a7d1a197"
22+
"AMI" : "ami-3d42300d"
2323
},
2424
"us-west-1" : {
25-
"AMI" : "ami-debdb89b"
25+
"AMI" : "ami-fa6463bf"
2626
},
2727
"eu-west-1" : {
28-
"AMI" : "ami-1df4396a"
28+
"AMI" : "ami-8f30fff8"
2929
}
3030
}
3131
},

0 commit comments

Comments
 (0)