Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Batch update for 1.3 #28119

Merged
merged 26 commits into from
Jun 29, 2016
Merged

Conversation

eparis
Copy link
Contributor

@eparis eparis commented Jun 27, 2016

#28030: Revert "Federation e2e supports aws"
#28026: Address outstanding review comments in #27999.
#28034: Adding lock files for kubeconfig updating
#28004: return nil from NewClientConfig instead of empty struct
#28032: Increase pod CPU/memory for fluentd, dns and kube-proxy.
#27208: Bump minimum API version for docker to 1.21
#28061: Remove extra double quotes in --federations.
#28060: rkt: Fix the 'privileged' check when stage1 annotation is provided.
#27996: Image GC logic should compensate for reserved blocks
#28044: rkt: Bump required rkt version to 1.9.1.
#28040: Tracked addition of federation, sed support in kube DNS
#28043: Set grace period to 0 when deleting namespaces after the test.
#28002: Fix startup type error in initializeCaches
#28087: Hotfix: Fixup the hyperkube dns manifest from a breaking federation PR
#28108: Fix initialization of volume controller caches.
#28056: Increase kube-dns requirements on CoreOS.
#28147: Fix error checks after cloning.
#28159: Use : as seccomp security option operator for Docker 1.10
#28165: Refactored, expanded and fixed federated-services e2e tests.
#28095: Kubelet should mark VolumeInUse before checking if it is Attached
#28172: Build: Add KUBE_GCS_RELEASE_BUCKET_MIRROR option to push-ci-build.sh
#28207: Bump cluster autoscaler to 0.2.2
#28160: Volume manager must verify containers terminated before deleting for ungracefully terminated pods
#28211: Fix federation e2e tests by correctly managing cluster clients
#27944: Fix pvc label selector validation error
#28186: federation: Upgrading the groupversion to v1beta1

@eparis eparis added cherrypick-candidate release-note-none Denotes a PR that doesn't merit a release note. labels Jun 27, 2016
@eparis eparis added this to the v1.3 milestone Jun 27, 2016
@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for the commit author(s). If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.

@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 27, 2016
@eparis
Copy link
Contributor Author

eparis commented Jun 27, 2016

@erictune updated as of 12:23 PM Eastern

@eparis eparis added priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Jun 27, 2016
@eparis
Copy link
Contributor Author

eparis commented Jun 27, 2016

cross your fingers, hopefully you just need to add LGTM...

@erictune
Copy link
Member

LGTM

@erictune erictune added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed cla: no labels Jun 27, 2016
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 27, 2016
@eparis eparis added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 27, 2016
@eparis
Copy link
Contributor Author

eparis commented Jun 27, 2016

removing LGTM until @spxtr @ixdy @pwittrock or someone gets node e2e running on release-1.3.

Fixing that is a 1.3.0 blocker in my mind...

@eparis eparis removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 27, 2016
@vishh
Copy link
Contributor

vishh commented Jun 27, 2016

@k8s-bot test node e2e github issue #IGNORE

@vishh
Copy link
Contributor

vishh commented Jun 27, 2016

Attempting to re-open this PR to see if the node e2e jenkins project will pick up this PR.

@vishh vishh closed this Jun 27, 2016
@vishh vishh reopened this Jun 27, 2016
@ixdy
Copy link
Member

ixdy commented Jun 27, 2016

@k8s-bot node e2e test this, issue #IGNORE

@ixdy
Copy link
Member

ixdy commented Jun 27, 2016

ok, it's running finally.

@eparis eparis added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 27, 2016
k8s-merge-robot and others added 6 commits June 29, 2016 14:57
…-e2e-debugging

Automatic merge from submit-queue

Refactored, expanded and fixed federated-services e2e tests.

1. Moved BeforeEach() and AfterEach() to an inner scope, to prevent clashes with Framework's BeforeEach() and AfterEach().  Morte to come on this, as it's a major bug in our use of Ginkgo, and affects many other tests.
2. Keep track of which clusters we have created namespaces in, so that we don't try to delete namespaces out of clusters that we didn't create them in (e.g. the primary cluster, where the framework already creates and deleted the required namespace).
3. Separate tests for federated service creation and verification that underlying services are created correctly.
4. For DNS resolution tests, create backend pods (and delete on cleanup) where required).
5. For non-local DNS resolution, delete a backend pod in one cluster to test, and in the remainder of clusters on cleanup.
6. Lots of refactoring to make code re-usable across multiple test.
7. Lots of debugging/fixing to make sure that everything that the testscreate are cleaned up properly afterwards, and don't clash with the cleanups done by the e2e Framework.

