Commit Graph

2573 Commits

Author SHA1 Message Date
Eric Paris
9828d8e9cc update Godeps.json with github.com/elazarl/go-bindata-assetfs 2014-10-08 14:28:03 -04:00
Daniel Smith
119fc0ebbf Merge pull request #1647 from thockin/cleanup
move completions from misc to contrib
2014-10-08 11:08:49 -07:00
Clayton Coleman
e27dacb1e4 Merge pull request #1648 from deads2k/dev/deads/tidy-compile-regex-api
make api match intent with less specific type
2014-10-08 13:50:08 -04:00
deads2k
e348b939bf make api match intent with less specific type 2014-10-08 10:01:55 -04:00
Tim Hockin
af3983464c move completions from misc to contrib 2014-10-07 22:20:32 -07:00
Tim Hockin
45f9f39b51 Merge pull request #1597 from thockin/iptables
Add a pkg for iptables support
2014-10-07 17:31:34 -07:00
Tim Hockin
2f2ef05fa8 Merge pull request #1646 from dchen1107/termination
Fix an issue on GetContainerInfo.
2014-10-07 17:27:56 -07:00
Dawn Chen
300c2c5f6f Fix an issue on GetContainerInfo.
I believe the issue was first introduced when we append namespace to docker
container's name. This is a temporary fix for #160.
2014-10-07 17:21:24 -07:00
erictune
0d2ce69574 Merge pull request #1445 from brendandburns/docs
Add some documentation for the container environment.
2014-10-07 15:44:35 -07:00
Daniel Smith
31e02b882b Merge pull request #1640 from ddysher/restclient_test
Add codec to restlient test.
2014-10-07 15:31:09 -07:00
Deyuan Deng
9047baa111 Add codec to restlient test. 2014-10-07 18:26:26 -04:00
Brendan Burns
4fe958f6cd Add some documentation for the container environment. 2014-10-07 15:00:17 -07:00
Tim Hockin
48a9ed3147 Merge pull request #1637 from lavalamp/fix
Fix 'go vet' issues
2014-10-07 14:25:41 -07:00
Daniel Smith
ee107d3fad fix extra un-cosmetic extraneous code. 2014-10-07 14:08:18 -07:00
Daniel Smith
4dd3094035 Fix mismatched arg and formatter in Errorf 2014-10-07 14:03:06 -07:00
Daniel Smith
9c0fafee39 Merge pull request #1636 from dchen1107/termination
Add the missing arg in Errorf.
2014-10-07 14:01:55 -07:00
Daniel Smith
2dde76bd03 Fix struct tag in apparently untested config struct 2014-10-07 14:01:45 -07:00
Daniel Smith
2d048bc0f2 fix captured loop variable 2014-10-07 13:57:30 -07:00
Daniel Smith
7ffe791486 fix error message in validation test 2014-10-07 13:54:41 -07:00
Dawn Chen
73c8f41737 Add the missing arg in Errorf. 2014-10-07 13:53:25 -07:00
Daniel Smith
3a62089790 Fix malformed namespace json tag 2014-10-07 13:52:51 -07:00
Daniel Smith
9a82a92764 Merge pull request #1620 from jhadvig/podex_envar
podex - DOCKER_HOST envar check
2014-10-07 13:42:53 -07:00
Daniel Smith
386caae675 Merge pull request #1478 from ddysher/minion-etcd
Use etcd as backend for minion registry.
2014-10-07 13:36:09 -07:00
Joe Beda
491579a98e Merge pull request #1632 from brendandburns/fix
Fix the exec test, on os x false and true have different paths
2014-10-07 13:35:54 -07:00
Brendan Burns
5bdb061f14 Fix the exec test, on os x false and true have different paths, but they're in $PATH on all. 2014-10-07 13:26:25 -07:00
jhadvig
e7af7b52c7 podex - DOCKER_HOST envar check 2014-10-07 22:26:03 +02:00
Deyuan Deng
4de810efb4 Rebase to master, change JSONBase to TypeMeta. 2014-10-07 16:22:36 -04:00
Deyuan Deng
c3d9197a4b Rename InsertMinion to CreateMinion. 2014-10-07 16:22:35 -04:00
Deyuan Deng
4a35325f29 Use etcd as backend for minion registry. 2014-10-07 16:22:35 -04:00
Daniel Smith
a6c748451d Merge pull request #1631 from lavalamp/fix
Fix build error in integration test
2014-10-07 13:22:12 -07:00
Daniel Smith
cf203f1304 Fix build error in integration test 2014-10-07 13:10:58 -07:00
Daniel Smith
a21cef0157 Merge pull request #1630 from brendandburns/nginx
Add a missing file that should have been in the previous ux push.
2014-10-07 12:53:35 -07:00
Brendan Burns
fcdefb5d30 Merge pull request #1613 from ghodss/fix_infinite_scheduler_crash
Prevent scheduler from crashing infinitely if apiserver is unreachable
2014-10-07 12:46:42 -07:00
Brendan Burns
9286e331c1 Update the UX, add documentation. 2014-10-07 12:33:33 -07:00
Tim Hockin
4bbe6a10ff Add a pkg for iptables support
This makes iptables an injectable dependency.  The test for this started off
simple, but got a bit out of hand.  It's starting to become a mocking
framework.
2014-10-07 11:36:46 -07:00
Daniel Smith
3cc2aa8f76 Merge pull request #1622 from smarterclayton/types_fixup
Add new metadata to internal/v1beta(1|2) for v1beta3
2014-10-07 11:35:23 -07:00
Daniel Smith
051d50e98d Merge pull request #1592 from thockin/utilexec
Add a util/exec interface for testing execs.
2014-10-07 11:26:27 -07:00
erictune
5503e95c1d Merge pull request #1529 from smarterclayton/add_auth_interfaces
Add simple Bearer authenticator filter for Kube
2014-10-07 11:23:41 -07:00
Clayton Coleman
338ee1e458 Add additional debugging output on mistyped conversion 2014-10-07 14:09:01 -04:00
Clayton Coleman
0a4d4b43f6 Move IsAnAPIObject() declarations to register.go
* Add Namespace, UID, Annotations to internal/v1beta1/v1beta2
* Update v1beta3 with minor consistency tweaks
2014-10-07 14:09:01 -04:00
Clayton Coleman
897c59a713 Merge pull request #1598 from brendandburns/nginx
Add UX documentation, link into the apiserver, add a missing file.
2014-10-07 14:06:20 -04:00
Daniel Smith
0212c9b29a Merge pull request #1623 from smarterclayton/rename_jsonbase
Rename JSONBase -> TypeMeta in preparation for v1beta3
2014-10-07 10:50:28 -07:00
Clayton Coleman
c8ef4b8230 Add simple Bearer authenticator filter for Kube
* Default file based implementation
* Define some simple interfaces
* Add -token_auth_file to apiserver that will start the apiserver
  with a request filter for tokens
2014-10-07 13:25:12 -04:00
Clayton Coleman
c629e33430 Update non .go references 2014-10-07 13:11:25 -04:00
Daniel Smith
11c2b1ea93 Merge pull request #1621 from smarterclayton/move_helpers
Move Policy test helpers into their own file
2014-10-07 09:58:31 -07:00
Brendan Burns
414473607a Update the UX, add documentation. 2014-10-07 09:49:49 -07:00
Joe Beda
037c74b60d Merge pull request #1617 from ghodss/increase_log_level_in_local_up_cluster
Increase logging levels in hack/local-up-cluster.sh
2014-10-07 09:12:22 -07:00
Joe Beda
cf8e1108e0 Merge pull request #1618 from vishh/fix_update_demo
Fix update demo
2014-10-07 09:06:55 -07:00
Joe Beda
c7e88427dc Merge pull request #1619 from VojtechVitek/typo
Fix typo
2014-10-07 09:04:04 -07:00
Clayton Coleman
d3e51a0f24 Rename JSONBase -> TypeMeta in preparation for v1beta3
Will make subsequent refactor much easier
2014-10-07 11:12:16 -04:00