Skip to content

[2.0] dhcp/dhclient.conf: add option rfc3442-classless-static-routes in dhclient.conf#8318

Merged
ddstreetmicrosoft merged 1 commit intomicrosoft:mainfrom
cjp256:2.0-dhclient
Mar 13, 2024
Merged

[2.0] dhcp/dhclient.conf: add option rfc3442-classless-static-routes in dhclient.conf#8318
ddstreetmicrosoft merged 1 commit intomicrosoft:mainfrom
cjp256:2.0-dhclient

Conversation

@cjp256
Copy link
Copy Markdown
Contributor

@cjp256 cjp256 commented Mar 8, 2024

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./SPECS/LICENSES-AND-NOTICES/data/licenses.json, ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md, ./SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary

What does the PR accomplish, why was it needed?

Azure configures classless routes and cloud-init requires the configuration to be included in the lease file to behave correctly.

Change Log
  • Add rfc3442-classless-static-routes option to dhclient.conf
Does this affect the toolchain?

No

Test Methodology

Build & installed RPM locally and validated cloud-init behavior.

@cjp256 cjp256 requested a review from a team as a code owner March 8, 2024 18:55
@cjp256 cjp256 changed the title dhcp/dhclient.conf: request classless static routes [20] dhcp/dhclient.conf: add option rfc3442-classless-static-routes in dhclient.conf Mar 8, 2024
@cjp256 cjp256 changed the title [20] dhcp/dhclient.conf: add option rfc3442-classless-static-routes in dhclient.conf [2.0] dhcp/dhclient.conf: add option rfc3442-classless-static-routes in dhclient.conf Mar 8, 2024
Copy link
Copy Markdown
Member

@mfrw mfrw left a comment

Choose a reason for hiding this comment

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

Can we please retarget this change to main.
Anything that has to go to 2.0 goes via main :)

Azure configures classless routes and cloud-init requires the configuration
to be included in the lease file to behave correctly.

Signed-off-by: Chris Patterson <cpatterson@microsoft.com>
@cjp256 cjp256 requested review from a team as code owners March 11, 2024 14:59
@cjp256 cjp256 changed the base branch from 2.0 to main March 11, 2024 14:59
@microsoft-github-policy-service microsoft-github-policy-service Bot added the main PR Destined for main label Mar 11, 2024
@cjp256
Copy link
Copy Markdown
Contributor Author

cjp256 commented Mar 11, 2024

Fixes #8334

@cjp256
Copy link
Copy Markdown
Contributor Author

cjp256 commented Mar 11, 2024

Can we please retarget this change to main. Anything that has to go to 2.0 goes via main :)

Done, thanks!

Copy link
Copy Markdown
Contributor

@ddstreetmicrosoft ddstreetmicrosoft left a comment

Choose a reason for hiding this comment

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

Thanks for #8334, it clearly explains the issue and after reading that this LGTM

We should add this to 3.0 as well, can you open a PR against 3.0-dev also?

@dmcilvaney dmcilvaney removed request for a team March 11, 2024 18:43
Copy link
Copy Markdown
Contributor

@dmcilvaney dmcilvaney left a comment

Choose a reason for hiding this comment

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

Cleaned up some spurious required reviews (probably a leftover from 2.0 target). Dropped tooling and admins. That said I don't see any issues with the change.

@ddstreetmicrosoft ddstreetmicrosoft merged commit ead84f4 into microsoft:main Mar 13, 2024
ddstreetmicrosoft pushed a commit that referenced this pull request Mar 13, 2024
…in dhclient.conf (#8318)

Signed-off-by: Chris Patterson <cpatterson@microsoft.com>
@cjp256 cjp256 deleted the 2.0-dhclient branch March 13, 2024 11:58
ddstreetmicrosoft pushed a commit that referenced this pull request Mar 22, 2024
…in dhclient.conf (#8318)

Signed-off-by: Chris Patterson <cpatterson@microsoft.com>
jslobodzian added a commit that referenced this pull request Mar 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

main PR Destined for main

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants