Commit Graph

990 Commits

Author SHA1 Message Date
Victor Vieux
e075c8fd46 remove proxyContainerAndForceRefresh
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-03-02 17:11:09 -08:00
Victor Vieux
f8db6a6e67 Merge pull request #434 from mattva01/patch-1
Corrected typos in swarm scheduler docs
2015-02-28 15:27:55 -08:00
Matthew Gallagher
3c7e74c43e Corrected typos in swarm scheduler docs
Signed-off-by: Matthew Gallagher <mattva01@gmail.com>
2015-02-28 03:31:49 -05:00
Andrea Luzzardi
4087e022d6 Merge pull request #398 from bacongobbler/refactor-scores-to-weighted-node
refactor score to WeightedNode structure
2015-02-27 16:47:26 -08:00
Andrea Luzzardi
db97473b40 Merge pull request #393 from vieux/mesos_poc
Proposal: Scheduler/Cluster Driver
2015-02-27 15:17:54 -08:00
Victor Vieux
8b7afe2c73 remove mesos.go to move it to it's own PR
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:25:50 -08:00
Victor Vieux
a8885ab997 removed nodes.go
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:25:50 -08:00
Victor Vieux
d8042f9677 add Node interface
Usable -> Total & Reserved -> Used

Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:25:50 -08:00
Victor Vieux
4bfeb4b640 move list of node to swarm only
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
Victor Vieux
47e03120f5 remove Nodes(), add Images() and Images()
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
Victor Vieux
fa8a06685b remove events from the cluster interface
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
Victor Vieux
6348fdd849 move discovery out of the cluster interface
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
Victor Vieux
ce98e66c63 cluster API instead of scheduler API
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
Victor Vieux
126f550317 add SchedulerOptions
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
Victor Vieux
dd537dbe74 clean cut cluster - scheduler
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
Victor Vieux
98a21bd373 initial mesos.go file full fo TODOs
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
Victor Vieux
eb88068f93 refactor code: move filter/ and strategy/ out of scheduler and create a simple
scheduler interface.

Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:20:37 -08:00
Andrea Luzzardi
6afdcb90bf Merge pull request #433 from vieux/update_dockerclient
update dockerclient
2015-02-27 14:18:56 -08:00
Victor Vieux
150940a67b update dockerclient
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-27 14:17:02 -08:00
Matthew Fisher
08b0ddbd14 refactor score to weightedNode structure
In many different scheduling strategies, a node is typically given
a certain weight based upon its values that are important to the
overall strategy. Exposing a weightedNode structure as well as a
new weightedNodeList type allows one to operate upon a set of nodes for
sorting purposes by assigning weights to each node and calling
sort.Sort() on a weightedNodeList.

Signed-off-by: Matthew Fisher <matthewf@opdemand.com>
2015-02-27 15:48:53 +00:00
Victor Vieux
4a18b36bbc Merge pull request #421 from bfirsh/add-beta-warning-to-docs
Add beta warning to docs
2015-02-26 17:13:27 -08:00
Ben Firshman
509a246a27 Add beta warning to docs
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-02-26 10:54:50 +00:00
Victor Vieux
621b83fc6f Merge pull request #420 from SvenDowideit/lets-use-the-right-repo-name
Spelling error in naming the image built
2015-02-25 17:40:44 -08:00
Victor Vieux
67ae35180c Merge pull request #418 from SvenDowideit/small-doc-tweaks
add an index and go make some small tweaks
2015-02-25 17:34:37 -08:00
Sven Dowideit
c530cd1523 add an index and go make some small tweaks
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-26 11:19:14 +10:00
Sven Dowideit
dec31d9cd8 Spelling error in naming the image built
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-26 09:51:30 +10:00
Victor Vieux
2acbea1149 Merge pull request #417 from frodenas/fix-createentries
Ignore empty addresses when creating discovery entries
2015-02-25 10:15:16 -08:00
Ferran Rodenas
cecdd7df02 Ignore empty addresses when creating discovery entries
Signed-off-by: Ferran Rodenas <frodenas@gmail.com>
2015-02-24 22:10:31 -08:00
Andrea Luzzardi
f326bc1f21 Merge pull request #416 from vieux/_manager_background
start the manager in bg
2015-02-24 12:01:05 -08:00
Victor Vieux
a114c363b3 start the manager in bg
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-24 11:49:53 -08:00
Victor Vieux
05d7b085cc Merge pull request #411 from SvenDowideit/build-docs-in-local-swarm-repo
add ./script/doc to build swarm documentation using the docs.docker.com tooling
2015-02-23 18:44:38 -08:00
Sven Dowideit
11b2121105 add ./script/doc to build swarm documentation using the docs.docker.com tooling
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-24 12:12:23 +10:00
Victor Vieux
2f23f98bee Merge pull request #410 from bfirsh/tweak-docs-introduction
Tweak docs introduction
2015-02-23 16:02:07 -08:00
Ben Firshman
4b48b68514 Tweak docs introduction
A bit punchier and tweaked the formatting to make it consistent with
other docs/projects.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-02-20 15:43:25 +00:00
Andrea Luzzardi
f5205cb7ca Merge pull request #407 from vieux/fix_panic_token
fix panic in token discovery
2015-02-19 11:39:06 -08:00
Victor Vieux
ff22cbc2d3 fix panic in token discovery
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-18 22:08:07 -08:00
Andrea Luzzardi
a445ed952e Merge pull request #365 from vieux/add_cpus_mem
Add cpus mem
2015-02-13 11:24:07 -08:00
Victor Vieux
14674b47ec Merge pull request #388 from aluzzardi/dependency-filter
Dependency Filter: co-schedule dependent containers on the same node.
2015-02-13 10:59:13 -08:00
Victor Vieux
95c4d97380 Merge pull request #397 from bacongobbler/395-correct-irc-channel
correct IRC channel
2015-02-13 10:54:22 -08:00
Matthew Fisher
96274a9567 correct IRC channel
Signed-off-by: Matthew Fisher <matthewf@opdemand.com>
2015-02-13 03:13:34 -07:00
Victor Vieux
12e1b047e7 Merge pull request #392 from aluzzardi/doc-fix-port-binding
README: Fix port binding in example.
2015-02-11 23:02:41 -08:00
Andrea Luzzardi
9f0d616273 README: Fix port binding in example.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-02-11 17:23:57 -08:00
Andrea Luzzardi
0bc7230120 Merge pull request #391 from JeffChien/update_consul_api
Update consul api
2015-02-11 11:22:21 -08:00
JChien
050c0572d2 update godeps
Signed-off-by: JChien <jeffchien13@gmail.com>
2015-02-11 21:26:44 +08:00
JChien
a19fecee87 update import url
Signed-off-by: JChien <jeffchien13@gmail.com>
2015-02-11 21:25:55 +08:00
Andrea Luzzardi
e6423f1aa4 Merge pull request #389 from vieux/update_testify
update testify
2015-02-10 16:45:31 -08:00
Victor Vieux
ba7195c1e6 add number of container per node
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-10 23:21:17 +00:00
Victor Vieux
348bb1ee4c update testify
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-10 21:56:49 +00:00
Andrea Luzzardi
7b009d6d43 Merge pull request #381 from vieux/closeIdleConnections
closeIdleConnections to prevent leaks with https
2015-02-10 13:41:28 -08:00
Andrea Luzzardi
12c5bb172e docker-compose examples: Remove affinities.
With the dependency filter, affinities are no longer required.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-02-10 13:26:21 -08:00