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

make ServiceCIDR independent in ManagedPools #4503

Merged
merged 1 commit into from
Feb 7, 2024

Conversation

nawazkh
Copy link
Member

@nawazkh nawazkh commented Jan 23, 2024

What type of PR is this?
/kind bug

What this PR does / why we need it:

  • Service CIDR should be set independent of DNS Service IP.
  • This was originally identified by vishu2498, all credits to vishu2498!

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Replaces PR #3760 since it has become stale and the user seems to be unresponsive.

Special notes for your reviewer:

  • cherry-pick candidate

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

Service CIDR addition to AKS Cluster should be independent of DNS Service IP

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. 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 Jan 23, 2024
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. 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 Jan 23, 2024
@nawazkh
Copy link
Member Author

nawazkh commented Jan 23, 2024

/cc vishu2498

@nawazkh
Copy link
Member Author

nawazkh commented Jan 23, 2024

Probing AKS REST API, I do not see a reason to set ServiceCIDR only when a DNSServiceIP is set(as of existing implementation in main).
Hence this change.
Reference documentation: https://learn.microsoft.com/en-us/rest/api/aks/managed-clusters/create-or-update?view=rest-aks-2023-10-01&tabs=HTTP#containerservicenetworkprofile

@nawazkh nawazkh requested a review from nojnhuh January 23, 2024 22:03
Copy link

codecov bot commented Jan 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (aa75a53) 62.44% compared to head (a8b8b5c) 62.44%.
Report is 4 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #4503   +/-   ##
=======================================
  Coverage   62.44%   62.44%           
=======================================
  Files         192      192           
  Lines       15379    15379           
=======================================
  Hits         9604     9604           
  Misses       5115     5115           
  Partials      660      660           

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

@nawazkh
Copy link
Member Author

nawazkh commented Jan 23, 2024

I may be able to push changes to original PR by the author, preserving credit to their effort. I will try that.
/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 23, 2024
@nawazkh
Copy link
Member Author

nawazkh commented Jan 23, 2024

Tried pushing changes to authors original PR, but couldn't.

❯ git push vishu2498 HEAD:service-cidr-fix
ERROR: Permission to vishu2498/cluster-api-provider-azure.git denied to nawazkh.
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

I will close the author's original PR.
/unhold

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 23, 2024
@nawazkh nawazkh force-pushed the aks_serviceCIDR_bug branch 2 times, most recently from 3706be0 to aa371bc Compare January 23, 2024 22:31
@nawazkh
Copy link
Member Author

nawazkh commented Jan 23, 2024

I was able to cherry-pick the author's changes! :)

@jackfrancis
Copy link
Contributor

I think we want to update the TestParameters UT to validate the changed conditional flows here.

@mboersma mboersma added this to the v1.14 milestone Feb 5, 2024
@jackfrancis
Copy link
Contributor

ping @nawazkh on the UT, I think this PR is basically ready w/ some test coverage

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 7, 2024
- Service CIDR addition to AKS Cluster should be independent of DNS Service IP
- add unit test for Service CIDR change
@nawazkh
Copy link
Member Author

nawazkh commented Feb 7, 2024

ping @nawazkh on the UT, I think this PR is basically ready w/ some test coverage

Thanks for the reminder, updated the PR.

@jackfrancis
Copy link
Contributor

/lgtm

/assign @mboersma @nojnhuh @willie-yao @Jont828

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

LGTM label has been added.

Git tree hash: ed0ed75e2ab59f1e0e40c519bcc531ba225ccde8

Copy link
Contributor

@mboersma mboersma 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: mboersma

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 Feb 7, 2024
@k8s-ci-robot k8s-ci-robot merged commit 8f27cbe into kubernetes-sigs:main Feb 7, 2024
19 checks passed
@nawazkh
Copy link
Member Author

nawazkh commented Feb 7, 2024

/cherry-pick release-1.13

@nawazkh
Copy link
Member Author

nawazkh commented Feb 7, 2024

/cherry-pick release-1.12

@k8s-infra-cherrypick-robot

@nawazkh: new pull request created: #4549

In response to this:

/cherry-pick release-1.13

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

@nawazkh: new pull request created: #4550

In response to this:

/cherry-pick release-1.12

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.

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/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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet

9 participants