Commit Graph

31450 Commits

Author SHA1 Message Date
k8s-merge-robot
8509b35cf2 Merge pull request #27637 from hongchaodeng/rc-clean
Automatic merge from submit-queue

RC: rename wait -> wg

We already have a package called "wait". We should differentiate the name.

/cc @caesarxuchao
2016-06-24 13:57:13 -07:00
k8s-merge-robot
ce0227bb8b Merge pull request #27402 from pwittrock/owners
Automatic merge from submit-queue

Remove bgrant from owners since he has plenty to do.

@bgrant0607 FYI

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-06-24 13:56:59 -07:00
k8s-merge-robot
e65965fca6 Merge pull request #26855 from xiang90/cacher_rm
Automatic merge from submit-queue

cacher: remove unnecessary initialzation
2016-06-24 13:56:47 -07:00
k8s-merge-robot
6dff5d24d1 Merge pull request #25769 from deads2k/remove-dead-discovery-code
Automatic merge from submit-queue

remove confusing, dead code from master.go

Found while chasing something else, looks completely dead.
2016-06-24 13:56:31 -07:00
k8s-merge-robot
c4aa7ee0b2 Merge pull request #25024 from xiangpengzhao/fix_typos
Automatic merge from submit-queue

Fix typos in docker.go

Fix minor typos in variable name
2016-06-24 13:56:22 -07:00
Yifan Gu
30c913e211 rkt: Bump required rkt version to 1.9.1. 2016-06-24 13:54:32 -07:00
Kris
88e2a31978 Adding lock files for kubeconfig updating 2016-06-24 13:11:52 -07:00
Davanum Srinivas
8beed4cd8d Fix pkg/kubelet unit tests fail on OSX
Fixes #27730
2016-06-24 15:58:09 -04:00
Sylwester Brzeczkowski
a558cadedd Fix attach command for InitContainers 2016-06-24 14:35:02 +02:00
k8s-merge-robot
bc1c1c1360 Merge pull request #27972 from mml/fed-backend2
Automatic merge from submit-queue

A few changes to federated-service e2e test.

Most of the changes that get the test to pass have been made already or
elsewhere.  Here we restructure a bit fixing a nesting problem, extend the
timeouts, and start creating distinct backend pods that I'll delete in the
non-local test (coming shortly).

Also some extra debugging info in the DNS code.  I made some upstream
changes to skydns in https://github.com/skynetservices/skydns/pull/283

For #27739

Includes a commit from @madhusudancs that I will remove once his merges.
2016-06-23 22:48:08 -07:00
Mike Danese
3162197c23 autogenerated 2016-06-23 22:15:03 -07:00
Ron Lai
038b8797c4 Calculating the disk usage based on available bytes instead of usage bytes to account for reserved blocks in image GC 2016-06-23 21:41:33 -07:00
k8s-merge-robot
a27fd4b01e Merge pull request #27708 from nikhiljindal/dnsHealthCheck
Automatic merge from submit-queue

federation: Updating KubeDNS to try finding a local service first for federation query

Ref https://github.com/kubernetes/kubernetes/issues/26762

Updating KubeDNS to try to find a local service first for federation query.
Without this change, KubeDNS always returns the DNS hostname, even if a local service exists.

Have updated the code to first remove federation name from path if it exists, so that the default search for local service happens. If we dont find a local service, then we try to find the DNS hostname.

Will appreciate a strong review since this is my first change to KubeDNS.
https://github.com/kubernetes/kubernetes/pull/25727 was the original PR that added federation support to KubeDNS.

cc @kubernetes/sig-cluster-federation @quinton-hoole @madhusudancs @bprashanth @mml
2016-06-23 20:30:58 -07:00
k8s-merge-robot
8ed6c8eeb8 Merge pull request #27914 from yifan-gu/fix_kubenet_hostport
Automatic merge from submit-queue

kubenet: Fix host port for rktnetes.

Because rkt pod runs after plugin.SetUpPod() is called, so
getRunningPods() does not return the newly created pod, which
causes the hostport iptable rules to be missing for this new pod.

cc @dcbw @freehan 

A follow up fix for https://github.com/kubernetes/kubernetes/pull/27878#issuecomment-227898936
2016-06-23 18:48:45 -07:00
nikhiljindal
61f43c5924 Updating KubeDNS to try a local service first for federation query 2016-06-23 17:50:12 -07:00
Matt Liggett
e2021ef241 A few changes to federated-service e2e test.
Most of the changes that get the test to pass have been made already or
elsewhere.  Here we restructure a bit fixing a nesting problem, extend
the timeouts, and start creating distinct backend pods that I'll delete
in the non-local test (coming shortly).

