Commit Graph

31152 Commits

Author SHA1 Message Date
k8s-merge-robot
9b198d6b1c Merge pull request #23733 from zhouhaibing089/instanceid-fix
Automatic merge from submit-queue

mount instanceid file from config drive when using openstack cloud provider

fix https://github.com/kubernetes/kubernetes/issues/23191, the instanceid file is read however we do not mount it as a volume, and it would cause the cloud provider contacts the metadata server, in some cases, the metadata server is not able to serve, then the cloud provider would fail to initialize, we should avoid that.

<!-- 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/23733)
<!-- Reviewable:end -->
2016-06-24 20:21:06 -07:00
k8s-merge-robot
fc1937f68f Merge pull request #20273 from kargakis/allow-scaling-paused-deployments
Automatic merge from submit-queue

Proportionally scale paused and rolling deployments

Enable paused and rolling deployments to be proportionally scaled.
Also have cleanup policy work for paused deployments.

Fixes #20853
Fixes #20966
Fixes #20754

@bgrant0607 @janetkuo @ironcladlou @nikhiljindal

<!-- 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/20273)
<!-- Reviewable:end -->
2016-06-24 19:41:51 -07:00
Mike Spreitzer
33e176eb9a Added note to developers about adding parameters to skydns
Added a friendly note, with a suggestion of how to find the scripts.
2016-06-24 22:29:40 -04:00
Mike Spreitzer
6aeb5da239 Fixed deployAddons.sh to use sed template for skydns-svc.yaml
My original change neglected to change the template from the salt one
to the sed one.
2016-06-24 22:21:35 -04:00
k8s-merge-robot
d50bd9e75c Merge pull request #27996 from ronnielai/gc-threshold
Automatic merge from submit-queue

Image GC logic should compensate for reserved blocks

Calculating the disk usage based on available bytes instead of usage bytes to account for reserved blocks in image GC

#27169
2016-06-24 19:08:36 -07:00
k8s-merge-robot
9ff31ad121 Merge pull request #28057 from david-mcmahon/fixdoc
Automatic merge from submit-queue

relnotes ready for use.
2016-06-24 17:58:11 -07:00
k8s-merge-robot
f33188a0d0 Merge pull request #28060 from yifan-gu/fix_stage1_anno
Automatic merge from submit-queue

rkt: Fix the 'privileged' check when stage1 annotation is provided.

Previously when stage1 annotation is provided, we only checks if
the kubelet allows privileged, which is not useful as that is a global
setting.

Instead, we should check if the pod has explicitly set the privileged
security context to 'true'.

cc @kubernetes/sig-rktnetes @kubernetes/sig-node
2016-06-24 17:58:07 -07:00
k8s-merge-robot
440dfc6c20 Merge pull request #28061 from mml/fed-double-quotes
Automatic merge from submit-queue

Remove extra double quotes in --federations.
2016-06-24 17:58:02 -07:00
k8s-merge-robot
6f8a0c61c1 Merge pull request #27208 from yujuhong/min_docker_version
Automatic merge from submit-queue

Bump minimum API version for docker to 1.21

The corresponding docker version is 1.9.x. Dropping support for docker 1.8.

/cc @kubernetes/sig-node
2016-06-24 17:24:19 -07:00
Angus Salkeld
b4f7e67d25 Fix startup type error in initializeCaches
The following error was getting logged:
PersistentVolumeController can't initialize caches, expected list of volumes, got:
&{TypeMeta:{Kind: APIVersion:} ListMeta:{SelfLink:/api/v1/persistentvolumes ResourceVersion:11} Items:[]}
2016-06-25 10:15:27 +10:00
David McMahon
037b25b6d0 relnotes ready for use. 2016-06-24 17:09:22 -07:00
k8s-merge-robot
33165328b1 Merge pull request #27907 from vishh/update-node-e2e-project
Automatic merge from submit-queue

Update node e2e test images project to the new centralized project
2016-06-24 16:46:04 -07:00
Matt Liggett
220da9949a Remove extra double quotes in --federations.
Fixes #28059
2016-06-24 16:43:52 -07:00
Yifan Gu
8b1b9120c6 rkt: Fix the 'privileged' check when stage1 annotation is provided.
Previously when stage1 annotation is provided, we only checks if
the kubelet allows privileged, which is not useful as that is a global
setting.

