Commit Graph

4402 Commits (23c7c2e3e7c27c13fc8904708e2b51b786212876)

Author SHA1 Message Date
Kubernetes Submit Queue 75e09a892f Merge pull request #32161 from hongchaodeng/rb
Automatic merge from submit-queue

etcd: data rollback tool of v3 -> v2

ref: https://github.com/kubernetes/features/issues/44
ref #20504

What?
This provides a rollback tool for some users to rollback etcd data from v3 to v2.
2016-09-14 04:12:02 -07:00
Piotr Szczesniak 0f40f94dd9 Bumped Heapster to v1.2.0 2016-09-14 09:16:09 +02:00
Kubernetes Submit Queue c4893df894 Merge pull request #32151 from bboreham/fix-cni-on-gci
Automatic merge from submit-queue

Add flag to set CNI bin dir, and use it on gci nodes

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

When using `kube-up` on GCE, following #31023 which moved the workers from debian to gci, CNI just isn't working.  The root cause is basically as discussed in #28563: one flag (`--network-plugin-dir`) means two different things, and the `configure-helper` script uses it for the wrong purpose.

This PR adds a new flag `--cni-bin-dir`, then uses it to configure CNI as desired.

As discussed at #28563, I have also added a flag `--cni-conf-dir` so users can be explicit 

**Which issue this PR fixes** : fixes #28563

**Special notes for your reviewer**:

I left the old flag largely alone for backwards-compatibility, with the exception that I stop setting the default when CNI is in use.  The value of `"/usr/libexec/kubernetes/kubelet-plugins/net/exec/"` is unlikely to be what is wanted there.

**Release note**:
```release-note
Added new kubelet flags `--cni-bin-dir` and `--cni-conf-dir` to specify where CNI files are located.
Fixed CNI configuration on GCI platform when using CNI.
```
2016-09-13 16:42:06 -07:00
Kubernetes Submit Queue 2dc4c26f76 Merge pull request #32330 from euank/e2e-kern-log
Automatic merge from submit-queue

e2e/log-dump: Collect kernel log with journald

Related to #31928

The kern.log file does not exist on journald distros typically.

cc @vishh @Random-Liu
2016-09-12 19:47:23 -07:00
Marcin Wielgus 0bee184681 Bump cluster autoscaler to 0.3 2016-09-12 18:56:54 +02:00
Kubernetes Submit Queue a062d9fe3b Merge pull request #32477 from wojtek-t/fix_etcd3_suite
Automatic merge from submit-queue

Fix etcd3 suite
2016-09-12 02:02:00 -07:00
Kubernetes Submit Queue af325ee7bf Merge pull request #31797 from aveshagarwal/master-dapi-volume-tests-image-update
Automatic merge from submit-queue

Update container image version for downward api volume tests

Some tests were using 0.7, and some were using 0.6, so updating all to 0.7.
@kubernetes/rh-cluster-infra
2016-09-12 01:22:27 -07:00
Marek Grabowski cc330692ba Merge pull request #32452 from MrHohn/revert-32018-kubedns-deployment
Revert "Use a Deployment for kube-dns"
2016-09-12 09:59:06 +02:00
Wojciech Tyczynski 7a9802d49f Fix etcd3 suite 2016-09-12 09:44:45 +02:00
Kubernetes Submit Queue 8a77e3fdb7 Merge pull request #32155 from euank/update-root-size
Automatic merge from submit-queue

cluster/gce: Update master root disk size

As part of #29213, the hyperkube image will be deployed alongside
existing dependencies.

This ends up just running over the root disk size of 10 during
extraction.

cc @yifan-gu @aaronlevy
2016-09-11 23:28:08 -07:00
Kubernetes Submit Queue 8f350198a9 Merge pull request #32204 from jszczepkowski/ha-port-fix
Automatic merge from submit-queue

Updated port for HA master etcd.
2016-09-11 15:43:34 -07:00
Kubernetes Submit Queue 2076319020 Merge pull request #32362 from piosz/heap
Automatic merge from submit-queue

Bumped Heapster to v1.2.0-beta.3

The new version contains Kubernetes deps in version `1.4.0-beta.0`
2016-09-11 13:47:44 -07:00
Kubernetes Submit Queue 8306fba9b0 Merge pull request #28469 from asalkeld/local-e2e
Automatic merge from submit-queue

