Commit Graph

28639 Commits (886d7bf48dfa482add48f6399917f37dd57a21a8)

Author SHA1 Message Date
k8s-merge-robot 886d7bf48d Merge pull request #25480 from thockin/clean-workspace-debris
Automatic merge from submit-queue

Remove Godeps/_workspace on `make clean`
2016-05-11 09:29:09 -07:00
k8s-merge-robot 91daebd951 Merge pull request #25350 from gmarek/configs-cidr
Automatic merge from submit-queue

Change default clusterCIDRs from /16 to /14 in GCE configs allowing 1000 Node clusters by default.

cc @thockin @roberthbailey @wojtek-t @zmerlynn @davidopp
2016-05-11 08:54:23 -07:00
Tim Hockin ddf5437b61 Remove Godeps/_workspace on `make clean`
I thought this was in the main PR.  My bad.
2016-05-11 08:07:04 -07:00
k8s-merge-robot e8dc9eae8c Merge pull request #25470 from wojtek-t/content_type_in_kubemark
Automatic merge from submit-queue

Pipe content-type variable to hollow node
2016-05-11 07:17:03 -07:00
Wojciech Tyczynski fe470b664b Pipe content-type variable to hollow node 2016-05-11 14:57:40 +02:00
k8s-merge-robot 13f60ea862 Merge pull request #25466 from wojtek-t/fix_kubemark_config
Automatic merge from submit-queue

Fix default arguments in kubemark
2016-05-11 05:15:36 -07:00
k8s-merge-robot c042156590 Merge pull request #25444 from janetkuo/kubectl-set
Automatic merge from submit-queue

Add 'kubectl set'

## Pull Request Guidelines

1. Please read our [contributor guidelines](https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md).
1. See our [developer guide](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md).
1. Follow the instructions for [labeling and writing a release note for this PR](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes) in the block below.

```release-note
```

Ref #21648, the parent `kubectl set` command; will add more sub-command in subsequent PRs. @kubernetes/kubectl 


[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-05-11 05:15:32 -07:00
k8s-merge-robot e1fa044dba Merge pull request #24703 from hpcloud/hpe/vsphere-instance
Automatic merge from submit-queue

vSphere Cloud Provider Implementation 

This is the first PR towards implementation for vSphere cloud provider support in Kubernetes (ref. issue #23932).
2016-05-11 04:32:16 -07:00
Wojciech Tyczynski 89b915a3b2 Fix default arguments in kubemark 2016-05-11 13:10:12 +02:00
k8s-merge-robot b79a1bb689 Merge pull request #25410 from gmarek/pipe
Automatic merge from submit-queue

Pipe variables from kubemark config to master binaries
2016-05-11 03:45:31 -07:00
k8s-merge-robot ef885d05eb Merge pull request #21675 from soltysh/job_template
Automatic merge from submit-queue

Added JobTemplate, a preliminary step for ScheduledJob and Workflow

@sdminonne as promised, sorry it took this long 😊 
@erictune fyi though it does not have to be in for 1.2

<!-- 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/21675)
<!-- Reviewable:end -->
2016-05-11 02:40:58 -07:00
gmarek 4a5ec11ce6 Pipe variables from kubemark config to master binaries 2016-05-11 11:22:03 +02:00
Wojciech Tyczynski d85c61cc08 Merge pull request #25407 from wojtek-t/fix_protobuf_deployments
Fix bug in marshaling/unmarshaling Time in protobufs
2016-05-11 10:24:35 +02:00
Wojciech Tyczynski 9d52822377 Reproduce time issue with protobufs. 2016-05-11 09:34:29 +02:00
k8s-merge-robot 17c3f19c64 Merge pull request #21737 from FujitsuEnablingSoftwareTechnologyGmbH/openstack-provider
Automatic merge from submit-queue

Openstack provider

Our pull request delivers solution to create Kubernetes cluster on the top of OpenStack. Heat OpenStack Orchestration engine describes the infrastructure for Kubernetes cluster. CentoOS images are used for Kubernetes host machines.

We tested our solution with DevStack and Citycloud provider.

We believe that our solution will fill the gap that which is on the market.

<!-- 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/21737)
<!-- Reviewable:end -->
2016-05-10 23:56:47 -07:00
k8s-merge-robot 22dfaef9f0 Merge pull request #24943 from XiaoningDing/federation-copy-server-address-by-client-cidr
Automatic merge from submit-queue

copy ServerAddressByClientCIDR to federation types

