Skip to content

Updated node label matching#464

Merged
OliverChen557 merged 4 commits into
release/v2.14.1from
pvt/prerelease-fixes
Aug 19, 2025
Merged

Updated node label matching#464
OliverChen557 merged 4 commits into
release/v2.14.1from
pvt/prerelease-fixes

Conversation

@OliverChen557

@OliverChen557 OliverChen557 commented Aug 19, 2025

Copy link
Copy Markdown
Contributor

Description

Updated node label matching to check if the IP in the node label is in the range of CIDR instead of checking with the IP/netmask from the label.

GitHub Issues

List the GitHub issues impacted by this PR:

GitHub Issue #
https://github.com/dell/csm/issues/1991

Checklist:

  • I have performed a self-review of my own code to ensure there are no formatting, vetting, linting, or security issues
  • I have verified that new and existing unit tests pass locally with my changes
  • I have not allowed coverage numbers to degenerate
  • I have maintained at least 90% code coverage
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have added tests that prove my fix is effective or that my feature works
  • Backward compatibility is not broken

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Please also list any relevant details for your test configuration

  • UT

donatwork
donatwork previously approved these changes Aug 19, 2025
Comment thread service/controller.go
@@ -1693,12 +1694,11 @@ func (s *service) getIpsFromAZNetworkLabel(ctx context.Context, nodeID, azNetwor
if match := pattern.FindStringSubmatch(key); len(match) == 4 {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Comments above are incorrect now with updated matching:

  • "Find the node label with matching AZNetwork" should be "Find the node label with IP that belongs to AZNetwork"
  • "Found the node with the matching AZNetwork label, get its IP" should be "Found the node with IP that belongs to the AZNetwork"

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Addressed

hoppea2
hoppea2 previously approved these changes Aug 19, 2025
@OliverChen557 OliverChen557 merged commit fabea07 into release/v2.14.1 Aug 19, 2025
6 checks passed
@OliverChen557 OliverChen557 deleted the pvt/prerelease-fixes branch August 19, 2025 19:53
@shaynafinocchiaro shaynafinocchiaro mentioned this pull request Aug 20, 2025
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants