Commit Graph

37137 Commits (aa485ce82c3336b0aa70e27e558d2ce12340a4dd)

Author SHA1 Message Date
derekwaynecarr 07bd42a192 update libcontainer,gocapability,cadvisor 2016-10-10 14:24:05 -04:00
Avesh Agarwal 83f447e6a6 Send a pod event if preStop hook did not finish in time. 2016-10-10 14:23:11 -04:00
Kubernetes Submit Queue cf707989b3 Merge pull request #34260 from jessfraz/ocd-about-cherry-pick-script
Automatic merge from submit-queue

hack: update cherry-pick script to show subject when patch is split

<!--  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**:

This is a continuation of #34049, which worked, but then I realized some patch files have more than one subject, see example: https://github.com/kubernetes/kubernetes/pull/34228

This cleans the output so it looks like this:

```
Automated cherry pick of #32593

Cherry pick of #32593 on release-1.4.

#32593: Fix audit_test regex for iso8601 timestamps
```

pretty!!!

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

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

Signed-off-by: Jess Frazelle <acidburn@google.com>
2016-10-10 11:00:35 -07:00
Kubernetes Submit Queue ff20b172ef Merge pull request #33718 from justinsb/arbitrary_names_2b
Automatic merge from submit-queue

Use nodeutil.GetHostIP consistently when talking to nodes

Most of our communications from apiserver -> nodes used
    nodutil.GetNodeHostIP, but a few places didn't - and this meant that the
    node name needed to be resolvable _and_ we needed to populate valid IP
    addresses.

