Open
Conversation
Signed-off-by: Ankit Kr. Chowdhury <rakesh856100@gmail.com>
… services Signed-off-by: Ankit Kr. Chowdhury <rakesh856100@gmail.com>
…t return values Signed-off-by: Ankit Kr. Chowdhury <rakesh856100@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR fixes a critical bug where
WorkerSliceGatewayobjects were using calculated subnets (Static IPAM formula) instead of the actual dynamically allocated subnets fromSliceIpamresources.Root Cause: The
subnetMapcontaining dynamically allocated subnets was not propagated fromCreateMinimalWorkerSliceConfig()to the gateway service layer, causing gateways to fall back to subnet calculation.Solution:
CreateMinimalWorkerSliceConfig()to returnsubnetMapalongsideclusterMapslice_config_serviceto capture and passsubnetMapto gateway serviceBuildNetworkAddresses()to prefer allocated subnets over calculated onesvpn_key_rotation_serviceto reconstructsubnetMapfor consistency during rotationChanges maintain backward compatibility - Static IPAM continues working with fallback to calculated subnets when
subnetMapis nil.Fixes gateway subnet allocation for Dynamic IPAM slices while preserving Static IPAM functionality.
How Has This Been Tested?
make build,make generate,make manifests,make generate-mocksTest Results:
Checklist:
Does this PR introduce a breaking change for other components like worker-operator?
NO - This is an internal controller fix. Worker-operator continues to work as expected since it relies on the subnet values in WorkerSliceConfig/WorkerSliceGateway specs, which now receive correct values.