Commit Graph

4341 Commits (8d0082548119e01e5a07fd96a8e3bf5caaa3ab31)

Author SHA1 Message Date
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
Wojciech Tyczynski 9c687add6b Make it possible to set higher limit for in-flight requests in test 2016-09-01 12:58:49 +02:00
Wojciech Tyczynski 22b160e552 Allow for configuring max inflight requests in kubemark 2016-09-01 11:46:37 +02:00
Amey Deshpande 6a2201f410 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.
2016-08-31 17:26:00 -07:00
Wojciech Tyczynski 3c64346e24 Bump addon-resizer version 2016-08-31 14:53:13 +02:00
Wojciech Tyczynski f75e0ece0a Revert "Bump addon-resizer version in heapster" 2016-08-31 08:30:56 +02:00
Kubernetes Submit Queue a3b17f5e53 Merge pull request #31614 from wojtek-t/bump_pod_nanny_version
Automatic merge from submit-queue

Bump addon-resizer version in heapster

Ref #31105
2016-08-30 12:14:28 -07:00
Kubernetes Submit Queue dccf3e9288 Merge pull request #31639 from derekwaynecarr/fix-e2e-local
Automatic merge from submit-queue

Fix running e2e against local cluster

required env vars were not being set.

/cc @pmorie
2016-08-30 09:11:22 -07:00
Kubernetes Submit Queue 3ccb99d87d Merge pull request #31692 from jszczepkowski/master
Automatic merge from submit-queue

Marked HA master feature experimental.

Marked HA master feature experimental.
2016-08-30 07:09:49 -07:00
Kubernetes Submit Queue 1388e664a4 Merge pull request #31637 from freehan/docker0fix
Automatic merge from submit-queue

keep docker0 with private cidr range

fixes: #31465

Keep docker0 when using kubenet on GCI. Assign 169.254.123.1/24 to docker0 to avoid cidr conflict.
2016-08-30 05:40:33 -07:00
Kubernetes Submit Queue 177a6840f8 Merge pull request #31519 from piosz/influxdb
Automatic merge from submit-queue

Update influxdb to 0.12

fix #27630 

```release-note
Update influxdb to 0.12
```
2016-08-30 05:03:47 -07:00
Jerzy Szczepkowski c5f18d517d Marked HA master feautre experimental.
Marked HA master feautre experimental.
2016-08-30 11:50:22 +02:00
Zach Loafman a167a90f80 AWS: Fix unbound SSH_CIDR
Another e2e bug, this one injected by https://github.com/kubernetes/kubernetes/pull/27061
2016-08-29 19:12:16 -07:00
Kubernetes Submit Queue e277ccef94 Merge pull request #31295 from zmerlynn/e2e-what-what
Automatic merge from submit-queue

AWS: Hopefully fix e2e?

**What this PR does / why we need it**: Fix AWS e2e
**Which issue this PR fixes**: fixes build broken by #28499 
**Special notes for your reviewer**: This is a pump & dump, I probably won't be around to respond to comments after this. If it needs a cherry-pick or anything, please check?
2016-08-29 17:10:06 -07:00
derekwaynecarr 275c29e208 Fix running e2e against local cluster 2016-08-29 17:16:13 -04:00
Minhan Xia a876f22102 keep docker0 with private cidr range 2016-08-29 13:57:42 -07:00
Kubernetes Submit Queue 033e473e12 Merge pull request #31242 from wojtek-t/attach_ttls
Automatic merge from submit-queue

Support for TTLs in etcd migration.

Ref #20504
2016-08-29 12:57:57 -07:00
Wojciech Tyczynski 0a0f3fd8a7 Bump addon-resizer version in heapster 2016-08-29 16:39:57 +02:00
Rodolfo Carvalho e24745d6d6 Fix Bash script
Two lines got mixed together.
2016-08-29 14:01:44 +02:00
Kubernetes Submit Queue e6df2db5c3 Merge pull request #31477 from freehan/cnibump
Automatic merge from submit-queue

bump cni to 9d5e6e6

fixes: #31348
2016-08-28 14:46:20 -07:00
Daniel Smith a291846cd1 Revert "Remove deprecated Namespace admission plug-ins" 2016-08-28 10:20:44 -07:00
Kubernetes Submit Queue 90e5559d03 Merge pull request #31250 from derekwaynecarr/deprecated-ns-plugins
Automatic merge from submit-queue

Remove deprecated Namespace admission plug-ins

```release-note
The NamespaceExists and NamespaceAutoProvision admission controllers have been removed.

All cluster operators should use NamespaceLifecycle.
```

Fixes https://github.com/kubernetes/kubernetes/issues/31195
2016-08-27 02:13:25 -07:00
Kubernetes Submit Queue 35ddfcba1a Merge pull request #31486 from jlowdermilk/feature-gate-salt
Automatic merge from submit-queue

fix feature_gates salt plumbing

Fix salt plumbing for `--feature-gate` from `FEATURE_GATES kube env.

Was generating grains.conf and kube-env for master only. Verified it works now for gci and debian master/nodes.

cc @thockin @timstclair
2016-08-26 22:43:02 -07:00
Kubernetes Submit Queue 1b38ba6d8f Merge pull request #31023 from vishh/gci-default
Automatic merge from submit-queue

Use upgraded container-vm by default on worker nodes for GCE k8s clusters

For https://github.com/kubernetes/kubernetes/issues/25276
Depends on https://github.com/kubernetes/test-infra/pull/417
2016-08-26 14:32:07 -07:00
Minhan Xia 69e540e634 bump cni to 9d5e6e6 2016-08-26 13:13:24 -07:00
derekwaynecarr c727fdc81f Remove deprecated namespace admission controllers 2016-08-26 11:14:55 -04:00
Kubernetes Submit Queue 76a458ccb8 Merge pull request #31507 from mwielgus/ca-0.3.0-b4
Automatic merge from submit-queue

Bump cluster autoscaler to 0.3.0-beta4
2016-08-26 04:00:41 -07:00
Piotr Szczesniak 94ca825a19 Update influxdb to 0.12.0 2016-08-26 12:17:00 +02:00