Skip to content

Remove deprecated field NumberOfProbes #5562

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

Merged
merged 1 commit into from
May 2, 2025

Conversation

jhixson74
Copy link
Contributor

@jhixson74 jhixson74 commented Apr 10, 2025

What type of PR is this?

/kind deprecation

What this PR does / why we need it:

Microsoft is retiring the numberOfProbes property in 2027. It is being replaced by probeThreshold.

https://learn.microsoft.com/en-us/answers/questions/2104921/action-required-end-of-support-for-microsoft-azure

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

Special notes for your reviewer:

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests
  • cherry-pick candidate

Release note:

Deprecated field NumberOfProbes has been replaced with ProbeThreshold

@k8s-ci-robot k8s-ci-robot added the kind/deprecation Categorizes issue or PR as related to a feature/enhancement marked for deprecation. label Apr 10, 2025
@k8s-ci-robot k8s-ci-robot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Apr 10, 2025
@k8s-ci-robot
Copy link
Contributor

Welcome @jhixson74!

It looks like this is your first PR to kubernetes-sigs/cluster-api-provider-azure 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api-provider-azure has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 10, 2025
@k8s-ci-robot
Copy link
Contributor

Hi @jhixson74. Thanks for your PR.

I'm waiting for a kubernetes-sigs 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.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

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-sigs/prow repository.

@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 do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Apr 10, 2025
Copy link

codecov bot commented Apr 10, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 53.27%. Comparing base (14311b2) to head (6545032).
Report is 13 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #5562   +/-   ##
=======================================
  Coverage   53.27%   53.27%           
=======================================
  Files         272      272           
  Lines       29533    29533           
=======================================
  Hits        15735    15735           
  Misses      12983    12983           
  Partials      815      815           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@mboersma
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 14, 2025
@jhixson74 jhixson74 force-pushed the main-probe-threshold branch from 140675a to 4ccd0f5 Compare April 18, 2025 02:11
@jhixson74
Copy link
Contributor Author

/retest-required

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 19, 2025
@jhixson74 jhixson74 force-pushed the main-probe-threshold branch from 4ccd0f5 to 5591769 Compare April 25, 2025 17:58
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 25, 2025
@jhixson74 jhixson74 force-pushed the main-probe-threshold branch from 5591769 to 6545032 Compare April 25, 2025 18:40
@patrickdillon
Copy link

/retest

1 similar comment
@jhixson74
Copy link
Contributor Author

/retest

@nawazkh
Copy link
Member

nawazkh commented Apr 30, 2025

Looks good to me so far. Although I wonder if don't need the /kind deprecation type to this PR.
As far as I know, /kind deprecation is used for user facing API fields of CAPZ.
Since probeThreshold is internal to the working of CAPZ, we could skip it.

@willie-yao @mboersma What do you say ?

@mboersma
Copy link
Contributor

Since probeThreshold is internal to the working of CAPZ, we could skip it.

I agree that /kind deprecation isn't needed here.

@mboersma mboersma removed the request for review from marosset April 30, 2025 14:17
@nawazkh
Copy link
Member

nawazkh commented Apr 30, 2025

/label kind/cleanup

@k8s-ci-robot
Copy link
Contributor

@nawazkh: The label(s) /label kind/cleanup cannot be applied. These labels are supported: api-review, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, team/katacoda, refactor, ci-short, ci-extended, ci-full. Is this label configured under labels -> additional_labels or labels -> restricted_labels in plugin.yaml?

In response to this:

/label kind/cleanup

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-sigs/prow repository.

@nawazkh
Copy link
Member

nawazkh commented Apr 30, 2025

/test ls

@k8s-ci-robot
Copy link
Contributor

@nawazkh: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test pull-cluster-api-provider-azure-apiversion-upgrade
/test pull-cluster-api-provider-azure-build
/test pull-cluster-api-provider-azure-ci-entrypoint
/test pull-cluster-api-provider-azure-e2e
/test pull-cluster-api-provider-azure-e2e-aks
/test pull-cluster-api-provider-azure-test
/test pull-cluster-api-provider-azure-verify

The following commands are available to trigger optional jobs:

