Commit Graph

38475 Commits

Author SHA1 Message Date
Kubernetes Submit Queue
05a083997f Merge pull request #36103 from Crassirostris/kibana-image-fix
Automatic merge from submit-queue

Fixed kibana image and controller to work through proxy

As described in #34969, new kibana image doesn't work properly with proxies without additional configuration.

@piosz
2016-11-03 14:40:19 -07:00
Kubernetes Submit Queue
04a7457032 Merge pull request #36096 from rmmh/disable-verify-owners
Automatic merge from submit-queue

Disable the test-owners verify step until the merge conflicts are resolved

It's causing more pain than it's preventing currently. There should be some simpler ways to fix this.
2016-11-03 13:53:41 -07:00
Kubernetes Submit Queue
fc6db328ce Merge pull request #35859 from madhusudancs/federation-kubefed-init-02
Automatic merge from submit-queue

[Federation][init-02] Stop passing command factory to the init command.

Please review only the last commit here. This is based on PR #35856 which will be reviewed independently.

Design Doc: PR #34484

cc @kubernetes/sig-cluster-federation @nikhiljindal
2016-11-03 13:53:03 -07:00
Kubernetes Submit Queue
c4eb04afa2 Merge pull request #36147 from jsafrane/fix-local-up
Automatic merge from submit-queue

Fix typo in local-up-cluster

Use curly braces instead of round ones for bash variable expansion. The
script complains about unknown ROOT_CA_FILE when running with
KUBE_ENABLE_CLUSTER_DNS=true.
2016-11-03 12:05:03 -07:00
Saad Ali
01c295e581 Merge pull request #36163 from sjenning/fix-cm-crossbuild
fix cross build for kubelet/cm
2016-11-03 11:26:42 -07:00
Kubernetes Submit Queue
758c56cc85 Merge pull request #35856 from madhusudancs/federation-kubefed-init-01
Automatic merge from submit-queue

[Federation] Add unit tests for `kubefed init`'s certificate generator.

Please review only the last commit here. This is based on PR #35594 which will be reviewed independently.

These are a subset of unit tests for code introduced in PR #35594

Design Doc: PR #34484

cc @kubernetes/sig-cluster-federation @quinton-hoole
2016-11-03 11:19:01 -07:00
Kubernetes Submit Queue
7c391158e3 Merge pull request #35810 from deads2k/client-18-decode-status
Automatic merge from submit-queue

always allow decoding of status when returned from the API

`unversioned.Status` should be able to come back from any API version and still be properly decoded.  This doesn't happen today by default.

@smarterclayton  Our projectrequest endpoint returns a `Status` object on a 200 return from list to indicate everything went well.  This (or something like it) is needed to make the API accepted by `kubectl`.  Alternatively, we change the API to return a different (still not a `Project`) value from list, which still feels wrong.
2016-11-03 11:18:23 -07:00
Kubernetes Submit Queue
c83a924628 Merge pull request #35624 from gmarek/nodeinfo
Automatic merge from submit-queue

Scheduler Reduce function can use nodeNameToNodeInfo map
2016-11-03 10:22:44 -07:00
Kubernetes Submit Queue
43b79d6626 Merge pull request #25532 from mkulke/resolve-nodename-in-kubelet-comm
Automatic merge from submit-queue

Populate Node.Status.Addresses with Hostname

This PR is supposed to address #22063 

Currently `NodeName` has to be a resolvable dns address on the master to allow apiserver -> kubelet communication (exec, log, port-forward operations on a pod). In some situations this is unfortunate (see the discussions on the issue).

The PR aims to do the following:
- Populate the `Type: Hostname` in the `Node.Status.Addresses` array, the type is already defined, but was not used so far.
- Add logic to resolve a Node's Hostname when the apiserver initiates communication with the Kubelet, instead of using the Nodename string as Hostname.

```release-note
The hostname of the node (as autodetected by the kubelet, specified via --hostname-override, or determined by the cloudprovider) is now recorded as an address of type "Hostname" in the status of the Node API object. The hostname is expected to be resolveable from the apiserver.
```
2016-11-03 10:22:36 -07:00
Kubernetes Submit Queue
bcfb4366e3 Merge pull request #36166 from yujuhong/remove_mount_rootfs_flag
Automatic merge from submit-queue

