Commit Graph

33382 Commits

Author SHA1 Message Date
Kubernetes Submit Queue
74bf443911 Merge pull request #30428 from CodeJuan/master
Automatic merge from submit-queue

fixed typos, the path is not docker



<!-- Reviewable:start -->
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30428)
<!-- Reviewable:end -->
2016-08-11 10:03:56 -07:00
Kubernetes Submit Queue
c31831ed01 Merge pull request #30439 from mwielgus/get-clientset
Automatic merge from submit-queue

Federation - common libs - get clientset for cluster

Get clientset method builds a clientset for a federated cluster.

cc: @quinton-hoole @wojtek-t @kubernetes/sig-cluster-federation

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30439)
<!-- Reviewable:end -->
2016-08-11 09:28:36 -07:00
Kubernetes Submit Queue
c51a89bc83 Merge pull request #30440 from sttts/sttts-fix-kubectl-logtostderr
Automatic merge from submit-queue

Fix glog's --v in kubectl

With https://github.com/kubernetes/kubernetes/pull/29147 kubectl lost its glog output to stderr because  the `init()` func did not run anymore which had set `logtostderr` to true before.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30440)
<!-- Reviewable:end -->
2016-08-11 09:28:20 -07:00
Kubernetes Submit Queue
613a2aa717 Merge pull request #30393 from mbohlool/cleanup_sidepod
Automatic merge from submit-queue

Start etcd-empty-dir-cleanup pod automatically on master

etcd-empty-dir-cleanup removes empty directories from etcd every hour. This PR runs the pod automatically on GCI masters.

related #30319 
fixes #27307

Workaround for non-gci systems:

ssh to master and:

sudo cp /home/kubernetes/kube-manifests/kubernetes/gci-trusty/etcd-empty-dir-cleanup/etcd-empty-dir-cleanup.yaml /etc/kubernetes/manifests/

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30393)
<!-- Reviewable:end -->
2016-08-11 08:46:25 -07:00
Kubernetes Submit Queue
f5861b9e49 Merge pull request #30176 from dims/check-for-root-access
Automatic merge from submit-queue

Check for CAP_SYS_ADMIN in Kubelet

Comment from nsenter_mount.go header:
The Kubelet process must have CAP_SYS_ADMIN (required by nsenter); at
the present, this effectively means that the kubelet is running in a
privileged container.

Related to #26093

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30176)
<!-- Reviewable:end -->
2016-08-11 08:46:19 -07:00
Kubernetes Submit Queue
2fb7cae2be Merge pull request #29999 from mtaufen/kubecfg-config-field-rename
Automatic merge from submit-queue

[Kubelet] Rename `--config` to `--pod-manifest-path`. `--config` is deprecated.

This field holds the location of a manifest file or directory of manifest
files for pods the Kubelet is supposed to run. The name of the field
should reflect that purpose. I didn't change the flag name because that
API should remain stable.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/29999)
<!-- Reviewable:end -->
2016-08-11 08:11:52 -07:00
Marcin Wielgus
8b53924a97 Federation - common libs - get clientset for cluster 2016-08-11 16:21:34 +02:00
Kubernetes Submit Queue
342aac2ffd Merge pull request #30402 from dims/fix-issue-30377
Automatic merge from submit-queue

Fix intermittent failures in TestPidOf {procfs}

Bailout if WalkFunc is called with an error.

Fixes #30377

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30402)
<!-- Reviewable:end -->
2016-08-11 06:47:45 -07:00
Kubernetes Submit Queue
b159e29da2 Merge pull request #30438 from wojtek-t/mount_etcd_directories_in_kubemark
Automatic merge from submit-queue

Mount etcd directories in Kubemark



<!-- Reviewable:start -->
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30438)
<!-- Reviewable:end -->
2016-08-11 05:38:22 -07:00
Kubernetes Submit Queue
6f7cc12c3c Merge pull request #29685 from bboreham/kill-setpgid-3
Automatic merge from submit-queue

Fix killing child sudo process in e2e_node tests

Fixes #29211; re-doing #29380 which was reverted due to cross-platform build failure #29669.

The context is we are trying to kill a process started as `sudo kube-apiserver`, but `sudo` ignores signals from the same process group. Applying `Setpgid` means the `sudo kill` process won't be in the same process group, so will not fall foul of this nifty feature.

~~I also took the liberty of removing some code setting `Pdeathsig` because it claims to be doing something  in the same area, but actually it doesn't do that at all.  The setting is applied to the forked process, i.e. `sudo`, and it means the `sudo` will get killed if we (`e2e_node.test`) die.  This (a) isn't what the comment says and (b) doesn't help because sending SIGKILL to the sudo process leaves sudo's child alive.~~