```release-note
The apiserver now uses addresses reported by the kubelet in the Node object's status for apiserver->kubelet communications, rather than the name of the Node object. The address type used defaults to `InternalIP`, `ExternalIP`, and `LegacyHostIP` address types, in that order.
```
2016-10-10 11:00:26 -07:00
Marcin Wielgus 47f0e738e9 Move periodic backoff gc to federation utils 2016-10-10 19:59:35 +02:00
Michael Taufen 263c54c424 Fix upgrade.sh image setup
The original fix (#33147) sourced the correct `node-helper.sh` but set
`node_os_distribution` instead of `NODE_OS_DISTRIBUTION`. The
`set-node-image` function is imported indirectly via `source
"${KUBE_ROOT}/cluster/kube-util.sh"`, which in turn (in the GCE case)
sources `cluster/gce/util.sh`. Since the `set-node-image` function
relies on the `NODE_OS_DISTRIBUTION` variable, the original fix
did not have the entire intended effect.

I have confirmed that cherry-picking #33147 into the `release-1.4`
branch and layering this commit on top of it make for a successful
upgrade from a GCI based K8s 1.3 cluster to a GCI based K8s 1.4 cluster.
2016-10-10 10:54:58 -07:00
Mike Bryant a6dafe401f Use correct variable in thirdpartyresourcedata codec.
Fixes #34459
2016-10-10 18:42:33 +01:00
Matt Liggett 37f0fce0b8 Clarify MinAvailable approval semantics.
Fixes doc comments to be in line with #33143
2016-10-10 10:40:40 -07:00
deads2k 581051b8fa hardcode deployment resync until deployment controller is updated 2016-10-10 13:11:50 -04:00
Kubernetes Submit Queue e72f26a3ff Merge pull request #34109 from mwielgus/fed-deployment-controller
Automatic merge from submit-queue

Federated deployment controller - part 1

Based on federated replicaset controller (copy + find/replace).

Remaining stuff:
- refacing out common elements to libs
- using owerref in pod analysis
- e2e tests
- renaming concurrency flag for rs and reusing it in deployment
- updating only one cluster at a time if rollingupdate strategy is used.

cc: @quinton-hoole @kubernetes/sig-cluster-federation

**Release note**:

```release-note
Federated deployment controller that supports the same api as the regular kubernetes deployment controller.
```
2016-10-10 10:08:01 -07:00
Michail Kargakis 2c797a80af Revert "Error out when any RS has more available pods then its spec replicas"
This reverts commit 32ababbe1b.
2016-10-10 19:02:31 +02:00
Kubernetes Submit Queue 851705ea59 Merge pull request #34147 from mikedanese/kubeadm-api
Automatic merge from submit-queue

kubeadm: turn api into a real apigroup

@kubernetes/sig-cluster-lifecycle
2016-10-10 09:59:54 -07:00
Hongchao Deng 2516ab058d etcd3 watcher: use prevKV for prevObj 2016-10-10 09:46:40 -07:00
Hongchao Deng c060417ecb godep: update etcd to 3.0.12 2016-10-10 09:46:40 -07:00
Michail Kargakis 5589469948 Generated code for RS/RC conditions 2016-10-10 18:34:01 +02:00
Michail Kargakis 63a6ce3a87 extensions: add Conditions in replica sets 2016-10-10 18:34:01 +02:00
Michail Kargakis 0701232996 api: add Conditions in replication controllers 2016-10-10 18:34:00 +02:00
Kubernetes Submit Queue 3c9600e4c4 Merge pull request #32154 from jessfraz/listen-for-signal-hack-e2e
Automatic merge from submit-queue

hack/e2e.go: listen for Interrupt signal and attempt cleanup if run with --down

<!--  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**: adds a listener on ^C, so if `hack/e2e.go` is run with `--down` and the user ^C, then it will attempt to cleanup the resources.

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

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



Signed-off-by: Jess Frazelle <me@jessfraz.com>
2016-10-10 08:10:26 -07:00
Kubernetes Submit Queue 5859bebf13 Merge pull request #34443 from kargakis/add-revision-flag-in-rollout-status
Automatic merge from submit-queue

kubectl: add --revision flag in rollout status

Fixes https://github.com/kubernetes/kubernetes/issues/33185

@kubernetes/kubectl ptal
2016-10-10 07:32:26 -07:00
Marcin Wielgus c9e771a7b2 Federated deployment controller - part 1 2016-10-10 16:25:05 +02:00
yuexiao-wang 7a33682ad2 Clean up for the link in cassandra
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-10-10 22:23:41 +08:00
Kubernetes Submit Queue a2961b3b4b Merge pull request #33841 from deads2k/api-18-controllers-to-posthook
Automatic merge from submit-queue

refactor controller as posthook when configured and enabled

builds on https://github.com/kubernetes/kubernetes/pull/33785 .

Models the bootstrap controller as a PostHook which is added when its API group is available and its configured.

@liggitt Stefan is out for a while.
2016-10-10 06:54:32 -07:00
Kubernetes Submit Queue 074891749b Merge pull request #33724 from guangxuli/k8s_test_oidc
Automatic merge from submit-queue

no need to remove file respectively
2016-10-10 06:16:38 -07:00
Kubernetes Submit Queue 049ad98581 Merge pull request #34010 from soltysh/fix_edit_sj
Automatic merge from submit-queue

Match GroupVersionKind against specific version

Currently when multiple GVK match a specific kind in `KindForGroupVersionKinds` only the first will be matched, which not necessarily will be the correct one. I'm proposing to extend this to pick the best match, instead.

Here's my problematic use-case, of course it involves ScheduledJobs 😉:
I have a `GroupVersions` with `batch/v1` and `batch/v2alpha1` in that order. I'm calling `KindForGroupVersionKinds` with kind `batch/v2alpha1 ScheduledJob` and that currently results this matching first `GroupVersion`, instead of picking more concrete one. There's a [clear description](ee77d4e6ca/pkg/api/unversioned/group_version.go (L183)) why it is on single `GroupVersion`, but `GroupVersions` should pick this more carefully.

@deads2k this is your baby, wdyt?
2016-10-10 06:16:29 -07:00
Michail Kargakis 75f30ec46f kubectl: add --revision flag in rollout status 2016-10-10 15:04:46 +02:00
Kubernetes Submit Queue 525958d295 Merge pull request #34444 from gmarek/refactor-sched-pred
Automatic merge from submit-queue

Small refactoring of scheduler predicates

Ref #34336, #34441
2016-10-10 05:38:34 -07:00
deads2k 5d3a210321 convert bootstrap controller to posthook to tighten master.go 2016-10-10 08:15:45 -04:00
Wojciech Tyczynski 4be6d5e9f2 Minor fixed to migrate-if-needed script 2016-10-10 13:26:39 +02:00
gmarek 8d3973c2f4 Small refactoring of scheduler predicates 2016-10-10 13:13:15 +02:00
Kubernetes Submit Queue 4bf35b6827 Merge pull request #29195 from piosz/rescheduler-proposal
Automatic merge from submit-queue

Rescheduling for critical pods proposal

ref #29023
2016-10-10 03:28:37 -07:00
Kubernetes Submit Queue 5509e50db4 Merge pull request #31605 from resouer/eclass-1
Automatic merge from submit-queue

[Part 1] Implementation of equivalence pod

Part 1 of #30844

This PR: 

- Refactored `predicate.go`, so that `GetResourceRequest` can be used in other places to `GetEquivalencePod`.
- Implement a `equivalence_cache.go` to deal with all information we need to calculate an equivalent pod.
- Define and register a `RegisterGetEquivalencePodFunction `.

Work in next PR:
- The update of `equivalence_cache.go`
- Unit test
- Integration/e2e test

I think we can begin from the `equivalence_cache.go`? Thanks.  cc @wojtek-t @davidopp 

If I missed any other necessary part, please point it out.
2016-10-10 02:46:00 -07:00
Piotr Szczesniak 4346e7b312 Rescheduling for critical pods proposal 2016-10-10 11:41:47 +02:00
Harry Zhang 204dbe7fdd Update provider and cache
Update equivalent class & remove priority

Use controller ref

Directly clear the cache
2016-10-10 09:25:15 +01:00
Kubernetes Submit Queue 42392fea3c Merge pull request #34009 from wojtek-t/upgrade_etcd_image
Automatic merge from submit-queue

Support upgrade/downgrade in etcd image.

Ref #22448 #20504
2016-10-10 01:05:35 -07:00
Wojciech Tyczynski e54bc86ab3 Support upgrade/downgrade in etcd image. 2016-10-10 08:40:59 +02:00
Kubernetes Submit Queue b359034817 Merge pull request #34239 from gnufied/update-e2e-docs
Automatic merge from submit-queue

Update documentation for running e2e tests locally

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

The docs for running e2e tests locally needs to be updated.
check_node_count option has been removed and developers usually
need to perform additional steps do get it going.
2016-10-09 17:46:10 -07:00
Kubernetes Submit Queue 538915c037 Merge pull request #34297 from AdoHe/fix_yaml_decoder
Automatic merge from submit-queue

fix yaml decode issue

fix #33588

@janetkuo @smarterclayton ptal.
2016-10-09 17:46:03 -07:00
Kubernetes Submit Queue ef1ba5f2be Merge pull request #33160 from m1093782566/m109-petset-internal-int32
Automatic merge from submit-queue

[Pet Set] petset internal replicas type should be int32

<!--  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**:

Fixes #32993 

Sometimes an int is 4 bytes and sometimes it's 8(depend on CPU architecture), but an int32 is always 32bits. So set petset internal replicas type to int32, avoid type casting in API version converting.
2016-10-09 16:08:11 -07:00
Cole Mickens 5bcf1f8051 hyperkube: speed up build with better use of docker cache 2016-10-09 08:06:36 -07:00
Cole Mickens 19b5ca791c hack: fix dev-push-hyperkube.sh 2016-10-09 07:19:30 -07:00
Cole Mickens 3aaf0a86e3 hyperkube image: add cifs-utils 2016-10-09 07:06:37 -07:00
Kubernetes Submit Queue 853ee4c9f7 Merge pull request #34399 from brendandburns/e2efix
Automatic merge from submit-queue

Fix a formatting string.

Related to #33793
2016-10-08 19:04:06 -07:00
Kubernetes Submit Queue 7746cb9182 Merge pull request #34352 from mikedanese/fix-cm
Automatic merge from submit-queue

kubeadm: still run cm if not pod cidr is specified

@kubernetes/sig-cluster-lifecycle
2016-10-08 18:25:43 -07:00
Kubernetes Submit Queue 0603af42c6 Merge pull request #34001 from mbohlool/h2o
Automatic merge from submit-queue

Generate and store federation OpenAPI spec in source tree

A follow up of #33628 to also add federation spec to source tree.
2016-10-08 17:46:51 -07:00
Davanum Srinivas ab68052424 Update sftp package
In support of #34328
2016-10-08 20:41:57 -04:00
Kubernetes Submit Queue 4b3498d2d5 Merge pull request #34287 from Random-Liu/add-sandbox-gc-minage
Automatic merge from submit-queue

Add sandbox gc minage

Fixes https://github.com/kubernetes/kubernetes/issues/34272.
Fixes https://github.com/kubernetes/kubernetes/issues/33984.

This PR:
1) Change the `GetPodStatus` to get statuses of all containers in a pod instead of only containers belonging to existing sandboxes. This is because sandbox may be removed by GC or by users, kubelet should be able to deal with this case.
2) Change the CRI comment to clarify the timestamp unit (nanosecond).
2) Add MinAge for sandbox GC Policy.

