diff options
| -rw-r--r-- | roles/kubernetes-base/templates/50-extra.conf.j2 | 3 | ||||
| -rw-r--r-- | roles/kubernetes-net/templates/ifupdown.sh.j2 | 10 |
2 files changed, 2 insertions, 11 deletions
diff --git a/roles/kubernetes-base/templates/50-extra.conf.j2 b/roles/kubernetes-base/templates/50-extra.conf.j2 index 9fff76b0..c722ade6 100644 --- a/roles/kubernetes-base/templates/50-extra.conf.j2 +++ b/roles/kubernetes-base/templates/50-extra.conf.j2 @@ -1,2 +1,3 @@ +{% set br_net = kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubernetes.net_index[inventory_hostname]) -%} [Service] -Environment="KUBELET_EXTRA_ARGS={% if external_ip is defined %}--node-ip={{ external_ip }} {% endif %}" +Environment="KUBELET_EXTRA_ARGS=--node-ip={{ br_net | ipaddr(1) | ipaddr('address') }}" diff --git a/roles/kubernetes-net/templates/ifupdown.sh.j2 b/roles/kubernetes-net/templates/ifupdown.sh.j2 index 3f6826c8..995d358b 100644 --- a/roles/kubernetes-net/templates/ifupdown.sh.j2 +++ b/roles/kubernetes-net/templates/ifupdown.sh.j2 @@ -20,11 +20,6 @@ TUN_IP_CIDR="{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, case "$1" in up) -{% if external_ip is defined %} - # add external-ip to loopback interface so kubelet will accept this as --node-ip - ip addr add dev lo {{ external_ip }}/32 - -{% endif %} # bring up bridge for local pods ip link add dev "$BR_IF" type bridge ip addr add dev "$BR_IF" "$BR_IP_CIDR" @@ -50,11 +45,6 @@ case "$1" in # bring down bridge for local pods iptables -t nat -D POSTROUTING -s "$BR_NET_CIDR" -o "$INET_IF" -j MASQUERADE ip link del dev "$BR_IF" -{% if external_ip is defined %} - - # remove external-ip from loopback interface - ip addr del dev lo {{ external_ip }}/32 -{% endif %} ;; *) echo "usage: $0 (up|down)" |