Commit Graph

32126 Commits (1d8c15ba14c9602c6ea74c4e41abf6517f57a034)

Author SHA1 Message Date
k8s-merge-robot 1d8c15ba14 Merge pull request #28755 from dubstack/remove-systemd-check
Automatic merge from submit-queue

Do not skip check for cgroup creation in the systemd mount

As soon as libcontainer dependency is update in #28410, we can skip check for cgroup creation in the systemd mount. As the latest version of libcontainer should create cgroups in the sytemd mount aswell.

This is tied to the upstream issue: #27204

@vishh PTAL
2016-07-18 15:05:51 -07:00
k8s-merge-robot 8eb0cf5039 Merge pull request #28871 from vishh/gce-cp
Automatic merge from submit-queue

Do not query the metadata server to find out if running on GCE.  Retry metadata server query for gcr if running on gce.

Retry the logic for determining is gcr is enabled to workaround metadata unavailability.

Note: This patch does not retry fetching registry credentials.
2016-07-18 14:32:04 -07:00
k8s-merge-robot 92f6b0c889 Merge pull request #29130 from caesarxuchao/fix-29065
Automatic merge from submit-queue

[flake fix] Wait for the podInformer to observe the pod

Fix #29065 

The problem is that the rc manager hasn't observed pod1, so it creates another pod and scales down, pod1 might get deleted. To fix it, wait for the podInformer to observe the pod before running the rc manager.

Marked as P0 as it's fixing a P0 flake.
2016-07-18 13:54:41 -07:00
k8s-merge-robot bbc09d5e65 Merge pull request #29128 from bprashanth/logrotate
Automatic merge from submit-queue

Change maxsize to size in logrotate.

How do I trigger a test? I usually test logrotate with `logrotate -s` and that works as expected.
2016-07-18 13:17:21 -07:00
k8s-merge-robot 6108725869 Merge pull request #29047 from lixiaobing10051267/masterServe
Automatic merge from submit-queue

Apiserver ServeHTTP() modify

In File "pkg\apiserver\watch.go", line 123:
"// Serve serves a series of encoded events via HTTP with Transfer-Encoding: chunked"
Here "Serve" should be "ServeHTTP" because the func name is ServeHTTP:
"func (s *WatchServer) ServeHTTP(w http.ResponseWriter, req *http.Request)"
2016-07-18 12:43:04 -07:00
k8s-merge-robot d08a722647 Merge pull request #28802 from fejta/service
Automatic merge from submit-queue

Drop support for --gce-service-account, require activated creds

Now that `gcloud auth activate-service-account` is in remove support in the test framework for default service accounts -- testing GCE/GKE now requires prior gcloud activation.
2016-07-18 12:08:03 -07:00
k8s-merge-robot e72f6a892d Merge pull request #28234 from damemi/record-false-bugfix
Automatic merge from submit-queue

Make sure --record=false is acknowledged when passed to commands

```release-note
Change setting "kubectl --record=false" to stop updating the change-cause when a previous change-cause is found.
```

Ensures that when `--record=false` is explicity set that no `ChangeCauseAnnotation`s are set on the object. Previously, if `--record=true` was used then all following actions triggered a `ChangeCauseAnnotation` even if `--record=false` was set, due to the prior `ChangeCauseAnnotation` existing.

Reference to bug report: https://bugzilla.redhat.com/show_bug.cgi?id=1351127

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-07-18 11:32:15 -07:00
Prashanth Balasubramanian 1173dd13bf Change maxsize to size in logrotate. 2016-07-18 11:30:50 -07:00
Chao Xu 519b57484c wait for the podInformer to observe the pod creation in the rc's TestAdoption test 2016-07-18 11:26:58 -07:00
k8s-merge-robot f50bb73ed6 Merge pull request #26136 from AdoHe/kubectl_apply_overwrite
Automatic merge from submit-queue

kubectl apply add --overwrite flag

```release-note
Add "kubectl --overwrite" flag to automatically resolve conflicts between the modified and live configuration using values from the modified configuration.
```
fixes #17238

This PR just add the `--overwrite` flag, pkg/strategicpatch has already support overwrite. @bgrant0607 @jackgr ptal.
2016-07-18 10:47:53 -07:00
k8s-merge-robot 6d09ba41e9 Merge pull request #29044 from lixiaobing10051267/masterWebHook
Automatic merge from submit-queue

Func note not consistent with real fun name

File "plugin\pkg\webhook.go", line #41 :
"// New creates a new GenericWebhook from the provided kubeconfig file."
Here "New" not consistant with real fun name "NewGenericWebhook" in line #42 :
"func NewGenericWebhook(kubeConfigFile string, groupVersions []unversioned.GroupVersion, initialBackoff time.Duration) (*GenericWebhook, error) {"
2016-07-18 10:13:05 -07:00
k8s-merge-robot 5d0d77df6c Merge pull request #28733 from rata/secret-configmap-file-mode-proposal
Automatic merge from submit-queue