cr2 e2e: remove experimental-mounter-rootfs flag
2016-11-03 09:41:09 -07:00
Seth Jennings
05bb27023b fix cross build for kubelet/cm 2016-11-03 10:54:22 -05:00
Kubernetes Submit Queue
909e19b88e Merge pull request #35900 from deads2k/api-34-healthz
Automatic merge from submit-queue

promote /healthz and /metrics to genericapiserver

Promotes `/healthz` to genericapiserver with methods to add healthz checks before running.

Promotes `/metrics` to genericapiserver gated by config flag.

@lavalamp adds the healthz checks linked to `postStartHooks` as promised.
2016-11-03 08:32:16 -07:00
Yu-Ju Hong
722ecfb21c cr2 e2e: remove experimental-mounter-rootfs flag
The commit was reverted and the flag no longer exists.
2016-11-03 08:21:07 -07:00
Kubernetes Submit Queue
f91cd17821 Merge pull request #35799 from deads2k/client-17-negotiation
Automatic merge from submit-queue

clean up client version negotiation to handle no legacy API

Version negotiation fails if the legacy API endpoint isn't available.

This tightens up the negotiation interface based to more clearly express what each stage is doing and what the constraints on negotiation are.  This is needed to speak to generic API servers.

@kubernetes/kubectl
2016-11-03 07:53:47 -07:00
Kubernetes Submit Queue
3fe8db8651 Merge pull request #33270 from hpcloud/bug/33128
Automatic merge from submit-queue

Don't rely on device name provided by Cinder

See issue #33128

We can't rely on the device name provided by Cinder, and thus must perform
detection based on the drive serial number (aka It's cinder ID) on the
kubelet itself.

This patch re-works the cinder volume attacher to ignore the supplied
deviceName, and instead defer to the pre-existing GetDevicePath method to
discover the device path based on it's serial number and /dev/disk/by-id
mapping.

This new behavior is controller by a config option, as falling back
to the cinder value when we can't discover a device would risk devices
not showing up, falling back to cinder's guess, and detecting the wrong
disk as attached.
2016-11-03 07:16:49 -07:00
Kubernetes Submit Queue
356b28b761 Merge pull request #35292 from sttts/sttts-bindnetwork
Automatic merge from submit-queue

Add BindNetwork to genericapiserver Config

This is needed for downstream use:

`BindNetwork` is the type of network to bind to - defaults to "tcp4", accepts "tcp", "tcp4", and "tcp6".
2016-11-03 06:23:14 -07:00
Kubernetes Submit Queue
95eef6e422 Merge pull request #33768 from hpcloud/bug/33759
Automatic merge from submit-queue

Corect filtering of OpenStack LBaaS resources to delete

Neutron's API ignores unknown parameters. When listing pools etc, K8
attempts to filter on "LoadBalancerID", which is not a valid filter.
As such, it is ignored by Neutron, and a list of all pools is
returned. K8 then proceeds to delete each of the pools.

Instead, we now double check the resources really belong to the LB
we're trying to delete.

Fixes issue #33759
2016-11-03 05:45:49 -07:00
Kubernetes Submit Queue
a8a8660415 Merge pull request #35204 from gmarek/node-affinity
Automatic merge from submit-queue

Add node affinity test to scheduler benchmark

cc @wojtek-t
2016-11-03 05:09:12 -07:00
Kubernetes Submit Queue
973fa6b334 Merge pull request #35821 from vishh/gci-mounter-scope
Automatic merge from submit-queue

[Kubelet] Use the custom mounter script for Nfs and Glusterfs only

This patch reduces the scope for the containerized mounter to NFS and GlusterFS on GCE + GCI clusters

This patch also enabled the containerized mounter on GCI nodes

Shepherding multiple PRs through the submit queue is painful. Hence I combined them into this PR. Please review each commit individually.

cc @jingxu97 @saad-ali

https://github.com/kubernetes/kubernetes/pull/35652 has also been reverted as part of this PR
2016-11-03 04:32:19 -07:00
Kubernetes Submit Queue
41b5fe86b6 Merge pull request #31546 from derekwaynecarr/systemd-pod-cgroups
Automatic merge from submit-queue

pod and qos level cgroup support

```release-note
[Kubelet] Add alpha support for `--cgroups-per-qos` using the configured `--cgroup-driver`. Disabled by default.
```
2016-11-03 03:56:56 -07:00
Kubernetes Submit Queue
db68b906e1 Merge pull request #35877 from mtaufen/bump-gci-56
Automatic merge from submit-queue

Bump GCI version to gci-dev-56-8938-0-0 for k8s v1.5
2016-11-03 03:21:03 -07:00
Kubernetes Submit Queue
175954fb12 Merge pull request #35090 from YuPengZTE/devConntrack
Automatic merge from submit-queue

In error, the first letter should be lowcase

**What this PR does / why we need it**:
Fix the typo of the first letter in error

**Special notes for your reviewer**:
Reference here: https://github.com/golang/go/wiki/CodeReviewComments#error-strings

Signed-off-by: YuPengZTE yu.peng36@zte.com.cn
2016-11-03 02:47:11 -07:00
Kubernetes Submit Queue
606a2dd020 Merge pull request #36090 from wojtek-t/fix_migration_collisions
Automatic merge from submit-queue

Fix collisions between different etcds during migration.

Ref #20504
2016-11-03 02:47:03 -07:00
Kubernetes Submit Queue
e817594648 Merge pull request #35731 from janetkuo/statefulset-v1beta1
Automatic merge from submit-queue

Move Statefulset (previously PetSet) to v1beta1

**What this PR does / why we need it**: #28718

**Which issue this PR fixes** _(optional, in `fixes #<issue number>(, #<issue_number>, ...)` format, will close that issue when PR gets merged)_: fixes #

**Special notes for your reviewer**: depends on #35663 (PetSet rename)
cc @erictune @foxish @kubernetes/sig-apps 

**Release note**:

``` release-note
v1beta1/StatefulSet replaces v1alpha1/PetSet.
```
2016-11-03 02:46:57 -07:00
Jan Safranek
8876ff8901 Fix typo in local-up-cluster
Use curly braces instead of round ones for bash variable expansion. The
script complains about unknown ROOT_CA_FILE when running with
KUBE_ENABLE_CLUSTER_DNS=true.
2016-11-03 10:28:22 +01:00
Kubernetes Submit Queue
8c67d08e3a Merge pull request #36125 from kubernetes/typofixgodepdoc
Automatic merge from submit-queue

Fix typo in docs/devel/godep.md
2016-11-03 02:09:05 -07:00
Kubernetes Submit Queue
5bca864d20 Merge pull request #36119 from rmmh/godep-restore
Automatic merge from submit-queue

Retry "godep restore" once in verify-dockerized.sh

This should fix #36110. The current flake rate is 0.5%, so with the
unrealistic assumption of uncorrelated flakes, a single retry will bring
it down to <0.01% flake rate.
2016-11-03 02:08:58 -07:00
Kubernetes Submit Queue
d34c02f11a Merge pull request #36093 from thockin/scary-warning-again
Automatic merge from submit-queue

Remove a few versioned-warnings that snuck in

Some pending PRs still have this in them.
2016-11-03 02:08:38 -07:00
Kubernetes Submit Queue
695cbde84f Merge pull request #36089 from mikedanese/fix-mac
Automatic merge from submit-queue

fix verify-bazel.sh on mac and windows

mac bash doesn't like |& because mac bash is really old. the formating of wc
is also slightly different then on linux.


```console
$ # on linux
$ echo -n | wc -l
0
$ # on mac
$ echo -n | wc -l
       0
```
2016-11-03 02:08:30 -07:00
Kubernetes Submit Queue
c6028b547c Merge pull request #36097 from foxish/fix-e2e-petset
Automatic merge from submit-queue

Moving annotation to the PodTemplateSpec

**What this PR does / why we need it**: Fixes broken tests.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #35768

**Special notes for your reviewer**: 
Tested locally.

```release-note
NONE
```

cc @kubernetes/sig-apps
2016-11-03 02:08:23 -07:00
Kubernetes Submit Queue
2f84a7c8d2 Merge pull request #35594 from madhusudancs/federation-kubefed-init-00
Automatic merge from submit-queue

[Federation][init] Implement `kubefed init` command that performs federation control plane bootstrap.

Please review only the last commit here. This is based on PR #35593 which will be reviewed independently.

I am intentionally not including the unit tests in this PR to better distribute and parallelize reviews. This PR is already big.

I will add a release note separately for this entire feature, so please don't worry too much about the release note here in the PR.

Design Doc: PR #34484

cc @kubernetes/sig-cluster-federation @quinton-hoole @nikhiljindal
2016-11-03 02:08:14 -07:00
gmarek
3971553298 Scheduler Reduce function can use nodeNameToNodeInfo map 2016-11-03 10:07:05 +01:00
Saad Ali
7a49b0eb77 Merge pull request #36139 from saad-ali/fixGoDeps6
Move godeps to version v74 instead of v73
2016-11-03 01:04:31 -07:00
saadali
62ee8b9d49 Move godeps to version v74 instead of v73 2016-11-03 00:43:06 -07:00
Saad Ali
a6bea3d79b Merge pull request #36138 from saad-ali/fixGoDeps5
Ensure verify-godep passes godep to godep-save
2016-11-02 23:52:43 -07:00
saadali
9e9a66ed22 Ensure verify-godep passes godep to godep-save 2016-11-02 23:49:30 -07:00
Saad Ali
63afad0d4e Merge pull request #36132 from saad-ali/fixGoDeps4
Fix godep to v73 in verify-godeps
2016-11-02 21:51:13 -07:00
saadali
87636fdd78 Fix godep to v73 in verify-godeps 2016-11-02 21:08:26 -07:00
Saad Ali
b8a5e7a81d Merge pull request #36131 from kubernetes/revert-36124-fixGoDeps2
Revert "Add missing vendor files to make godeps happy"
2016-11-02 20:56:44 -07:00
Saad Ali
d41b3b0929 Revert "Add missing vendor files to make godeps happy" 2016-11-02 20:56:06 -07:00
Madhusudan.C.S
b8109eae5b [Federation][init-02] Stop passing command factory to the init command.
Init command completely relies on the host factory, so it is unnecessary
to pass the default command factory to the init command.
2016-11-02 19:28:17 -07:00
Madhusudan.C.S
331ef53b69 [Federation][init-01] Add unit tests for kubefed init's certificate generator. 2016-11-02 19:27:39 -07:00
Saad Ali
3fe2de05ac Merge pull request #36124 from saad-ali/fixGoDeps2
Add missing vendor files to make godeps happy
2016-11-02 19:27:33 -07:00
Saad Ali
fd80fd2e88 Fix typo in docs/devel/godep.md 2016-11-02 19:07:35 -07:00
saadali
e9afbd5cdf Add missing vendor files to make godeps happy 2016-11-02 18:55:10 -07:00
Ryan Hitchman
bfae674093 Retry "godep restore" once in verify-dockerized.sh
This should fix #36110. The current flake rate is 0.5%, so with the
unrealistic assumption of uncorrelated flakes, a single retry will bring
it down to <0.01% flake rate.
2016-11-02 17:14:08 -07:00
Saad Ali
d7b6245ab0 Merge pull request #36114 from saad-ali/fixGoDeps
Hard code godep version to v74
2016-11-02 16:54:57 -07:00
saadali
683ea197be Hard code godep version to v74
See issue #36111
2016-11-02 16:33:53 -07:00
Ryan Hitchman
57a152ca40 Disable the test-owners verify step until the merge conflicts are resolved.
Fixes #35850.

GitHub's merging doesn't support .gitattributes-- I verified this with
support. There may be a workaround with line padding or making the bot
do merges on its own, which is beneficial for custom merge conflict
resolution in general.
2016-11-02 15:39:06 -07:00
Vishnu Kannan
40fc804831 Enable containerized storage plugins mounter on GCI
This reverts commit 765f7b9406.
2016-11-02 15:18:09 -07:00