Also some extra debugging info in the DNS code.  I made some upstream
changes to skydns in https://github.com/skynetservices/skydns/pull/283
2016-06-23 17:40:54 -07:00
Vishnu kannan
fc3101f515 remove reference to documentation webpage from kubectl describe nodes output
Signed-off-by: Vishnu kannan <vishnuk@google.com>
2016-06-23 16:28:01 -07:00
k8s-merge-robot
38182e91c9 Merge pull request #27960 from madhusudancs/fed-kube-dns-append-region
Automatic merge from submit-queue

Append both the zone and the region to the federation query responses, not just the zone.

This PR is based on @mml's #27896. I will rebase once that PR is merged.


[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-06-23 14:13:31 -07:00
Yifan Gu
9140ce07bc kubenet: Fix host port for rktnetes.
Because rkt pod runs after plugin.SetUpPod() is called, so
getRunningPods() does not return the newly created pod, which
causes the hostport iptable rules to be missing for this new pod.
2016-06-23 13:17:01 -07:00
k8s-merge-robot
436a109a14 Merge pull request #27950 from mml/fed-nil-subtree
Automatic merge from submit-queue

Verify that the we get a non-nil subtree before consulting it.
2016-06-23 12:54:37 -07:00
Madhusudan.C.S
a827ef0713 Addressed review comments. 2016-06-23 12:33:41 -07:00
Madhusudan.C.S
6894e74027 Append both the zone and the region to the federation query responses, not just the zone. 2016-06-23 11:54:32 -07:00
k8s-merge-robot
e70434a19f Merge pull request #27896 from mml/fed-labels-not-annotations
Automatic merge from submit-queue

Look for the failure zone label in labels.
2016-06-23 11:35:07 -07:00
Yu-Ju Hong
07b8c61274 Bump minimum API version for docker to 1.21
The corresponding docker version is 1.9.x. Dropping support for docker 1.8.
2016-06-23 10:21:54 -07:00
Matt Liggett
7a40584f66 Verify that the we get a non-nil subtree before consulting it.
Fixes #27919
2016-06-23 09:51:14 -07:00
Matt Liggett
c87b613412 Look for the failure zone label in labels.
Not annotations.  Found this working on #27819.
2016-06-23 09:50:03 -07:00
k8s-merge-robot
3a29aa7941 Merge pull request #27496 from hpcloud/hpe/vsphere-scsidriver
Automatic merge from submit-queue

Adding SCSI controller type filter for vSphere disk attach

Hot plug of disks to a SCSI controller of type lsilogic doesn't work as expected. When a device is detached from the controller, it fails to remove the device from the /dev path which makes the subsequent attaches to the node to fail. With scsi controller types lsilogic-sas or paravirtual this seems to work well. This patch filters the existing controller for these types, and if it doesn't find one, it creates a new controller for disk attach.

This PR is dependent on https://github.com/kubernetes/kubernetes/pull/26658 (1st commit) also targeting this for 1.3
2016-06-23 08:09:43 -07:00
Kanghua Wang
b694fc0688 fix return value
// matchesNodeSelector returns true if pod matches node's labels.
Whether this return value should be false?
2016-06-23 16:14:55 +08:00
k8s-merge-robot
1f78e7ea68 Merge pull request #27905 from freehan/krestart
Automatic merge from submit-queue

avoid deleting cbr0 address due to subnet string mismatch

fix: #27873
2016-06-22 23:01:49 -07:00
k8s-merge-robot
89bb77d3e8 Merge pull request #27737 from yifan-gu/grace_period
Automatic merge from submit-queue

rkt: Refactor grace termination period.

Add `TimeoutStopSec` service option to support grace termination.

Found we can improve the grace-period-termination by adding a systemd service option.

cc @kubernetes/sig-rktnetes
2016-06-22 19:23:25 -07:00
k8s-merge-robot
d36375954e Merge pull request #27733 from caesarxuchao/gc-parametercodec
Automatic merge from submit-queue

let dynamic client handle non-registered ListOptions

And register v1.ListOptions in the policy group.

Fix #27622

@lavalamp @smarterclayton @krousey
2016-06-22 17:36:16 -07:00
Minhan Xia
48169ce736 avoid deleting cbr0 address due to subnet string mismatch 2016-06-22 16:45:04 -07:00
k8s-merge-robot
ae1e194766 Merge pull request #27893 from saad-ali/fixAwsEbsDevicePath
Automatic merge from submit-queue

Fix device path used by volume WaitForAttach

Fixes https://github.com/kubernetes/kubernetes/issues/27872 "AWS: problem mounting dynamic PVs"
2016-06-22 15:48:33 -07:00
k8s-merge-robot
db43b68640 Merge pull request #27891 from mml/fed-nil-node
Automatic merge from submit-queue

Catch the case where we cannot find any nodes.
2016-06-22 13:43:12 -07:00
k8s-merge-robot
a505958f2b Merge pull request #27878 from dcbw/cni-cleanup
Automatic merge from submit-queue

Make kubelet CNI network plugin runtime-agnostic

cni.go has a couple docker-isms in it still, so let's remove those and make the plugin runtime-agnostic.  Also fixes some docker-isms in kubenet that snuck in with the HostPort changes.
2016-06-22 13:43:04 -07:00
Chao Xu
d9f07925be let dynamic client handle non-registered ListOptions;
register ListOptions for apis/policy
2016-06-22 13:18:50 -07:00
saadali
dfe8e606c1 Fix device path used by volume WaitForAttach 2016-06-22 12:56:58 -07:00
Matt Liggett
d6ab379275 Catch the case where we cannot find any nodes.
It's possible to fall through the loops above with node still nil.  This
catches this and reports an error.

Found this working on #27819.
2016-06-22 12:35:48 -07:00
Dan Williams
e47d020cb6 kubelet/kubenet: simplify getting nsenter path 2016-06-22 14:26:11 -05:00
Dan Williams
a657d0587b kubelet/kubenet: Fix getRunningPods() to support rkt pods
Don't assume there's an infra container.
2016-06-22 13:45:13 -05:00
k8s-merge-robot
b7ac841e7f Merge pull request #27810 from hpcloud/lbaas-v2-liberty-fix
Automatic merge from submit-queue

Removing name field from Member for compatibility with OpenStack Liberty

In OpenStack Mitaka, the name field for members was added as an optional field but does not exist in Liberty.  Therefore the current implementation for lbaas v2 will not work in Liberty.
2016-06-22 11:22:48 -07:00
derekwaynecarr
029acfc8aa Allow handlers earlier in a request flow to inject a UID for an object 2016-06-22 13:38:15 -04:00
k8s-merge-robot
5289de0501 Merge pull request #27837 from saad-ali/blockKubeletDetachFix
Automatic merge from submit-queue

Prevent detach before node status update

The PR prevents the attach/detach controller from start a detach operation before updating the node status (to remove the volume from the list of attached volumes).

Fixes https://github.com/kubernetes/kubernetes/issues/27836
2016-06-22 10:10:58 -07:00
Dan Williams
db078dbea4 kubelet/cni/kubenet: use common container IP address functions 2016-06-22 11:36:10 -05:00
Dan Williams
9865ac325c kubelet/cni: make cni plugin runtime agnostic
Use the generic runtime method to get the netns path.  Also
move reading the container IP address into cni (based off kubenet)
instead of having it in the Docker manager code.  Both old and new
methods use nsenter and /sbin/ip and should be functionally
equivalent.
2016-06-22 11:36:10 -05:00
k8s-merge-robot
cd66fb7a55 Merge pull request #27772 from jsafrane/kubelet-volume-not-found
Automatic merge from submit-queue

Rephrase 'pv not found in cache' warnings.

When kubelet starts a pod that refers to non-existing PV, PVC or Node, it should clearly show that the requested element does not exist.

Previous `PersistentVolumeClaim 'default/ceph-claim-wm' is not in cache` looks like random kubelet hiccup, while `PersistentVolumeClaim 'default/ceph-claim-wm' not found` suggests that the object may not exist at all and it might be an user error.

Fixes #27523
2016-06-22 05:16:02 -07:00
saadali
773ac20880 Prevent detach before node status update 2016-06-22 04:45:50 -07:00
k8s-merge-robot
7454bc464a Merge pull request #27845 from nikhiljindal/fixNodesStore
Automatic merge from submit-queue

Initialising nodesStore in KubeDNS

Fixes https://github.com/kubernetes/kubernetes/issues/27820

cc @kubernetes/sig-cluster-federation @mml
2016-06-22 04:38:47 -07:00
bin liu
fd27cd47f7 fix some typos
Signed-off-by: bin liu <liubin0329@gmail.com>
2016-06-22 18:14:26 +08:00
nikhiljindal
5875397a3f Initialising nodesStore in KubeDNS 2016-06-22 01:28:02 -07:00