Add proposal for secret and configmap files mode bits

This is a proposal to address https://github.com/kubernetes/kubernetes/issues/28317.

cc @pmorie (owner) @thockin 

@thockin: Sorry if you preferred not to be CCed, I thougth you'd be interested :-)

I think this is always the case, but let me say it one more time just in case: as this is a PR, ALL the feedback is more than welcome!

It's my first time in kubernetes, so sorry in advance if this is obviously wrong. What I realize now is that I forgot to add the headers to the proposal. Is there some script to add them? Or should I just c&p from some other proposal?


Thanks a lot,
Rodrigo
2016-07-18 09:34:49 -07:00
Marek Grabowski 77037722a3 Merge pull request #29111 from gmarek/maxpods
Fix the fix - no type-checking...
2016-07-18 16:30:18 +02:00
k8s-merge-robot fa174bcdaf Merge pull request #29042 from dims/fixup-imports
Automatic merge from submit-queue

Use Go canonical import paths

Add canonical imports only in existing doc.go files.
https://golang.org/doc/go1.4#canonicalimports

Fixes #29014
2016-07-18 07:23:38 -07:00
gmarek 9c49e87aa4 Fix the fix - no type-checking... 2016-07-18 16:02:47 +02:00
Rodrigo Campos 45ea7eb1f4 Add proposal for secret and configmap files mode bits
This is a proposal to address
https://github.com/kubernetes/kubernetes/issues/28317.
2016-07-18 10:17:14 -03:00
k8s-merge-robot 9b5696b7b4 Merge pull request #26705 from nebril/issue-26704
Automatic merge from submit-queue

Make discovery summarizer call servers in parallel

fixes #26704
2016-07-18 04:42:46 -07:00
k8s-merge-robot 6032494276 Merge pull request #29096 from gmarek/cidrAllocation
Automatic merge from submit-queue

Re-check assigned CIDR during update

Ref. #29064

cc @bgrant0607
2016-07-18 03:35:30 -07:00
k8s-merge-robot 524c5b5361 Merge pull request #29005 from gmarek/maxpods
Automatic merge from submit-queue

Fix verify results in MaxPods

As we already have "unschedulable" PodCondition we can stop relying on Events, which should make the tests more reliable.

cc @davidopp
2016-07-18 02:54:44 -07:00
k8s-merge-robot 18df451031 Merge pull request #28982 from yujuhong/rm_todos
Automatic merge from submit-queue

kubelet: remove outdated TODOs
2016-07-18 02:19:23 -07:00
gmarek 579912d9d2 Re-check assigned CIDR during update 2016-07-18 10:57:58 +02:00
k8s-merge-robot 450a71cd2a Merge pull request #29093 from wojtek-t/fix_scheduler_crash
Automatic merge from submit-queue

Fix crashes in schedulercache

Fix #29090

@davidopp
2016-07-18 01:44:08 -07:00
k8s-merge-robot 5f766748db Merge pull request #27762 from xiangpengzhao/fix-port-range
Automatic merge from submit-queue

Fix port range checking, port should not be greater than 65535.

When passing flag `--proxy-port-range` to kube-proxy with an invalid range which is greater than 65535, the proxy doesn't exit. That's not what we want.

Should we fix this in v1.3?
/cc @thockin @mikedanese @resouer 

Before fixing:
```
root@vm:/home/paas/zxp# kube-proxy --master=172.16.1.11:8080 --logtostderr=false --log-dir=/home/user/log/kube --proxy-port-range=65536-65599 &
[6] 6671
root@vm:/home/paas/zxp# ps -ef | grep kube-proxy
root      6671 13507  0 03:48 pts/1    00:00:00 kube-proxy --master=172.16.1.11:8080 --logtostderr=false --log-dir=/home/user/log/kube --proxy-port-range=65536-65599
```

