github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 20:42:26 +00:00
Code Issues Projects Releases Wiki Activity
5,321 Commits 42 Branches 7,905 Tags 1.3 GiB
b078889360
Commit Graph

5321 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
3c370d0b1b Merge pull request #3583 from jlowdermilk/example-docs 
Update README.md for cassandra/hazelcast examples to use kubectl resize
 2015-01-16 15:34:48 -08:00
Jeff Lowdermlk
7960d88b21 Update README.md for cassandra/hazelcast examples to use kubectl resize 2015-01-16 15:05:13 -08:00
Zach Loafman
2febee5510 Merge pull request #3581 from satnam6502/revert 
Revert basic.sh and private.sh
 2015-01-16 14:52:24 -08:00
Satnam Singh
d8f07da775 Revert basic.sh and private.sh 2015-01-16 14:43:11 -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
davidopp
a3e057d5d9 Merge pull request #3544 from mikedanese/provider-run-opt 
Configure scheduler algorithm provider with cli option
 2015-01-16 12:41:09 -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
Brendan Burns
0e751dad01 Merge pull request #3549 from mikedanese/standardize-name-key 
Standardize on variable name
 2015-01-16 12:27:34 -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
Brendan Burns
6873b9cf8f Merge pull request #3572 from dchen1107/clean 
Separate colume for PodIP from kubectl get pods
 2015-01-16 11:52:10 -08:00
Zach Loafman
d11b615a01 Merge pull request #3570 from vishh/monitoring_rc 
Adding a replication controller for all monitoring pods
 2015-01-16 11:31:47 -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
Vishnu Kannan
50c32fbba4 Adding a replication controller for all monitoring pods. 
Removed auth for Grafana to facilitate usage via service proxy on the api-server.
Added a grafana service
Removed elasticsearch dependency for monitoring - faster startup times.
 2015-01-16 18:37:46 +00:00
Zach Loafman
efef4b7d5e Merge pull request #3568 from satnam6502/e2e 
Breakfix: Skip GET test for basic.go when no hostIP
 2015-01-16 10:13:38 -08:00
Satnam Singh
8b68d7ee2d Skip GET test for basic.go when no hostIP 2015-01-16 10:04:53 -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
Zach Loafman
39c917b068 Merge pull request #3559 from GoogleCloudPlatform/revert-3489-monitoring_rc 
Revert "Adding a replication controller for all monitoring pods."
 2015-01-16 07:26:23 -08:00
Zach Loafman
43cd9e91f6 Revert "Adding a replication controller for all monitoring pods." 2015-01-16 07:16:54 -08:00
Paulo Pires
4788f7fa4b Updated AMI images for the alpha channel on all regions (HVM). Fixes #3543 2015-01-16 11:44:07 +00:00
Paulo Pires
b40fe81569 Updated minion section in AWS Cloudformation template. Refs #3543 2015-01-16 11:44:07 +00:00
Paulo Pires
1571dd69f2 Updated master section in AWS Cloudformation template. Refs #3543 2015-01-16 11:44:07 +00:00
Paulo Pires
20eb0b2bf3 Updated cloud-configs and AWS CoreOS instructions to Kubernetes 0.8.1 and informing users about better picking CoreOS AWS images. Refs #3543 2015-01-16 11:44:07 +00: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
Filipe Brandenburger
b1f5b3f287 Merge pull request #3550 from satnam6502/e2e 
Convert private.sh test to Go and remove basic.sh and private.sh
 2015-01-15 18:21:08 -08:00
Satnam Singh
d443dd8ea6 Merge pull request #3489 from vishh/monitoring_rc 
Adding a replication controller for all monitoring pods.
 2015-01-15 18:18:54 -08:00
Satnam Singh
33e00320bf Convert private.sh test to Go and remove basic.sh and private.sh 2015-01-15 18:04:12 -08:00
Mike Danese
9f4c42e988 name and key are used interchangably in plugin/pkg/scheduler/factory/plugins.go. this standardizes on name. 2015-01-15 17:30:48 -08: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
7095fed5b9 Merge pull request #3539 from mikedanese/algorithm-name-validation 
added algorithm name validation
 2015-01-15 17:21:58 -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
Satnam Singh
732255706c Merge pull request #3545 from filbranden/e2e_test_list_flag1 
Support a --test/-t repeated flag to allow run only a subset of the e2e go tests
 2015-01-15 17:04:15 -08:00
Mike Danese
9dffd0c105 added algorithm name validation 2015-01-15 16:59:02 -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
bgrant0607
39b6b00558 Merge pull request #3540 from jlowdermilk/rollingupdate 
Fail rollingupdate if replacement rc schema has same name as existing
 2015-01-15 16:58:36 -08:00
Vishnu Kannan
ca2267e3e9 Adding a replication controller for all monitoring pods. 
Removed auth for Grafana to facilitate usage via service proxy on the api-server.
Added a grafana service
Removed elasticsearch dependency for monitoring - faster startup times.
 2015-01-16 00:56:51 +00:00
Joe Beda
cbfc468843 Merge pull request #3546 from derekwaynecarr/disable_resource_defaults 
Disable defaults plugin on vagrant
 2015-01-15 16:45:29 -08:00
derekwaynecarr
123c96164e Disable defaults plugin 2015-01-15 19:42:20 -05:00
Filipe Brandenburger
6a79d4e265 Support a --test/-t repeated flag to allow run only a subset of the e2e.go tests. 
This syntax is akin to what Python unittest uses for running a subset of the tests.

If a test gets skipped, log it. If an invalid test test is passed to --test, warn about it.
 2015-01-15 16:30:39 -08:00
Mike Danese
e3da5e15bc added algorithm provider cli option to the kube-scheduler command and renamed default provider to follow naming convention 2015-01-15 16:27:25 -08:00