(cherry picked from commit 1f62850)
Automatic merge from submit-queue

Kubelet should mark VolumeInUse before checking if it is Attached

Kubelet should mark VolumeInUse before checking if it is Attached.
Controller should fetch fresh copy of node object before detach instead of relying on node informer cache.

Fixes kubernetes#27836

(cherry picked from commit 532491a)
Build: Add KUBE_GCS_RELEASE_BUCKET_MIRROR option to push-ci-build.sh
(cherry picked from commit 43437e4)
Bump cluster autoscaler to 0.2.2
(cherry picked from commit d7eaad9)
Automatic merge from submit-queue

Volume manager must verify containers terminated before deleting for ungracefully terminated pods

A pod is removed from volume manager (triggering unmount) when it is deleted from the kubelet pod manager. Kubelet deletes the pod from pod manager as soon as it receives a delete pod request. As long as the graceful termination period is non-zero, this happens after kubelet has terminated all containers for the pod. However, when graceful termination period for a pod is set to zero, the volume is deleted from pod manager *before* its containers are terminated.

This  can result in volumes getting unmounted from a pod before all containers have exited when graceful termination is set to zero.

This PR prevents that from happening by only deleting a volume from volume manager once it is deleted from the pod manager AND the kubelet containerRuntime status indicates all containers for the pod have exited. Because we do not want to call containerRuntime too frequently, we introduce a delay in the `findAndRemoveDeletedPods()` method to prevent it from executing more frequently than every two seconds.

Fixes kubernetes#27691

Running test in tight loop to verify fix.

(cherry picked from commit c6fa861)
…-federation-e2e

Automatic merge from submit-queue

Fix federation e2e tests by correctly managing cluster clients

1. The main fix: Correct overall BeforeEach() to create a new set of cluster clients, rather than just append to the set created by all previous tests.  This was screwing up a lot of stuff in difficult to diagnose ways.
2. Add lots of debug logging.
3. Be better about cleaning up after each test.

```
SUCCESS! -- 6 Passed | 0 Failed :-)
```

cc @nikhiljindal @madhusudancs @mfanjie @colhom FYI
(cherry picked from commit 02de009)
@k8s-github-robot k8s-github-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 29, 2016
Automatic merge from submit-queue

Fix pvc label selector validation error

This is for kubernetes#26866. Other selectors are e.g. v1beta1.x , the pvc one is unversioned.x
(cherry picked from commit 11e4158)
@k8s-bot
Copy link

k8s-bot commented Jun 29, 2016

GCE e2e build/test passed for commit e5245a5.

@k8s-bot
Copy link

k8s-bot commented Jun 29, 2016

GCE e2e build/test passed for commit 37a0c0a.

Automatic merge from submit-queue

federation: Upgrading the groupversion to v1beta1

This PR contains 2 commits:
* Removing fields from Cluster API object that we are not using. This includes: Capacity, Allocatable and ClusterMeta.
* Move code and rename groupversion `federation/v1alpha1` to `federation/v1beta1`

cc @kubernetes/sig-cluster-federation
(cherry picked from commit 044de6e)
@eparis
Copy link
Contributor Author

eparis commented Jun 29, 2016

seems easy enough to pick the federation v1beta1 PR if you like.

@eparis
Copy link
Contributor Author

eparis commented Jun 29, 2016

@erictune everything passed locally. if it passes here I think you should merge...

@erictune
Copy link
Member

Okay, will merge when it passes.

@erictune erictune removed the cla: no label Jun 29, 2016
@eparis eparis added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 29, 2016
@k8s-bot
Copy link

k8s-bot commented Jun 29, 2016

GCE e2e build/test passed for commit 19c07b1.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Jun 29, 2016

GCE e2e build/test passed for commit 19c07b1.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 28925df into kubernetes:release-1.3 Jun 29, 2016
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.3" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.