Commit Graph

4372 Commits

Author SHA1 Message Date
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
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
Scott Dodson
36d3dfcf9b Fix 127.0.01 typo 2016-09-08 16:45:50 -04: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
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
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
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
Dmitry Shulyak
9d26d3701e 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%

Change-Id: I56ca03bc3c5467c8450150e292f7a346fa7772a9
2016-09-06 17:24:57 +03:00
Kubernetes Submit Queue
af8124c7bf Merge pull request #31609 from rhcarvalho/fix-bash
Automatic merge from submit-queue

Fix Bash script

<!--  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**: `cluster/mesos/docker/socat/build.sh` had two lines mixed together.

Old command output:

```
$ ./cluster/mesos/docker/socat/build.sh 
./cluster/mesos/docker/socat/build.sh: line 21: set: pipefailscript_dir=/home/rodolfo/src/k8s.io/kubernetes/cluster/mesos/docker/socat: invalid option name
```

**Special notes for your reviewer**: probably nobody is using that script? @sttts PTAL.

**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
```
2016-09-05 18:10:24 -07:00
Kubernetes Submit Queue
09e5fa62b5 Merge pull request #31294 from mml/federated-oops
Automatic merge from submit-queue

Fix e2e logic when FEDERATION=false.

Also add debugging output to GCE detect-master.

Fixes #31285.
2016-09-05 13:01:12 -07:00
Kubernetes Submit Queue
2cc5923ed6 Merge pull request #31974 from piosz/enable-rescheduler
Automatic merge from submit-queue

Enable Rescheduler by default

Rescheduler is stable - e2e test is passing constantly for >1week.

ref #29023

```release-note
Rescheduler which ensures that critical pods are always scheduled enabled by default in GCE.
```
2016-09-05 00:27:43 -07:00
Kubernetes Submit Queue
2ead4ba589 Merge pull request #32011 from chuckbutler/upstream-master-messaging-fix
Automatic merge from submit-queue

Fixes the master messaging

<!--  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**: Corrects the master unit messaging state to correctly reflect that kubernetes is active

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #32010

**Special notes for your reviewer**:

**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
```

Proof: ![](https://www.evernote.com/l/AX74r1GLG3dNG504sJrDOPkb5_nYpkO_DUQB/image.png)
2016-09-04 02:02:54 -07:00
Kubernetes Submit Queue
7bab34c3e9 Merge pull request #31998 from mwielgus/ca-0.3.0-b6
Automatic merge from submit-queue

Bump ClusterAutoscaler to 0.3.0-beta6

Contains https://github.com/kubernetes/contrib/pull/1685.
2016-09-03 22:47:03 -07:00
Kubernetes Submit Queue
af9afbff87 Merge pull request #31970 from wojtek-t/configurable_qps_limits_in_tests
Automatic merge from submit-queue

Make it possible to set test args
2016-09-03 08:36:55 -07:00
Charles Butler
ff2478042a Fixes the master messaging
Resolves #32010
2016-09-02 16:57:07 -05:00
Marcin Wielgus
5d3adbe552 Bump ClusterAutoscaler to 0.3.0-beta6 2016-09-02 22:15:35 +02:00
Kubernetes Submit Queue
b921c675a0 Merge pull request #31518 from bryk/release-v1.4.0-beta1
Automatic merge from submit-queue

Increase Dashboard UI version to v1.4.0-beta2

This is our first beta for 1.4. We started synchronizing versions with
the core.

Release tag:
https://github.com/kubernetes/dashboard/releases/tag/v1.4.0-beta2
2016-09-02 09:50:09 -07:00
Piotr Szczesniak
9ce2ad3f4c Enable Rescheduler by default 2016-09-02 15:53:57 +02:00
bryk
b2373b05f9 Increase Dashboard UI version to v1.4.0-beta2
This is our first beta for 1.4. We started synchronizing versions with
the core.

Release tag:
https://github.com/kubernetes/dashboard/releases/tag/v1.4.0-beta2
2016-09-02 15:46:47 +02:00
Kubernetes Submit Queue
dfccabe22f Merge pull request #31961 from piosz/heapster-fix
Automatic merge from submit-queue

Fixed port in Heapster liveness probe

fix #31955
2016-09-02 06:41:18 -07:00
Wojciech Tyczynski
58e7308dee Make it possible to set test args 2016-09-02 14:24:20 +02:00
Piotr Szczesniak
45b6b861ae Fixed port in Heapster liveness probe 2016-09-02 11:50:32 +02:00
Wojciech Tyczynski
794074b273 Bump pod nany version to fix a bug 2016-09-02 10:44:41 +02:00
Girish Kalele
5d7d02b5bd Propagate KUBE_FEATURE_GATES environment variable to e2e environment 2016-09-01 15:37:24 -07:00
Kubernetes Submit Queue
ff3ca3d616 Merge pull request #31830 from Amey-D/gci-kubelet
Automatic merge from submit-queue

Pick a specific GCI version by default on GCE.

Prior to this change, a K8s branch (master as well as release) was
pinned to a GCI milestone.  It would pick up the latest GCI release on
that milestone at the time of cluster creation.  The rationale was the
K8s users would automatically get the bug fixes in newer versions of
GCI.  However in practice, it makes the runtime environment
non-deterministic, and lack of continuous e2e tests mean we would run
into breakages sooner or later.

With this change, each K8s release will pick a specific version
of GCI by default (similar to how the Debian-based container-vm gets used).
Users can override the default version through KUBE_GCE_MASTER_IMAGE and
KUBE_GCE_NODE_IMAGE environment variables.

We expect the default GCI version will be updated relatively frequently stay
updated with newer GCI releases.  We can also automate the process to
automatically bump the hard-coded GCI version in future.


@vishh @adityakali can you please review?

cc @kubernetes/goog-image FYI
2016-09-01 13:41:05 -07:00
Marcin Wielgus
89f901d79a Bump cluster autoscaler to 0.3.0-beta5 2016-09-01 18:33:30 +02:00
Kubernetes Submit Queue
a910a597fa Merge pull request #31872 from wojtek-t/store_startupscript_from_gke
Automatic merge from submit-queue

Store startupscript from GKE clusters too

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

@kubernetes/goog-gke  Is there any reason why we don't want to do it?

@kubernetes/test-infra-maintainers
2016-09-01 08:33:24 -07:00
mksalawa
92c7feaf53 Add liveness probe in controller configurations. 2016-09-01 14:37:07 +02:00
mksalawa
84ad23d5e6 Bump heapster version to 1.2.0-beta.2 2016-09-01 14:37:07 +02:00
Wojciech Tyczynski
4fc48cfce3 Store startupscript from GKE clusters too 2016-09-01 13:48:50 +02:00
Kubernetes Submit Queue
ef2dde9c48 Merge pull request #31868 from wojtek-t/enable_more_inflight_requests
Automatic merge from submit-queue

Make it possible to set higher limit for in-flight requests in test

Ref #31589
2016-09-01 04:42:01 -07:00