Commit Graph

30617 Commits (4523429b207e5a781a06d6cdb65de64daa162987)

Author SHA1 Message Date
Weixu Zhuang 4523429b20 Azure/ubuntu/saltstack support re-instated
This first reverts commit 8e8437dad8.
Also resolves conflicts with docs on f334fc41
And resolves conflicts with https://github.com/kubernetes/kubernetes/pull/22231/commits
to make people switching between two different methods of setting up by
setting env variables.

Conflicts:
	cluster/get-kube.sh
	cluster/saltbase/salt/README.md
	cluster/saltbase/salt/kube-proxy/default
	cluster/saltbase/salt/top.sls
2016-06-17 23:41:41 -07:00
k8s-merge-robot 076bf81b8b Merge pull request #23473 from AdoHe/kubelet_tls_overwrite
Automatic merge from submit-queue

fix kubelet tls overwrite issue

@lavalamp apply the same thing to kubelet. @dchen1107 ptal.

<!-- Reviewable:start -->
---
This change is [<img src="http://reviewable.k8s.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](http://reviewable.k8s.io/reviews/kubernetes/kubernetes/23473)
<!-- Reviewable:end -->
2016-06-17 23:20:03 -07:00
k8s-merge-robot ec86c428c1 Merge pull request #27596 from saad-ali/removetestfromflaky
Automatic merge from submit-queue

Remove PD tests out of flaky

Closes https://github.com/kubernetes/kubernetes/issues/26127
2016-06-17 22:46:52 -07:00
k8s-merge-robot d1115dc184 Merge pull request #27636 from mml/fed-dns-followup
Automatic merge from submit-queue

Cleanups following #27587

- Add back the negative assertions, but mark them [Slow].
- Use the current DNS TTL of 180 sec as our timeout for all DNS tests.
- Assorted cleanups and refactoring.
2016-06-17 22:05:39 -07:00
k8s-merge-robot 42a88fc304 Merge pull request #27647 from quinton-hoole/2016-06-17-excise-example.com
Automatic merge from submit-queue

Change default Federation DNS zone to be RFC 2606 compliant.

example.com is reserved, so don't use it.
Use federation.example instead.
2016-06-17 21:10:51 -07:00
k8s-merge-robot db904257f9 Merge pull request #27599 from dchen1107/gci
Automatic merge from submit-queue

Fix docker log level on GCI node.

Fix #27584

cc/ @a-robinson
2016-06-17 20:21:05 -07:00
k8s-merge-robot 808f3ecbe6 Merge pull request #27220 from yifan-gu/kube-up-master
Automatic merge from submit-queue

cluster/gce/coreos: Make kube-up works for both rkt and docker on coreos on gce

With this PR, kube-up will be able to spin up a pure rkt cluster given the choice `KUBE_CONTAINER_RUNTIME=rkt`

e.g. 
```
export KUBE_GCE_ZONE=us-east1-b
export KUBE_OS_DISTRIBUTION=coreos

export KUBE_GCE_MASTER_PROJECT=coreos-cloud
export KUBE_GCE_MASTER_IMAGE=coreos-alpha-1032-0-0-v20160428

export KUBE_GCE_NODE_PROJECT=coreos-cloud
export KUBE_GCE_NODE_IMAGE=coreos-alpha-1032-0-0-v20160428


export KUBE_ENABLE_NODE_LOGGING=false
export KUBE_ENABLE_CLUSTER_MONITORING=none

export KUBE_CONTAINER_RUNTIME=rkt
export KUBE_RKT_VERSION=v1.8.0
```

```
$ cluster/kube-up.sh
...
$ kubectl cluster-info
Kubernetes master is running at https://104.196.41.124
GLBCDefaultBackend is running at https://104.196.41.124/api/v1/proxy/namespaces/kube-system/services/default-http-backend
Elasticsearch is running at https://104.196.41.124/api/v1/proxy/namespaces/kube-system/services/elasticsearch-logging
Kibana is running at https://104.196.41.124/api/v1/proxy/namespaces/kube-system/services/kibana-logging
KubeDNS is running at https://104.196.41.124/api/v1/proxy/namespaces/kube-system/services/kube-dns
kubernetes-dashboard is running at https://104.196.41.124/api/v1/proxy/namespaces/kube-system/services/kubernetes-dashboard
```

```
$ kubectl get pods --all-namespaces
NAMESPACE     NAME                                            READY     STATUS    RESTARTS   AGE
kube-system   elasticsearch-logging-v1-5zfrd                  1/1       Running   0          2m
kube-system   elasticsearch-logging-v1-83u6w                  1/1       Running   0          2m
kube-system   etcd-server-events-yifan-test-rkt-master        1/1       Running   0          2m
kube-system   etcd-server-yifan-test-rkt-master               1/1       Running   0          2m
kube-system   kibana-logging-v1-0g7yu                         1/1       Running   2          2m
kube-system   kube-addon-manager-yifan-test-rkt-master        1/1       Running   0          3m
kube-system   kube-apiserver-yifan-test-rkt-master            1/1       Running   0          2m
kube-system   kube-controller-manager-yifan-test-rkt-master   1/1       Running   0          3m
kube-system   kube-dns-v14-1mqco                              3/3       Running   0          2m
kube-system   kube-scheduler-yifan-test-rkt-master            1/1       Running   0          2m
kube-system   kubernetes-dashboard-v1.1.0-beta2-uwutn         1/1       Running   0          2m
kube-system   l7-lb-controller-v0.6.0-8pgbo                   2/2       Running   0          2m
kube-system   node-problem-detector-v0.1-7iwb2                1/1       Running   0          2m
kube-system   node-problem-detector-v0.1-k4m8o                1/1       Running   0          2m
kube-system   node-problem-detector-v0.1-rxtp8                1/1       Running   0          2m
kube-system   node-problem-detector-v0.1-wsoqd                1/1       Running   0          2m

```


Fix #24103 

cc @kubernetes/sig-node @kubernetes/rktnetes-maintainers
2016-06-17 19:39:22 -07:00
k8s-merge-robot 64f79df54e Merge pull request #27650 from nikhiljindal/fixFedTest
Automatic merge from submit-queue

federation-apiserver test: Fixing the AfterEach order in e2e test

Moving "It" and "AfterEach" into a "Describe" fixes the order of AfterEach.
Verified that now, test.AfterEach is run before running framework.AfterEach.

Removing the temporary disabling of framework.SkipUnlessFederated(f.Client) in AfterEach.

cc @kubernetes/sig-cluster-federation @mml
2016-06-17 18:48:36 -07:00
k8s-merge-robot a521a16d0d Merge pull request #27591 from dchen1107/cadvisor2
Automatic merge from submit-queue

Bump cAdvisor to v0.23.4

```release-note
*  Check for thin_is binary in path for devicemapper when using ThinPoolWatcher
*  Fix uint64 overflow issue for CPU stats
```

Fix #27194 #27573
2016-06-17 18:48:33 -07:00
k8s-merge-robot 04fd079d09 Merge pull request #27597 from dchen1107/kubectl
Automatic merge from submit-queue

No timeout for kubectl logs

Fix #27588

cc/ @smarterclayton
2016-06-17 17:48:15 -07:00
nikhiljindal 60f0dce033 Fixing the AfterEach order 2016-06-17 17:14:17 -07:00
k8s-merge-robot d03a5fab29 Merge pull request #23666 from smarterclayton/initctrproposal
Automatic merge from submit-queue

Proposal for implementing init containers

Addresses #1589. Implemented in #23567. Docs in https://github.com/kubernetes/kubernetes.github.io/pull/679

```release-note
Init containers enable pod authors to perform tasks before their normal containers start. Each init container is started in order, and failing containers will prevent the application from starting.
```
2016-06-17 17:02:17 -07:00
k8s-merge-robot 7ab303efbe Merge pull request #27466 from madhusudancs/fed-dns-scope
Automatic merge from submit-queue

Move GCE NODE_SCOPES to config-common.sh and enable DNS scope in GKE.

Follow up to #27357

cc @colhom @kubernetes/sig-cluster-federation 

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-06-17 17:02:11 -07:00
Dawn Chen 1ea5c460bc Bump cAdvisor to v0.23.4 2016-06-17 16:26:39 -07:00
Daniel Smith 392ff36e29 Merge pull request #27585 from quinton-hoole/2016-06-02-ubernetes-e2e
Improve federation e2e tests
2016-06-17 16:01:57 -07:00
Daniel Smith 22d3267188 Merge pull request #27387 from yujuhong/sources_ready
kubelet: don't GC containers of deleted pods until all sources are ready
2016-06-17 16:01:31 -07:00
Quinton Hoole 8d8d1922dd Change default Federation DNS zone to be RFC 2606 compliant. 2016-06-17 15:32:45 -07:00
Clayton Coleman bdde25cf43
Proposal for implementing init containers 2016-06-17 17:39:07 -04:00
k8s-merge-robot 5a6188d61e Merge pull request #26113 from aaronlevy/log-elect
Automatic merge from submit-queue

pkg/client/leaderelection: log err when retrieving endpoint

The leader election code currently suppresses errors when trying to retrieve an endpoint. This can lead to difficult to debug situations.

In the case of a mis-configured controller-manager or scheduler - where they fail to contact an apiserver - this currently leads to no log output in the default case, or `failed to renew lease foo/bar` in `--v=4`, which isn't very actionable.
2016-06-17 14:03:22 -07:00
k8s-merge-robot 2266c4eb1d Merge pull request #27371 from andyzheng0831/network-plugin
Automatic merge from submit-queue

Revert "Revert "GCI: add support for network plugin""

PR #27027 added the network plugin support in GCI config, but later a bug in the network plugin broke e2e tests (see issue #27118). The bug was fixed by #27141 and we have been repeatedly run the serial e2e tests more than 10 times to verify the fix. Now it should be safe to put the GCI network plugin support back.

We will first merge in the master branch and monitor the Jenkins serial tests for a while and then cherry-pick it into release-1.3 branch.
2016-06-17 14:03:18 -07:00
k8s-merge-robot 8b7d842203 Merge pull request #27227 from abhgupta/issue_27198
Automatic merge from submit-queue

Counting pod volume towards PV limit even if PV/PVC is missing

Fixes #27198 

Implements option 3 from https://github.com/kubernetes/kubernetes/issues/27198#issuecomment-225298492

/cc @smarterclayton @markturansky @childsb
2016-06-17 12:40:51 -07:00
Quinton Hoole 4445dc2b59 Improve e2e tests for Cluster Federation. 2016-06-17 12:39:10 -07:00
Daniel Smith 25d8aec037 Merge pull request #27632 from bprashanth/ing_e2e_static_ip_leak
Don't leak static-ips in ingress e2es
2016-06-17 12:15:57 -07:00
Matt Liggett b0a4fdea4d tidy 2016-06-17 12:08:36 -07:00
Matt Liggett 7cf7717d4c Move the slow part of the test into a Slow block. 2016-06-17 12:08:36 -07:00
Matt Liggett dd7626bbf1 refactor and re-add exists 2016-06-17 12:08:36 -07:00
Matt Liggett 2b3e9d5a98 Add a "this should not work" comment. 2016-06-17 12:07:20 -07:00
Matt Liggett 011b2cde33 Use DNS TTL 2016-06-17 12:07:20 -07:00
k8s-merge-robot d4d6184931 Merge pull request #27627 from justinsb/fix_23390
Automatic merge from submit-queue

kube-up multizone: don't print scary warning

The node-count check gets confused when there are more nodes that we
launched, which is normal with KUBE_USE_EXISTING_MASTER.

This fix just suppresses the error message in that case.

Fix #23390
2016-06-17 11:24:29 -07:00
k8s-merge-robot 0ea74dae5c Merge pull request #27511 from quinton-hoole/2016-06-15-improve-logging-in-federation-service-controller
Automatic merge from submit-queue

Improve error logging on DNS updates for federated services

This makes debugging easier.  Prior to this, the logs would e.g. contain "Successfully updated 4 out of 4 DNS records", when in fact zero DNS records had been successfully updated.  It's difficult to debug what's happening with such confusing log messages.
2016-06-17 11:24:25 -07:00
k8s-merge-robot 1a89f1acba Merge pull request #26995 from mikedanese/integration-dead-code
Automatic merge from submit-queue

delete a bunch of dead code in cmd/integration

this command should just go away
2016-06-17 11:24:21 -07:00
k8s-merge-robot 82ab80cb57 Merge pull request #27265 from gmarek/grabber-test
Automatic merge from submit-queue

Remove known metrics list

Fixes #26800
2016-06-17 11:24:17 -07:00
Prashanth Balasubramanian dafe27617e Don't leak stati-ips in ingress e2es 2016-06-17 10:35:16 -07:00
Justin Santa Barbara bab7a255b7 kube-up multizone: don't print scary warning
The node-count check gets confused when there are more nodes that we
launched, which is normal with KUBE_USE_EXISTING_MASTER.

This fix just suppresses the error message in that case.

Fix #23390
2016-06-17 13:00:50 -04:00
k8s-merge-robot 926ff6e3fd Merge pull request #27619 from mwielgus/ca-0.2.0
Automatic merge from submit-queue

Bump cluster autoscaler to 0.2.0

cc: @piosz @jszczepkowski @fgrzadkowski
2016-06-17 09:08:58 -07:00
k8s-merge-robot dc729a275a Merge pull request #27617 from pmorie/int-test-typo
Automatic merge from submit-queue

Fix typo in GC integration tests

Fix a typo in `TestCreateWithNonExisitentOwner`
2016-06-17 09:08:54 -07:00
k8s-merge-robot 1444cbf594 Merge pull request #27525 from wojtek-t/network_unavailable_only_in_gce
Automatic merge from submit-queue

Don't set NetworkUnavailable condition in non-GCE/GKE clouds

Ref #27347

@davidopp @erictune @justinsb @simonswine
2016-06-17 09:08:50 -07:00
k8s-merge-robot fd7803cdbb Merge pull request #27229 from pmorie/pod-manager-godoc
Automatic merge from submit-queue

Godoc for kubelet pod manager

Improve godoc for pod manager and mirror client.

@kubernetes/sig-node
2016-06-17 08:15:58 -07:00
Marcin Wielgus 9031e4780c Bump cluster autoscaler to 0.2.0 2016-06-17 16:31:25 +02:00
Paul Morie f0ead64881 Fix typo in GC integration tests 2016-06-17 10:20:49 -04:00
k8s-merge-robot 7edb84c2eb Merge pull request #27613 from jszczepkowski/kac-tests-cleanup
Automatic merge from submit-queue

Fixed updating node labels in cluster autoscaler e2e test.

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

Fixed updating node labels in cluster autoscaler e2e test.
2016-06-17 06:23:33 -07:00
k8s-merge-robot ba00c9ecca Merge pull request #27611 from wojtek-t/log_namespace_creation_error
Automatic merge from submit-queue

Log namespace creation error

Ref #27610
2016-06-17 06:23:29 -07:00
k8s-merge-robot 983b478ff4 Merge pull request #27042 from lukaszo/logs
Automatic merge from submit-queue

Fix kubectl logs for init containers
2016-06-17 05:01:04 -07:00
Jerzy Szczepkowski 5308f4a9ae Fixed updating node labels in cluster autoscaler e2e test.
Fixed updating node labels in cluster autoscaler e2e test.
2016-06-17 13:46:15 +02:00
Wojciech Tyczynski b519c72a84 Log namespace creation error 2016-06-17 13:18:02 +02:00
k8s-merge-robot ce3d7090a2 Merge pull request #26821 from bprashanth/lb_e2e
Automatic merge from submit-queue

Extend ingress e2e

Splits the test into a cross platform conformance list, and platform specific bits that exercise features through annotations. Also exercises the features in https://github.com/kubernetes/contrib/pull/1133. Assigning to Girish, simply because I assigned the other pr to Minhan.
2016-06-17 04:01:44 -07:00
k8s-merge-robot 622535d15e Merge pull request #27606 from kubernetes/revert-27526-revert-27422-burst
Automatic merge from submit-queue

Change default value of deleting-pods-burst to 1

Let's try again.

cc @davidopp 

Reverts kubernetes/kubernetes#27526
2016-06-17 03:06:26 -07:00
k8s-merge-robot c538106450 Merge pull request #24916 from mesosphere/jdef_fix_23822
Automatic merge from submit-queue

MESOS: fix race condition in contrib/mesos/pkg/queue/delay

attempt to fix #23822

/cc @ihmccreery
2016-06-17 03:06:22 -07:00
k8s-merge-robot 2b0be0ba97 Merge pull request #27563 from derekwaynecarr/fix_help
Automatic merge from submit-queue

Fix typo in kubelet help

minor typo fix.
2016-06-17 02:16:04 -07:00
k8s-merge-robot 6a18fbe6af Merge pull request #27019 from girishkalele/nethealth2saltbase
Automatic merge from submit-queue

Add nethealth container to prepull manifest
2016-06-17 02:15:59 -07:00