@yujuhong @feiskyer @yifan-gu 
/cc @kubernetes/sig-node
2016-10-08 17:07:28 -07:00
Kubernetes Submit Queue d631d8e751 Merge pull request #34004 from wojtek-t/all_versions_in_etcd_image
Automatic merge from submit-queue

Grab different etcd versions in etcd image.

Ref #20504

@timothysc
2016-10-08 16:28:36 -07:00
Kubernetes Submit Queue de55cb85ab Merge pull request #34359 from ixdy/build-gcs-dir-suffix
Automatic merge from submit-queue

Add support for adding a suffix to the GCS upload dir in jenkins/build

Second step of fixing kubernetes/test-infra#670. Sequences after https://github.com/kubernetes/release/pull/135.

cc @luxas
2016-10-08 15:50:14 -07:00
Kubernetes Submit Queue c8668df048 Merge pull request #34357 from bowei/flake-fix-27023
Automatic merge from submit-queue

Add retry loop around check for /etc/hosts contents to work around issue #34256

See https://github.com/kubernetes/kubernetes/issues/34256

fixes #27023
2016-10-08 15:11:20 -07:00
Kubernetes Submit Queue a99adcdf49 Merge pull request #34343 from mikedanese/prune-tests
Automatic merge from submit-queue

kubectl: add two more test of kubectl apply --prune

@pwittrock
2016-10-08 14:29:56 -07:00