Instead, we should check if the pod has explicitly set the privileged
security context to 'true'.
2016-06-24 16:33:12 -07:00
Buddha Prakash
c3551ae6cd Refactor qos package
Signed-off-by: Buddha Prakash <buddhap@google.com>
2016-06-24 15:36:04 -07:00
k8s-merge-robot
ef905c8125 Merge pull request #28032 from fabioy/increase-reqs
Automatic merge from submit-queue

Increase pod CPU/memory for fluentd, dns and kube-proxy.

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

Improvements in cluster-wide resource utilization allows us to restore some of the CPU and memory limits on pods that was previously shrunk in 1.2.
2016-06-24 15:15:12 -07:00
k8s-merge-robot
07d24e4557 Merge pull request #28004 from mikedanese/fix-nil
Automatic merge from submit-queue

return nil from NewClientConfig instead of empty struct

This is a go convention and fixes an nil pointer in kubelet when passing in bad command line options:

```
I0624 04:12:33.333246   25404 plugins.go:141] Loaded network plugin "kubenet"
E0624 04:12:33.333390   25404 runtime.go:58] Recovered from panic: "invalid memory address or nil pointer dereference" (runtime error: invalid memory address or nil pointer dereference)
/go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/pkg/util/runtime/runtime.go:52
/go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/pkg/util/runtime/runtime.go:40
/usr/local/go/src/runtime/asm_amd64.s:472
/usr/local/go/src/runtime/panic.go:443
/usr/local/go/src/runtime/panic.go:62
/usr/local/go/src/runtime/sigpanic_unix.go:24
/go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/service.go:132
/go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/pkg/kubelet/kubelet.go:254
/go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/pkg/client/cache/listwatch.go:80
/go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/pkg/client/cache/reflector.go:262
/go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/pkg/client/cache/reflector.go:204
/go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/pkg/util/wait/wait.go:86
/go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/pkg/util/wait/wait.go:87
/go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/pkg/util/wait/wait.go:49
```
cc @caesarxuchao @lavalamp
2016-06-24 15:15:08 -07:00
Girish Kalele
5b50b74390 Merge pull request #28048 from lavalamp/flake
disable flaky PD test
2016-06-24 14:49:14 -07:00
k8s-merge-robot
284d33332d Merge pull request #28037 from mml/fed-vlog
Automatic merge from submit-queue

Fixup debug log line in federation controller
2016-06-24 14:37:53 -07:00
k8s-merge-robot
cd422ada25 Merge pull request #28034 from krousey/kubeconfig_filelock
Automatic merge from submit-queue

Adding lock files for kubeconfig updating

This is to prevent concurrent executions from corrupting the kubeconfig file. 

Also, release note?

#23964
2016-06-24 14:37:50 -07:00
k8s-merge-robot
9b215a33b5 Merge pull request #28026 from quinton-hoole/2016-06-24-fix-nits-in-dns-deletion-logic-fix
Automatic merge from submit-queue

Address outstanding review comments in #27999.
2016-06-24 14:37:45 -07:00
Daniel Smith
886f5c7a8e disable flaky PD test 2016-06-24 14:23:52 -07:00
Rudi Chiarito
8db551f674 golint fixes for aws cloudprovider 2016-06-24 17:06:38 -04:00
k8s-merge-robot
e8aa0e8a7b Merge pull request #27936 from piosz/typo
Automatic merge from submit-queue

Fixed typo in upgrade.sh script

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-06-24 13:57:25 -07:00
k8s-merge-robot
7565e38d0c Merge pull request #27904 from vishh/node-e2e-makefile
Automatic merge from submit-queue

Add a makefile rule for ginkgo.
2016-06-24 13:57:21 -07:00
k8s-merge-robot
d88485f6e1 Merge pull request #27666 from xiangpengzhao/pre-commit-typo
Automatic merge from submit-queue

Fix typos in pre-commit
2016-06-24 13:57:17 -07:00
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
f04177e5f4 Merge pull request #27530 from sdminonne/bug_fix
Automatic merge from submit-queue

to remove workflow proposal

@erictune @brendanburns 
I think workflow proposal should be removed now. If you have a specific plan to remove it disregard this.
2016-06-24 13:57:09 -07:00
k8s-merge-robot
ba7e0b4dad Merge pull request #27482 from quinton-hoole/2016-06-15-build-darwin-test-binaries-on-os-x
Automatic merge from submit-queue

Build Darwin test binaries on OS X when KUBE_FASTBUILD is set

Without this, on OS X, test binaries would not be built for the local ARCH, and test scripts fail with an obscure error due to not being able to find the correct binary to run.

This makes the behavior on OS X more consistent with Linux.

Tested on OS X and Linux.
2016-06-24 13:57:04 -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
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
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