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

Upgrade k8s-dns-dnsmasq-nanny to match KubeDNS #9687

Merged
merged 1 commit into from
Aug 5, 2020

Conversation

johngmyers
Copy link
Member

#9462 missed upgrading k8s-dns-dnsmasq-nanny in the 1.12 manifest to match KubeDNS. It was thus missed in the #9485 backport. It has since been fixed in master branch.

@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Aug 5, 2020
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 5, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: johngmyers

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 5, 2020
@hakman
Copy link
Member

hakman commented Aug 5, 2020

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 5, 2020
@gjtempleton
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot merged commit ef9bf51 into kubernetes:release-1.18 Aug 5, 2020
@johngmyers johngmyers deleted the dnsmasq-nanny branch August 5, 2020 05:30
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. area/addons 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. 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.

None yet

4 participants