github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity
29,578 Commits 42 Branches 7,905 Tags 1.3 GiB
b089c18c49
Commit Graph

29578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Robinson
b089c18c49 Merge pull request #25853 from spxtr/sync-e2e 
Run setupProviderConfig in BeforeSuite.
 2016-05-27 11:28:43 -07:00
Alex Robinson
aa4e182656 Merge pull request #26094 from mhrgoog/godeps_verify_echo 
Godeps verify echo
 2016-05-27 11:27:01 -07:00
Alex Robinson
789b69758e Merge pull request #25688 from sjpotter/rkt_annotations 
kubelet: Move common labels out of dockertools package
 2016-05-27 11:26:31 -07:00
Alex Robinson
1ec7fd4e1e Merge pull request #26174 from derekwaynecarr/enable_vagrant_accounting 
Enable CPU and Memory accounting on vagrant cluster
 2016-05-27 11:25:34 -07:00
Alex Robinson
3ab6ac4d9e Merge pull request #26348 from thockin/fix-godep-licenses 
Simplify godep licenses logic
 2016-05-27 11:07:00 -07:00
Alex Robinson
d2a45f0ba5 Merge pull request #24909 from pmorie/security-context-loc 
Reduce LOC in security context tests
 2016-05-27 10:27:55 -07:00
Alex Robinson
294e49f8b9 Merge pull request #26121 from hpcloud/hpe/vsphere-vol-validation 
Adding vSphere volume validation in api
 2016-05-27 10:11:23 -07:00
Alex Robinson
7551b0ff9f Merge pull request #26150 from wojtek-t/fix_flannel_config 
Fix transient flannel etcd
 2016-05-27 10:10:38 -07:00
Tim Hockin
847b56b253 Simplify godep licenses logic 
This code used to actually reach out to the internet to look for files.  This
is flaky, slow, and semantically WRONG.  The license that is upstream might
actually be different than what we have vendored.  Only look at local files.

This now passes back-to-back updates and verifies.
 2016-05-27 10:01:27 -07:00
Alex Robinson
5bc7ec7a48 Merge pull request #26031 from luxas/remove_docker_multinode 
Remove docker-multinode
 2016-05-27 10:01:02 -07:00
Alex Robinson
07d9dff83c Merge pull request #26208 from freehan/kubenetteardownfix 
do not return error if TearDownPod is called twice
 2016-05-27 09:59:03 -07:00
Alex Robinson
ba3bf90448 Merge pull request #26363 from wonderfly/fix-yaml-search-path 
GCI: Fix yaml search path
 2016-05-27 09:58:03 -07:00
Alex Robinson
7522389d8d Merge pull request #26207 from zmerlynn/fix-unneeded-updated 
nodecontroller: Fix log message on successful update
 2016-05-27 09:56:28 -07:00
k8s-merge-robot
4047ca1d97 Merge pull request #26132 from nikhiljindal/newmaster 
Automatic merge from submit-queue

federation: replacing string credentials field by secretRef

Fixes https://github.com/kubernetes/kubernetes/issues/25761

Replaced the string Credentials field in ClusterSpec by secretRef as discussed in https://github.com/kubernetes/kubernetes/issues/25761.
Also updated the clusterController to use this new secretRef field while creating a client to talk to a k8s cluster.

cc @lavalamp @kubernetes/sig-cluster-federation
 2016-05-27 08:31:58 -07:00
derekwaynecarr
6090bc9112 Enable CPU and Memory accounting on vagrant 2016-05-27 11:21:04 -04:00
derekwaynecarr
ff07195f4e Fix vagrant issues with salt bootstrap 2016-05-27 11:21:04 -04:00
k8s-merge-robot
071cfe6086 Merge pull request #26407 from saad-ali/fixRaceReconcilerTest 
Automatic merge from submit-queue

Fix DATA RACE in unit tests: reconciler_test.go

Fixes https://github.com/kubernetes/kubernetes/issues/26377
 2016-05-27 07:40:09 -07:00
k8s-merge-robot
1cb088857b Merge pull request #26416 from wojtek-t/dont_run_mulitple_registries_prefix 
Automatic merge from submit-queue

Speed up test, by not running with custom etcd prefix

Ref #25940

Since we don't test upgrades or stuff like that in unit tests & integration tests, it doesn't make much sense to test different etcd prefixes.

@ixdy
 2016-05-27 06:58:19 -07:00
k8s-merge-robot
e7269a13ff Merge pull request #26413 from mwielgus/gci-ca 
Automatic merge from submit-queue

Support for cluster autoscaler in GCE Trusty and GCI images

Fixes: #26346
Ref: #26197

cc: @fgrzadkowski  @vulpecula @piosz @jszczepkowski
 2016-05-27 06:58:15 -07:00
k8s-merge-robot
ae28564526 Merge pull request #26386 from janetkuo/etcd-test-flake 
Automatic merge from submit-queue

Increase etcd test server up timeout and disallow returning nil server 

Fixes #25047

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
 2016-05-27 05:49:51 -07:00
Wojciech Tyczynski
19ccbb9f99 Speed up test, by not running with custom etcd prefix 2016-05-27 14:30:24 +02:00
Marcin
5f2695be8e Support for cluster autoscaler in GCE Trusty and GCI images 2016-05-27 12:02:20 +02:00
k8s-merge-robot
35922bdcbd Merge pull request #26378 from pwittrock/fix-26138 
Automatic merge from submit-queue

