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

Support customization of numOfProbe and probeInterval when externaltrafficpolicy is local #4207

Merged
merged 1 commit into from
Jul 5, 2023
Merged

Support customization of numOfProbe and probeInterval when externaltrafficpolicy is local #4207

merged 1 commit into from
Jul 5, 2023

Conversation

MartinForReal
Copy link
Contributor

@MartinForReal MartinForReal commented Jul 3, 2023 •
edited
Loading

What type of PR is this?

/kind bug

What this PR does / why we need it:

Support customization of numOfProbe and probeInterval when externaltrafficpolicy is local

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

move health probe related code to azure_loadbalancer_healthprobe*

Does this PR introduce a user-facing change?

Support customization of numOfProbe and probeInterval when externaltrafficpolicy is local

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/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jul 3, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MartinForReal

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 requested review from feiskyer and jwtty July 3, 2023 07:17
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jul 3, 2023
github-advanced-security[bot]
github-advanced-security bot found potential problems Jul 3, 2023
View reviewed changes
pkg/provider/azure_loadbalancer_healthprobe.go
// Not need to verify probePort is in correct range again.
for _, item := range serviceManifest.Spec.Ports {
//nolint:gosec
if item.Port == int32(port) {

Check failure

Code scanning / CodeQL

Incorrect conversion between integer types

Incorrect conversion of an integer with architecture-dependent bit size from [strconv.Atoi](1) to a lower bit size type int32 without an upper bound check.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

upper bound check has been added. false alarm.

@MartinForReal
Copy link
Contributor Author

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

@MartinForReal
Copy link
Contributor Author

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

feiskyer
feiskyer reviewed Jul 5, 2023
View reviewed changes
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jul 5, 2023
MartinForReal
MartinForReal commented Jul 5, 2023
View reviewed changes
pkg/provider/azure_loadbalancer_healthprobe.go
}

// getHealthProbeConfigProbeIntervalAndNumOfProbe
func (az *Cloud) getHealthProbeConfigProbeIntervalAndNumOfProbe(serviceManifest *v1.Service, port int32) (*int32, *int32, error) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

newly added.

MartinForReal
MartinForReal commented Jul 5, 2023
View reviewed changes
pkg/provider/azure_loadbalancer_healthprobe.go
// getHealthProbeConfigProbeInterval get probe interval in seconds
// minimum probe interval in seconds is 5. ref: https://docs.microsoft.com/en-us/rest/api/load-balancer/load-balancers/create-or-update#probe
// if probeInterval is not set, set it to default instead ref: https://docs.microsoft.com/en-us/rest/api/load-balancer/load-balancers/create-or-update#probe
func (*Cloud) getHealthProbeConfigProbeInterval(serviceManifest *v1.Service, port int32) (*int32, error) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

newly added.

pkg/provider/azure_loadbalancer_healthprobe.go
// getHealthProbeConfigNumOfProbe get number of probes
// minimum number of unhealthy responses is 2. ref: https://docs.microsoft.com/en-us/rest/api/load-balancer/load-balancers/create-or-update#probe
// if numberOfProbes is not set, set it to default instead ref: https://docs.microsoft.com/en-us/rest/api/load-balancer/load-balancers/create-or-update#probe
func (*Cloud) getHealthProbeConfigNumOfProbe(serviceManifest *v1.Service, port int32) (*int32, error) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

newly added.

pkg/provider/azure_loadbalancer_healthprobe.go
properties.RequestPath = path
}

properties.IntervalInSeconds, properties.ProbeThreshold, err = az.getHealthProbeConfigProbeIntervalAndNumOfProbe(serviceManifest, port.Port)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

extracted three functions from here.

pkg/provider/azure_loadbalancer.go
@@ -2396,15 +2193,18 @@ func (az *Cloud) getExpectedLBRules(
if servicehelpers.NeedsHealthCheck(service) && !(consts.IsPLSEnabled(service.Annotations) && consts.IsPLSProxyProtocolEnabled(service.Annotations)) {
podPresencePath, podPresencePort := servicehelpers.GetServiceHealthCheckPathPort(service)
lbRuleName := az.getLoadBalancerRuleName(service, v1.ProtocolTCP, podPresencePort, isIPv6)

probeInterval, numberOfProbes, err := az.getHealthProbeConfigProbeIntervalAndNumOfProbe(service, podPresencePort)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

newly added.

@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jul 5, 2023
feiskyer
feiskyer reviewed Jul 5, 2023
View reviewed changes
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

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 5, 2023
@k8s-ci-robot k8s-ci-robot merged commit 6948221 into kubernetes-sigs:master Jul 5, 2023
@MartinForReal MartinForReal deleted the shafan/repo branch July 5, 2023 06:10
@MartinForReal
Copy link
Contributor Author

/cherrypick release-1.27

@k8s-infra-cherrypick-robot
Copy link

@MartinForReal: #4207 failed to apply on top of branch "release-1.27":

Applying: Support customization of numOfProbe and probeInterval when externaltrafficpolicy is local
Using index info to reconstruct a base tree...
M	pkg/provider/azure_loadbalancer.go
M	pkg/provider/azure_loadbalancer_test.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
Auto-merging pkg/provider/azure_loadbalancer_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_loadbalancer_test.go
Auto-merging pkg/provider/azure_loadbalancer.go
CONFLICT (content): Merge conflict in pkg/provider/azure_loadbalancer.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 Support customization of numOfProbe and probeInterval when externaltrafficpolicy is local
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.27

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.

@MartinForReal
Copy link
Contributor Author

/cherrypick release-1.27

@k8s-infra-cherrypick-robot
Copy link

@MartinForReal: #4207 failed to apply on top of branch "release-1.27":

Applying: Support customization of numOfProbe and probeInterval when externaltrafficpolicy is local
Using index info to reconstruct a base tree...
M	pkg/provider/azure_loadbalancer.go
M	pkg/provider/azure_loadbalancer_test.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
Auto-merging pkg/provider/azure_loadbalancer_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_loadbalancer_test.go
Auto-merging pkg/provider/azure_loadbalancer.go
CONFLICT (content): Merge conflict in pkg/provider/azure_loadbalancer.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 Support customization of numOfProbe and probeInterval when externaltrafficpolicy is local
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.27

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.

@nimimeht
Copy link

@MartinForReal - was this PR successfully cherry-picked for release-1.27? I don't see the merge commit for this PR in the release changelog: v1.27.5...v1.27.6

@MartinForReal
Copy link
Contributor Author

@nimimeht please refer to 48ccfc3

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@feiskyer feiskyer feiskyer left review comments

@jwtty jwtty Awaiting requested review from jwtty

Assignees

@feiskyer feiskyer

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/bug Categorizes issue or PR as related to a bug. 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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@MartinForReal @k8s-ci-robot @k8s-infra-cherrypick-robot @nimimeht @feiskyer