Commit Graph

32049 Commits (36c07cc554fa44d0cbafe36f9d3a5640fd843856)

Author SHA1 Message Date
k8s-merge-robot 36c07cc554 Merge pull request #27961 from maisem/os-distribution
Automatic merge from submit-queue

Splitting OS_DISTRIBUTION into NODE_OS_DISTRIBUTION and MASTER_OS_DISTRIBUTION

fixes #26183 
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
2016-07-15 14:11:47 -07:00
k8s-merge-robot d3dbe9c716 Merge pull request #28202 from hongchaodeng/cpa
Automatic merge from submit-queue

Better handle etcd compaction in multi-apiserver

What:
- Change etcd compaction routine to better handle multi-apiserver (HA) scenarios. See the docs in code.
2016-07-15 13:33:58 -07:00
k8s-merge-robot d7c17ca94c Merge pull request #29016 from thockin/fix-makefile-line-continuations
Automatic merge from submit-queue

Fix make to include line-continuations

This got broken in recent changes.  Sorry for the noise.
2016-07-15 13:00:09 -07:00
Maisem Ali 97f3f80833 Splitting OS_DISTRIBUTION into NODE_OS_DISTRIBUTION and
MASTER_OS_DISTRIBUTION.
2016-07-15 12:02:31 -07:00
k8s-merge-robot b6c87904f6 Merge pull request #27853 from dubstack/dubstack-inject-qos-creation2
Automatic merge from submit-queue

[Kubelet] Improving QOS in kubelet by introducing QoS level Cgroups - `--cgroups-per-qos`

This PR is tied to this upstream issue #27204 
Please note that only the last commit is unique to this PR. The first two commits are from previous PR's.

It introduces a new flag in the Kubelet which can be used to specify if the user wants to use the QoS cgroup hierarchy. 

cc @kubernetes/sig-node
2016-07-15 11:54:25 -07:00
k8s-merge-robot 6193335bd9 Merge pull request #28985 from caesarxuchao/v1ojbref
Automatic merge from submit-queue

move api.ObjectReference.ObjectKind to pkg/api/ref.go

This is needed to convert k8s components to use versioned clientset.