Retry concurrency exceptions in e2e/kubectl.go.  Fixes #26138





[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
 2016-05-27 02:21:21 -07:00
saadali
3c345abafd Fix DATA RACE in unit tests: reconciler_test.go 2016-05-27 01:19:25 -07:00
k8s-merge-robot
227b8bad81 Merge pull request #26365 from janetkuo/tag-test-image 
Automatic merge from submit-queue

Prevent use of ":latest" or untagged gcr.io images 

Ref #20836
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
 2016-05-27 01:12:57 -07:00
Daniel Smith
476bdccecc Merge pull request #26400 from lavalamp/fix-docs2 
update docs; fix build
 2016-05-26 22:17:43 -07:00
Daniel Smith
5de03a8776 update docs; fix build 2016-05-26 22:16:17 -07:00
Eric Paris
cd700ee3eb Merge pull request #26313 from nikhiljindal/fedServerDoc 
federation: Adding a tool to generate docs for federation apiserver and controller manager
 2016-05-26 23:09:51 -04:00
k8s-merge-robot
2127a40596 Merge pull request #26142 from nikhiljindal/registerDeepCopyGeneratedFuncs 
Automatic merge from submit-queue

federation: Adding deep copy funcs for v1 objects in federation apiserver

Trying to fix https://github.com/kubernetes/kubernetes/issues/26111
 2016-05-26 19:17:54 -07:00
k8s-merge-robot
8bfaec4b59 Merge pull request #26334 from fejta/own 
Automatic merge from submit-queue

Create pkg/storage/OWNERS

Fixes #26118
 2016-05-26 16:10:03 -07:00
k8s-merge-robot
b6929e19eb Merge pull request #26336 from caesarxuchao/remove-deprecated-typed-clients 
Automatic merge from submit-queue

remove deprecated generated typed clients

The typed clients had been moved to pkg/client/clientset_generated/xxx/typed. We kept these files for backward compatibility. But it seems release 1.3 is the appropriate time to get rid of them.

@kubernetes/sig-api-machinery @lavalamp
 2016-05-26 16:10:00 -07:00
Alex Mohr
1dfa068055 Merge pull request #26384 from Random-Liu/disable-node-problem-detector 
Temporarily disable node-problem-detector to unblock #26351
 2016-05-26 15:53:50 -07:00
Alex Mohr
0b7614d6cd Merge pull request #26382 from dchen1107/docker 
Bump Node Image to  container-v1-3-v20160517
 2016-05-26 15:53:22 -07:00
Alex Mohr
9a4ea69525 Merge pull request #26372 from yujuhong/fix_more_tests 
e2e: fix the expectation of always running kube-system pods
 2016-05-26 15:52:53 -07:00
Alex Mohr
aab6c43a33 Merge pull request #25604 from freehan/kubenethostport 
Kubenet host-port support through iptables
 2016-05-26 15:49:12 -07:00
Alex Mohr
0a6178959f Merge pull request #25852 from vishh/network-volumes 
Add metrics support for a GCE PD, EC2 EBS & Azure File volumes
 2016-05-26 15:47:33 -07:00
Alex Mohr
87f3cf130f Merge pull request #25914 from timstclair/godeps 
Bump cAdvisor (and dependencies) godeps version
 2016-05-26 15:47:26 -07:00
Alex Mohr
9803393a67 Merge pull request #25960 from jsafrane/do-not-sort-bind 
volume controller: Speed up binding by not sorting volumes
 2016-05-26 15:47:14 -07:00
Alex Mohr
2233417673 Merge pull request #25973 from derekwaynecarr/fix_build 
Fix builds on selinux systems
 2016-05-26 15:47:06 -07:00
Phillip Wittrock
feaa3aba82 Retry concurrency exceptions in e2e/kubectl.go. Fixes #26138 2016-05-26 14:44:51 -07:00
Janet Kuo
672cd64035 Disallow returning nil server in NewEtcdTestClientServer 2016-05-26 14:37:12 -07:00
Janet Kuo
3cc2311c54 Increase etcd test server up timeout to wait.ForeverTestTimeout 2016-05-26 14:35:57 -07:00
Random-Liu
e5320c6063 Temporarily disable node-problem-detector to unblock #26351 2016-05-26 14:06:05 -07:00
Dawn Chen
16662d8fb4 Bump Node Image to container-v1-3-v20160517 2016-05-26 13:30:56 -07:00
Alex Mohr
f24b7a7391 Merge pull request #25898 from deads2k/make-admission-enablable 
make admission plugins configurable based on external criteria
 2016-05-26 13:23:27 -07:00
Alex Mohr
edda837142 Merge pull request #25599 from caesarxuchao/orphaning-finalizer 
Add orphaning finalizer logic to GC
 2016-05-26 13:19:19 -07:00
Alex Mohr
0f3003671c Merge pull request #25963 from bryk/release-beta1 
Set Dashboard UI version to v1.1.0-beta1
 2016-05-26 12:38:48 -07:00
Alex Mohr
5b1653ec39 Merge pull request #25681 from vishh/lifecycle-probe-logs 
Log output of lifecycle hooks on failure
 2016-05-26 12:37:02 -07:00
Alex Mohr
6f919dc6fc Merge pull request #25634 from ericchiang/rbac_api_group 
Add RBAC authorization API group and authorizer
 2016-05-26 12:36:53 -07:00
Minhan Xia
0834dc489a do not return error if TearDownPod is called twice 2016-05-26 11:57:22 -07:00