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

Deprecate LoadBalancerIP with Servie LB IP annotation #2428

Merged
merged 1 commit into from
Oct 10, 2022

Conversation

lzhecheng
Copy link
Contributor

@lzhecheng lzhecheng commented Sep 28, 2022

Signed-off-by: Zhecheng Li [email protected]

What type of PR is this?

/kind cleanup
/kind feature
/kind deprecation

What this PR does / why we need it:

Deprecate LoadBalancerIP with Servie LB IP annotation
* Add service.beta.kubernetes.io/azure-load-balancer-ipv4
and service.beta.kubernetes.io/azure-load-balancer-ipv6
* Add an e2e test
* Support retrieve Service CIDR in e2e framework
related: #814

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Deprecate LoadBalancerIP with Servie LB IP annotation. Add service.beta.kubernetes.io/azure-load-balancer-ipv4 and service.beta.kubernetes.io/azure-load-balancer-ipv6

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


@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/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. labels Sep 28, 2022
@netlify
Copy link

netlify bot commented Sep 28, 2022

Deploy Preview for kubernetes-sigs-cloud-provide-azure ready!

Name Link
🔨 Latest commit 22b2d4c
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-sigs-cloud-provide-azure/deploys/634261855a0bda0008f1bdee
😎 Deploy Preview https://deploy-preview-2428--kubernetes-sigs-cloud-provide-azure.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Sep 28, 2022
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 28, 2022
@lzhecheng lzhecheng force-pushed the use-lb-ip-annotation branch 2 times, most recently from 9ea5876 to 4cf6ffc Compare September 29, 2022 06:15
@coveralls
Copy link

coveralls commented Sep 29, 2022

Coverage Status

Coverage decreased (-0.008%) to 79.961% when pulling 22b2d4c on lzhecheng:use-lb-ip-annotation into d92742e on kubernetes-sigs:master.

@lzhecheng
Copy link
Contributor Author

/assign @feiskyer

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 29, 2022
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 29, 2022
@lzhecheng
Copy link
Contributor Author

/test pull-cloud-provider-azure-e2e-capz

1 similar comment
@lzhecheng
Copy link
Contributor Author

/test pull-cloud-provider-azure-e2e-capz

@lzhecheng lzhecheng force-pushed the use-lb-ip-annotation branch from 007b07d to 4e7469c Compare October 4, 2022 09:24
@lzhecheng
Copy link
Contributor Author

/test pull-cloud-provider-azure-e2e-ccm-vmss-ip-lb-capz

@lzhecheng
Copy link
Contributor Author

lzhecheng commented Oct 4, 2022

Requested by:
#1920 (comment)

So make this PR first and then the dualstack one.

@lzhecheng lzhecheng force-pushed the use-lb-ip-annotation branch 2 times, most recently from 809e448 to 487c139 Compare October 4, 2022 12:09
@lzhecheng
Copy link
Contributor Author

/retest