After:
```
root@vm:/home/paas/zxp# kube-proxy --master=172.16.1.11:8080 --logtostderr=false --log-dir=/home/user/log/kube --proxy-port-range=65536-65599 &
[6] 6725
root@vm:/home/paas/zxp# invalid argument "65536-65599" for --proxy-port-range=65536-65599: "65536-65599" is not a valid port range: the port range cannot be greater than 65535: 65536-65599
..............
[6]+  Exit 2                  kube-proxy --master=172.16.1.11:8080 --logtostderr=false --log-dir=/home/user/log/kube --proxy-port-range=65536-65599
```
```
root@vm:/home/paas/zxp# kube-proxy --master=172.16.1.11:8080 --logtostderr=false --log-dir=/home/user/log/kube --proxy-port-range=6000-65599 &
[6] 6732
root@vm:/home/paas/zxp# invalid argument "6000-65599" for --proxy-port-range=6000-65599: "6000-65599" is not a valid port range: the port range cannot be greater than 65535: 6000-65599
..............
[6]+  Exit 2                  kube-proxy --master=172.16.1.11:8080 --logtostderr=false --log-dir=/home/user/log/kube --proxy-port-range=6000-65599
```
2016-07-18 01:44:03 -07:00
Wojciech Tyczynski 78101ac55e Fix crashes in schedulercache 2016-07-18 10:04:36 +02:00
k8s-merge-robot d168bbe3b8 Merge pull request #28767 from johscheuer/fix-volume-typos
Automatic merge from submit-queue

Fix typos in volume.go

Fixed some minor typos in the docs of `volume.go`.
2016-07-18 00:36:00 -07:00
k8s-merge-robot 08b4f5f8f5 Merge pull request #28766 from lixiaobing10051267/masterOverlayId
Automatic merge from submit-queue

Doc referrence "container-id" incorrect

File "docs\proposals\disk-accounting.md", line 154, "Everything under  `/var/lib/docker/overlay/<container-id>` are files required for running the container", here "container-id" is incorrect because files under "/var/lib/docker/overlay" are layer files, and  "container-id"  should be "id" thus consistent with line 148 "Image layers and writable layers are stored under `/var/lib/docker/overlay/<id>`".
2016-07-18 00:35:56 -07:00
k8s-merge-robot 7408c91d5e Merge pull request #29032 from timothysc/http2_godep_update
Automatic merge from submit-queue

Update golang.org/x/net godep for http2 issues being seen during scale

This is to address https://github.com/kubernetes/kubernetes/issues/29001 , 

"Header called after Handler finished".   There are a number of race fixes.
2016-07-18 00:35:51 -07:00
k8s-merge-robot 1e1d4b023a Merge pull request #29082 from bprashanth/lb_fw
Automatic merge from submit-queue

Don't recreate lb cloud resources on kcm restart

Absolute dumbest way to fix it right now.
Fixes https://github.com/kubernetes/kubernetes/issues/29079
2016-07-17 22:33:50 -07:00
Prashanth Balasubramanian a9426a19c9 Don't recreate lb cloud resources on kcm restart 2016-07-17 21:59:22 -07:00
AdoHe ddbd539d1e kubectl apply add --overwrite flag 2016-07-18 00:32:13 -04:00
k8s-merge-robot 4196be053b Merge pull request #29019 from apelisse/update-automation-doc-close-pr
Automatic merge from submit-queue

Document auto-close on stale pull-request

Document the change made by https://github.com/kubernetes/contrib/pull/891.
2016-07-17 16:07:29 -07:00
David McMahon 87a0213d43 Update CHANGELOG.md for v1.3.2. 2016-07-17 11:59:30 -07:00
David McMahon 3304dbd3d0 Update CHANGELOG.md for v1.3.1. 2016-07-17 11:05:22 -07:00
k8s-merge-robot 01925c810b Merge pull request #24733 from kargakis/rc-rs-conversions
Automatic merge from submit-queue

Custom conversions between RCs/RSs

Needed for building storages that still need to work with RCs but also want to facilitate RSs.

cc: @deads2k @smarterclayton @liggitt
2016-07-17 04:49:16 -07:00
k8s-merge-robot 86b47f26d9 Merge pull request #29067 from dims/fix-issue-29013
Automatic merge from submit-queue

Ignore GREP_OPTIONS/GREP_COLOR

On OSX - default BSD grep breaks gen_conversion. Let's just
make sure we use --color=never everywhere, so we don't trip
over GREP_OPTIONS/GREP_COLOR in a user environment.

Fixes #29013
2016-07-16 21:56:45 -07:00
k8s-merge-robot 156205523d Merge pull request #28852 from deads2k/use-user
Automatic merge from submit-queue

authorize based on user.Info

Update the `authorization.Attributes` to use the `user.Info` instead of discrete getters for each piece.

@kubernetes/sig-auth
2016-07-16 20:12:43 -07:00
Davanum Srinivas 0cf59707bd Ignore GREP_OPTIONS/GREP_COLOR
On OSX - default BSD grep breaks gen_conversion. Let's just
make sure we use --color=never everywhere, so we don't trip
over GREP_OPTIONS/GREP_COLOR in a user environment.

Fixes #29013
2016-07-16 20:28:30 -04:00
k8s-merge-robot 0bec77bd6b Merge pull request #29062 from bprashanth/cidr
Automatic merge from submit-queue

