Commit Graph

31398 Commits

Author SHA1 Message Date
k8s-merge-robot
1fb8596636 Merge pull request #27033 from zefciu/lvm-fix
Automatic merge from submit-queue

Fixed an error in lvm bash script

The space in this script is an obvious typo and caused an error
(trying to call volume_id as command).
2016-06-24 13:56:55 -07:00
k8s-merge-robot
120d2519ff Merge pull request #27025 from asalkeld/type-o-number-or-name
Automatic merge from submit-queue

Fix type-o in definitions.html

Simple typing error.

fixes #14834
2016-06-24 13:56:51 -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
9612e10337 Merge pull request #26729 from quinton-hoole/2016-06-02-tell-mac-wussies-to-be-more-linux
Automatic merge from submit-queue

Add note to development guide regarding GNU tools versions


…especially on Mac OS X.
2016-06-24 13:56:43 -07:00
k8s-merge-robot
a9678fa4f3 Merge pull request #26716 from justinclayton/patch-1
Automatic merge from submit-queue

remove DCOS section from README.md

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

As far as I can tell, as of DCOS 1.7, the Kubernetes-Mesos framework is no longer available in the DCOS Universe. This PR reflects that change so as not to cause confusion.
2016-06-24 13:56:39 -07:00
k8s-merge-robot
46e7c7160a Merge pull request #26467 from euank/delete-old-e2e-tests
Automatic merge from submit-queue

e2e: Delete old code

These tests were added commented out over a year ago. Now they don't compile. The port forward test has a whole file devoted to replacing it (`e2e/portforward.go`) and while the exec test doesn't have a perfect replacement, it has several tests that cover for it (exec over a websocket, an e2e_node test, all the kubectl execs). If we want that test, it would be better to write it fresh anyways.

cc @ncdc
2016-06-24 13:56:35 -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
a405df4391 Merge pull request #25710 from xiangpengzhao/fix_predicate
Automatic merge from submit-queue

No need to log empty string in predicates.go

If `pvcName` is empty, we don't need to log it.
2016-06-24 13:56:26 -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
k8s-merge-robot
8c9577888c Merge pull request #19706 from jonboulle/master
Automatic merge from submit-queue

Remove unused coreos/go-etcd fork from third_party
2016-06-24 13:56:15 -07:00
Yifan Gu
30c913e211 rkt: Bump required rkt version to 1.9.1. 2016-06-24 13:54:32 -07:00
Matt Liggett
c16416d6b4 fg 2016-06-24 13:54:05 -07:00
nikhiljindal
b1021db07e Adding OWNERS for federation 2016-06-24 13:47:39 -07:00
Kris
88e2a31978 Adding lock files for kubeconfig updating 2016-06-24 13:11:52 -07:00
k8s-merge-robot
eeda4c7915 Merge pull request #24910 from paralin/aws-configurable-context
Automatic merge from submit-queue

cluster/aws: Add option for kubeconfig context

Added KUBE_CONFIG_CONTEXT environment variable to customize the kubeconfig context created at the end of the aws kube-up script.

Fixes #24877 

This PR does barely anything and shouldn't require e2e tests. It's just a minor convenience.

<!-- 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/24910)
<!-- Reviewable:end -->
2016-06-24 13:09:40 -07:00
Davanum Srinivas
8beed4cd8d
Fix pkg/kubelet unit tests fail on OSX
Fixes #27730
2016-06-24 15:58:09 -04:00
Matt Liggett
772ba36a72 Fixup debug log line in federation controller 2016-06-24 12:32:42 -07:00
Mike Spreitzer
e12fa40c1d Tracked addition of federation, sed support in kube DNS
The kube DNS app recently gained support for federation (whatever that
is), including a new Salt parameter.  It also gained alternate
templates, intended to be friendly to `sed`.  Fortunately, those do
not demand a federation parameter.
2016-06-24 15:28:55 -04:00
k8s-merge-robot
e93608c859 Merge pull request #28030 from nikhiljindal/revertPR
Automatic merge from submit-queue

Revert "Federation e2e supports aws"

Reverting https://github.com/kubernetes/kubernetes/pull/27791 to get our Jenkins tests green again.

cc @kubernetes/sig-cluster-federation
2016-06-24 12:07:50 -07:00
k8s-merge-robot
f949b24ee0 Merge pull request #28031 from yujuhong/rm_docker8
Automatic merge from submit-queue

node e2e: stop testing trusty+docker 1.8
2016-06-24 11:33:36 -07:00
k8s-merge-robot
391bcfb206 Merge pull request #27986 from madhusudancs/fed-kubedns-flags
Automatic merge from submit-queue

Parametrize the kube-dns --federations command line argument in the manifest

This parameter is later substituted with the environment variable during
the build process.

cc @kubernetes/sig-cluster-federation 

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-06-24 11:33:31 -07:00
Fabio Yeon
86928dbea0 Increase pod CPU/memory for fluentd, dns and kube-proxy. 2016-06-24 11:03:08 -07:00
k8s-merge-robot
280c4c57a1 Merge pull request #28024 from jszczepkowski/addon-mgr
Automatic merge from submit-queue

Added PetSet support to addon manager.

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

Added PetSet support to addon manager.
2016-06-24 10:58:17 -07:00
k8s-merge-robot
8571bb1e2c Merge pull request #27993 from cjcullen/webhook
Automatic merge from submit-queue

Add retries on 429s & 5xxs to the Auth webhooks