var (
// There's no "service.beta.kubernetes.io/azure-load-balancer" annotation before these 2 new ones are added.
// Service.Spec.LoadBalancerIP was used and it will be deprecated.
ServiceAnnotationLoadBalancerIPDualStack = map[bool]string{
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we make them two strings? It looks strange to have variables in consts file.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The intention is to make dualstack code cleaner. Since there will be a lot of isIPv6 bool parameters for dualstack support, such map avoids if statements.

@lzhecheng
Copy link
Contributor Author

/test pull-cloud-provider-azure-e2e-capz

Copy link
Member

@feiskyer feiskyer left a comment

Choose a reason for hiding this comment

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

And this PR should close issue #1781?

pkg/consts/consts.go Outdated Show resolved Hide resolved
pkg/consts/consts.go Outdated Show resolved Hide resolved
pkg/consts/consts.go Show resolved Hide resolved
site/content/en/topics/pls-integration.md Outdated Show resolved Hide resolved
site/content/en/topics/pls-integration.md Outdated Show resolved Hide resolved
site/content/en/topics/shared-ip.md Outdated Show resolved Hide resolved
@lzhecheng lzhecheng force-pushed the use-lb-ip-annotation branch from 487c139 to e052e68 Compare October 9, 2022 05:50
* Add service.beta.kubernetes.io/azure-load-balancer-ipv4
  and service.beta.kubernetes.io/azure-load-balancer-ipv6
* Add an e2e test
* Support retrieve Service CIDR in e2e framework

Signed-off-by: Zhecheng Li <[email protected]>
@lzhecheng lzhecheng force-pushed the use-lb-ip-annotation branch from e052e68 to 22b2d4c Compare October 9, 2022 05:52
Copy link
Member

@feiskyer feiskyer left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: feiskyer, lzhecheng

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

@lzhecheng
Copy link
Contributor Author

/test pull-cloud-provider-azure-e2e-capz

@k8s-ci-robot k8s-ci-robot merged commit 05435ea into kubernetes-sigs:master Oct 10, 2022
@lzhecheng lzhecheng deleted the use-lb-ip-annotation branch October 10, 2022 23:01
@lzhecheng
Copy link
Contributor Author

/cherrypick release-1.25

@lzhecheng
Copy link
Contributor Author

/cherrypick release-1.24

@lzhecheng
Copy link
Contributor Author

/cherrypick release-1.23

@lzhecheng
Copy link
Contributor Author

/cherrypick release-1.1

@k8s-infra-cherrypick-robot

@lzhecheng: #2428 failed to apply on top of branch "release-1.25":

Applying: Deprecate LoadBalancerIP with Servie LB IP annotation * Add service.beta.kubernetes.io/azure-load-balancer-ipv4 and service.beta.kubernetes.io/azure-load-balancer-ipv6 * Add an e2e test * Support retrieve Service CIDR in e2e framework
Using index info to reconstruct a base tree...
M	pkg/consts/consts.go
M	pkg/provider/azure_loadbalancer_test.go
M	pkg/provider/azure_standard.go
M	pkg/provider/azure_standard_test.go
M	pkg/provider/azure_test.go
M	tests/e2e/network/ensureloadbalancer.go
M	tests/e2e/network/service_annotations.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/network/service_annotations.go
CONFLICT (content): Merge conflict in tests/e2e/network/service_annotations.go
Auto-merging tests/e2e/network/ensureloadbalancer.go
Auto-merging pkg/provider/azure_test.go
Auto-merging pkg/provider/azure_standard_test.go
Auto-merging pkg/provider/azure_standard.go
Auto-merging pkg/provider/azure_loadbalancer_test.go
Auto-merging pkg/consts/consts.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Deprecate LoadBalancerIP with Servie LB IP annotation * Add service.beta.kubernetes.io/azure-load-balancer-ipv4 and service.beta.kubernetes.io/azure-load-balancer-ipv6 * Add an e2e test * Support retrieve Service CIDR in e2e framework
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.25

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.

@k8s-infra-cherrypick-robot

@lzhecheng: #2428 failed to apply on top of branch "release-1.24":

Applying: Deprecate LoadBalancerIP with Servie LB IP annotation * Add service.beta.kubernetes.io/azure-load-balancer-ipv4 and service.beta.kubernetes.io/azure-load-balancer-ipv6 * Add an e2e test * Support retrieve Service CIDR in e2e framework
Using index info to reconstruct a base tree...
M	pkg/consts/consts.go
M	pkg/provider/azure_loadbalancer_test.go
M	pkg/provider/azure_standard.go
M	pkg/provider/azure_standard_test.go
M	pkg/provider/azure_test.go
A	site/content/en/topics/pls-integration.md
M	tests/e2e/network/ensureloadbalancer.go
M	tests/e2e/network/network_security_group.go
M	tests/e2e/network/service_annotations.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/network/service_annotations.go
CONFLICT (content): Merge conflict in tests/e2e/network/service_annotations.go
Auto-merging tests/e2e/network/network_security_group.go
Auto-merging tests/e2e/network/ensureloadbalancer.go
Auto-merging site/content/en/development/design-docs/pls-integration.md
CONFLICT (content): Merge conflict in site/content/en/development/design-docs/pls-integration.md
Auto-merging pkg/provider/azure_test.go
Auto-merging pkg/provider/azure_standard_test.go
Auto-merging pkg/provider/azure_standard.go
Auto-merging pkg/provider/azure_loadbalancer_test.go
Auto-merging pkg/consts/consts.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Deprecate LoadBalancerIP with Servie LB IP annotation * Add service.beta.kubernetes.io/azure-load-balancer-ipv4 and service.beta.kubernetes.io/azure-load-balancer-ipv6 * Add an e2e test * Support retrieve Service CIDR in e2e framework
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.24

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.

@k8s-infra-cherrypick-robot

@lzhecheng: #2428 failed to apply on top of branch "release-1.23":

Applying: Deprecate LoadBalancerIP with Servie LB IP annotation * Add service.beta.kubernetes.io/azure-load-balancer-ipv4 and service.beta.kubernetes.io/azure-load-balancer-ipv6 * Add an e2e test * Support retrieve Service CIDR in e2e framework
Using index info to reconstruct a base tree...
M	pkg/consts/consts.go
M	pkg/provider/azure_loadbalancer.go
M	pkg/provider/azure_loadbalancer_test.go
M	pkg/provider/azure_standard.go
M	pkg/provider/azure_standard_test.go
M	pkg/provider/azure_test.go
A	site/content/en/topics/pls-integration.md
M	tests/e2e/network/ensureloadbalancer.go
M	tests/e2e/network/network_security_group.go
M	tests/e2e/network/service_annotations.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/network/service_annotations.go
CONFLICT (content): Merge conflict in tests/e2e/network/service_annotations.go
Auto-merging tests/e2e/network/network_security_group.go
Auto-merging tests/e2e/network/ensureloadbalancer.go
CONFLICT (modify/delete): site/content/en/topics/pls-integration.md deleted in HEAD and modified in Deprecate LoadBalancerIP with Servie LB IP annotation * Add service.beta.kubernetes.io/azure-load-balancer-ipv4 and service.beta.kubernetes.io/azure-load-balancer-ipv6 * Add an e2e test * Support retrieve Service CIDR in e2e framework. Version Deprecate LoadBalancerIP with Servie LB IP annotation * Add service.beta.kubernetes.io/azure-load-balancer-ipv4 and service.beta.kubernetes.io/azure-load-balancer-ipv6 * Add an e2e test * Support retrieve Service CIDR in e2e framework of site/content/en/topics/pls-integration.md left in tree.
Auto-merging pkg/provider/azure_test.go
Auto-merging pkg/provider/azure_standard_test.go
Auto-merging pkg/provider/azure_standard.go
Auto-merging pkg/provider/azure_loadbalancer_test.go
Auto-merging pkg/provider/azure_loadbalancer.go
Auto-merging pkg/consts/consts.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Deprecate LoadBalancerIP with Servie LB IP annotation * Add service.beta.kubernetes.io/azure-load-balancer-ipv4 and service.beta.kubernetes.io/azure-load-balancer-ipv6 * Add an e2e test * Support retrieve Service CIDR in e2e framework
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.23

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.

@k8s-infra-cherrypick-robot

@lzhecheng: #2428 failed to apply on top of branch "release-1.1":

Applying: Deprecate LoadBalancerIP with Servie LB IP annotation * Add service.beta.kubernetes.io/azure-load-balancer-ipv4 and service.beta.kubernetes.io/azure-load-balancer-ipv6 * Add an e2e test * Support retrieve Service CIDR in e2e framework
Using index info to reconstruct a base tree...
M	pkg/consts/consts.go
M	pkg/provider/azure_loadbalancer.go
M	pkg/provider/azure_loadbalancer_test.go
M	pkg/provider/azure_standard.go
M	pkg/provider/azure_standard_test.go
M	pkg/provider/azure_test.go
A	site/content/en/topics/pls-integration.md
M	tests/e2e/network/ensureloadbalancer.go
M	tests/e2e/network/network_security_group.go
M	tests/e2e/network/service_annotations.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/network/service_annotations.go
CONFLICT (content): Merge conflict in tests/e2e/network/service_annotations.go
Auto-merging tests/e2e/network/network_security_group.go
Auto-merging tests/e2e/network/ensureloadbalancer.go
CONFLICT (modify/delete): site/content/en/topics/pls-integration.md deleted in HEAD and modified in Deprecate LoadBalancerIP with Servie LB IP annotation * Add service.beta.kubernetes.io/azure-load-balancer-ipv4 and service.beta.kubernetes.io/azure-load-balancer-ipv6 * Add an e2e test * Support retrieve Service CIDR in e2e framework. Version Deprecate LoadBalancerIP with Servie LB IP annotation * Add service.beta.kubernetes.io/azure-load-balancer-ipv4 and service.beta.kubernetes.io/azure-load-balancer-ipv6 * Add an e2e test * Support retrieve Service CIDR in e2e framework of site/content/en/topics/pls-integration.md left in tree.
Auto-merging pkg/provider/azure_test.go
Auto-merging pkg/provider/azure_standard_test.go
Auto-merging pkg/provider/azure_standard.go
Auto-merging pkg/provider/azure_loadbalancer_test.go
Auto-merging pkg/provider/azure_loadbalancer.go
CONFLICT (content): Merge conflict in pkg/provider/azure_loadbalancer.go
Auto-merging pkg/consts/consts.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Deprecate LoadBalancerIP with Servie LB IP annotation * Add service.beta.kubernetes.io/azure-load-balancer-ipv4 and service.beta.kubernetes.io/azure-load-balancer-ipv6 * Add an e2e test * Support retrieve Service CIDR in e2e framework
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.1

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.

@dimakow
Copy link

dimakow commented Oct 31, 2022

@lzhecheng any plans to fix the cherry-picks for v1.23 through v1.25?

Would be highly appreciated :)

@lzhecheng
Copy link
Contributor Author

@lzhecheng any plans to fix the cherry-picks for v1.23 through v1.25?

Would be highly appreciated :)

Thanks for reminding. Will do.

@lzhecheng
Copy link
Contributor Author

@dimakow oh my bad memory, actually those cherry-picks have already been finished.

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. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. 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
Development

Successfully merging this pull request may close these issues.

7 participants