Commit Graph

1178 Commits (c65ac62cdd9352842cbef9066922e095ba9bbc01)

Author SHA1 Message Date
Yuki Yugui Sonoda c65ac62cdd Allow omitting -machines flag in apiserver when -cloud_provider and
-minion_regexp are specified because it is eventually overwritten by
-minion_regexp.
2014-07-31 14:38:54 +09:00
Daniel Smith 6af0717205 Merge pull request #714 from filbranden/version_fixes
Version fixes
2014-07-30 19:08:21 -07:00
Filipe Brandenburger de405ac126 Improve generation of version information from the git tree
Detect whether the tree is dirty and append a "-dirty" indication to the
git commit (common practice with other repos, e.g. kernel, docker.)

Properly handle the case where a git tree is not found (e.g. building
from archive.)

In the sed expression, look for the variable to be updated
(commitFromGit) instead of hardcoding a line number.

Tested:

- Built from a dirty tree:
    $ output/go/bin/kubelet -version
    Kubernetes version 0.1, build 2d784c684c75-dirty

- Built from a clean tree:
    $ output/go/bin/kubelet -version
    Kubernetes version 0.1, build 505f23a31172

- Built from an archive:
    $ hack/build-go.sh
    WARNING: unable to find git commit, falling back to commitFromGit = `(none)`
    $ output/go/bin/kubelet -version
    Kubernetes version 0.1, build (none)

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2014-07-30 18:48:57 -07:00
Filipe Brandenburger 7e56609139 Handle -version flag on all commands
Tested: Passed -version argument to kubelet (and all other binaries):
  $ output/go/bin/kubecfg -version
  Kubernetes version 0.1, build 6454a541fd56

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2014-07-30 18:48:56 -07:00
brendandburns 76e2cd70f7 Merge pull request #683 from smarterclayton/slightly_pause_on_return
Slightly pause on requests to allow most to finish
2014-07-30 16:05:15 -07:00
Dawn Chen 21513b1e08 Merge pull request #691 from dchen1107/restart
Add RestartPolicy to Pod and PodTemplate
2014-07-30 15:32:20 -07:00
Dawn Chen 2740fb0abf Add RestartPolicy to Pod and PodTemplate 2014-07-30 15:31:27 -07:00
Daniel Smith c5ca032287 Merge pull request #706 from brendandburns/proxy
Revert the revert and fix tests.
2014-07-30 15:19:12 -07:00
brendandburns 59c5fb11c0 Merge pull request #672 from lavalamp/customConversionFuncs
Custom conversion funcs
2014-07-30 15:09:01 -07:00
Brendan Burns 2cbe2c18d4 Add a comment to tickle travis. 2014-07-30 15:06:56 -07:00
Daniel Smith ce586c1448 Test both directions of the conversion. 2014-07-30 15:04:01 -07:00
Brendan Burns 9519a8049b Fixed tests. 2014-07-30 15:02:36 -07:00
Clayton Coleman 1bdeb058e1 Slightly pause on requests to allow most to finish
Currently, every write will result in a 202 (etcd adding a few
ms of latency to each request).  This forces clients to go into
a poll loop and pick a reasonable server poll frequency, which
results in 1 + N queries to the server for the single operation
and adds unavoidable latency to each request which affects their
perception of the service.

Add a very slight (25ms by default) delay to wait for requests
to finish.  For clients doing normal writes this reduces the
requests made against the server to 1.  For clients on long requests
this has no effect.  The downside is that http connections are held
on to for a longer period in high write loads.  The decrease in
perceived latency from the kubecfg is significant.
2014-07-30 17:49:47 -04:00
brendandburns 2486414c16 Merge pull request #690 from smarterclayton/refactor_apiserver_changes
Clean up pkg/apiserver
2014-07-30 14:41:00 -07:00
brendandburns 5443929b84 Merge pull request #702 from fsouza/update-go-dockerclient
third_party: update go-dockerclient
2014-07-30 14:25:37 -07:00
Daniel Smith 242c8cdaec Add custom conversion function system.
As an example, demonstrate how Env.Key's deprecation ought to work.
2014-07-30 14:18:23 -07:00
Clayton Coleman e64a393e1a Move handle* methods to their respective locations
Fix names
2014-07-30 17:15:09 -04:00
Clayton Coleman fe7f611d88 Split operations code and add comments 2014-07-30 17:15:09 -04:00
Clayton Coleman 9069696514 Rename write -> writeJSON 2014-07-30 17:15:09 -04:00
Clayton Coleman b84c9f7a1c Rename methods and move parseTimeout 2014-07-30 17:15:09 -04:00
Clayton Coleman 82b78912fc Move prefix methods 2014-07-30 17:15:09 -04:00
Clayton Coleman a2c86e4c97 Simplify helpers 2014-07-30 17:15:09 -04:00
Clayton Coleman c7d311896e Shorten variable name 2014-07-30 17:15:09 -04:00
Clayton Coleman 8b511832ff Split minion 2014-07-30 17:15:09 -04:00
Clayton Coleman a46f6313bc Split interfaces 2014-07-30 17:15:09 -04:00
Clayton Coleman d5e22bfe2a Split index 2014-07-30 17:14:07 -04:00
Clayton Coleman b70a145161 Split operations test 2014-07-30 17:14:06 -04:00
Clayton Coleman db51ea2a17 Split async 2014-07-30 17:14:06 -04:00
Clayton Coleman b911d9265a Split watch 2014-07-30 17:14:06 -04:00
erictune a41aeeca67 Merge pull request #701 from SebastianM/misspelling
fix misspelling
2014-07-30 13:36:14 -07:00
Francisco Souza 2a345ffa9e third_party: update go-dockerclient
math.MaxInt64 represents 8 exabytes, which is a good limit for memory.
Also, this is the type used by Docker, so it's not possible to get any
value bigger than math.MaxInt64 as memory limit (both ram and swap) on a
Docker container.