#24016
copy ServerAddressByClientCIDR to federation types
update generated files

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-05-10 20:22:34 -07:00
k8s-merge-robot c10d12b7b7 Merge pull request #24923 from mwielgus/drain-refactor
Automatic merge from submit-queue

Small refactoring around drain - move drain logic to separate function.

cc: @piosz @fgrzadkowski
2016-05-10 19:44:21 -07:00
Fabio Yeon 6071540799 Merge pull request #25249 from mkumatag/typo_fix
Rename a function parameter name in authn.go
2016-05-10 19:42:50 -07:00
Fabio Yeon 05cfd9c584 Merge pull request #24852 from johscheuer/fix-hyperkube-makefile
OS X: Fix hyperkube build by adding empty string to sed invocation
2016-05-10 19:40:52 -07:00
Fabio Yeon 4dcc4bbcd8 Merge pull request #23362 from miguelfrde/configure-base-vpc-cidr
AWS kube-up: Allow VPC CIDR to be specified (experimental)
2016-05-10 19:37:33 -07:00
Fabio Yeon d4de319ea8 Merge pull request #16000 from cilium-team/change-docker-storage-driver
Changed docker storage driver to overlayfs
2016-05-10 19:36:49 -07:00
Fabio Yeon 0809b2be4d Merge pull request #25119 from XiaoningDing/api-shared-annotations
move shared annotations to new api/annotations package
2016-05-10 19:34:17 -07:00
Fabio Yeon a206b3680c Merge pull request #25282 from derekwaynecarr/eviction_proposal_update
Eviction proposal transition frequency
2016-05-10 19:33:00 -07:00
k8s-merge-robot bfccd929c6 Merge pull request #25414 from derekwaynecarr/quota_int_test_improvements
Automatic merge from submit-queue

Quota integration test improvements

This PR does the following:

* allow a replication manager to get created that does not record events
* improve the shutdown behavior of replication manager and resource quota to ensure doWork funcs exit properly
* update quota integration test to use non event generating replication manager, reduce number of pods to provision

I am hoping this combination of changes should fix the referenced flake.

Fixes https://github.com/kubernetes/kubernetes/issues/25037
2016-05-10 18:58:34 -07:00
k8s-merge-robot 7339b7c094 Merge pull request #25162 from mikebrow/devel-tree-80col-updates-C
Automatic merge from submit-queue

devel/ tree further minor edits

Address line wrap issue #1488. Also cleans up other minor editing issues in the docs/devel/* tree such as spelling errors, links, content tables...

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2016-05-10 18:15:19 -07:00
k8s-merge-robot aa8fddb7d9 Merge pull request #25369 from liggitt/cached-watch
Automatic merge from submit-queue

Return 'too old' errors from watch cache via watch stream

Fixes #25151

This PR updates the API server to produce the same results when a watch is attempted with a resourceVersion that is too old, regardless of whether the etcd watch cache is enabled. The expected result is a `200` http status, with a single watch event of type `ERROR`. Previously, the watch cache would deliver a `410` http response.

This is the uncached watch impl:
```
// Implements storage.Interface.
func (h *etcdHelper) WatchList(ctx context.Context, key string, resourceVersion string, filter storage.FilterFunc) (watch.Interface, error) {
	if ctx == nil {
		glog.Errorf("Context is nil")
	}
	watchRV, err := storage.ParseWatchResourceVersion(resourceVersion)
	if err != nil {
		return nil, err
	}
	key = h.prefixEtcdKey(key)
	w := newEtcdWatcher(true, h.quorum, exceptKey(key), filter, h.codec, h.versioner, nil, h)
	go w.etcdWatch(ctx, h.etcdKeysAPI, key, watchRV)
	return w, nil
}
```

once the resourceVersion parses, there is no path that returns a direct error, so all errors would have to be returned as an `ERROR` event via the ResultChan().
2016-05-10 18:15:15 -07:00
Janet Kuo eb58cd6676 Add 'kubectl set' 2016-05-10 17:24:25 -07:00
derekwaynecarr 44372c9a16 Eviction proposal transition frequency 2016-05-10 20:24:22 -04:00
k8s-merge-robot bf7dad01a5 Merge pull request #25437 from zmerlynn/gke_test_custom_cidr
Automatic merge from submit-queue

GKE provider: Add cluster-ipv4-cidr and arbitrary flags

cc @roberthbailey @a-robinson @cjcullen

