Skip to content

Automated cherry pick of #48205 #48183 #48118#48229

Merged
caesarxuchao merged 3 commits intokubernetes:release-1.7from
caesarxuchao:automated-cherry-pick-of-#48205-#48183-#48118-upstream-release-1.7
Jun 29, 2017
Merged

Automated cherry pick of #48205 #48183 #48118#48229
caesarxuchao merged 3 commits intokubernetes:release-1.7from
caesarxuchao:automated-cherry-pick-of-#48205-#48183-#48118-upstream-release-1.7

Conversation

@caesarxuchao
Copy link
Copy Markdown
Contributor

@caesarxuchao caesarxuchao commented Jun 28, 2017

Cherry pick of #48205 #48183 #48118 on release-1.7.

#48205: Bumped Heapster to v1.4.0
#48183: Fix kube-proxy panic when running with
#48118: Ensures node becomes schedulable at the end of tests that

Bumped Heapster to v1.4.0.
More details about the release https://github.com/kubernetes/heapster/releases/tag/v1.4.0

@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/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note-label-needed labels Jun 28, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 28, 2017
@caesarxuchao
Copy link
Copy Markdown
Contributor Author

I manually copied the Bumped Heapster to v1.4.0. release note as it's not clear if a bot will retrieve the release note from the original PR.

@caesarxuchao caesarxuchao added release-note Denotes a PR that will be considered when it comes time to generate release notes. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed release-note-label-needed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Jun 28, 2017
@caesarxuchao
Copy link
Copy Markdown
Contributor Author

cc @dchen1107

@dchen1107
Copy link
Copy Markdown
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 28, 2017
@k8s-github-robot
Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: caesarxuchao, dchen1107

Associated issue: 48205

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 28, 2017
@caesarxuchao
Copy link
Copy Markdown
Contributor Author

/test pull-kubernetes-unit

@caesarxuchao caesarxuchao added this to the v1.7 milestone Jun 29, 2017
@caesarxuchao
Copy link
Copy Markdown
Contributor Author

I0628 20:23:07.133] • [SLOW TEST:341.970 seconds]
I0628 20:23:07.133] [k8s.io] Service endpoints latency
I0628 20:23:07.133] /go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/test/e2e/framework/framework.go:619
I0628 20:23:07.133] should not be very high [Conformance]
I0628 20:23:07.134] /go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/test/e2e/service_latency.go:117
I0628 20:23:07.134] ------------------------------
I0628 20:23:07.134] Jun 28 20:23:07.075: INFO: Running AfterSuite actions on all node
I0628 20:23:07.134]
W0628 20:41:16.879] 2017/06/28 20:41:16 util.go:155: Interrupt testing after 1h5m0s timeout. Will terminate in another 15m
I0628 20:41:16.980]

@caesarxuchao
Copy link
Copy Markdown
Contributor Author

/test pull-kubernetes-e2e-gce-etcd3

@caesarxuchao
Copy link
Copy Markdown
Contributor Author

Manual merge.

@caesarxuchao caesarxuchao merged commit 3648549 into kubernetes:release-1.7 Jun 29, 2017
@piosz
Copy link
Copy Markdown
Member

piosz commented Jun 29, 2017

/lgtm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants