Commit Graph

31992 Commits

Author SHA1 Message Date
k8s-merge-robot
bea5232790 Merge pull request #28946 from ping035627/ping035627-patch-0714-2
Automatic merge from submit-queue

Modify wrong description about "InsecurePort" in genericapiserver.go

Modify wrong description about "InsecurePort" in genericapiserver.go, avoid misleading.
2016-07-14 19:56:09 -07:00
k8s-merge-robot
e182520db6 Merge pull request #28944 from ping035627/ping035627-patch-0715
Automatic merge from submit-queue

Improve fatal error description for init in genericapiserver.go

When api.NewRequestContextFilter return error in the "init" function of genericapiserver.go, there are no handler info, add more information to indicate s.Handler or s.InsecureHandler, I suggest.
2016-07-14 19:56:04 -07:00
k8s-merge-robot
c481291320 Merge pull request #28937 from ping035627/ping035627-patch-0714
Automatic merge from submit-queue

Optimise the New function in genericapiserver.go

It needn't the handlerContainer variable in the "New" function when deal s.HandlerContainer, I think, and it seems the codes more concise.
2016-07-14 19:56:00 -07:00
k8s-merge-robot
4030afdfb1 Merge pull request #28922 from david-mcmahon/release-push
Automatic merge from submit-queue

Add RELEASE_INFRA_PUSH related code to support pushes from kubernetes/release.

ref #16529
2016-07-14 19:55:56 -07:00
k8s-merge-robot
01e34b72c1 Merge pull request #27151 from caesarxuchao/gc-e2e
Automatic merge from submit-queue

[garbage collector] add e2e test

This PR also includes some changes to plumb controller-manager's `--enable_garbage_collector` from the environment variable.

The e2e test will not be run by the core suite because it's marked `[Feature:GarbageCollector]`.

The corresponding jenkins job configuration PR is https://github.com/kubernetes/test-infra/pull/132.
2016-07-14 19:55:52 -07:00
Maisem Ali
e4265cebbc Merge pull request #28980 from kubernetes/revert-28691-pv-gid-squash2
Revert "Remove pod mutation for PVs with supplemental GIDs"
2016-07-14 17:48:41 -07:00
Daniel Smith
360f2eb927 Revert "Remove pod mutation for PVs with supplemental GIDs" 2016-07-14 17:47:46 -07:00
PingWang
a7cea72e66 modify two wrong description about InsecurePort
Signed-off-by: PingWang <wang.ping5@zte.com.cn>

Update genericapiserver.go

Signed-off-by: PingWang <wang.ping5@zte.com.cn>
2016-07-15 08:29:18 +08:00
David McMahon
ae18034920 Add RELEASE_INFRA_PUSH related code to support pushes from kubernetes/release. 2016-07-14 11:46:59 -07:00
k8s-merge-robot
3a0d2d55c3 Merge pull request #28613 from a-robinson/blog
Automatic merge from submit-queue

Remove crufty blog post material that isn't actually an example.
2016-07-14 11:22:14 -07:00
k8s-merge-robot
4c58621413 Merge pull request #28966 from liggitt/cache-filter
Automatic merge from submit-queue

Fix watch cache filtering

When serving watch events for a particular namespace, the watch cache filters out events from other namespaces by checking the etcd key of the event's object, and making sure it is prefixed with the root key for the namespace being watched.

The prefix check does not ensure the match occurs on a path segment boundary, so a watch on  namespace `test` is delivered watch events for namespace `test1`.

This tightens the check to ensure the prefix match occurs on a path segment boundary.
2016-07-14 11:22:10 -07:00
k8s-merge-robot
be3175611c Merge pull request #28691 from wongma7/pv-gid-squash2
Automatic merge from submit-queue

Remove pod mutation for PVs with supplemental GIDs

Continuation of https://github.com/kubernetes/kubernetes/pull/27571 to bring the feature back without pod mutation
2016-07-14 11:22:04 -07:00
Jordan Liggitt
4fcd999c25
Fix watch cache filtering 2016-07-14 13:13:17 -04:00
k8s-merge-robot
bea382c124 Merge pull request #28932 from smarterclayton/fix_protobuf_error
Automatic merge from submit-queue

Fail correctly in go-to-protobuf

We need to return earlier.

@wojtek-t
2016-07-14 09:09:42 -07:00
k8s-merge-robot
03be7117a4 Merge pull request #28882 from gmarek/ratelimiter
Automatic merge from submit-queue

Allow switching rate limiter inside RateLimitedQueue

Ref. #28832
cc @davidopp  

```release-note
Deprecate deleting-pods-burst ControllerManager flag
```
2016-07-14 08:44:35 -07:00
k8s-merge-robot
673b486776 Merge pull request #28957 from ziyadbasheer/patch-1
Automatic merge from submit-queue

Update CONTRIBUTING.md

```release-note
* Rewrote two sentences.
```
2016-07-14 08:03:44 -07:00
k8s-merge-robot
98d769cf3d Merge pull request #27943 from ivan4th/refactor-printer-arguments
Automatic merge from submit-queue

Refactor Printer arguments

<!--
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.
-->
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
Fixes #21260
2016-07-14 08:03:40 -07:00
k8s-merge-robot
50172148e4 Merge pull request #25273 from ncdc/exec-sigwinch
Automatic merge from submit-queue

Support terminal resizing for exec/attach/run

```release-note
Add support for terminal resizing for exec, attach, and run. Note that for Docker, exec sessions
inherit the environment from the primary process, so if the container was created with tty=false,
that means the exec session's TERM variable will default to "dumb". Users can override this by
setting TERM=xterm (or whatever is appropriate) to get the correct "smart" terminal behavior.
```

Fixes #13585
2016-07-14 07:26:49 -07:00
gmarek
f6b1c316e9 Allow switching rate limiter inside RateLimitedQueue 2016-07-14 15:38:14 +02:00
k8s-merge-robot
6558b30f11 Merge pull request #28931 from smarterclayton/fix_conversions
Automatic merge from submit-queue

genconversion=false should skip fields during conversion generation

Currently it only skips if the fields don't match, but that leaves no
way for callers to say "no really, ignore this field".

@wojtek-t @thockin *must* be able to ignore a non-convertible field (if the types are different but we still want the autogeneration of everything else)
2016-07-14 06:36:27 -07:00
ziyadbasheer
b7494a59e2 Update CONTRIBUTING.md
Rewrote a few sentences.
2016-07-14 16:33:34 +03:00
Ivan Shvedunov
5ed881c6c4 Refactor Printer arguments
Fixes #21260
2016-07-14 16:23:02 +03:00
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
PingWang
4e9b8b15c5 Improve fatal error description
Signed-off-by: PingWang <wang.ping5@zte.com.cn>
2016-07-14 15:03:31 +08: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
PingWang
97b4a6fa42 optimise the New function
Signed-off-by: PingWang <wang.ping5@zte.com.cn>
2016-07-14 11:43:53 +08:00
Clayton Coleman
c55f47c4c9
Fail correctly in go-to-protobuf
We need to return earlier.
2016-07-13 23:02:45 -04: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
Clayton Coleman
f5975afc06
genconversion=false should skip fields during conversion generation
Currently it only skips if the fields don't match, but that leaves no
way for callers to say "no really, ignore this field".
2016-07-13 22:20:40 -04: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