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

Remove deprecated ESIPP beta annotations #50224

Merged
merged 2 commits into from
Aug 11, 2017
Merged

Remove deprecated ESIPP beta annotations #50224

merged 2 commits into from
Aug 11, 2017

Conversation

xiangpengzhao
Copy link
Contributor

@xiangpengzhao xiangpengzhao commented Aug 7, 2017 •
edited
Loading

What this PR does / why we need it:
Remove deprecated ESIPP beta annotations.

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

Special notes for your reviewer:
/assign @MrHohn
/sig network

Release note:

Beta annotations `service.beta.kubernetes.io/external-traffic` and `service.beta.kubernetes.io/healthcheck-nodeport` have been removed. Please use fields `service.spec.externalTrafficPolicy` and `service.spec.healthCheckNodePort` instead.

@k8s-ci-robot k8s-ci-robot added sig/network Categorizes an issue or PR as relevant to SIG Network. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 7, 2017
@k8s-ci-robot
Copy link
Contributor

Hi @xiangpengzhao. 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-github-robot k8s-github-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. release-note-none Denotes a PR that doesn't merit a release note. labels Aug 7, 2017
@xiangpengzhao xiangpengzhao mentioned this pull request Aug 7, 2017
Closed
@xiangpengzhao
Copy link
Contributor Author

Maybe we want a release note for this PR as it removes some deprecated things?

@MrHohn
Copy link
Member

MrHohn commented Aug 7, 2017

Thanks for the PR, will review it soon.

Maybe we want a release note for this PR as it removes some deprecated things?

Yep, maybe something like:

Beta annotations `service.beta.kubernetes.io/external-traffic` and `service.beta.kubernetes.io/healthcheck-nodeport` have been deprecated. Please use `service.spec.externalTrafficPolicy` and `service.spec.healthCheckNodePort` instead.

/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 Aug 7, 2017
@xiangpengzhao
Copy link
Contributor Author

@MrHohn thanks for your suggestion on release note. I modify the release-note block as below.

Beta annotations `service.beta.kubernetes.io/external-traffic` and `service.beta.kubernetes.io/healthcheck-nodeport` have been removed. Please use fields `service.spec.externalTrafficPolicy` and `service.spec.healthCheckNodePort` instead.

Note that I use removed instead of deprecated. Because I think deprecated things are still supported for compatibility, but removed things aren't. For this PR, these annotations won't be supported anymore.

Dose this make sense?

@xiangpengzhao
Copy link
Contributor Author

/release-note

@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 Aug 8, 2017
@MrHohn
Copy link
Member

MrHohn commented Aug 8, 2017

Note that I use removed instead of deprecated. Because I think deprecated things are still supported for compatibility, but removed things aren't. For this PR, these annotations won't be supported anymore.

Dose this make sense?

Thanks, the release note SGTM.

MrHohn
MrHohn reviewed Aug 8, 2017
View reviewed changes
Copy link
Member

@MrHohn MrHohn left a comment

Choose a reason for hiding this comment

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

Codes look good, couple minor comments :)

pkg/api/service/util.go Outdated
@@ -104,45 +87,16 @@ func NeedsHealthCheck(service *api.Service) bool {

// GetServiceHealthCheckNodePort Return health check node port for service, if one exists
func GetServiceHealthCheckNodePort(service *api.Service) int32 {
Copy link
Member

Choose a reason for hiding this comment

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

Do you think it worth to get rid of this function? This is essentially checking service.Spec.HealthCheckNodePort. As the beta API is removed we don't need this abstraction layer anymore.

Copy link
Member

Choose a reason for hiding this comment

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

And so we could remove those unit tests as well :) WDYT?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Agreed. I was also thinking to remove these helpers when I first hit them. As you said, they're not needed anymore. Will address this. Thanks!

pkg/api/service/util.go Outdated
return 0
}
return int32(p)
}
return service.Spec.HealthCheckNodePort
}

// ClearExternalTrafficPolicy resets the ExternalTrafficPolicy field.
func ClearExternalTrafficPolicy(service *api.Service) {
Copy link
Member

Choose a reason for hiding this comment

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

The same comment here.

pkg/api/service/util.go Outdated
if _, ok := service.Annotations[api.BetaAnnotationExternalTraffic]; ok {
delete(service.Annotations, api.BetaAnnotationExternalTraffic)
return
}
service.Spec.ExternalTrafficPolicy = api.ServiceExternalTrafficPolicyType("")
}

// SetServiceHealthCheckNodePort sets the given health check node port on service.
// It does not check whether this service needs healthCheckNodePort.
func SetServiceHealthCheckNodePort(service *api.Service, hcNodePort int32) {
Copy link
Member

Choose a reason for hiding this comment

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

The same.

@k8s-github-robot k8s-github-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Aug 9, 2017
@xiangpengzhao
Copy link
Contributor Author

@MrHohn inline comments addressed. I sent a separate commit for easy review. Feel free to tell me if I need to squash them after your review. Thanks!

@xiangpengzhao xiangpengzhao force-pushed the remove-beta-annotations branch from 0bf7313 to ea1a577 Compare August 9, 2017 06:25
@MrHohn
Copy link
Member

MrHohn commented Aug 9, 2017

Thanks, this looks great :)
/lgtm

/assign @thockin
for approval.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 9, 2017
@thockin thockin added release-note-action-required Denotes a PR that introduces potentially breaking changes that require user action. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Aug 11, 2017
@thockin
Copy link
Member

thockin commented Aug 11, 2017

/approve

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MrHohn, thockin, xiangpengzhao

Associated issue: 50187

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 11, 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

@k8s-github-robot k8s-github-robot merged commit 524a0e0 into kubernetes:master Aug 11, 2017
@xiangpengzhao xiangpengzhao deleted the remove-beta-annotations branch August 11, 2017 05:59
@xiangpengzhao xiangpengzhao mentioned this pull request Aug 16, 2017
Closed
@MrHohn MrHohn mentioned this pull request May 21, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MrHohn MrHohn MrHohn left review comments

Assignees

@thockin thockin

@MrHohn MrHohn

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-action-required Denotes a PR that introduces potentially breaking changes that require user action. sig/network Categorizes an issue or PR as relevant to SIG Network. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

TODO: remove deprecated ESIPP beta annotations in 1.8
5 participants
@xiangpengzhao @k8s-ci-robot @MrHohn @thockin @k8s-github-robot