We do need to use the same 'hack' to access `Setpgid` as the `e2e_node.test` program gets built on Windows (although it doesn't run there).

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/29685)
<!-- Reviewable:end -->
2016-08-11 05:38:17 -07:00
codejuan
849adf5adb fixed typos, the path is not docker 2016-08-11 18:30:24 +08:00
bindata-mockuser
e07e65d411 Setup logging in kubectl via pkg/util/logs
pkg/util/logs.go got its own package in a771578a1c, but it was not
imported in the kubelet anymore such that its init() func
did not run setting logtostderr to true by default.
2016-08-11 12:19:19 +02:00
Kubernetes Submit Queue
7bd2db47f9 Merge pull request #29584 from ixdy/node-e2e-separate-project
Automatic merge from submit-queue

Run node e2e pull VMs in a separate GCP project

I haven't increased quota yet, so we shouldn't merge until I've done so. This is mostly just testing to see if the rest of the plumbing works.

Part of #27648.

cc @fejta @spxtr @pwittrock

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/29584)
<!-- Reviewable:end -->
2016-08-11 03:09:13 -07:00
Wojciech Tyczynski
dcd5c2f9e6 Mounted etcd directories in Kubemark 2016-08-11 11:37:30 +02:00
Kubernetes Submit Queue
035ec518af Merge pull request #28387 from caesarxuchao/gc-latency-measure
Automatic merge from submit-queue

[GarbageCollector] measure latency

First commit is #27600.

In e2e tests, I measure the average time an item spend in the eventQueue(~1.5 ms), dirtyQueue(~13ms), and orphanQueue(~37ms). There is no stress test in e2e yet, so the number may not be useful.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/28387)
<!-- Reviewable:end -->
2016-08-11 02:33:55 -07:00
mbohlool
a5b2ffffd2 Start etcd-empty-dir-cleanup pod automatically on master 2016-08-10 23:28:21 -07:00
Kubernetes Submit Queue
ea69570f61 Merge pull request #30092 from mbruzek/juju-util-fixes
Automatic merge from submit-queue

Juju util fixes

The util.sh file was out of date and caused the kube-up script to error out. This work fixes #23198
```release-note
* Updating the util.sh for the juju provider kube-up.sh 
```

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30092)
<!-- Reviewable:end -->
2016-08-10 17:09:52 -07:00
Kubernetes Submit Queue
1d4e0ea3c1 Merge pull request #30341 from sttts/sttts-simplify-deepcopy-canonical-element
Automatic merge from submit-queue

Simplify canonical element term in deepcopy

Replace the old functional canonical element term in deepcopy registration with direct struct instantiation.

The old way was an artifact of non-uniform pointer/non-pointer types in the signature of deepcopy function. Since we changed that to always be a pointer, we can simplify the code.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30341)
<!-- Reviewable:end -->
2016-08-10 16:34:07 -07:00
Kubernetes Submit Queue
c10f95deea Merge pull request #30336 from fejta/fix
Automatic merge from submit-queue

Do not require --test_args to be set

Fixes kubernetes/kubernetes#30322

Not all jobs set `GINKGO_TEST_ARGS`, such as many of the gke tests. When this is unset all test to run (or just federated tests if in that mode).

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30336)
<!-- Reviewable:end -->
2016-08-10 16:34:03 -07:00
Kubernetes Submit Queue
97d65ce8e4 Merge pull request #28778 from ivan4th/support-custom-fedora-repos-in-vagrant-provider
Automatic merge from submit-queue

Support custom Fedora repos in vagrant provider

Sometimes `KUBERNETES_PROVIDER=vagrant cluster/kube-up.sh` fails due to problems
with Fedora's metalink URL:
```
Timeout was reached for https://mirrors.fedoraproject.org/metalink?repo=fedora-23&arch=x86_64 [Connection timed out after 120002 milliseconds]
```

This PR makes it possible to specify a custom Fedora repository URL:
```
export CUSTOM_FEDORA_REPOSITORY_URL=https://download.fedoraproject.org/pub/fedora/
```

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

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/28778)
<!-- Reviewable:end -->
2016-08-10 16:33:54 -07:00
Kubernetes Submit Queue
cbe75f40df Merge pull request #29610 from ivan4th/fix-vagrant-provision-error
Automatic merge from submit-queue

Fix error reporting during vagrant provisioning

