github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
29,614 Commits
32 Branches
881 Tags
633 MiB
Commit Graph

29614 Commits (baaf1b628a4c0b4765e9d191cd275dd499276994)

Author SHA1 Message Date
Alex Robinson baaf1b628a Merge pull request #25696 from rmmh/showbuildlog 
Show hack/build-go.sh output during e2e tests.
 2016-05-27 16:17:08 -07:00
Alex Robinson 91f8c784a0 Merge pull request #21373 from enoodle/read_cadvisor_cloudinfo_in_kubelet 
kubelet: reading cloudinfo from cadvisor
 2016-05-27 16:14:24 -07:00
Alex Robinson 782ac14f70 Merge pull request #25848 from bprashanth/petset_e2e 
Petset e2es
 2016-05-27 16:09:52 -07:00
Alex Robinson 079a2b4cc0 Merge pull request #26459 from smarterclayton/bump_appc 
bump(github.com/appc/spec):ab50d12e88f57788bf84b83fef2be236eb1fcc0b
 2016-05-27 16:07:09 -07:00
Alex Robinson cddf564f3c Merge pull request #24771 from timstclair/event-store 
Disable cAdvisor event storage by default
 2016-05-27 15:56:13 -07:00
Clayton Coleman 74bfb3e7bd bump(github.com/appc/spec):ab50d12e88f57788bf84b83fef2be236eb1fcc0b 
To match changes to pkg/api/resource#ParseQuantity
 2016-05-27 18:43:00 -04:00
Alex Robinson 1cca499e92 Merge pull request #26225 from yujuhong/less_noise 
Reduce noise in kubelet.log
 2016-05-27 14:28:53 -07:00
Alex Robinson d577550dd0 Merge pull request #26054 from gmarek/flags 
Make service-range flag in controller-manager optional
 2016-05-27 14:26:15 -07:00
Alex Robinson 644258fa56 Merge pull request #26422 from sttts/sttts-flake-26210-status-error 
Flake 26210: verbosely print StatusError in proxy e2e test
 2016-05-27 14:20:11 -07:00
Alex Robinson 90ca2aae24 Merge pull request #26423 from wojtek-t/speedup_update_codecget 
Speedup update_codecgen by precomputing dependencies.
 2016-05-27 14:19:08 -07:00
Alex Robinson f6b4707619 Merge pull request #26308 from quinton-hoole/2016-05-25-uberentes-add-cluster-zone 
Add zones and region to federation cluster API object status.
 2016-05-27 13:23:46 -07:00
k8s-merge-robot 7fc2e16843 Merge pull request #26442 from mwielgus/reduce-ca-request 
Automatic merge from submit-queue

Reduce cluster autoscaler request to fit into n1 master in e2e tests

cc: @piosz @fgrzadkowski @vulpecula
 2016-05-27 13:11:13 -07:00
Wojciech Tyczynski 92fc59cacf Speedup update_codecgen by precomputing dependencies. 2016-05-27 22:01:06 +02:00
Quinton Hoole 8fb3c81ac3 Add zones and region to federation cluster API object status. 2016-05-27 12:24:44 -07:00
Alex Robinson b61ce0bc81 Merge pull request #26443 from ixdy/jenkins-build-only-if-new 
Don't delete existing CI releases if pushing the same version
 2016-05-27 12:15:59 -07:00
Jeff Grafton 7cafb1763c Don't delete existing CI releases if pushing the same version. 2016-05-27 12:07:49 -07:00
Alex Robinson 4db3cc7e5e Merge pull request #26396 from colhom/fix-federation-build 
Fix docker load error in federation image push
 2016-05-27 11:44:32 -07:00
Alex Robinson bd0b94efe2 Merge pull request #26029 from luxas/mkdir_all 
kubelet: Use MkdirAll instead of Mkdir
 2016-05-27 11:40:01 -07:00
Alex Robinson 5773b64721 Merge pull request #22665 from rootfs/nfs-doc 
better NFS example doc
 2016-05-27 11:32:38 -07:00
Alex Robinson 804e36be26 Merge pull request #26157 from gmarek/poll 
Remove unused POLL_SLEEP_INTERVAL
 2016-05-27 11:30:41 -07:00
Alex Robinson c0a91b17ba Merge pull request #26072 from kubernetes/sttts-fix-e2e-kubectl-exec-log 
Do not show command twice in e2e kubectl exec
 2016-05-27 11:30:20 -07:00
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
Marcin d6cba0165a Reduce cluster autoscaler request to fit into n1 master in e2e tests 2016-05-27 20:25:25 +02: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
Dr. Stefan Schimanski 27a3554c84 Verbosely print StatusError in proxy e2e test 2016-05-27 16:05:03 +02: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