Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

dixudx
Copy link
Member

@dixudx dixudx commented Jul 23, 2017

What this PR does / why we need it:

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #49336

Special notes for your reviewer:

/cc @janetkuo @foxish

Depends on #49071 (Merged)

Release note:

None

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 23, 2017
@k8s-ci-robot
Copy link
Contributor

Hi @dixudx. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jul 23, 2017
@k8s-github-robot k8s-github-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. kind/new-api size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Jul 23, 2017
@dixudx dixudx force-pushed the cleanup_DaemonSet_templateGeneration branch from e2055d4 to 7e7868b Compare July 24, 2017 02:04
@dixudx dixudx mentioned this pull request Jul 24, 2017
@dixudx dixudx force-pushed the cleanup_DaemonSet_templateGeneration branch from 7e7868b to 7140223 Compare July 25, 2017 02:35
@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 25, 2017
@janetkuo janetkuo assigned foxish and janetkuo and unassigned smarterclayton and deads2k Jul 25, 2017
@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 25, 2017
Copy link
Member

Choose a reason for hiding this comment

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

No need to delete this annotation

Copy link
Member

Choose a reason for hiding this comment

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

Just took a closer look, you touched out.Annotations here, which is correct. Please ignore the previous comment.

Copy link
Member Author

Choose a reason for hiding this comment

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

@janetkuo Will rebase and update the PR once #49071 gets merged. Seems #49071 has been approved.

Copy link
Member

Choose a reason for hiding this comment

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

They're pointers, need to be converted with the way you did in L393

Copy link
Member

Choose a reason for hiding this comment

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

Would you move these closer to other DaemonSet conversion codes? The TODO comment does not apply to these conversion codes.

@janetkuo
Copy link
Member

janetkuo commented Jul 25, 2017

Thanks a lot for the fix! You'd need to run auto-gen scripts again (make update will run all auto-gen scripts). Please put those auto-generated codes in a separate commit in this PR so that rebase would much be easier.

@janetkuo
Copy link
Member

@k8s-bot ok to test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jul 25, 2017
Copy link
Member

Choose a reason for hiding this comment

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

Need to check if Annotations is nil or not, otherwise this will panic

Copy link
Member

Choose a reason for hiding this comment

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

if out.Annotations == nil {
	out.Annotations = make(map[string]string)
}

@janetkuo
Copy link
Member

@dixudx would you update conversion_test.go as well?

@dixudx
Copy link
Member Author

dixudx commented Jul 26, 2017

@janetkuo Yeah, count on me.

@dixudx
Copy link
Member Author

dixudx commented Jul 26, 2017

@janetkuo Add conversion_test.go in this PR or open a new PR ?

@dixudx dixudx force-pushed the cleanup_DaemonSet_templateGeneration branch from 7140223 to e178946 Compare July 26, 2017 05:08
@bgrant0607
Copy link
Member

I don't think a user will understand the change just by reading the release note.

kubernetes/community#484

@dixudx
Copy link
Member Author

dixudx commented Aug 11, 2017

@bgrant0607 Updated the release note. PTAL.

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 11, 2017
@janetkuo
Copy link
Member

I don't recall what release note you wrote originally, but I think something like "Deprecate .spec.templateGeneration field of extensions/v1beta1 DaemonSet" is enough

@bgrant0607
Copy link
Member

@janetkuo The original note was something like "Cleanup templateGeneration", which was vague. Your suggestion is fine.

@dixudx dixudx force-pushed the cleanup_DaemonSet_templateGeneration branch from f9e7189 to 4d3cba7 Compare August 12, 2017 02:42
@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 Aug 12, 2017
@dixudx
Copy link
Member Author

dixudx commented Aug 12, 2017

@janetkuo Rebased. PTAL. Thanks.

@janetkuo
Copy link
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 Aug 12, 2017
@janetkuo
Copy link
Member

Just took a closer look, template generation was already deprecated in 1.7. This PR just removes the use of it in apps/v1beta2 DaemonSet. Since apps/v1beta2 was added in this release (1.8), this PR does not need a release note.

@dixudx
Copy link
Member Author

dixudx commented Aug 12, 2017

/assign @thockin
Need your approval. Thanks.

@janetkuo janetkuo 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 Aug 14, 2017
@janetkuo
Copy link
Member

@bgrant0607 would you take another look?

@thockin
Copy link
Member

thockin commented Aug 14, 2017

Was v1beta2 available in 1.7 releases?

https://kubernetes.io/docs/reference/deprecation-policy/

@dixudx
Copy link
Member Author

dixudx commented Aug 15, 2017

@thockin apps/v1beta2 is for 1.8 release.

@thockin
Copy link
Member

thockin commented Aug 15, 2017

/approve

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dixudx, janetkuo, thockin

Associated issue: 49336

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

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 Aug 15, 2017
@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue

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. 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-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Clean up deprecated DaemonSet templateGeneration field
10 participants