Commit Graph

31962 Commits

Author SHA1 Message Date
k8s-merge-robot
c94976570f Merge pull request #28917 from wonderfly/gci-family
Automatic merge from submit-queue

e2e-runner: Update the image family used for GCI canary test images

@Amey-D @spxtr Can you review?
@Random-Liu Heads up
cc/ @kubernetes/goog-image
2016-07-14 06:02:40 -07:00
k8s-merge-robot
6bb0995c89 Merge pull request #28886 from wojtek-t/fix_schedulercache_bug
Automatic merge from submit-queue

Add ForgetPod to SchedulerCache

Fix #28883

@gmarek @davidopp @xiang90
2016-07-14 05:30:23 -07:00
k8s-merge-robot
cdb4df8ea5 Merge pull request #26908 from pmorie/pv-dynprov
Automatic merge from submit-queue

dynamic provisioning proposal

Proposal for dynamic provisioning using storage classes; supercedes #17056

@kubernetes/sig-storage
2016-07-14 04:54:37 -07:00
k8s-merge-robot
74c5b4e4be Merge pull request #28459 from ping035627/ping035627-patch-0704
Automatic merge from submit-queue

Optimise the process of the CalculateSpreadPriority in selector_spreading.go

It had better inspect if the nodeLister is normal first in the CalculateSpreadPriority in selector_spreading.go. If the nodeLister.List return error, the function return directly, not need deal the serviceLister and controllerLister and replicaSetLister.
2016-07-14 04:54:32 -07:00
k8s-merge-robot
ae990defcf Merge pull request #26956 from joe2far/fix-typos
Automatic merge from submit-queue

Fixed several typos
2016-07-14 04:13:15 -07:00
Wojciech Tyczynski
31d09f5290 Merge pull request #28948 from soltysh/issue28941
Fix issue with closing channels in job controller tests
2016-07-14 13:01:50 +02:00
k8s-merge-robot
06939c57aa Merge pull request #20699 from jiangyaoguo/add-AvoidPreviousNode
Automatic merge from submit-queue

Implement alpha version of PreferAvoidPods

This is part of #18853