List all nodes and occupy cidr map before starting allocations

Manually tested by starting a 200 node cluster with frequent controller manager restarts.
Fixes https://github.com/kubernetes/kubernetes/issues/29058
2016-07-16 15:49:10 -07:00
Prashanth Balasubramanian 2f9516db30 List all nodes and occupy cidr map before starting allocations 2016-07-16 13:54:01 -07:00
k8s-merge-robot 8677b0c545 Merge pull request #28743 from Clarifai/gpu-impl
Automatic merge from submit-queue

Fix GPU resource validation

This fixes scheduling of pods with GPU resources. The change was never upstreamed during the 1.3 beta period, as it got lost in the noise of other changes in our fork. Ooops. I'll submit a cherry-pick request for 1.3.1 as soon as this lands in master.

Because of defaulting, requests are always set if limits are. Thus, the check can never succeed. Instead, make sure that the two values are equal.

Also, remove a few other error messages and remove unnecessary Sprintf calls.
2016-07-16 11:48:42 -07:00
Davanum Srinivas 2b0ed014b7 Use Go canonical import paths
Add canonical imports only in existing doc.go files.
https://golang.org/doc/go1.4#canonicalimports

Fixes #29014
2016-07-16 13:48:21 -04:00
k8s-merge-robot 51629f50b7 Merge pull request #29031 from saad-ali/waitForDetachOnPDTests
Automatic merge from submit-queue

Make PD E2E Tests Wait for Detach to Prevent Kernel Errors

Fixes https://github.com/kubernetes/kubernetes/issues/28854
2016-07-16 10:01:15 -07:00
k8s-merge-robot 3a305c1cfa Merge pull request #28978 from foxish/patch-1
Automatic merge from submit-queue

Added instructions on turning on dynamic provisioning for testing.

HostPath volumes are not automatically provisioned unless we pass in `--enable-hostpath-provisioner` to the controller manager. This was not mentioned in the docs previously, leading to questions like [this](https://groups.google.com/forum/#!searchin/kubernetes-dev/mysterious/kubernetes-dev/jVk_RgAkbaY/LRX7IuCEDQAJ).
2016-07-16 08:12:54 -07:00
lixiaobing10051267 97219275b1 Apiserver ServeHTTP() modify 2016-07-16 12:29:11 +08:00
k8s-merge-robot e60df08532 Merge pull request #29038 from mml/e2e-federation-env
Automatic merge from submit-queue

Only run federation tests if FEDERATION==true.
2016-07-15 20:36:37 -07:00
k8s-merge-robot 5e1b75d164 Merge pull request #28990 from xiangpengzhao/fix_duplicated_code
Automatic merge from submit-queue

Delete duplicated code

The code block below is called twice sequentially in func `doTestPlugin`.
.
```go
 	if _, err := os.Stat(path); err != nil {
 		if os.IsNotExist(err) {
 			t.Errorf("SetUp() failed, volume path not created: %s", path)
 		} else {
 			t.Errorf("SetUp() failed: %v", err)
 		}
 	}
```
2016-07-15 19:30:34 -07:00
lixiaobing10051267 3dfdb1dbb3 Func note not consistent with real fun name 2016-07-16 10:25:01 +08:00
k8s-merge-robot d6336c4f4b Merge pull request #29024 from yifan-gu/copy_etc_hosts_resolv
Automatic merge from submit-queue

rkt: Copy the /etc/hosts /etc/resolv.conf into pod dir before mounting.

rkt: Copy the /etc/hosts /etc/resolv.conf into pod dir before mounting.
    
This enables the container to modify the /etc/hosts/ /etc/resolv.conf without changing the host's ones.
With this PR, we now match the docker's behavior.

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

cc @kubernetes/sig-rktnetes @quentin-m
2016-07-15 18:56:48 -07:00
k8s-merge-robot 6f98b693e8 Merge pull request #28876 from thockin/kube-proxy-scale-conntrack-by-cores
Automatic merge from submit-queue

Scale kube-proxy conntrack limits by cores (new default behavior)

For large machines we want more conntrack entries than smaller machines.

Commence bike-shedding on names and values and semantics.  I'd love to get this in as a patch to 1.3.x since we have had some trouble for users on large machines.

Fixes #28867
2016-07-15 18:14:32 -07:00
Yifan Gu 56698a6c3e rkt: Copy the /etc/hosts /etc/resolv.conf into pod dir before mounting.
This enables the container to modify the /etc/hosts/ /etc/resolv.conf
without changing the host's ones.

With this PR, we now match the docker's behavior.
2016-07-15 17:40:29 -07:00