Commit Graph

32383 Commits

Author SHA1 Message Date
PingWang
f759f3243a print two errors to log
Signed-off-by: PingWang <wang.ping5@zte.com.cn>

update for go vet

Signed-off-by: PingWang <wang.ping5@zte.com.cn>
2016-07-22 09:47:52 +08:00
k8s-merge-robot
4694a6dd71 Merge pull request #24797 from screeley44/vols_debug_mkfs
Automatic merge from submit-queue

add enhanced volume and mount logging for block devices

Fixes #24568 

Adding better logging and debugging for block device volumes and the shared SafeFormatAndMount (aws, gce, flex, rbd, cinder, etc...)
2016-07-21 17:12:33 -07:00
k8s-merge-robot
5b21ae4ca7 Merge pull request #28814 from lixiaobing10051267/mastercidr
Automatic merge from submit-queue

Flannel doc description cidr modify

File "docs\proposals\flannel-integration.md", line 123, "node controller backs off cidr allocation", here cidr is not easy to understand, can be modified to CIDR.
2016-07-21 16:35:48 -07:00
k8s-merge-robot
c8a3c5c02c Merge pull request #29396 from fgrzadkowski/fix_kubemark
Automatic merge from submit-queue

Add static IP address for kubemark master.

This PR fixes kubemark, which was broken after https://github.com/kubernetes/kubernetes/pull/29295.

Because of https://github.com/kubernetes/kubernetes/issues/29392 merge queue is not blocked so it's not super urgent.

@k8s-oncall @wojtek-t  @roberthbailey @lavalamp
2016-07-21 16:35:44 -07:00
k8s-merge-robot
ea312b7b31 Merge pull request #29182 from kevin-wangzefeng/fix-scheduler-predicates
Automatic merge from submit-queue

use regular client instead of kubectl in scheduler predicate tests when checking/setting/cleanning taints/labels

The existing implementation in scheduler predicate tests uses kubectl to check/set/clean taints/labels on node, which makes the test very related to kubectl.

 This PR is to use regular client instead.
2016-07-21 16:02:59 -07:00
k8s-merge-robot
8780b45a04 Merge pull request #29369 from ping035627/ping035627-patch-0721
Automatic merge from submit-queue

two optimization for StartControllers in controllermanager.go

The PR changed two places to optimise StartControllers function in controllermanager.go.
2016-07-21 14:51:13 -07:00
k8s-merge-robot
f4de2c4ed4 Merge pull request #29394 from madhusudancs/fed14-fix-release_1_4_client
Automatic merge from submit-queue

Add "federation" API group to the known versions list of federation API clients.

PR #29302 did not to add a list of known API groups to the release_1_4 client and that broke our tests. This PR should fix it (hopefully).

cc @quinton-hoole @nikhiljindal @kubernetes/sig-cluster-federation 

Ref: #28615.
2016-07-21 14:51:08 -07:00
k8s-merge-robot
223d1cf836 Merge pull request #29367 from k82cn/rm_empty_line
Automatic merge from submit-queue

Removed unnecessary empty line.
2016-07-21 14:08:18 -07:00
k8s-merge-robot
2c490945e8 Merge pull request #28758 from xiang90/clean_service
Automatic merge from submit-queue

controller/service: minor cleanup

1. always handle short case first for if statement

2. do not capitalize error message

3. put the mutex before the fields it protects

4. prefer switch over if elseif.
2016-07-21 14:08:14 -07:00
k8s-merge-robot
3ba81a45a9 Merge pull request #29181 from Random-Liu/add-doc-for-node-e2e-kubenet-flag
Automatic merge from submit-queue

Node E2E: Add document for node e2e --disable-kubenet flag.

Address the comment https://github.com/kubernetes/kubernetes/pull/28213#discussion_r70137103.
Offline discussed with @vishh, we should document the `--disable-kubenet` flag in node e2e test.
2016-07-21 12:58:00 -07:00
k8s-merge-robot
0ff40f3a19 Merge pull request #29103 from xiangpengzhao/fix_if_conditions
Automatic merge from submit-queue

Fix incorrect if conditions

