diff --git a/.config.sample.env b/.config.sample.env index 012a3d31..72726bed 100644 --- a/.config.sample.env +++ b/.config.sample.env @@ -36,12 +36,6 @@ export BOOTSTRAP_METALLB_TRAEFIK_ADDR="" # e.g. age15uzrw396e67z9wdzsxzdk7ka0g2gr3l460e0slaea563zll3hdfqwqxdta export BOOTSTRAP_AGE_PUBLIC_KEY="" -# The network interface on the host kube-vip should attach to -# Look this up on your nodes to verify what NIC to use -# This name should be the same across your nodes, see: -# https://github.com/k8s-at-home/template-cluster-k3s/issues/310 -# e.g. eno1 -export BOOTSTRAP_KUBE_VIP_INTERFACE="" # The IP Address to use with KubeVIP # Pick a unused IP that is on the same network as your nodes # and outside the ${BOOTSTRAP_METALLB_LB_RANGE} range diff --git a/provision/ansible/playbooks/templates/kube-vip-daemonset.yaml.j2 b/provision/ansible/playbooks/templates/kube-vip-daemonset.yaml.j2 index 35d357e9..9484567b 100644 --- a/provision/ansible/playbooks/templates/kube-vip-daemonset.yaml.j2 +++ b/provision/ansible/playbooks/templates/kube-vip-daemonset.yaml.j2 @@ -27,8 +27,6 @@ spec: env: - name: vip_arp value: "true" - - name: vip_interface - value: "{{ kubevip_interface }}" - name: port value: "6443" - name: vip_cidr diff --git a/provision/ansible/roles/ubuntu/tasks/checks.yml b/provision/ansible/roles/ubuntu/tasks/checks.yml deleted file mode 100644 index 9c95a42d..00000000 --- a/provision/ansible/roles/ubuntu/tasks/checks.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -- name: Check if network interface provided for kube-vip is valid - ansible.builtin.assert: - that: - - ansible_{{ kubevip_interface }}.device is defined - - ansible_{{ kubevip_interface }}['ipv4']['address'] | ansible.utils.ipaddr('{{ ansible_host }}') - success_msg: |- - kube-vip is able to use {{ kubevip_interface }} for this node - fail_msg: |- - This node does not have a network interface called {{ kubevip_interface }}. - - You either provided the wrong BOOTSTRAP_KUBE_VIP_INTERFACE value or your nodes have different network interface names. - - See this link on how to set static interface names across your nodes by using netplan - https://askubuntu.com/a/1317043 - when: - "'master' in group_names" diff --git a/provision/ansible/roles/ubuntu/tasks/main.yml b/provision/ansible/roles/ubuntu/tasks/main.yml index 7f0f8c28..6d59372a 100644 --- a/provision/ansible/roles/ubuntu/tasks/main.yml +++ b/provision/ansible/roles/ubuntu/tasks/main.yml @@ -1,8 +1,4 @@ --- -- include: checks.yml - tags: - - checks - - include: locale.yml tags: - locale diff --git a/tmpl/ansible/kube-vip.yml b/tmpl/ansible/kube-vip.yml index 2449053b..0720e05e 100644 --- a/tmpl/ansible/kube-vip.yml +++ b/tmpl/ansible/kube-vip.yml @@ -1,5 +1,3 @@ --- -# (string) The interface on the host kube-vip should attach to -kubevip_interface: "${BOOTSTRAP_KUBE_VIP_INTERFACE}" # (string) The ARP address kube-vip broadcasts kubevip_address: "${BOOTSTRAP_KUBE_VIP_ADDR}" diff --git a/tmpl/cluster/kube-vip-daemonset.yaml b/tmpl/cluster/kube-vip-daemonset.yaml index 188bba76..10ec71bd 100644 --- a/tmpl/cluster/kube-vip-daemonset.yaml +++ b/tmpl/cluster/kube-vip-daemonset.yaml @@ -27,8 +27,6 @@ spec: env: - name: vip_arp value: "true" - - name: vip_interface - value: "${BOOTSTRAP_KUBE_VIP_INTERFACE}" - name: port value: "6443" - name: vip_cidr