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.

Sign up for GitHub

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

Jump to bottom

Bump up addon kube-dns to v20 for graceful termination #33774

Merged
merged 1 commit into from
Sep 30, 2016
Merged

Bump up addon kube-dns to v20 for graceful termination #33774

merged 1 commit into from
Sep 30, 2016
+52 −51

Conversation

MrHohn
Copy link
Member

@MrHohn MrHohn commented Sep 29, 2016 •
edited by jessfraz
Loading

Below images are built and pushed:

  • gcr.io/google_containers/kubedns-amd64:1.8
  • gcr.io/google_containers/kubedns-arm:1.8
  • gcr.io/google_containers/kubedns-arm64:1.8
  • gcr.io/google_containers/kubedns-ppc64le:1.8

Both kubedns and dnsmasq are bumped up in the manifest files.

@thockin @bprashanth

Bump up addon kube-dns to v20 for graceful termination

This change is Reviewable

@k8s-github-robot k8s-github-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note-label-needed labels Sep 29, 2016
@jbeda
Copy link
Contributor

jbeda commented Sep 29, 2016

Some duplication with #33791. Make sure these don't clobber each other.

@jbeda
Copy link
Contributor

jbeda commented Sep 29, 2016

LGTM -- does this need a release note?

@jbeda jbeda added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 29, 2016
@k8s-github-robot k8s-github-robot added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Sep 29, 2016
@MrHohn
Copy link
Member Author

MrHohn commented Sep 29, 2016 •
edited
Loading

@jbeda Thanks for reminding. We could wait for that fix merges first. And I think we don't need the release note for now.

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 30, 2016
@k8s-github-robot k8s-github-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Sep 30, 2016
@k8s-ci-robot
Copy link
Contributor

Jenkins GKE smoke e2e failed for commit 3e55d4d. Full PR test history.

The magic incantation to run this job again is @k8s-bot gke e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@MrHohn
Copy link
Member Author

MrHohn commented Sep 30, 2016

Rebased.

@jbeda jbeda added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Sep 30, 2016
@jbeda
Copy link
Contributor

jbeda commented Sep 30, 2016

/lgtm

@jbeda jbeda removed the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Sep 30, 2016
@thockin
Copy link
Member

thockin commented Sep 30, 2016

I feel like I already reviewed part of this, didn't I ?

On Thu, Sep 29, 2016 at 8:50 PM, Joe Beda notifications@github.com wrote:

/lgtm

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#33774 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AFVgVKNcltRDCWMYL6nRG1WmmLGbqKdqks5qvIbxgaJpZM4KKSh3
.

@thockin thockin added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 30, 2016
@k8s-github-robot
Copy link

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

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit b71def7 into kubernetes:master Sep 30, 2016
@jbeda
Copy link
Contributor

jbeda commented Sep 30, 2016

Thanks @thockin. Looks like /lgtm isn't working yet?

@MrHohn
Copy link
Member Author

MrHohn commented Oct 4, 2016

@thockin Should we add label cherrypick-candidate and the milestone v1.4 to this PR in order to get it in 1.4.1?

This was referenced Oct 7, 2016
Closed
Closed
Merged
@k8s-cherrypick-bot
Copy link

Removing label cherrypick-candidate because no release milestone was set. This is an invalid state and thus this PR is not being considered for cherry-pick to any release branch. Please add an appropriate release milestone and then re-add the label.

@thockin
Copy link
Member

thockin commented Oct 7, 2016

Yes, we should get this into 1.4.1

On Thu, Oct 6, 2016 at 8:20 PM, k8s-cherrypick-bot <notifications@github.com

wrote:

Removing label cherrypick-candidate because no release milestone was set.
This is an invalid state and thus this PR is not being considered for
cherry-pick to any release branch. Please add an appropriate release
milestone and then re-add the label.

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#33774 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AFVgVCQdC6LICSEQMchNA3R7TeHFs82sks5qxbqbgaJpZM4KKSh3
.

k8s-github-robot pushed a commit that referenced this pull request Oct 7, 2016
Merge pull request #34290 from MrHohn/automated-cherry-pick-of-#31894-#…
70e97fc 
…32422-#32406-#33146-#33774-upstream-release-1.4

Automatic merge from submit-queue

Automated cherry pick of #31894 #32422 #32406 #33146 #33774

Cherry pick of #31894 #32422 #32406 #33146 #33774 on release-1.4.

#31894: Support graceful termination in kube-dns
#32422: Added --log-facility flag to enhance dnsmasq logging
#32406: Split dns healthcheck into two different urls
#33146: Tune down initialDelaySeconds for readinessProbe
#33774: Bump up addon kube-dns to v20 for graceful termination
@jbeda jbeda added this to the v1.4 milestone Oct 7, 2016
@k8s-cherrypick-bot
Copy link

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

@jessfraz jessfraz added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Oct 7, 2016
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
Merge pull request kubernetes#34290 from MrHohn/automated-cherry-pick…
711c3e0 
…-of-#31894-kubernetes#32422-kubernetes#32406-kubernetes#33146-kubernetes#33774-upstream-release-1.4

Automatic merge from submit-queue

Automated cherry pick of kubernetes#31894 kubernetes#32422 kubernetes#32406 kubernetes#33146 kubernetes#33774

Cherry pick of kubernetes#31894 kubernetes#32422 kubernetes#32406 kubernetes#33146 kubernetes#33774 on release-1.4.

kubernetes#31894: Support graceful termination in kube-dns
kubernetes#32422: Added --log-facility flag to enhance dnsmasq logging
kubernetes#32406: Split dns healthcheck into two different urls
kubernetes#33146: Tune down initialDelaySeconds for readinessProbe
kubernetes#33774: Bump up addon kube-dns to v20 for graceful termination
@MrHohn MrHohn deleted the kubedns-graceful branch May 16, 2017 23:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jbeda jbeda

Labels
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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.4
Development

Successfully merging this pull request may close these issues.
8 participants
@MrHohn @jbeda @k8s-ci-robot @thockin @k8s-github-robot @k8s-cherrypick-bot @jessfraz @googlebot