When the current conditions `if inspect == nil && inspect.Config == nil && inspect.Config.Labels == nil` is true, the func containerAndPodFromLabels will return. else will not. Suppose `inspect != nil` but `inspect.Config == nil`, the current conditions will be false and the func won't return, then the below `labels := inspect.Config.Labels` will lead to panic.
2016-07-21 12:25:10 -07:00
Filip Grzadkowski
a2c2f7d8f7 Add static IP address for kubemark master. 2016-07-21 21:03:18 +02:00
Madhusudan.C.S
31e09d326d Add "federation" API group to the known versions list of federation API clients. 2016-07-21 11:55:44 -07:00
k8s-merge-robot
8972b4ad4e Merge pull request #29164 from cjcullen/customuser
Automatic merge from submit-queue

append an abac rule for $KUBE_USER.

Allows the specified basic-auth credentials to be authorized against all resources.

Fixes #28869.
2016-07-21 11:39:22 -07:00
k8s-merge-robot
42a1deeff3 Merge pull request #26861 from xiang90/embed
Automatic merge from submit-queue

cacher.go: embed storage.Interface into cacher

Continuous effort to simplify cacher implementation.
2016-07-21 09:50:19 -07:00
CJ Cullen
e559e305dd append an abac rule for $KUBE_USER. 2016-07-21 09:40:39 -07:00
k8s-merge-robot
e3fa011d28 Merge pull request #29302 from nikhiljindal/updatClientsetInFederationControllers
Automatic merge from submit-queue

Updating federation controllers to use release_1_4 clientset instead of release_1_3 clientset

release_1_4 client was introduced in https://github.com/kubernetes/kubernetes/pull/26588.

Motivation for this change: All changes are now being done to release_1_4 clientset. Namespaces for ex is included in federation_release_1_4 clientset but not in federation_release_1_3.

cc @caesarxuchao @kubernetes/sig-cluster-federation
2016-07-21 09:08:53 -07:00
k8s-merge-robot
20246986df Merge pull request #29295 from fgrzadkowski/ha_master
Automatic merge from submit-queue

Add load balancer in front of apiserver in HA master setup

The first commit is just https://github.com/kubernetes/kubernetes/pull/29201 and has been already LGTMed.

Second commit has some small fixes:
1. Precompute REGION variable in config
2. Add timeout for waiting for loadbalancer
3. Fix kube-down so that it doesn't delete some resources if there are still masters/nodes in other zones

Second commit also fixes bug in https://github.com/kubernetes/kubernetes/pull/29201 where variable `REGION` was unset in `kube-down` when deleting master IP. The bug caused leaking of IP addresses. 

https://github.com/kubernetes/kubernetes/issues/21124

@davidopp @jszczepkowski @wojtek-t @mikedanese
2016-07-21 08:32:30 -07:00
k8s-merge-robot
cad9333ce7 Merge pull request #29242 from kubernetes/revert-28802-service
Automatic merge from submit-queue

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

Reverts kubernetes/kubernetes#28802

This appears to break the soak tests with "invalid grant" errors -- see the recent batch of errors in #27920.
2016-07-21 07:57:41 -07:00
k8s-merge-robot
1cf3f1cf03 Merge pull request #29237 from ncdc/fixup-windows-term
Automatic merge from submit-queue

Fix Windows terminal handling

Fix some issues with Windows terminal handling with respect to TTYs that came up as part of the
code that adds support for terminal resizing.

cc @smarterclayton @sttts @csrwng
2016-07-21 07:24:13 -07:00
k8s-merge-robot
0b1f0e8353 Merge pull request #29234 from mtaufen/doublecode-volume-newmainkubelet
Automatic merge from submit-queue

Remove duplicate code

I think this code is wrongly duplicated. See #29233. Feel free to correct me if I am wrong.
2016-07-21 06:48:51 -07:00
Scott Creeley
11d1289afa Add volume and mount logging 2016-07-21 09:10:00 -04:00
k8s-merge-robot
7e0a6e497a Merge pull request #29288 from wojtek-t/ability_for_faster_load_test
Automatic merge from submit-queue

Allow for overriding throughput in load test

We seem to be already supporting higher throughput that what the default is.

I'm going to increase the throughput in our tests:
- speed up scalability tests
- ensure that what I'm seeing locally is really the repeatable case

This PR is a short preparation for those experiments.

[Ideally, I would like to have kubemark-500 to be finishing within 30 minutes. And I think this should be doable pretty soon.]

@gmarek
2016-07-21 05:20:20 -07:00
k8s-merge-robot
ac17b239b6 Merge pull request #29145 from yifan-gu/no_chtime
Automatic merge from submit-queue

rkt: Don't return if the service file doesn't exist when killing the pod

Remove an unused logic. Also this prevents the KillPod() from failing
when the service file doesn't exist. E.g., it can be removed by garbage
collection in a rare case:

1, There are already more than `gcPolicy.MaxContainers` containers running
   on the host.
2, The new pod(A) starts to run but doesn't enter 'RUNNING' state yet.
3, GC is triggered, and it sees the pod(A) is in an inactive state (not running),
   and the it needs to remove the pod to force the `gcPolicy.MaxContainers`.
4, GC fails to remove the pod because `rkt rm` fails when the pod is running,
   but it removes the service file anyway.
5, Follow up KillPod() call will fail because it cannot find the service file
   on disk.

Also this is possible only when the pod has been in prepared state for longer
than 1 min, which sounds like another issue.

cc @kubernetes/sig-rktnetes
2016-07-21 05:20:15 -07:00
k8s-merge-robot
f4543250a8 Merge pull request #29133 from deads2k/priority-queue
Automatic merge from submit-queue

use a separate queue for initial quota calculation

When the quota controller gets backed up on resyncs, it can take a long time to observe the first usage stats which are needed by the admission plugin.  This creates a second queue to prioritize the initial calculation.
2016-07-21 04:46:59 -07:00
PingWang
eb2f6934c6 two optimization for StartControllers
Signed-off-by: PingWang <wang.ping5@zte.com.cn>
2016-07-21 18:31:28 +08:00
k8s-merge-robot
9b1f3efab4 Merge pull request #29261 from wojtek-t/improve_scheduler_throughput
Automatic merge from submit-queue

Improve scheduler throughput

Ref #28590

This improves scheduler throughput by another 10-15%.

@davidopp @kubernetes/sig-scheduling
2016-07-21 03:16:15 -07:00
Klaus Ma
d0c67d8fee Removed unnecessary empty line. 2016-07-21 18:07:36 +08:00
k8s-merge-robot
80a59f0294 Merge pull request #29131 from Random-Liu/use-pre-pull
Automatic merge from submit-queue

Change some node e2e test to use the prepull image framework.

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

Node e2e test framework pre-pulls all images in [image_list.go](bc2f223f5a/test/e2e_node/image_list.go)

All node e2e test should use image from the "image_list". If a test needs new image, we should update the image_list to include the new image.

/cc @kubernetes/sig-node to notice people to use `image_list` when adding test. :)
2016-07-21 02:39:57 -07:00
Kevin
4e280c6fd9 use regular client instead of kubectl in scheduler predicate tests when setting/cleanning taints/labels 2016-07-21 17:13:28 +08:00
Wojciech Tyczynski
e31926def9 Allow for increasing qps limits in kubemark 2016-07-21 10:07:53 +02:00
Wojciech Tyczynski
7f70a63095 Allow for overriding throughput in load test 2016-07-21 10:07:53 +02:00
Wojciech Tyczynski
68687013e8 Merge pull request #29361 from kubernetes/revert-28788-wire-authentication
Revert "add tokenreviews endpoint to implement webhook"
2016-07-21 09:45:32 +02:00
Wojciech Tyczynski
4d0d115690 Revert "add tokenreviews endpoint to implement webhook" 2016-07-21 09:40:35 +02:00
k8s-merge-robot
f8fd8046e7 Merge pull request #29275 from wojtek-t/rs_shared_pod_informer
Automatic merge from submit-queue

Use sharedPodInformer in ReplicaSet controller

@caesarxuchao
2016-07-21 00:05:01 -07:00
k8s-merge-robot
1784e99a1d Merge pull request #29102 from ping035627/ping035627-patch-0719
Automatic merge from submit-queue

Optimise getAPIGroupVersion function in genericapiserver.go

About the newAPIGroupVersion and the getAPIGroupVersion function  in genericapiserver.go, I think they can optimise.
2016-07-20 23:31:17 -07:00
Wojciech Tyczynski
fc6d38baa2 Avoid locking when computing predicates. 2016-07-21 08:21:07 +02:00
Wojciech Tyczynski
cab7db3a64 Use []*api.Node instead of NodeLister in priority functions. 2016-07-21 08:21:07 +02:00
k8s-merge-robot
165add8692 Merge pull request #29034 from ivan4th/fix-init-container-update-validation
Automatic merge from submit-queue

Fix init container update validation for pods

Partial fix #26840