Add detect-master to local provider to get e2e working

Make it possible to run some e2e tests using the local provider (./hack/local-up-cluster.sh)

This will now work for tests that don't need more than one node:
export  KUBERNETES_PROVIDER=local
go run hack/e2e.go -v -test --check_node_count=false --check_version_skew=false --test_args="--ginkgo.focus=Cadvisor"

Note: without this commit, the port and ip address are wrong and require the --host option (which is inconsistent with the other providers).
2016-09-11 05:44:47 -07:00
Kubernetes Submit Queue 2673ce4c21 Merge pull request #26244 from asalkeld/kconfig-common.sh
Automatic merge from submit-queue

Teach create-kubeconfig() to deal with multi path KUBECONFIG

When KUBECONFIG is in the form "A:B:C" make sure each file is
created.

fixes #17778
2016-09-10 23:51:37 -07:00
Zihong Zheng dce1c06ad3 Revert "Use a Deployment for kube-dns" 2016-09-10 20:29:00 -07:00
Kubernetes Submit Queue fdd3cf89a2 Merge pull request #32018 from MrHohn/kubedns-deployment
Automatic merge from submit-queue

Use a Deployment for kube-dns

Attempt to fix #31554 

Switching kube-dns from using Replication Controller to Deployment.

The outdated kube-dns YAML file in coreos and juju dir is also updated. Most of the specific memory limit in the files remain unchanged because it seems like people were modifying it explicitly(c8d82fc2a9). Only the memory limit for healthz is increased due to this pending investigation(#29688).

YAML files stay in *-rc.yaml format considering there are a lots of scripts in cluster and hack dirs are using this format. But it may be fine to changed them all.

@bprashanth @girishkalele
2016-09-10 19:16:03 -07:00
Kubernetes Submit Queue 859737fa0d Merge pull request #30847 from bmoylan/fix/centos-docker-download
Automatic merge from submit-queue

Fix/centos docker download

<!--  Thanks for sending a pull request!  Here are some tips for you:
1. If this is your first time, read our contributor guidelines https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md and developer guide https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md
2. If you want *faster* PR reviews, read how: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/faster_reviews.md
3. Follow the instructions for writing a release note: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes
-->

**What this PR does / why we need it**: The CentOS cluster provider attempts to download docker from a location that 404's.

**Which issue this PR fixes**: addresses https://github.com/kubernetes/kubernetes/issues/27572#issuecomment-226690177

**Special notes for your reviewer**: I don't know how Kubernetes decides docker compatibility, but it was previously pulling `latest` so I chose the most recent release. Is there any mechanism for keeping things like this up to date?

What is the status of kubernetes rpm's? As far as I could tell there aren't any 1.3 rpm's published. Are those officially supported or a community project?

**Release note**:
<!--  Steps to write your release note:
1. Use the release-note-* labels to set the release note state (if you have access) 
2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`. 
-->
```release-note
CentOS Cluster Provider: fix docker download location & use docker 1.12.0
```
2016-09-10 16:35:20 -07:00
Kubernetes Submit Queue 43710a8714 Merge pull request #30845 from YuPengZTE/master
Automatic merge from submit-queue

The first letter should be capitalized
2016-09-10 00:22:10 -07:00
Kubernetes Submit Queue a400a8b7f4 Merge pull request #32397 from luxas/etcd_fix_makefile
Automatic merge from submit-queue

Fix etcd2 cross-build in the Makefile

fixes https://github.com/kubernetes/kubernetes/issues/32328

Make it possible to compile both etcd2 and etcd3 in the Makefile and compile attachlease for multiple arches as well.

@lavalamp The etcd build-from-source semantics changed between etcd2 and etcd3.
I updated it to etcd3 in my last PR, and didn't think we were gonna build etcd2 more.
However, I've now fixed it to build for both versions.
Thanks!
2016-09-09 18:00:09 -07:00
Kubernetes Submit Queue 4d244ff169 Merge pull request #32404 from caesarxuchao/etcd-2.2.1
Automatic merge from submit-queue

Stick to 2.2.1 etcd

Fixes #32253. See https://github.com/kubernetes/kubernetes/issues/32253#issuecomment-245974746. We are sticking with etcd 2.2.1 until we have a recommended rollforward/rollback process for etcd.

See https://github.com/kubernetes/kubernetes/issues/32253#issuecomment-245735209 for etcd roadmap.

I guess I also need to build the image like https://github.com/kubernetes/kubernetes/issues/32253#issuecomment-245744295, and update build/build-image/cross/VERSION?

@lavalamp @timothysc
2016-09-09 18:00:04 -07:00
Kubernetes Submit Queue 8a8ebbbc60 Merge pull request #32424 from bprashanth/glbc_version
Automatic merge from submit-queue

Fix glbc name to match image version

Risk is low, we should get it into 1.4 to avoid confusion. Image is 0.7.1 (bumped in 1.3.6) so name and label should match.
2016-09-09 17:59:57 -07:00
Chao Xu 7e92025cfd stick to 2.2.1 etcd 2016-09-09 16:35:05 -07:00
bprashanth 46dae270ef Fix glbc name to match image version 2016-09-09 16:00:20 -07:00
Kubernetes Submit Queue 1d0404466d Merge pull request #32396 from adityakali/cleanup
Automatic merge from submit-queue

Update Container-VM Image product name in docs
2016-09-09 11:11:15 -07:00
Kubernetes Submit Queue 3ddd39cd97 Merge pull request #32239 from zmerlynn/aws-bringup-fail
Automatic merge from submit-queue

AWS: Change default networking for kube-up to kubenet

**What this PR does / why we need it**: Fixes AWS bring-up. Again.

There's a kubelet bug that prevents NETWORK_PROVIDER=none from working right now, and we should migrate AWS to `kubenet` anyways.

Working on reproing the `none` issue on GCE, then I'll file a bug on the main issue. But this fixes AWS, so quick tactical fix.
2016-09-09 10:32:20 -07:00
Lucas Käldström c9e794e1cb Make it possible to compile both etcd2 and etcd3 in the Makefile and compile attachlease for multiple arches as well 2016-09-09 20:25:15 +03:00
Aditya Kali d5e4cfa2c0 Update Container-VM Image product name in docs 2016-09-09 10:08:56 -07:00
Kubernetes Submit Queue f535aea7fd Merge pull request #32359 from wojtek-t/rollback_etcd
Automatic merge from submit-queue

Use etcd 2.3.7

This will switch to etcd 2.3.7 for release 1.4, to resolve issues rolling back from 1.4 to 1.3 (while preventing those same issues rolling back to 1.4.0 from a release including etcd 3.0.x).

Fixes #32253.

See #32253 (comment) for etcd roadmap.
2016-09-09 09:53:02 -07:00
Kubernetes Submit Queue d139177529 Merge pull request #32317 from sdodson/master
Automatic merge from submit-queue

Fix 127.0.01 typo

**What this PR does / why we need it**:
Fixes a small typo, though typo seems inconsequential

**Release note**:
none
2016-09-09 04:06:52 -07:00
Bryan Boreham fd4596bd27 Use --cni-bin-dir flag when using CNI on GCI 2016-09-09 11:43:17 +01:00
Piotr Szczesniak 2d87deb043 Bumped Heapster to v1.2.0-beta.3 2016-09-09 11:41:48 +02:00
gmarek c304fa1f06 Remove explicit limits from manifest files 2016-09-09 11:19:54 +02:00
Daniel Smith 279219ca89 Use etcd 2.3.7 (container already pushed) 2016-09-09 09:45:53 +02:00
Euan Kemp 6b226cbfd9 e2e/log-dump: Collect kernel log with journald
Related to #31928

The kern.log file does not exist on journald distros typically.
2016-09-08 16:04:02 -07:00
Scott Dodson 36d3dfcf9b Fix 127.0.01 typo 2016-09-08 16:45:50 -04:00
Hongchao Deng 61e238cac3 etcd: data rollback tool of v3 -> v2 2016-09-08 12:29:19 -07:00
Kubernetes Submit Queue 9cf0ec3ce2 Merge pull request #27783 from jianhuiz/openstack-heat-network
Automatic merge from submit-queue

Openstack heat network

add lbaas subnet and floating network configuration
support lbaas v2
add environment variable for fixed network
~~fix lb creation failed because of no 'name' for pool members according to lbaas v2 api~~ #27810

#25987 
@dagnello @lavalamp @mikedanese

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-09-07 16:25:02 -07:00
Zach Loafman 11c8830dec AWS: Docker is flapping because of cbr0 bringup, flip to kubenet
This is a mitigation. There's a kubelet bug that prevents
NETWORK_PROVIDER=none from working right now.
2016-09-07 15:41:38 -07:00
Kubernetes Submit Queue d1569489a3 Merge pull request #31545 from vishh/inodes-eviction
Automatic merge from submit-queue

Enable kubelet eviction whenever inodes free is < 5% on GCE

This is a pre-req for enabling inodes based evictions in GKE.
2016-09-07 12:49:46 -07:00
Kubernetes Submit Queue 23147d30e9 Merge pull request #32197 from gmarek/gci
Automatic merge from submit-queue

Make image-puller work on GCI nodes.

Currently image-puller works only on debian nodes. This will make our test more flaky after we switch to the GCI by default. This PR ports the image-puller to the GCI-based Nodes.

cc @vishh @wonderfly @dchen1107
2016-09-07 10:54:15 -07:00
Jerzy Szczepkowski 8541ea6c29 Updated port for HA master etcd.
Updated port for HA master etcd to 2379 (needed after #30514).
2016-09-07 16:10:55 +02:00
gmarek 3e2c3a5db2 Make image-puller work on GCI nodes. 2016-09-07 15:23:39 +02:00
Piotr Szczesniak e77fe15a20 Bumped Rescheduler version 2016-09-07 14:11:48 +02:00
Kubernetes Submit Queue 243959ce5a Merge pull request #32020 from euank/version-twiddling
Automatic merge from submit-queue

rkt: Update kube-up rkt version to v1.14.0

cc @kubernetes/sig-rktnetes 

This should have been included in #31286 (whoops).

This is a bugfix that I propose for v1.4 inclusion.
2016-09-07 01:18:57 -07:00
Angus Salkeld f52fc54176 Teach create-kubeconfig() to deal with multi path KUBECONFIG
When KUBECONFIG is in the form "A:B:C" make sure each file is
created.
2016-09-07 14:26:14 +10:00
Kubernetes Submit Queue 4348190b8a Merge pull request #31794 from chuckbutler/messaging-uniformity
Automatic merge from submit-queue

move '(master)' to end of message for uniformity

**What this PR does / why we need it**: This is a small polish operation on the kubernetes charm wrt juju status output.


**Release note**:
<!--  Steps to write your release note:
1. Use the release-note-* labels to set the release note state (if you have access) 
2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`. 
-->
```release-note
NONE
```

This changes the status output from:

```
kubernetes/0  active    idle   3        172.27.24.54    8088/tcp
Kubernetes running.
kubernetes/1  active    idle   4        172.27.24.55    6443/tcp
(master) Kubernetes services started
```
 to this:
 ```
 kubernetes/0  active    idle   3        172.27.24.54    8088/tcp
 Kubernetes running.
 kubernetes/1  active    idle   4        172.27.24.55    6443/tcp
 Kubernetes services started (master)
 ```
2016-09-06 15:04:56 -07:00
Euan Kemp e023ec90f3 cluster/gce: Update master root disk size
As part of #29213, the hyperkube image will be deployed alongside
existing dependencies.

This ends up just running over the root disk size of 10 during
extraction.
2016-09-06 13:54:39 -07:00
Euan Kemp a2a324bf8b cluster/rkt: Update default rkt version 2016-09-06 12:09:11 -07:00
Minhan Xia 1e88c99e3e bump cni 2016-09-06 10:48:36 -07:00
Kubernetes Submit Queue 34f3633b0b Merge pull request #32066 from dshulyak/vagrant_eviction
Automatic merge from submit-queue

Set eviction-hard for vagrant cluster

In order to test eviction related functionality it will be convenient to have reasonable eviction defaults.
At this moment exactly same flags are used by GCE environment

kubelet will have a following flag:

--eviction-hard=memory.available<100Mi,nodefs.available<10%
2016-09-06 08:23:37 -07:00