al/tiny-cloud
al/tiny-cloud
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/cloud/tiny-cloud.git synced 2025-12-16 03:42:44 +03:00
Code Packages Wiki

Fix imds-net-sync with multiple interfaces

Browse Source 
* all IPv4s of non-eth0 interfaces should be associated with route table
* also add "to" rules for non-eth0 interfaces (symmetry with the "from" rules)
This commit is contained in:
Jake Buchholz Göktürk 2023-03-23 10:33:52 -07:00
parent 33257650c8
commit 520b72b8d6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sbin/imds-net-sync
View File

@ -49,15 +49,14 @@ iface_ip6s() {
} }
imds_ip4s() { imds_ip4s() {
local ip4=$(imds "@nic:$IFACE,@ipv4") local ip4s=$(imds "@nic:$IFACE,@ipv4")
local ip4s=$(echo "$ip4" | tail +2) # secondary IPv4s
local ip4p ip4_cidr ip4_gw local ip4p ip4_cidr ip4_gw
# non-eth0 interfaces need custom route tables # non-eth0 interfaces need custom route tables
# #
if [ "$IFACE" != eth0 ] && [ -n "$ip4s" ] && if [ "$IFACE" != eth0 ] && [ -n "$ip4s" ] &&
[ -z $(ip +F -4 route show table "$RTABLE" 2>/dev/null) ]; then [ -z $(ip +F -4 route show table "$RTABLE" 2>/dev/null) ]; then
ip4p=$(echo "$ip4" | head -1) # primary IPv4 ip4p=$(echo "$ip4s" | head -1) # primary IPv4
ip4_cidr=$(imds "@nic:$IFACE,@ipv4-net") # TODO: get from iface instead? ip4_cidr=$(imds "@nic:$IFACE,@ipv4-net") # TODO: get from iface instead?
# TODO: this may not hold true for non-AWS clouds # TODO: this may not hold true for non-AWS clouds
ip4_gw=$(echo "$ip4_cidr" | cut -d/ -f1 | ip4_gw=$(echo "$ip4_cidr" | cut -d/ -f1 |
@ -91,6 +90,7 @@ imds_ip6s() {
sleep 0.5 sleep 0.5
done done
ip -6 route add default via "$gw" dev "$IFACE" table "$RTABLE" ip -6 route add default via "$gw" dev "$IFACE" table "$RTABLE"
# TODO? match ipds_ip4s() with ip -6 route add "ip6_cidr" dev "$IFACE" ...
fi fi
echo "$ip6s" echo "$ip6s"
} }
@ -110,6 +110,7 @@ ip_addr() {
# non-eth0 interfaces get rules associating IPs with route tables # non-eth0 interfaces get rules associating IPs with route tables
ip -"$1" rule "$2" from "$3" lookup "$RTABLE" ip -"$1" rule "$2" from "$3" lookup "$RTABLE"
ip -"$1" rule "$2" to "$3" lookup "$RTABLE"
} }
# sync_ips {4|6} "<imds-ips>" "<iface-ips>" # sync_ips {4|6} "<imds-ips>" "<iface-ips>"