The remaining issues with `kubectl apply` on pods with init containers
are caused by temporary annotation-based representation and
will resolve themselves once init containers leave alpha state.
Also, this PR makes sure internal and external objects don't get mixed up by the
PATCH handler (see related issue #25106).

This PR is an alternative for #28557 which met criticism from @smarterclayton 
and @liggitt for working around the temporary issue with annotations.
#28557 is a full fix for #26840 and contains an e2e test that cannot pass
without the `VolumeMounts` workaround. As there appears to be no
good way to include an e2e test that's known to be failing in k8s source,
I've removed it from this PR.

Either this PR or #28557 should be applied, but not both.
2016-07-20 22:56:00 -07:00
k8s-merge-robot
8ead63f127 Merge pull request #28788 from deads2k/wire-authentication
Automatic merge from submit-queue

add tokenreviews endpoint to implement webhook

Wires up an API resource under `apis/authentication.k8s.io/v1beta1` to expose the webhook token authentication API as an API resource.  This allows one API server to use another for authentication and uses existing policy engines for the "authoritative" API server to controller access to the endpoint.

@cjcullen you wrote the initial type
2016-07-20 22:23:45 -07:00
k8s-merge-robot
13b93ce656 Merge pull request #28363 from mikebrow/enable-debug-build-options
Automatic merge from submit-queue

adds source debug build options

See issue & discussion here: #28227

Enables source debugging the Kubernetes binaries with tools like delve by providing the user with the ability to provide debug build options to the glang compiler.

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2016-07-20 21:48:27 -07:00
k8s-merge-robot
99e24da2ff Merge pull request #29077 from saad-ali/fixIssue29051NamespaceDeletion
Automatic merge from submit-queue

Fix "PVC Volume not detached if pod deleted via namespace deletion" issue

Fixes #29051: "PVC Volume not detached if pod deleted via namespace deletion"

This PR:
* Fixes a bug in `desired_state_of_the_world_populator.go` to check the value of `exists` returned by the `podInformer` so that it can delete pods even if the delete event is missed (or fails).
* Reduces the desired state of the world populators sleep period from 5 min to 1 min (reducing the amount of time a volume would remain attached if a volume delete event is missed or fails).
2016-07-20 20:40:32 -07:00
k8s-merge-robot
8dee38928e Merge pull request #29301 from zmerlynn/get-aws-back
Automatic merge from submit-queue

AWS kube-up: Fix unbound KUBE_MANIFESTS_TAR_URL variable in Salt config

It shouldn't be necessary for all distros to define this env variable (broken in 97f3f80833).

This should get our e2es back creating AWS clusters, at least.
2016-07-20 20:08:19 -07:00
Mike Danese
d0ddefffd9 Merge pull request #29355 from rmmh/fix-munge-docs
Fix broken verify-munge-docs build by running hack/update-munge-docs.sh.
2016-07-20 19:04:01 -07:00
Ryan Hitchman
fdc85ade76 Fix broken verify-munge-docs build by running hack/update-munge-docs.sh. 2016-07-20 18:58:55 -07:00
xiangpengzhao
c51346e5cc Fix incorrect if conditions and add test case 2016-07-20 20:50:02 -04:00
Antoine Pelisse
cb6f8f2ce9 Merge pull request #29349 from kubernetes/revert-29153-cadvisor-bump
Revert "Fix working_set calculation in kubelet"
2016-07-20 17:27:21 -07:00
Antoine Pelisse
b681b17bb0 Revert "Fix working_set calculation in kubelet" 2016-07-20 17:04:32 -07:00
Tim Hockin
b829d4d4ef Merge pull request #26702 from joe2far/fix-broken-links
Fix broken warning image link in docs
2016-07-20 15:10:41 -07:00
k8s-merge-robot
f25d5439af Merge pull request #29264 from bboreham/focus-example
Automatic merge from submit-queue

Fix 'make test-e2e-node' example to run some tests

This PR fixes the minor problem that if you take the first example given in the Makefile and paste it verbatim,

    make test-e2e-node FOCUS=kubelet SKIP=container

it says something like "Will run 0 of 34 specs".  Several of the test suite descriptions contain "Kubernetes" with a capital K, but none match with a lower-case k.

The second part of the line is not great either, since some tests use "container" and some use "Container",   but fixing that seems to require some standardisation on how you name the tests.
2016-07-20 14:57:03 -07:00