<!--
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_not_found` shell function can be used both while running
`provision-master.sh` and `privision-node.sh` (it's used by `install-salt`
function in `provision-utils.sh`, but it was defined in `provision-master.sh`.
Because of this, one of my colleagues got the following diagnostic:

```
==> master: Succeeded: 52 (changed=8)
==> master: Failed:     0
==> master: -------------
==> master: Total states run:     52
==> node-1: Machine already provisioned. Run `vagrant provision` or use the `--provision`
==> node-1: flag to force provisioning. Provisioners marked to run always will still run.
==> node-1: Running provisioner: shell...
    node-1: Running: /tmp/vagrant-shell20160726-19144-hahnl1.sh
==> node-1: Prepare package manager
==> node-1: Provisioning network on node
==> node-1: Network configuration verified
==> node-1: /tmp/vagrant-shell: line 134: release_not_found: command not found
The SSH command responded with a non-zero exit status. Vagrant
assumes that this means the command failed. The output for this command
should be in the log above. Please read the output to determine what
went wrong.
```
... which is rather confusing.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/29610)
<!-- Reviewable:end -->
2016-08-10 15:45:59 -07:00
Kubernetes Submit Queue
cdfd46cc15 Merge pull request #30245 from ronnielai/container-gc
Automatic merge from submit-queue

Adding known issues



<!-- Reviewable:start -->
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30245)
<!-- Reviewable:end -->
2016-08-10 14:29:49 -07:00
Kubernetes Submit Queue
48b7aca2c9 Merge pull request #29672 from lixiaobing10051267/masterLen
Automatic merge from submit-queue

Add handling empty index key that may cause panic issue

if len(indexKeys) == 0, "return indexKeys[0]" will cause unexpected result.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/29672)
<!-- Reviewable:end -->
2016-08-10 14:29:45 -07:00
Davanum Srinivas
e1ad642da0 Fix intermittent failures in TestPidOf {procfs}
Bailout if WalkFunc is called with an error.

Fixes #30377
2016-08-10 17:23:58 -04:00
Jeff Grafton
f9b6b70269 Use Kubekins service account in node e2e tests on Jenkins 2016-08-10 14:05:38 -07:00
Jeff Grafton
212ded55c1 Run node e2e pull VMs in a separate GCP project 2016-08-10 14:04:24 -07:00
Kubernetes Submit Queue
eef8bfec23 Merge pull request #29815 from vishh/node-e2e-latest-gci
Automatic merge from submit-queue

Use latest GCI image based on a regex in Node e2e

This PR also makes it possible to run node e2e against multiple previous images, sorted by creation time. A regex for the image name can be used to instruct node e2e to identify test images.

Depends on #29577

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/29815)
<!-- Reviewable:end -->
2016-08-10 13:52:21 -07:00
Erick Fejta
8ca5759bb0 Do not require --test_args to be set 2016-08-10 13:25:59 -07:00
Kubernetes Submit Queue
f2d9aaba4d Merge pull request #30276 from nhlfr/mesos-build-fix
Automatic merge from submit-queue

Avoid duplicated contrib/ sources

This commit removes a part of common.sh script which copied contrib/ sources for enabled contribs, which resulted in the duplicated files inside tarball.

Fixes #30150

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30276)
<!-- Reviewable:end -->
2016-08-10 13:16:27 -07:00
Chao Xu
41572cb22d add metrics to gc 2016-08-10 12:45:06 -07:00
Kubernetes Submit Queue
42553b92ae Merge pull request #28693 from mtaufen/eviction
Automatic merge from submit-queue

Node e2e memory eviction test

This tests memory evictions.
See related issue #28619 and fix to cadvisor https://github.com/google/cadvisor/pull/1380.

cc @vishh @derekwaynecarr @timstclair

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/28693)
<!-- Reviewable:end -->
2016-08-10 12:39:58 -07:00
Kubernetes Submit Queue
66c9edfdea Merge pull request #30380 from zmerlynn/fix-aws-teardown
Automatic merge from submit-queue

AWS: Allow no-op kube-down to exit 0

Not exactly sure why hack/e2e.go `IsUp()` is returning true right now,
but I can solve this a different way. This unifies with the GCE
behavior, which is that no-op kube-down returns 0.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30380)
<!-- Reviewable:end -->
2016-08-10 12:05:11 -07:00
Vishnu kannan
e9034f1e0a make GCI the default node e2e test image. Fix bugs in runner
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-08-10 11:25:40 -07:00
Vishnu kannan
2f6514bd63 Node e2e can run tests against GCE images based on a regex.
It can run tests against multiple existing images that match a regex.
GCI images will be using a regex.

Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-08-10 11:24:54 -07:00
Kubernetes Submit Queue
a40d2cd92e Merge pull request #30296 from deads2k/wq-metrics
Automatic merge from submit-queue

add metrics for workqueues

Adds prometheus metrics to work queues and enables them for the resourcequota controller.  It would be easy to add this to all other workqueue based controllers and gather basic responsiveness metrics.

@kubernetes/rh-cluster-infra helps debug quota controller responsiveness problems.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30296)
<!-- Reviewable:end -->
2016-08-10 11:13:13 -07:00
Zach Loafman
8d0200e5af AWS: Allow no-op kube-down to exit 0
Not exactly sure why hack/e2e.go IsUp() is returning true right now,
but I can solve this a different way. This unifies with the GCE
behavior, which is that no-op kube-down returns 0.
2016-08-10 10:36:38 -07:00
Kubernetes Submit Queue
0d42ce62ee Merge pull request #30349 from wojtek-t/run_with_etcd3
Automatic merge from submit-queue

Allow running etcd in v3 API (currently just on GCE)

Ref #20504 #25286

@timothysc @xiang90 @hongchaodeng @smarterclayton @kubernetes/sig-api-machinery

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30349)
<!-- Reviewable:end -->
2016-08-10 10:33:19 -07:00
Kubernetes Submit Queue
24ee4e8eb1 Merge pull request #30291 from dims/fix-issue-30290
Automatic merge from submit-queue

Prevent panic in 'kubectl exec' when redirecting stdout

Just add some nil checks to make sure we don't trip over when
we redirect output from exec to a file.

Fixes #30290

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30291)
<!-- Reviewable:end -->
2016-08-10 10:33:15 -07:00
Michael Taufen
e43ccdbf2c Rename KubeletConfiguration.Config to PodManifestPath for clarity
Also provide a new --pod-manifest-path flag and deprecate the old
--config one.

This field holds the location of a manifest file or directory of manifest
files for pods the Kubelet is supposed to run. The name of the field
should reflect that purpose.
2016-08-10 09:40:21 -07:00
Kubernetes Submit Queue
072798b253 Merge pull request #30365 from mwielgus/delaying-fix
Automatic merge from submit-queue

Federation - common libs - small changes in delaying deliverer

No-arg constructor, start and option to start with a handler listening on the target channel.

cc: @quinton-hoole @wojtek-t @kubernetes/sig-cluster-federation

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30365)
<!-- Reviewable:end -->
2016-08-10 09:26:12 -07:00
Kubernetes Submit Queue
a69054f9c3 Merge pull request #30368 from wojtek-t/log_terminating_all_watchers
Automatic merge from submit-queue

Log warning when terminating all watchers

Ref #30275

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30368)
<!-- Reviewable:end -->
2016-08-10 09:26:07 -07:00
Marcin Wielgus
9f01136df4 Federation - common libs - small changes in delaying deliverer 2016-08-10 17:05:15 +02:00
Wojciech Tyczynski
497f891cfb Log warning when terminating all watchers 2016-08-10 17:04:10 +02:00
Kubernetes Submit Queue
473425200f Merge pull request #29841 from mfojtik/fix-label-selector
Automatic merge from submit-queue

Do not re-initialize the output on label selector conversion

This conversion will always kill whatever is passed in the output.

@kargakis @deads2k PTAL

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/29841)
<!-- Reviewable:end -->
2016-08-10 08:02:30 -07:00
Kubernetes Submit Queue
c97b76326c Merge pull request #30328 from janetkuo/sj-log-fix
Automatic merge from submit-queue

Fix incorrect logging format in sj controller



<!-- Reviewable:start -->
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30328)
<!-- Reviewable:end -->
2016-08-10 07:10:13 -07:00
Marek Grabowski
8faa588ab8 Merge pull request #30364 from gmarek/master
Change the name of kubemark config file
2016-08-10 16:05:51 +02:00
gmarek
d0eb29cc67 Change the name of kubemark config file 2016-08-10 16:04:14 +02:00
deads2k
b981ea1a70 add metrics for workqueues 2016-08-10 09:28:42 -04:00
Kubernetes Submit Queue
d611e611d9 Merge pull request #30359 from mwielgus/lib-update
Automatic merge from submit-queue

Minor fixes in federated controller libraries

Arg change in federated informer + get channel func in delaying deliverer.

cc: @quinton-hoole @wojtek-t @kubernetes/sig-cluster-federation

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30359)
<!-- Reviewable:end -->
2016-08-10 06:09:26 -07:00
Kubernetes Submit Queue
24899a7d80 Merge pull request #30357 from gmarek/comment
Automatic merge from submit-queue

Print location of kubemark kubeconfig at the end of start-kubemark

cc @caesarxuchao

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30357)
<!-- Reviewable:end -->
2016-08-10 06:09:21 -07:00