Commit Graph

29256 Commits

Author SHA1 Message Date
Clayton Coleman
48146e01cd Expose ValidateLabels in validation.go for reuse by other components
Label validation is common to anyone building kube resources.
2015-01-19 22:33:52 -05:00
Anthony Yeh
8c900187b6 Add reverse proxy headers in apiserver proxy.
Fixes #3484
2015-01-19 13:15:41 -08:00
Jordan Liggitt
888fe4b175 Build TLS client for kubelet correctly 2015-01-19 12:26:12 -05:00
Clayton Coleman
e4dcbb6edb Explicitly handle errors received during watch
Log them as Error and then continue.
2015-01-19 11:10:45 -05:00
Andrew Seidl
6dee1d7fa4 Fix typos in user-facing strings 2015-01-18 01:32:34 -06:00
Filipe Brandenburger
79ff06ffa1 Fix comparison of EtcdClient to nil so that it does not run into the pointer vs. interface issue
This is a partial rollback of commit 6e6f465a36 ("Fix a crash for
kubelet when without EtcdClient") in which we used the `reflect` module
to inspect that the pointer stored inside the interface was `nil`, but
as pointed out by @lavalamp, the correct solution is to make the
function return the interface type, in which case a `return nil` will
return the interface nil and not a nil pointer that turns into a non-nil
value when coerced into an interface.

For more details, see http://golang.org/doc/faq#nil_error and the
discussion in PR #3356.

Tested by installing a kubelet built from head with this patch into a
containervm instance and confirming it did not crash on standalone.go.
Confirmed that by only removing the `reflect.IsNil()` comparison but not
changing the return type of `EtcdClientOrDie()` did indeed cause that
same crash, so changing the return type does indeed fix the issue.

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2015-01-16 16:43:05 -08:00
Brendan Burns
d54242a649 Merge pull request #3552 from commonlisp/master
Replace kubelet logging %s--%s--%s with dockertools.BuildDockerName()
2015-01-16 14:31:43 -08:00
Filipe Brandenburger
6d9845361f Merge pull request #3577 from erictune/fixforfilib
Test for and fix crash with nil client in kubelet.
2015-01-16 13:53:29 -08:00
Eric Tune
fc11801246 Merge pull request #3535 from smarterclayton/ignore_the_root_key_on_watch_list
WatchList should not convey events for the root key
2015-01-16 13:43:44 -08:00
Eric Tune
98bdd3f7c4 Test for and fix crash with nil client in kubelet.
Added test that fails before fix.
Fixed use of nil pointer.
2015-01-16 13:39:31 -08:00
Joe Beda
474212106f Merge pull request #3564 from liggitt/client_cert_data
Allow client and kubelet configs to hold cert/key/ca data directly
2015-01-16 13:19:52 -08:00
bgrant0607
ee0ba6c922 Merge pull request #3574 from mikedanese/proxy-config-panic
fix interface conversion panic
2015-01-16 12:45:00 -08:00
Brendan Burns
311dada4f2 Merge pull request #3551 from ukai/oauth
cloudprovider/gce: use golang.org/x/oauth2
2015-01-16 12:30:48 -08:00
Mike Danese
8b65621aeb fix interface conversion panic 2015-01-16 12:23:16 -08:00
Brendan Burns
e86c8f9e53 Merge pull request #3565 from dchen1107/podstatus
Introduce PodStatusResult, and deprecate PodContainerInfo.
2015-01-16 12:05:07 -08:00
Dawn Chen
a71588dc89 Merge pull request #3504 from ddysher/kubectl-node-status
Include node status in kubectl get output
2015-01-16 12:01:29 -08:00
Deyuan Deng
616feac25b Include node status in kubectl get output 2015-01-16 14:28:35 -05:00
Dawn Chen
7b457fd33f Separate colume for PodIP from kubectl get pods 2015-01-16 11:10:30 -08:00
Jordan Liggitt
1ebe885827 Allow client and kubelet configs to hold cert/key/ca data directly 2015-01-16 12:18:20 -05:00
Dawn Chen
15e9fa8a9d Introduce PodStatusResult, and deprecate PodContainerInfo. 2015-01-16 09:10:40 -08:00
George Kuan
af4bbd1a1b Replace kubelet logging %s--%s--%s with dockertools.BuildDockerName()
Fixes issue #3454
2015-01-15 19:47:54 -08:00
Fumitoshi Ukai
54f498acd5 cloudprovider/gce: use golang.org/x/oauth2
code.google.com/p/goauth2 is deprecated.
use golang.org/x/oauth2 instead.

hooks/prepare-commit-msg ignore Godeps
for sh's boilerplate check.
2015-01-16 12:17:52 +09:00
bgrant0607
790a78415e Merge pull request #3494 from nikhiljindal/deletePublicMethods
master.go: converting API_v1beta* functions to private since they are not used outside
2015-01-15 17:22:31 -08:00
bgrant0607
52cd620da8 Merge pull request #3537 from brendandburns/cli
Add inline JSON patching to kubectl update ...
2015-01-15 17:08:51 -08:00
bgrant0607
03421ada2c Merge pull request #3542 from erictune/channel_api
Remove dead code in test.
2015-01-15 16:58:52 -08:00
nikhiljindal
1ccae67b6e master.go cleanup: Deleting unused public methods and converting rest to private 2015-01-15 16:22:43 -08:00
Brendan Burns
3572ed1828 Addressed comments. 2015-01-15 16:08:12 -08:00
Brendan Burns
ae88521739 Add inline patching to kubectl update. 2015-01-15 16:08:12 -08:00
Brendan Burns
e8489264cf Addressed comments. 2015-01-15 16:07:56 -08:00
Jeff Lowdermlk
f7b0a92932 Fail rollingupdate if replacement rc schema has same name as existing 2015-01-15 15:52:53 -08:00
Nikhil Jindal
e6c5d59a55 Merge pull request #3509 from enisoc/apiserver-proxy-trailing-slash
Preserve trailing slash in apiserver proxy.
2015-01-15 15:13:49 -08:00
Nikhil Jindal
aeab434400 Merge pull request #3514 from enisoc/apiserver-proxy-content-type
Allow Content-Type with charset in apiserver proxy.
2015-01-15 15:07:07 -08:00
Eric Tune
5aeda8a5bb Remove dead code in test. 2015-01-15 14:49:08 -08:00
Daniel Smith
46f8a56dba Merge pull request #3376 from erictune/channel_api
Kublet watches Pods.
2015-01-15 14:48:12 -08:00
Brendan Burns
4209bd4888 Add add a utility for merging JSON fragments, and use it in run-container. 2015-01-15 14:44:26 -08:00
bgrant0607
fc24ca7044 Merge pull request #3524 from jlowdermilk/fix-cmd-printing
Fix nil dereference in kubectl run-container
2015-01-15 13:44:26 -08:00
Eric Tune
2e002b1095 Add second pod to test. 2015-01-15 13:36:49 -08:00
Clayton Coleman
ce36431954 WatchList should not convey events for the root key
It's possible to watch /foo/bar, get events for /foo/bar/baz,
and then if someone deletes /foo/bar you'll get an event for /foo/bar
without a value.  This results in an error being printed in the logs
because /foo/bar has value "" and we can't decode that.

This commit excludes the parent directory from watch events for now.
2015-01-15 16:00:49 -05:00
Clayton Coleman
f312edf24d Merge pull request #3531 from lavalamp/fix2
make conversion do deep copies
2015-01-15 15:29:21 -05:00
bgrant0607
cffa257349 Merge pull request #3529 from smarterclayton/less_chatty_apiserver_init
The API server setup logging is debug specific, bump above V(4)
2015-01-15 12:04:17 -08:00
Daniel Smith
37f5a9df07 make conversion do deep copies 2015-01-15 12:02:22 -08:00
Jeff Lowdermlk
e6e6092904 Fix nil dereference in kubectl run-container 2015-01-15 11:39:50 -08:00
Joe Beda
224ffa4567 Merge pull request #3480 from jbeda/all_pflag
Convert all main binaries to pflag library
2015-01-15 11:26:41 -08:00
Clayton Coleman
90c835af47 The API server setup logging is debug specific, bump above V(4)
Reduces some chatter in test suites where we are confident this code
already works.  Also removed any logging which is obvious from swagger.

Finally, rolls up InstallREST related errors all the way back to master,
which will glog.Fatalf (coding errors).
2015-01-15 14:25:58 -05:00
Brendan Burns
bece5ec8a3 Merge pull request #3516 from enisoc/kubectl-resize-docs
Fix example usage of kubectl resize command.
2015-01-15 09:55:20 -08:00
Dawn Chen
8509618311 Merge pull request #3501 from lavalamp/fix2
log on health checks
2015-01-15 09:16:15 -08:00
Joe Beda
6bd6b905f5 Address code review comments
Add some documentation.
Create new util.InitFlags() function to merge and parse in one step.
2015-01-15 09:12:20 -08:00
Joe Beda
1d0b6ee5f5 Fix up logging flags for kubectl. 2015-01-15 09:12:20 -08:00
Joe Beda
f692604bdf Fix name of pflag_import.go 2015-01-15 09:12:19 -08:00
Joe Beda
dcd00c936e Move all kubernetes to posix flags 2015-01-15 09:12:19 -08:00