<!-- 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/25437)
<!-- Reviewable:end -->
2016-05-10 17:22:18 -07:00
k8s-merge-robot 9f00ed6075 Merge pull request #25377 from freehan/kubenetmutex
Automatic merge from submit-queue

modify kubenet mutex and add timer
2016-05-10 17:22:15 -07:00
derekwaynecarr fc3e71894d Improve quota integration test to not use events, reduce number of pods provisioned 2016-05-10 19:50:36 -04:00
derekwaynecarr 31970780cc Fix resource quota controller shutting down its worker threads 2016-05-10 19:50:36 -04:00
derekwaynecarr ff4a5e2068 Allow a replication manager to be created that does not record events 2016-05-10 19:50:36 -04:00
k8s-merge-robot a598ae2ab4 Merge pull request #25420 from caesarxuchao/finish-24099
Automatic merge from submit-queue

remove extra quotation mark that breaks API docs

Finish #24099
2016-05-10 16:08:55 -07:00
k8s-merge-robot d7cf4e60cb Merge pull request #25396 from hongchaodeng/w
Automatic merge from submit-queue

etcd3/watcher: Event.Object should have the same rev as etcd delete

### What's the problem?
When a delete is watched, the revision should be larger than any previous to guarantee ordering. However, currently etcd3 decodes the previous rev into returned object:

995f022808/pkg/storage/etcd3/watcher.go (L322)

This will break, for example, cacher's assumption here if it re-watch.
995f022808/pkg/storage/cacher.go (L579-L581)

The etcd2 impl. also takes the current ModifiedIndex to ensure it's a larger number:
995f022808/pkg/storage/etcd/etcd_watcher.go (L437-L442)

### What's this PR?
It fixes above problem by using etcd's delete revision.
2016-05-10 16:08:50 -07:00
k8s-merge-robot 3894c7972c Merge pull request #25185 from freehan/kubenetgetpodstatus
Automatic merge from submit-queue

kubenet try to retrieve ip inside pod net namespace

Kubenet currently stores the ips of pods inside a map. Kubelet gets pod ip from kubenet during syncpod. If Kubelet restarts, all pods on the node lost their ips in podStatus. This PR adds logic to retrieve pod IP from pod netns. 

cc: @yujuhong
2016-05-10 16:08:45 -07:00
Zach Loafman e42f201189 GKE provider: Add cluster-ipv4-cidr and arbitrary flags 2016-05-10 16:00:34 -07:00
Fabio Yeon a167a6b4df Merge pull request #25308 from AdoHe/deployment_panic
fix rollout nil panice issue
2016-05-10 15:51:22 -07:00
Fabio Yeon 58617a083c Merge pull request #25405 from justinsb/fix/23623
AWS kube-up: Increase timeout waiting for docker start
2016-05-10 15:50:37 -07:00
Fabio Yeon c4a2724eb2 Merge pull request #25080 from derekwaynecarr/quota_controller_close_channels
Quota integration test was not closing launched controllers
2016-05-10 15:49:59 -07:00
Fabio Yeon 9040bec0ba Merge pull request #25317 from roberthbailey/build-cop
Update links for the user and troubleshooting guides for the build cop
2016-05-10 13:57:01 -07:00
Maciej Szulik a31ca0dc98 enable batch/v2alpha1 tests 2016-05-10 22:40:24 +02:00
Maciej Szulik df11a51b64 Generated changes for batch/v2alpha1 2016-05-10 22:40:22 +02:00
Chao Xu a013351ba3 remove extra quotation mark that breaks API docs 2016-05-10 13:29:55 -07:00
Maciej Szulik 5ef870d4c7 Added JobTemplate, a preliminary step for ScheduledJob and Workflow 2016-05-10 21:48:39 +02:00
Maciej Szulik de357fdea0 extensions -> batch internals move leftovers 2016-05-10 21:48:39 +02:00
Hongchao Deng cd3f7f41c1 etcd3/watcher: refactor test 2016-05-10 12:37:31 -07:00
Robert Bailey c7a7f0592f Update links for the user and troubleshooting guides for the build
cop to copy-paste from the oncall documentation.
2016-05-10 11:15:18 -07:00
Hongchao Deng da7e9783e8 etcd3/watcher: Event.Object should have the same rev as etcd delete
instead of previous object's revision.
2016-05-10 10:53:53 -07:00
Fabio Yeon 6f288b31cf Merge pull request #25364 from krousey/proxy_exec_flake
Adding extra logging in case of error.
2016-05-10 10:37:30 -07:00