Relevant discussion at #589 (more precisely,
https://github.com/GoogleCloudPlatform/kubernetes/pull/589#issuecomment-50640605).
2014-07-30 15:18:42 -03:00
Sebastian Müller e1172fc78c fix misspelling 2014-07-30 20:10:12 +02:00
Clayton Coleman dc6fdc423d Merge pull request #627 from lavalamp/fix
Add /version to server and check it in client.
2014-07-30 12:52:15 -04:00
erictune b0689b0acf Merge pull request #698 from danmcp/fix_typos
Fixing typo
2014-07-30 08:55:57 -07:00
Dan McPherson d94f5c3360 Fixing typo 2014-07-30 16:45:53 +02:00
Brendan Burns 448a4b7d69 Revert "Revert "Add support for stopping a proxier.""
This reverts commit 19beaf71b5.
2014-07-30 06:52:03 -07:00
brendandburns 0ad9221f5c Merge pull request #695 from danmcp/fix_golint_warnings
Fixing golint warnings
2014-07-30 06:49:27 -07:00
Dan McPherson d5fcaa1f03 Fixing golint warnings 2014-07-30 13:41:09 +02:00
Daniel Smith cf1f17957a Merge pull request #693 from GoogleCloudPlatform/revert-682-proxy
Revert "Add support for stopping a proxier."
2014-07-29 23:26:03 -07:00
Daniel Smith 19beaf71b5 Revert "Add support for stopping a proxier." 2014-07-29 23:24:57 -07:00
Daniel Smith 00bdeecb63 Merge pull request #682 from brendandburns/proxy
Add support for stopping a proxier.
2014-07-29 23:20:55 -07:00
brendandburns b0d18b2af0 Merge pull request #571 from lavalamp/master
Decode/Encode everywhere
2014-07-29 17:19:33 -07:00
Daniel Smith 2396bdfa1b Incorporate new types into versioned api system.
* Made externalize/internalize generic to prevent boilerplate.
* Add fuzz testing.
* All objects pass fuzz tests now.
* This turned up some things we'll need to fix eventually. Left TODOs.
2014-07-29 15:46:57 -07:00
Brendan Burns 99f0d2e807 Add support for stopping a proxier. 2014-07-29 15:40:47 -07:00
Daniel Smith fcbd365814 Merge pull request #678 from brendandburns/fix
Add some initial validation logic.
2014-07-29 15:22:57 -07:00
brendandburns 1ab9f6ebae Merge pull request #689 from Sarsate/salt-kubelet-dir
Set kubelet user home directory to /var/lib/kubelet
2014-07-29 15:06:30 -07:00
brendandburns 28668055c7 Merge pull request #680 from mfojtik/kube_env
Allow to set global KUBERNETES_PROVIDER env var
2014-07-29 15:04:38 -07:00
Danny Jones bc11e8c57b Set kubelet user home directory to /var/lib/kubelet
The kubelet user does not have permissions to create directories in
/var/lib. This sets the home directory to /var/lib/kubelet so that the
directory is made prior to running the kubelet. This matches the
default root directory path (/var/lib/kubelet) and allows kubelet to
us that directory.
2014-07-29 14:44:01 -07:00
Victor Marmol a21cec0fc4 Merge pull request #687 from rjnagal/master
Fix handling of default cpu shares.
2014-07-29 12:06:50 -07:00
Rohit Jnagal fbd3e85e9c Fix handling of default cpu shares. 2014-07-29 18:34:16 +00:00