Commit Graph

29755 Commits

Author SHA1 Message Date
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
Euan Kemp
93487867ac kubenet: Update empty ip check
The previous check was incorrect because the `IP.String` method returns
`<nil>` and other non-empty-strings on error conditions.
2016-05-27 10:47:13 -07:00
Euan Kemp
c4b8959a75 kubenet: Reduce loglevel of spammy message
When no shaping is enabled, that warning would always be printed.
2016-05-27 10:47:12 -07:00
Euan Kemp
7e0b9bfa66 kubenet: Fix panic when teardown run before setup
Teardown can run before Setup when the kubelet is restarted... in that
case, the shaper was nil and thus calling the shaper resulted in a panic

This fixes that by ensuring the shaper is always set... +1 level of
indirection and all that.
2016-05-27 10:47:12 -07:00
Euan Kemp
2f5e738dc1 kubenet: Fix inconsistent cidr usage/parsing
Before this change, the podCIDRs map contained both cidrs and ips
depending on which code path entered a container into it.

Specifically, SetUpPod would enter a CIDR while GetPodNetworkStatus
would enter an IP.

This normalizes both of them to always enter just IP addresses.

This also removes the now-redundant cidr parsing that was used to get
the ip before
2016-05-27 10:47:12 -07:00
Phillip Wittrock
d051f0b7cd Node e2e - Fix issue where error in scp is not return. Fixes #26435 2016-05-27 10:33:23 -07:00
Wojciech Tyczynski
be1b57100d Change to NotReadyNetworking and use in scheduler 2016-05-27 19:32:49 +02:00
gmarek
7bdf480340 Node is NotReady until the Route is created 2016-05-27 19:29:51 +02: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
Euan Kemp
766eb6f0f7 kubenet: Fix bug where shaper.Reset wasn't called
The error check was inverse what it should have been, causing
shaper.Reset to only get called with invalid cidrs.
2016-05-27 10:20:43 -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
Justin Santa Barbara
6c66764a35 Generated output from update-codecgen.sh and update-codegen.sh 2016-05-27 10:09:29 -04: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
Justin Santa Barbara
b754393630 kube-controller-manager: Add configure-cloud-routes option
This allows kube-controller-manager to allocate CIDRs to nodes (with
allocate-node-cidrs=true), but will not try to configure them on the
cloud provider, even if the cloud provider supports Routes.

The default is configure-cloud-routes=true, and it will only try to
configure routes if allocate-node-cidrs is also configured, so the
default behaviour is unchanged.

This is useful because on AWS the cloud provider configures routes by
setting up VPC routing table entries, but there is a limit of 50
entries.  So setting configure-cloud-routes on AWS would allow us to
continue to allocate node CIDRs as today, but replace the VPC
route-table mechanism with something not limited to 50 nodes.

We can't just turn off the cloud-provider entirely because it also
controls other things - node discovery, load balancer creation etc.

Fix #25602
2016-05-27 09:42:20 -04: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
AdoHe
04c0103c4a fix strategy patch diff list issue 2016-05-27 08:42:33 -04:00
Wojciech Tyczynski
19ccbb9f99 Speed up test, by not running with custom etcd prefix 2016-05-27 14:30:24 +02:00
Robert Rati
2d487f7c06 Added pods-per-core to kubelet. #25762 2016-05-27 07:10:13 -04: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
Euan Kemp
ecfd8f723f rkt: Fix panic in setting ReadOnlyRootFS 2016-05-26 20:43:26 -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
Colin Hom
f9e32118dc Fix docker load error in federation image push 2016-05-26 19:44:09 -07: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
Prashanth Balasubramanian
d57575762b petset E2Es 2016-05-26 18:39:24 -07:00
Tim St. Clair
e4d8dea0d7 Move containerd process into docker cgroup for versions >= v1.11 2016-05-26 17:27:00 -07:00