/test pull-cluster-api-provider-azure-apidiff
/test pull-cluster-api-provider-azure-apiserver-ilb
/test pull-cluster-api-provider-azure-capi-e2e
/test pull-cluster-api-provider-azure-conformance
/test pull-cluster-api-provider-azure-conformance-custom-builds
/test pull-cluster-api-provider-azure-conformance-dual-stack-with-ci-artifacts
/test pull-cluster-api-provider-azure-conformance-ipv6-with-ci-artifacts
/test pull-cluster-api-provider-azure-conformance-with-ci-artifacts
/test pull-cluster-api-provider-azure-conformance-with-ci-artifacts-dra
/test pull-cluster-api-provider-azure-e2e-optional
/test pull-cluster-api-provider-azure-e2e-workload-upgrade
/test pull-cluster-api-provider-azure-load-test-custom-builds
/test pull-cluster-api-provider-azure-perf-test-apiserver-availability
/test pull-cluster-api-provider-azure-windows-custom-builds
/test pull-cluster-api-provider-azure-windows-with-ci-artifacts

Use /test all to run the following jobs that were automatically triggered:

pull-cluster-api-provider-azure-apidiff
pull-cluster-api-provider-azure-build
pull-cluster-api-provider-azure-ci-entrypoint
pull-cluster-api-provider-azure-e2e
pull-cluster-api-provider-azure-e2e-aks
pull-cluster-api-provider-azure-test
pull-cluster-api-provider-azure-verify

In response to this:

/test ls

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-sigs/prow repository.

@nawazkh
Copy link
Member

nawazkh commented Apr 30, 2025

/test pull-cluster-api-provider-azure-e2e-optional

@nawazkh
Copy link
Member

nawazkh commented Apr 30, 2025

/label cleanup

@k8s-ci-robot
Copy link
Contributor

@nawazkh: The label(s) /label cleanup cannot be applied. These labels are supported: api-review, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, team/katacoda, refactor, ci-short, ci-extended, ci-full. Is this label configured under labels -> additional_labels or labels -> restricted_labels in plugin.yaml?

In response to this:

/label cleanup

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-sigs/prow repository.

@nawazkh
Copy link
Member

nawazkh commented Apr 30, 2025

Sorry about the spam of comments @jhixson74 . I was trying to update the label here to a cleanup type.

@nawazkh nawazkh added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. and removed kind/deprecation Categorizes issue or PR as related to a feature/enhancement marked for deprecation. labels Apr 30, 2025
@nawazkh
Copy link
Member

nawazkh commented Apr 30, 2025

/lgtm

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

LGTM label has been added.

Git tree hash: eb39d0f9ad366b1b2757b19db70aefd7a92c31c5

Copy link
Contributor

@willie-yao willie-yao 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
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: willie-yao

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 2, 2025
@k8s-ci-robot
Copy link
Contributor

@jhixson74: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-provider-azure-e2e 6545032 link unknown /test pull-cluster-api-provider-azure-e2e

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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-sigs/prow repository. I understand the commands that are listed here.

@nawazkh
Copy link
Member

nawazkh commented May 2, 2025

/test pull-cluster-api-provider-azure-e2e

@k8s-ci-robot k8s-ci-robot merged commit 3d6690a into kubernetes-sigs:main May 2, 2025
29 of 31 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.20 milestone May 2, 2025
@github-project-automation github-project-automation bot moved this from Todo to Done in CAPZ Planning May 2, 2025
@nawazkh
Copy link
Member

nawazkh commented May 5, 2025

/cherry-pick release-1.18
/cherry-pick release-1.19

@k8s-infra-cherrypick-robot

@nawazkh: #5562 failed to apply on top of branch "release-1.18":

Applying: azure/services/loadbalancers: Remove deprecated field NumberOfProbes
Using index info to reconstruct a base tree...
M	azure/services/loadbalancers/spec.go
M	azure/services/loadbalancers/spec_test.go
Falling back to patching base and 3-way merge...
Auto-merging azure/services/loadbalancers/spec_test.go
CONFLICT (content): Merge conflict in azure/services/loadbalancers/spec_test.go
Auto-merging azure/services/loadbalancers/spec.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 azure/services/loadbalancers: Remove deprecated field NumberOfProbes

In response to this:

/cherry-pick release-1.18
/cherry-pick release-1.19

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-sigs/prow repository.

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

7 participants