chore: add generic methods and use them part 2/2 #5720
Merged
Conversation
This file contains 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
DmitriyMV
changed the title
DmitriyMV
commented
Jun 9, 2022
| @@ -53,7 +53,8 @@ func Generate(ctx context.Context, in *machine.GenerateConfigurationRequest) (re | |||
| DeviceCIDR: device.Cidr, | |||
| DeviceDHCP: device.Dhcp, | |||
| DeviceIgnore: device.Ignore, | |||
| DeviceRoutes: routes, | |||
| // TODO: this looks strange, since its always empty de-facto. | |||
There was a problem hiding this comment.
I have no idea whats happening here
There was a problem hiding this comment.
@Unix4ever should know! I think it should be a copy, but ?
There was a problem hiding this comment.
probably copy(routes, device.Routes) before this place is missing
DmitriyMV
changed the title
Use things from siderolabs#5702. Signed-off-by: Dmitriy Matrenichev <dmitry.matrenichev@siderolabs.com>
|
I added DeviceRoutes: slices.Map(device.Routes, func(route *machine.RouteConfig) *v1alpha1.Route {
return &v1alpha1.Route{
RouteNetwork: route.Network,
RouteGateway: route.Gateway,
RouteMetric: route.Metric,
}
}), |
|
FYI @Unix4ever |
|
/m |
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.
Use things from #5702.
Signed-off-by: Dmitriy Matrenichev dmitry.matrenichev@siderolabs.com
This change is