To let components use versioned client, we need to convert `pkg/client/record` to v1, which depends on `pkg/api/ref.go`, so we need to make a `pkg/api/v1/ref.go`. And this [line](https://github.com/kubernetes/kubernetes/blob/master/pkg/api/ref.go#L44) requires v1.ObjectReference to be a runtime.Object. Moving `api.ObjectReference.ObjectKind` to `pkg/api/ref.go` will make the writing a conversion script easier because all the necessary changes will be restricted in `ref.go`.
2016-07-15 11:14:07 -07:00
k8s-merge-robot e3ddf0fb16 Merge pull request #28903 from thockin/run-in-gopath
Automatic merge from submit-queue

Fix build for non-GOPATH users

I want feedback on this.  There are 2 commits here, we should probably only do one of them.  The release note will depend on which one we choose.  Also docs need update.

Fixes #28890
Fixes #28987
2016-07-15 11:14:02 -07:00
k8s-merge-robot 7c7aa9835e Merge pull request #28699 from mikedanese/addons-mv
Automatic merge from submit-queue

move kube-dns to the cluster/addons/ directory

Fixes #28553

cc @girishkalele @bprashanth
2016-07-15 10:39:36 -07:00
Hongchao Deng 54025ce8b3 etcd3/store: Add test for compact conflict 2016-07-15 10:24:50 -07:00
Hongchao Deng 186b4858b4 better handle etcd compaction in multi-apiserver 2016-07-15 10:24:49 -07:00
Tim Hockin 31badf0ab8 Fix make to include line-continuations 2016-07-15 10:19:58 -07:00
k8s-merge-robot 529df988e8 Merge pull request #28964 from ncdc/export-isterminal
Automatic merge from submit-queue

Reexport term.IsTerminal

Reexport term.IsTerminal so downstream consumers (e.g. OpenShift) can use it.

@smarterclayton @sttts
2016-07-15 10:06:20 -07:00
Buddha Prakash 5000e74664 Inject top level QoS cgroup creation in the Kubelet 2016-07-15 10:02:22 -07:00
David McMahon cec04b5e9e Update CHANGELOG.md for v1.2.6. 2016-07-15 09:37:53 -07:00
k8s-merge-robot 4374b090c3 Merge pull request #28958 from wojtek-t/optimize_priorities_5
Automatic merge from submit-queue

Few more optimizations of priority functions in scheduler

Ref #28590

@davidopp
2016-07-15 09:32:04 -07:00
k8s-merge-robot 8b2d994153 Merge pull request #28952 from wojtek-t/optimize_pod_affinity
Automatic merge from submit-queue

First step of optimizing PodAffinity priority function

Ref #26144 

This is obviously only a first step - I will continue working on this code. However, this is changing the general scheme of computations to what is described in: https://github.com/kubernetes/kubernetes/issues/26144#issuecomment-232612384
2016-07-15 08:59:17 -07:00
Tim Hockin 2a4495cf89 Allow make to run from outside GOPATH 2016-07-15 08:42:12 -07:00
k8s-merge-robot e967a773c4 Merge pull request #28945 from aledbf/fix-make-mac
Automatic merge from submit-queue

Fix make on Mac replacing sed with tr

fixes #28930
2016-07-15 08:17:56 -07:00
k8s-merge-robot 0af6d321e8 Merge pull request #28935 from smarterclayton/avoid_double_encode
Automatic merge from submit-queue

Don't double encode protobuf runtime.Unknown

When using runtime.Object and runtime.RawExtension, passing
runtime.Unknown to protobuf serializer should result in the raw message
being serialized (since all normal protobuf objects are
runtime.Unknown).

Also, avoid setting a content-type when decoding a protobuf object
except when the content appears to be proto.

@wojtek-t
2016-07-15 07:43:09 -07:00
Marek Grabowski d1ff1b9726 Merge pull request #29003 from gmarek/taint
Fix the fix for taint scheduler predicate test
2016-07-15 16:15:02 +02:00
gmarek e936d57266 Fix the fix for taint scheduler predicate test 2016-07-15 16:13:13 +02:00
k8s-merge-robot aa16140298 Merge pull request #28926 from ronnielai/pleg
Automatic merge from submit-queue

Including ContainerRemoved in PLEG event reporting
2016-07-15 07:03:19 -07:00
k8s-merge-robot 186c0c7b14 Merge pull request #29000 from gmarek/taint
Automatic merge from submit-queue

Defer taint removal in SchedulerPredictes

cc @davidopp @kevin-wangzefeng
2016-07-15 06:23:01 -07:00
k8s-merge-robot 15b1fe33ee Merge pull request #28915 from ronnielai/gc-threshold
Automatic merge from submit-queue

Support deleting all unused images

#25239
2016-07-15 06:22:56 -07:00
k8s-merge-robot 5844145795 Merge pull request #28815 from smarterclayton/fix_stringer
Automatic merge from submit-queue

Generate a better Stringer method for proto types

This replaces the bad string output generated by golang/proto with gogo/protobuf stringer generation. Makes the output similar to %#v and more debuggable. We have to have a String() method to implement proto.Message, so this is strictly better.

@wojtek-t, @thockin for after your PR merges

Fixes #28756
2016-07-15 05:49:40 -07:00
k8s-merge-robot 423106ccee Merge pull request #28512 from smarterclayton/multirestmapper
Automatic merge from submit-queue

Implement a RESTMappings method

With the introduction of batch/v1 and batch/v2alpha1, any
MultiRESTMapper that has per groupversion mappers (as a naive discovery
client would create) would end up being unable to call RESTMapping() on
batch.Jobs. As we finish up discovery we will need to be able to choose
prioritized RESTMappings based on the service discovery doc.

This change implements RESTMappings(groupversion) which returns all
possible RESTMappings for that kind.  That allows a higher level call to
prioritize the returned mappings by server or client preferred version.

@deads2k
2016-07-15 05:13:55 -07:00
gmarek 0129e25f8e Defer taint removal in SchedulerPredictes 2016-07-15 14:01:32 +02:00
k8s-merge-robot e7e434b10d Merge pull request #27600 from caesarxuchao/rc-gc
Automatic merge from submit-queue

[GarbageCollector] Let the RC manager set/remove ControllerRef

What's done:
* RC manager sets Controller Ref when creating new pods
* RC manager sets Controller Ref when adopting pods with matching labels but having no controller
* RC manager clears Controller Ref when pod labels change
* RC manager clears pods' Controller Ref when rc's selector changes
* RC manager stops adoption/creating/deleting pods when rc's DeletionTimestamp is set
* RC manager bumps up ObservedGeneration: The [original code](https://github.com/kubernetes/kubernetes/blob/master/pkg/controller/replication/replication_controller_utils.go#L36) will do this.
* Integration tests:
  * verifies that changing RC's selector or Pod's Labels triggers adoption/abandoning
* e2e tests (separated to #27151):
  * verifies GC deletes the pods created by RC if DeleteOptions.OrphanDependents=false, and orphans the pods if DeleteOptions.OrphanDependents=true.

TODO:

- [x] we need to be able to select Pods that have a specific ControllerRef. Then each time we sync the RC, we will iterate through all the Pods that has a controllerRef pointing the RC, event if the labels of the Pod doesn't match the selector of RC anymore. This will prevent a Pod from stuck with a stale controllerRef, which could be caused by the race between abandoner (the goroutine that removes controllerRef) and worker the goroutine that add controllerRef to pods).
- [ ] use controllerRef instead of calling `getPodController`. This might be carried out by the control-plane team.
- [ ] according to the controllerRef proposal (#25256): "For debugging purposes we want to add an adoptionTime annotation prefixed with kubernetes.io/ which will keep the time of last controller ownership transfer." This might be carried out by the control-plane team.

cc @lavalamp @gmarek
2016-07-15 04:40:40 -07:00
k8s-merge-robot d347435708 Merge pull request #19837 from mikedanese/kubelet-external
Automatic merge from submit-queue

kubelet external componentconfig
2016-07-15 03:59:50 -07:00
k8s-merge-robot ff998ab566 Merge pull request #28810 from smarterclayton/keep_proto_name
Automatic merge from submit-queue

Allow proto tag to define field name

When we introduce a new field for backwards compatibility, we may want
to specify a different protobuf field name (one that matches JSON) than
the automatic transformation applied to the struct field. This allows an
API field to define the name of its protobuf tag.

@wojtek-t hit this while adding protobuf to OpenShift - we have fields we
keep for backward compatibility that need to be assigned a field by name.
Has no impact on existing (already tagged) fields.
2016-07-15 03:17:33 -07:00
Marek Grabowski 12483d9028 Merge pull request #28993 from kubernetes/revert-27151-gc-e2e
Revert "[garbage collector] add e2e test"
2016-07-15 10:16:05 +02:00
Wojciech Tyczynski f71244975d Revert "[garbage collector] add e2e test" 2016-07-15 10:10:02 +02:00
Wojciech Tyczynski a538045d7b Cleanup and prepare for optimizing PodAffinity priority function. 2016-07-15 10:06:36 +02:00
Chao Xu 3fb678aca3 move api.OjbectReference.ObjectKind() to ref.go 2016-07-14 23:02:05 -07:00
k8s-merge-robot 87d3c74715 Merge pull request #25104 from mikebrow/devel-tree-80col-updates-B
Automatic merge from submit-queue

devel/ tree additional minor edits

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

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2016-07-14 21:01:45 -07:00
k8s-merge-robot bb2c74b709 Merge pull request #28834 from asalkeld/rbd-example
Automatic merge from submit-queue

Remove id field from rbd examples

Currently the RBD examples fail with the following error:

```
kubectl create -f examples/volumes/rbd/rbd-with-secret.json 
error validating "examples/volumes/rbd/rbd-with-secret.json": error validating data: found invalid field id for v1.Pod; if you choose to ignore these errors, turn validation off with --validate=false
```

fixes #28831
2016-07-14 20:28:58 -07:00
k8s-merge-robot 7be82496eb Merge pull request #28428 from justinsb/aws_region_ap_south
Automatic merge from submit-queue

AWS: Add ap-south-1 to list of known AWS regions

Adding the new ap-south-1 region (Mumbai)
2016-07-14 20:28:53 -07:00
Chao Xu 11a341de67 let RC manager utilize the GC 2016-07-14 19:59:31 -07:00
k8s-merge-robot bea5232790 Merge pull request #28946 from ping035627/ping035627-patch-0714-2
Automatic merge from submit-queue

Modify wrong description about "InsecurePort" in genericapiserver.go

Modify wrong description about "InsecurePort" in genericapiserver.go, avoid misleading.
2016-07-14 19:56:09 -07:00
k8s-merge-robot e182520db6 Merge pull request #28944 from ping035627/ping035627-patch-0715
Automatic merge from submit-queue

Improve fatal error description for init in genericapiserver.go

When api.NewRequestContextFilter return error in the "init" function of genericapiserver.go, there are no handler info, add more information to indicate s.Handler or s.InsecureHandler, I suggest.
2016-07-14 19:56:04 -07:00
k8s-merge-robot c481291320 Merge pull request #28937 from ping035627/ping035627-patch-0714
Automatic merge from submit-queue

Optimise the New function in genericapiserver.go

It needn't the handlerContainer variable in the "New" function when deal s.HandlerContainer, I think, and it seems the codes more concise.
2016-07-14 19:56:00 -07:00
k8s-merge-robot 4030afdfb1 Merge pull request #28922 from david-mcmahon/release-push
Automatic merge from submit-queue

Add RELEASE_INFRA_PUSH related code to support pushes from kubernetes/release.

ref #16529
2016-07-14 19:55:56 -07:00
k8s-merge-robot 01e34b72c1 Merge pull request #27151 from caesarxuchao/gc-e2e
Automatic merge from submit-queue

[garbage collector] add e2e test

This PR also includes some changes to plumb controller-manager's `--enable_garbage_collector` from the environment variable.

The e2e test will not be run by the core suite because it's marked `[Feature:GarbageCollector]`.

The corresponding jenkins job configuration PR is https://github.com/kubernetes/test-infra/pull/132.
2016-07-14 19:55:52 -07:00
Michael Taufen e52718bbc6 Clean up API
Move SystemReserved and KubeReserved into KubeletConfiguration struct
Convert int64 to int32 for some external type fields so they match internal ones
tLS* to tls* for JSON field names
Fix dependency on removed options.AutoDetectCloudProvider
Change floats in KubeletConfiguration API to ints
2016-07-14 18:40:11 -07:00
Michael Taufen 9393bd0fa6 Fix unit test build errors
These tests can just use the empty string for the PodInfraContainerImage.
2016-07-14 18:40:11 -07:00
Michael Taufen 2e49f6b64a Make it build!
Update external KubeletConfiguration type
Add defaults for new KubeletConfiguration fields
Modify some defaults to match upstream settings
Add/rename some conversion functions
Updated codegen
Fixed typos
Mike Danese caught that s.NodeLabels wasn't allocated, fix on line 118
of cmd/kubelet/app/options/options.go.
Provide list of valid sources in comment for HostNetworkSources field
2016-07-14 18:38:58 -07:00
Mike Danese e235073c26 f 2016-07-14 18:38:58 -07:00
Mike Danese e070cb617a componentconfig: add external kubelet configuration type 2016-07-14 18:38:58 -07:00
Manuel de Brito Fontes d3d569315c Fix make on Mac replacing sed with tr 2016-07-14 21:01:45 -04:00
Maisem Ali e4265cebbc Merge pull request #28980 from kubernetes/revert-28691-pv-gid-squash2
Revert "Remove pod mutation for PVs with supplemental GIDs"
2016-07-14 17:48:41 -07:00