This gets some retry logic above the restclient (as proposed in https://github.com/kubernetes/kubernetes/issues/27965#issuecomment-228188192).

I'd like to add a unit test, but I'm not coming with a good way without either gross stubbing or making a few fields in restclient.Result public. Any thoughts?
2016-06-24 10:58:12 -07:00
Yu-Ju Hong
a031f7aea4 node e2e: stop testing trusty+docker 1.8 2016-06-24 10:45:45 -07:00
nikhiljindal
1204411209 Revert "Federation e2e supports aws"
This reverts commit 5bacc4830e.
2016-06-24 10:44:35 -07:00
Minhan Xia
ca1e808c2f introduce shell2junit 2016-06-24 10:28:16 -07:00
Madhusudan.C.S
3ee03a5584 Remove federation_domain_map entirely if it isn't set, seems to be not replaced by empty value. 2016-06-24 09:59:17 -07:00
Quinton Hoole
8d5d7e9013 Address outstanding review comments in #27999. 2016-06-24 08:35:12 -07:00
k8s-merge-robot
178bcd1c11 Merge pull request #28015 from wojtek-t/workaround_kubeproxy
Automatic merge from submit-queue

Workardound KubeProxy failures in test framework

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

This is obviously not a fix - this is just test-framework-related workaround to avoid situations when we spin up a 2000-node clusters for few hours and then are not even to run tests.

@dchen1107 @Random-Liu @gmarek @zmerlynn
2016-06-24 08:14:43 -07:00
Jerzy Szczepkowski
51c70f2369 Added PetSet support to addon manager.
Added PetSet support to addon manager.
2016-06-24 16:45:41 +02:00
Łukasz Oleś
8ec15ad937 Skip test if ssh is not supported by provider
On local vagrant cluster this test is failing because there is no ssh support.
2016-06-24 16:37:39 +02:00
Wojciech Tyczynski
77679b0437 Workardoun KubeProxy failures in test framework 2016-06-24 15:49:12 +02:00
Sylwester Brzeczkowski
a558cadedd Fix attach command for InitContainers 2016-06-24 14:35:02 +02:00
k8s-merge-robot
eedc438da9 Merge pull request #28014 from jszczepkowski/kube-down-cleanup
Automatic merge from submit-queue

Cleanup in kube-down: removed deletion of old autoscaler.

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

Cleanup in kube-down: removed deletion of old autoscaler.
2016-06-24 05:14:39 -07:00
Jerzy Szczepkowski
a745bb17e3 Cleanup in kube-down: removed deletion of old autoscaler.
Cleanup in kube-down: removed deletion of old autoscaler.
2016-06-24 13:32:37 +02:00
k8s-merge-robot
35c9e9f74e Merge pull request #28011 from mwielgus/node-pool-enable
Automatic merge from submit-queue

Use gcloud for default node pool and api for other in cluster autoscaler e2e test

cc: @piosz @jszczepkowski @fgrzadkowski 

Currently there is a problem with gcloud when non-default pool is used for cluster update. So we temporarily switch to the old ca-enable method for non-default pools until it is fixed.
2016-06-24 03:56:37 -07:00
Marcin Wielgus
6e449190ec Use gcloud for default node pool and api for other in cluster autoscaler e2e testx 2016-06-24 11:55:54 +02:00
k8s-merge-robot
c0c2e9d9fd Merge pull request #27999 from quinton-hoole/2016-06-23-add-debug-logging-to-ensure-dns
Automatic merge from submit-queue

federation service controller: fixing the logic to update DNS records

dd78dd8e2b introduced an 'endpointsReachable' boolean argument to ensureDnsRrrsets(), which is incorrect.

The logic prior to the above commit does the right thing, provided that the correct set of healthy endpoints are passed into that function.  

This PR essentially reverts the part of the above commit related to 'endpointsReachable', and adds some debug logging (at --v=4) in case it becomes necessary.

cc: @mfanjie @mml @nikhiljindal @madhusudancs
2016-06-24 01:10:23 -07: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
k8s-merge-robot
7552f43c69 Merge pull request #27995 from ncdc/bump-cadvisor
Automatic merge from submit-queue

bump(google/cadvisor): v0.23.6

Fix a bug where cadvisor couldn't gather container filesystem stats on RHEL 7.2 devicemapper.

Fixes #27955 

cc @kubernetes/sig-node @kubernetes/rh-cluster-infra
2016-06-23 22:14:25 -07:00
Mike Danese
135c6899e9 return nil from NewClientConfig instead of empty struct 2016-06-23 22:13:42 -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
038c120423 Merge pull request #27963 from yujuhong/less_verbal
Automatic merge from submit-queue

e2e_node: lower the log verbosity level

The current level is so high that the logs are almost unreadable.

This fixes #27593
2016-06-23 19:23:37 -07:00
Quinton Hoole
6b435a6415 Fixes #27989 2016-06-23 19:06:22 -07:00
k8s-merge-robot
5ccd1e7cf6 Merge pull request #27990 from adityakali/fluentd
Automatic merge from submit-queue

Use new fluentd-gcp container with journal support

This makes use of the systemd-journal support added in PR #27981
and Fixes #27446.

cc/ @a-robinson @andyzheng0831
2016-06-23 18:48:53 -07:00
k8s-merge-robot
6aa016b2d1 Merge pull request #27981 from a-robinson/journal-cvm
Automatic merge from submit-queue

Support journal logs in fluentd-gcp on GCI

This maintains a single common image for each rather than having to fork out separate images, relying on different commands in yaml manifests to differentiate in the behavior. This is treading on top of @adityakali's #27906, but I wasn't able to get in touch with him this afternoon until very recently. He's handling making sure that the new yaml manifests are used when running on GCI.

```release-note
```
2016-06-23 18:48:49 -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