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

Jump to bottom

coredns dep.Severity is newdefault, not newDefault #96907

Merged
merged 1 commit into from Dec 1, 2020
Merged

coredns dep.Severity is newdefault, not newDefault #96907

merged 1 commit into from Dec 1, 2020

Conversation

pacoxu
Copy link
Member

@pacoxu pacoxu commented Nov 27, 2020 •
edited

kubernetes/vendor/github.com/coredns/corefile-migration/migration/notice.go

Line 43 in 5ed4b76

newdefault = "newdefault" // added to the default corefile. CoreDNS may not function properly if it is not present in the corefile.

What type of PR is this?
/kind bug

What this PR does / why we need it:
typo in code which makes that migration is not triggerred

Which issue(s) this PR fixes:

During investigating the #96833 , I find this issue

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

kubeadm: fix coredns migration should be triggered when there are newdefault configs during kubeadm upgrade

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

image

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/kubeadm sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Nov 27, 2020
@pacoxu pacoxu mentioned this pull request Nov 27, 2020
Closed
@pacoxu
coredns dep.Severity is newdefault, not newDefault
4525f3f 
Signed-off-by: pacoxu <paco.xu@daocloud.io>
@pacoxu
Copy link
Member Author

pacoxu commented Nov 27, 2020

/retest

@pacoxu
Copy link
Member Author

pacoxu commented Nov 27, 2020

/triage accepted

neolit123
neolit123 reviewed Nov 30, 2020
View reviewed changes
Copy link
Member

@neolit123 neolit123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/triage accepted
/approve
/cc @chrisohaver

is this change valid?
thanks

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Nov 30, 2020
@neolit123
Copy link
Member

/priority backlog

@k8s-ci-robot k8s-ci-robot added priority/backlog Higher priority than priority/awaiting-more-evidence. approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Nov 30, 2020
@neolit123
Copy link
Member

@pacoxu please prefix the release note with "kubeadm: ..."

kubeadm: fix coredns migration should be triggered when there are newdefault configs during kubeadm upgrade

@chrisohaver @rajansandeep
should we include this change in 1.20 and backport to older releases?

@rajansandeep
Copy link
Contributor

@chrisohaver @rajansandeep
should we include this change in 1.20 and backport to older releases?

Yes, this can be included in 1.20 and backported if possible

@chrisohaver
Copy link
Contributor

/triage accepted
/approve
/cc @chrisohaver

is this change valid?
thanks

The value of the constant defined in the migration package is "newdefault", all lowercase.
I'll make them public so the constants can be used instead of literals in the future.

@neolit123
Copy link
Member

neolit123 commented Nov 30, 2020 •
edited

ok, thanks.

/remove-priority backlog
/priority important-soon
/milestone v1.20

@pacoxu
would you like sending the cherry pick PRs to the older branches and pinging me on those for approval?
https://github.com/kubernetes/community/blob/master/contributors/devel/sig-release/cherry-picks.md#initiate-a-cherry-pick

@k8s-ci-robot k8s-ci-robot added the priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. label Nov 30, 2020
@k8s-ci-robot k8s-ci-robot removed the priority/backlog Higher priority than priority/awaiting-more-evidence. label Nov 30, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.20 milestone Nov 30, 2020
@chrisohaver
Copy link
Contributor

Fixes #96833

It's not obvious to me how this is the case. This is a valid issue that needs to be fixed, but I don't see the connection of how fixing this would resolve #96833.

@pacoxu
Copy link
Member Author

pacoxu commented Nov 30, 2020 •
edited

Fixes #96833

It's not obvious to me how this is the case. This is a valid issue that needs to be fixed, but I don't see the connection of how fixing this would resolve #96833.

@chrisohaver his corelfile has newdefault and need to be migrated，so the configmap will be updated.

if no migrition， kubeadm will create or update the coredns configmap.

however，this issue will not fix the whole issue. It fix the obvious one.

@pacoxu
Copy link
Member Author

pacoxu commented Nov 30, 2020

ok, thanks.

/remove-priority backlog
/priority important-soon
/milestone v1.20

@pacoxu
would you like sending the cherry pick PRs to the older branches and pinging me on those for approval?
https://github.com/kubernetes/community/blob/master/contributors/devel/sig-release/cherry-picks.md#initiate-a-cherry-pick

Sure，I will do it tomorrow.

@neolit123
Copy link
Member

Sure，I will do it tomorrow.

thanks.

however，this issue will not fix the whole issue. It fix the obvious one.

ok, so we better remove the Fixes #96833 in the PR description here, so that the original issue is not closed.

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Nov 30, 2020
@pacoxu
Copy link
Member Author

pacoxu commented Nov 30, 2020 •
edited

ok, so we better remove the Fixes #96833 in the PR description here, so that the original issue is not closed.

Description is fixed now.

rajansandeep
rajansandeep approved these changes Nov 30, 2020
View reviewed changes
Copy link
Contributor

@rajansandeep rajansandeep left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 30, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: neolit123, pacoxu, rajansandeep

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

@pacoxu pacoxu mentioned this pull request Nov 30, 2020
Merged
@pacoxu
Copy link
Member Author

pacoxu commented Nov 30, 2020

Only 1.19 need a cherry-pick.
I opened #96970 for 1.19 release.

@neolit123
Copy link
Member

@pacoxu
as mentioned here:
#96907 (comment)

we should still include the full release note prefixed with "kubeadm: ..."

kubeadm: fix coredns migration should be triggered when there are newdefault configs during kubeadm upgrade

same for the cherry pick for 1.19:
#96970

the request to use None was for the other PR that did the error fix.

@k8s-ci-robot k8s-ci-robot 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 Dec 1, 2020
@pacoxu
Copy link
Member Author

pacoxu commented Dec 1, 2020

/retest

fix release note

@pacoxu
Copy link
Member Author

pacoxu commented Dec 1, 2020

/retest

@k8s-ci-robot k8s-ci-robot merged commit 98bc258 into kubernetes:master Dec 1, 2020
@pacoxu pacoxu deleted the patch-1 branch June 23, 2021 05:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rajansandeep rajansandeep rajansandeep approved these changes

@rosti rosti Awaiting requested review from rosti

@yastij yastij Awaiting requested review from yastij

@chrisohaver chrisohaver Awaiting requested review from chrisohaver

@neolit123 neolit123 Awaiting requested review from neolit123

Assignees

@rajansandeep rajansandeep

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubeadm cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.20
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@pacoxu @neolit123 @rajansandeep @chrisohaver @k8s-ci-robot