<!-- Reviewable:start -->
---
This change is [<img src="http://reviewable.k8s.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](http://reviewable.k8s.io/reviews/kubernetes/kubernetes/20699)
<!-- Reviewable:end -->
2016-07-14 03:30:25 -07:00
Maciej Szulik
fd76f71fd5 Fix issue with closing channels in job controller tests 2016-07-14 12:09:12 +02:00
k8s-merge-robot
febd37b148 Merge pull request #28164 from intelsdi-x/dont_set_provider_for_conformance_tests
Automatic merge from submit-queue

Unset KUBERNETES_PROVIDER when KUBERNETES_CONFORMANCE_TEST is set

fixes #26269
same as #26530 - i accidentally lost my fork and couldn't rebase there ;)
@mikedanese PTAL
2016-07-14 02:53:08 -07:00
Jan Safranek
7aa61dd0ff Dynamic provisioning proposal 2016-07-14 10:14:06 +02:00
Marek Grabowski
339c6924b2 Merge pull request #28942 from kubernetes/revert-28805-ssh-dial-timeout
Revert "Add a customized ssh dialer that will timeout"
2016-07-14 09:05:39 +02:00
Wojciech Tyczynski
4b9b1afe76 Revert "Add a customized ssh dialer that will timeout" 2016-07-14 08:48:24 +02:00
k8s-merge-robot
f27a8034fd Merge pull request #28911 from thockin/fix-gendocs-for-symlinks
Automatic merge from submit-queue

Don't panic if we hit a dangling symlink in mungedocs

I hit this because I have a dangling symlink, which would cause a panic.
2016-07-13 20:55:34 -07:00
k8s-merge-robot
8f08cb3391 Merge pull request #28910 from rmmh/body-log
Automatic merge from submit-queue

Log restclient request/response bodies using %#v.

These are now protobufs, so outputting them with %s dumps a large
amount of binary garbage into the log. %#v properly escapes exotic
characters.
2016-07-13 19:24:13 -07:00
k8s-merge-robot
224b039307 Merge pull request #28797 from aaronlevy/insecure-retry
Automatic merge from submit-queue

Retry when apiserver fails to listen on insecure port

The apiserver will already continually retry when it fails to bind to the secure port. However, with the insecure port it does not retry, and any failures cause the apiserver to exit.

This change makes it so the api-server will retry on both insecure/secure ports.

A use-case for this change is for self-hosting the api-server, particularly when you are only running a single copy in your cluster. In some bootstrap and upgrade scenarios - it's necessary to replace/pivot from an existing api-server on the same host -- where you need a new copy running before tearing down the old (which is problematic when the api-server will try to bind to an in-use port and exit).
2016-07-13 18:51:29 -07:00
PingWang
e4ab32cde2 Modify CalculateAntiAffinityPriority function
Signed-off-by: PingWang <wang.ping5@zte.com.cn>
2016-07-14 09:10:50 +08:00
PingWang
437e133b34 Optimise the process of the CalculateSpreadPriority in selector_spreading.go
Signed-off-by: PingWang <wang.ping5@zte.com.cn>
2016-07-14 09:09:05 +08:00
k8s-merge-robot
54c8c82045 Merge pull request #28805 from caesarxuchao/ssh-dial-timeout
Automatic merge from submit-queue

Add a customized ssh dialer that will timeout

Fix https://github.com/kubernetes/kubernetes/issues/23835.

@a-robinson @cjcullen @lavalamp
2016-07-13 17:27:16 -07:00
k8s-merge-robot
ec5678847e Merge pull request #28914 from david-mcmahon/fix-munge-toc
Automatic merge from submit-queue

Add missing mungedoc run to hack/verify-munge-docs.sh.
2016-07-13 16:43:23 -07:00
k8s-merge-robot
5b92ee2155 Merge pull request #28823 from zenly/master
Automatic merge from submit-queue

ConfigMap added to kube addon manager

fixes #28775
2016-07-13 16:43:19 -07:00
k8s-merge-robot
6b6141f812 Merge pull request #28820 from caesarxuchao/patch-subresource
Automatic merge from submit-queue

[client-gen] Allow passing subresources in Patch method

Expand the Patch() method from:
```
Patch(name string, pt api.PatchType, data []byte)
```
to
```
Patch(name string, pt api.PatchType, data []byte, subresources ...string)
```

Continue on #27293. Fixes #26580.

cc @Random-Liu @lavalamp
2016-07-13 16:09:01 -07:00
k8s-merge-robot
f9a45e6983 Merge pull request #28673 from cheld/add-cni-config
Automatic merge from submit-queue

add default flannel configuration for cni

I added a default flannel configuration for cni.

So hyperkube can be started with:
```
--network-plugin=kubenet
```
or with flannel:

```
--network-plugin=cni
--network-plugin-dir=/etc/cni/net.d
```

Requires update of cni binaries to 0.3.0 or later to work. See also https://github.com/kubernetes/kubernetes/issues/27603

This PR is intended to support multi-node Hyperkube 
https://github.com/kubernetes/kube-deploy/pull/115



CC @zreigz  

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-07-13 14:42:07 -07:00
k8s-merge-robot
721eabf492 Merge pull request #28626 from juanvallejo/update-resource-builder-format-error
Automatic merge from submit-queue

update resource builder error message to be more clear

release-note-none

The error message given by command line `kubectl get` is sometimes of no help / not clear on what must be corrected, e.g.:
`kubectl get pod pod/database-1-i10b9`
error: when passing arguments in resource/name form, all arguments must include the resource 

##### Steps to Reproduce:
1. Run command "$ kubectl get pod pod/database-1-i10b9"  

##### Actual Result:
Get unfriendly error message which is of no help:
"error: when passing arguments in resource/name form, all arguments must include the resource"

##### Expected Result:
Error message should recommend end user to run this cli in good grammar: "$ kubectl get pod database-1-i10b9" or "$ kubectl get pod/database-1-i10b9"

##### Before
"error: when passing arguments in resource/name form, all arguments must include the resource"

##### After
"error: there is no need to specify a resource type as a separate argument when passing arguments in resource/name form (e.g. `kubectl get resource/<resource_name>` instead of `kubectl get resource resource/<resource_name>`"

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-07-13 14:42:02 -07:00
Daniel Wang
f5d711a56c Update the image family used for GCI canary test images 2016-07-13 14:27:18 -07:00
k8s-merge-robot
aebc35a9e8 Merge pull request #28800 from lavalamp/reallypanic
Automatic merge from submit-queue

Stop eating panics

Fixes #28365
2016-07-13 14:05:41 -07:00
David McMahon
f5ca4e888c Add missing mungedoc run to hack/verify-munge-docs.sh.
Update CHANGELOG.md.
2016-07-13 13:39:20 -07:00
k8s-merge-robot
d4846f127a Merge pull request #28639 from jfrazelle/update-contributing-doc-to-link-to-the-best-page
Automatic merge from submit-queue

Better visibility to contributing docs.

<!--
Checklist for submitting a Pull Request

Please remove this comment block before submitting.

1. Please read our [contributor guidelines](https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md).
2. See our [developer guide](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md).
3. If you want this PR to automatically close an issue when it is merged,
   add `fixes #<issue number>` or `fixes #<issue number>, fixes #<issue number>`
   to close multiple issues (see: https://github.com/blog/1506-closing-issues-via-pull-requests).
4. Follow the instructions for [labeling and writing a release note for this PR](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes) in the block below.
-->

```release-note

```


[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

1. Updates the README.md to have a heading with the word "contribute", long
   time OSS contributors (or maybe I just do this) skim docs quickly and need
   a large call out to exactly what they are looking for.
2. The best resource I found was a developer guide that wasn't even linked in
   CONTRIBUTING.md, which seems like a shame so I made it right at the top!
2016-07-13 13:28:52 -07:00
Maisem Ali
017965d6dc Merge pull request #28649 from david-mcmahon/fix-heading
Fix heading for previous releases on v1.3.0.
2016-07-13 13:13:38 -07:00
k8s-merge-robot
43f1fa9ce3 Merge pull request #28875 from david-mcmahon/dot-github
Automatic merge from submit-queue

Don't add analytics to .entries.
2016-07-13 12:54:30 -07:00
k8s-merge-robot
783aa1a28b Merge pull request #28872 from lojies/sshoptadd
Automatic merge from submit-queue

Add SSH_OPTS to config ssh and scp port

Add SSH_OPTS support.This can change ssh and scp default port.

fixes #17934
2016-07-13 12:54:25 -07:00
k8s-merge-robot
753ba9f6fe Merge pull request #28806 from silasbw/ubuntu-version-0
Automatic merge from submit-queue

cluster/ubuntu/download-release.sh: if $KUBE_VERSION is set, use it.

```release-note
If $KUBE_VERSION is set in cluster/ubuntu/download-release.sh use that version, 
otherwise set it to the result of `get_latest_version_number`.
```

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-07-13 12:54:20 -07:00
k8s-merge-robot
b50e66c66e Merge pull request #28340 from ZTE-PaaS/zhangke-patch-007
Automatic merge from submit-queue

controller-manager support number of garbage collector workers to be configurable

The number of garbage collector workers of controller-manager is a fixed value 5 now, make it configurable should more properly
2016-07-13 12:54:15 -07:00
k8s-merge-robot
ec99d90b0f Merge pull request #28905 from mtaufen/codec_factory-fixup
Automatic merge from submit-queue

Fix typo in pkg/runtime/serializer/codec_factory.go
2016-07-13 12:17:24 -07:00
k8s-merge-robot
3dbc4db681 Merge pull request #28891 from wojtek-t/avoid_generator_annoying_logs
Automatic merge from submit-queue

Unify logging in generators and avoid annoying logs.

@thockin regarding our discussing in the morning

@lavalamp - FYI
2016-07-13 12:17:19 -07:00
Tim Hockin
a8d394bfd4 Don't panic if we hit a dangling symlink in mungedocs 2016-07-13 11:50:26 -07:00
Ryan Hitchman
f1cd578363 Log restclient request/response bodies using %#v.
These are now protobufs, so outputting them with %s dumps a large
amount of binary garbage into the log. %#v properly escapes exotic
characters.
2016-07-13 11:37:16 -07:00
Daniel Smith
78c02cd052 Stop eating panics 2016-07-13 11:12:59 -07:00
David McMahon
ecb774ca4e Don't add analytics to .entries. 2016-07-13 11:09:38 -07:00
Chao Xu
d29b880efe add a customized ssh dialer that will timeout 2016-07-13 10:46:57 -07:00
Michael Taufen
d3f3bedbb7 Fix typo in pkg/runtime/serializer/codec_factory.go 2016-07-13 10:41:02 -07:00
k8s-merge-robot
2906a35c1a Merge pull request #28745 from justinsb/fix_28644
Automatic merge from submit-queue

kube-up: install new Docker pre-requisite (libltdl7) when not in image

Docker now has a dependency on libltdl7; we have to specify it manually
if we are installing docker using dpkg (vs using apt-get or similar,
which would pull it in automatically)

Fixes #28644
2016-07-13 10:17:15 -07:00
Wojciech Tyczynski
9745878778 Add ForgetPod to SchedulerCache 2016-07-13 16:30:05 +02:00
k8s-merge-robot
7823c5779d Merge pull request #28893 from wojtek-t/optimize_priorities_4
Automatic merge from submit-queue

More optimizations to scheduler throughput

Ref #28590

@davidopp @gmarek
2016-07-13 07:23:02 -07:00
joe2far
45922f155b Update swagger spec with changes.. 2016-07-13 15:16:32 +01:00
joe2far
5ead89b5bb Fixed several typos 2016-07-13 15:06:24 +01:00
k8s-merge-robot
7e6a856078 Merge pull request #28843 from gmarek/limiterPerZone
Automatic merge from submit-queue

Separate rate limiters for Pod evictions for different zones in NodeController

Ref. #28832

NodeController needs to be able to separately adjust rate-limits for eviction for different zones. This PR splits rate limiters.

cc @davidopp
2016-07-13 06:42:11 -07:00
k8s-merge-robot
af1891ca03 Merge pull request #28531 from dims/fix-issues-28314
Automatic merge from submit-queue

Add custom-columns and custom-template-file to --help text
2016-07-13 06:09:25 -07:00
Wojciech Tyczynski
16bf8c4008 Unify logging in generators and avoid annoying logs. 2016-07-13 15:06:44 +02:00
gmarek
5677a9845e Split NodeController rate limiters between zones 2016-07-13 14:09:19 +02:00
Wojciech Tyczynski
c929d95884 Cache Allocatable Resources 2016-07-13 12:57:18 +02:00