host-device: copy host interface IP addresses and routes into container#1257
host-device: copy host interface IP addresses and routes into container#1257SchSeba wants to merge 1 commit into
Conversation
0feea32 to
df398aa
Compare
|
Hi @s1061123 @squeed @LionelJouin if you have time please take a look on the PR. |
| localRouteTable = 255 | ||
| ) | ||
|
|
||
| // HostNetworkStateFile holds the captured host-side L3 configuration |
There was a problem hiding this comment.
personal preference no comment unless exported
There was a problem hiding this comment.
Done - removed doc comments from all unexported symbols.
|
|
||
| // HostNetworkStateFile holds the captured host-side L3 configuration | ||
| // (addresses, routes, and rules) that should be applied to the container interface. | ||
| type HostNetworkStateFile struct { |
There was a problem hiding this comment.
prefix ^File$ not very nice not really a file. May InterfaceInfo, InterfaceConfig, or just Interface
There was a problem hiding this comment.
Good call - renamed HostNetworkStateFile to HostNetworkState throughout.
| type HostNetworkStateFile struct { | ||
| HostIfName string `json:"hostIfName"` | ||
| HostLinkWasUp bool `json:"hostLinkWasUp"` | ||
| Addresses []string `json:"addresses,omitempty"` |
There was a problem hiding this comment.
can we use netlink.Addr, netlink.routes, rule
There was a problem hiding this comment.
The string-based representation is intentional here - netlink.Addr, netlink.Route and netlink.Rule contain net.IP / *net.IPNet fields that don't round-trip cleanly through JSON (net.IP marshals as a base64 byte array, *net.IPNet isn't directly marshalable). Using strings gives us portable, human-readable JSON and avoids coupling the serialization format to the netlink library's internal types.
We do convert back to netlink types when applying (applyOnLink), so the actual netlink interaction is the same.
|
|
||
| // applyNetworkStateToPod applies captured state to the moved interface inside the pod namespace. | ||
| func applyNetworkStateToPod(containerNs ns.NetNS, contDev netlink.Link, state *HostNetworkStateFile) error { | ||
| if state == nil { |
There was a problem hiding this comment.
having that check, (imo) indicates that this function maybe should be method to the struct.
There was a problem hiding this comment.
Agreed - converted applyNetworkStateToPod and applyNetworkStateOnLink to methods on *HostNetworkState (applyToPod and applyOnLink). The nil-receiver check now reads more naturally.
| }, | ||
| }, | ||
| } | ||
| mergeNetworkStateIntoResult(result, state) |
There was a problem hiding this comment.
imo if user decides to keep network config from the host then we should ignore IPAM or block the combination witt IPAM in the config. I think is either IPAM, or host network config (no ip is also valid config)
There was a problem hiding this comment.
I see the point, but there are valid use cases for the combination: the host interface provides the base L3 config (addresses/routes from the cloud provider), and IPAM adds additional addresses on top (e.g. secondary IPs, service IPs). Blocking the combination would reduce flexibility for users who need both.
The current merge behavior is additive - IPAM addresses are appended alongside host-captured ones. If you feel strongly, we could add a validation warning instead of an error, but I'd prefer to keep the flexibility. WDYT?
There was a problem hiding this comment.
What about conflicting default routes? IPs on the same prefix?
| ) | ||
|
|
||
| // TestUseInterfaceNetwork verifies useInterfaceNetwork boolean behavior. | ||
| func TestUseInterfaceNetwork(t *testing.T) { |
There was a problem hiding this comment.
what exactly this test is doing?
There was a problem hiding this comment.
Removed this test - it was only validating the trivial boolean guard function which is already covered implicitly by the integration tests.
| } | ||
|
|
||
| // TestStateJSONHasNoNeighbors verifies state serialization excludes neighbors. | ||
| func TestStateJSONHasNoNeighbors(t *testing.T) { |
There was a problem hiding this comment.
what exactly this test is doing? Not sure the tests in the file really add value
There was a problem hiding this comment.
Removed this test as well. Kept the TestMergeNetworkState* and TestLoadConf* tests since those exercise actual logic (result merging, config parsing, DPDK rejection).
df398aa to
20dc60e
Compare
s1061123
left a comment
There was a problem hiding this comment.
This PR introduces new parameter, 'useInterfaceNetwork', so could you please create another PR in https://github.com/containernetworking/cni.dev/pulls to modify host-device CNI document as well?
| RuntimeConfig struct { | ||
| DeviceID string `json:"deviceID,omitempty"` | ||
| } `json:"runtimeConfig,omitempty"` | ||
| UseInterfaceNetwork bool `json:"useInterfaceNetwork,omitempty"` |
There was a problem hiding this comment.
Recommend to add comment to quickly mention what is 'UseInterfaceNetwork' because the option name is not intuitive (what 'useInterfaceNetwork' is used?)
There was a problem hiding this comment.
Done - added an inline comment: // When true, copy the host interface's IP addresses and routes into the container before IPAM runs.
8903cec to
72eec2d
Compare
Add a new configuration option `useInterfaceNetwork` that instructs the
host-device plugin to capture the interface's IP addresses and routes
from the host before moving the device into the container namespace,
and then apply them inside the container.
This is critical for virtual environments (AWS, IBM Cloud, GPC) where
the cloud provider configures IP addresses and routes directly on the
network device. In these environments, there is no traditional IPAM
source; the ground truth for L3 configuration lives on the host
interface itself.
When `useInterfaceNetwork` is enabled, the plugin:
- Captures all global-scope addresses and non-local routes from the
host device before moving it into the container namespace.
- Applies the captured addresses and routes to the interface inside
the container.
- Reports the addresses and routes in the CNI result (merged with
any IPAM result if an IPAM plugin is also configured).
NOTE: The interface configuration on the host node must be persistent.
When the device is moved back to the host (via DEL) and renamed to its
original name, the system's network management service (e.g.
NetworkManager, systemd-networkd, cloud-init, or cloud-specific agents)
is expected to detect the device and re-apply the IP addresses and
routes. This plugin does NOT re-configure the host interface on DEL; it
relies on the node's network configuration being declarative and
reconciled by the platform's networking stack.
Also implements the STATUS command to verify the host device exists,
replacing the previous TODO stub.
Signed-off-by: Sebastian Sch <sebassch@gmail.com>
72eec2d to
10936b3
Compare
|
I am a bit unsure if we capture everything that need to be re-applied or if capture something we should not. Some AI generated list which seems possible |
Add a new configuration option
useInterfaceNetworkthat instructs the host-device plugin to capture the interface's IP addresses and routes from the host before moving the device into the container namespace, and then apply them inside the container.This is critical for virtual environments (AWS, IBM Cloud, GPC) where the cloud provider configures IP addresses and routes directly on the network device. In these environments, there is no traditional IPAM source; the ground truth for L3 configuration lives on the host interface itself.
When
useInterfaceNetworkis enabled, the plugin:NOTE: The interface configuration on the host node must be persistent. When the device is moved back to the host (via DEL) and renamed to its original name, the system's network management service (e.g. NetworkManager, systemd-networkd, cloud-init, or cloud-specific agents) is expected to detect the device and re-apply the IP addresses and routes. This plugin does NOT re-configure the host interface on DEL; it relies on the node's network configuration being declarative and reconciled by the platform's networking stack.
Also implements the STATUS command to verify the host device exists, replacing the previous TODO stub.