k3os ok

templates/agent.tpl

@@ -1,19 +1,27 @@
 ssh_authorized_keys:
 - ${ssh_public_key}
 hostname: ${name}
+boot_cmd:
+- |
+  echo 'auto eth0
+  iface eth0 inet dhcp
+  auto eth1
+  iface eth1 inet dhcp' > /etc/network/interfaces
+- rc-update del connman boot
+- rc-update add networking boot
+- rc-update add ntpd default
+run_cmd:
+- sh -c "ip route add 10.0.0.0/16 via 10.0.0.1 dev eth1"
 k3os:
   k3s_args:
-  - server
-  --node-ip=${ip} 
-  --advertise-address=${ip} 
-  --bind-address=${ip} 
-  --tls-san=${ip}
-  --disable-cloud-controller
-  --disable-network-policy
-  --disable=traefik
-  --disable=servicelb
-  --disable='local-storage'
-  --kubelet-arg='cloud-provider=external'
+  - agent
+  - "--server"
+  - "https://${master_ip}:6443"
+  - "--node-ip"
+  - "${node_ip}"
+  - "--kubelet-arg"
+  - "cloud-provider=external"
+  - "--flannel-iface=eth1"
   token: ${k3s_token}
   ntp_servers:
   - 0.de.pool.ntp.org
@@ -21,9 +29,5 @@ k3os:
   dns_nameservers:
   - 8.8.8.8
   - 1.1.1.1
-  - 8.8.4.4
-  - 1.0.0.1
   - 2001:4860:4860::8888
-  - 2606:4700:4700::1111
-  - 2001:4860:4860::8844
-  - 2606:4700:4700::1001
+  - 2606:4700:4700::1111

templates/master.tpl

@@ -10,6 +10,8 @@ boot_cmd:
 - rc-update del connman boot
 - rc-update add networking boot
 - rc-update add ntpd default
+run_cmd:
+- sh -c "ip route add 10.0.0.0/16 via 10.0.0.1 dev eth1"
 k3os:
   k3s_args:
   - server
@@ -20,11 +22,11 @@ k3os:
   - "--disable=local-storage"
   - "--flannel-iface=eth1"
   - "--node-ip"
-  - "${ip}"
+  - "${master_ip}"
   - "--advertise-address"
-  - "${ip}"
+  - "${master_ip}"
   - "--tls-san"
-  - "${ip}"
+  - "${master_ip}"
   - "--kubelet-arg"
   - "cloud-provider=external"
   token: ${k3s_token}

templates/server.tpl

@@ -0,0 +1,41 @@
+ssh_authorized_keys:
+- ${ssh_public_key}
+hostname: ${name}
+boot_cmd:
+- |
+  echo 'auto eth0
+  iface eth0 inet dhcp
+  auto eth1
+  iface eth1 inet dhcp' > /etc/network/interfaces
+- rc-update del connman boot
+- rc-update add networking boot
+- rc-update add ntpd default
+run_cmd:
+- sh -c "ip route add 10.0.0.0/16 via 10.0.0.1 dev eth1"
+k3os:
+  k3s_args:
+  - server
+  - "--server"
+  - "https://${master_ip}:6443"
+  - "--disable-cloud-controller"
+  - "--disable=traefik"
+  - "--disable=servicelb"
+  - "--disable=local-storage"
+  - "--flannel-iface=eth1"
+  - "--node-ip"
+  - "${node_ip}"
+  - "--advertise-address"
+  - "${node_ip}"
+  - "--tls-san"
+  - "${node_ip}"
+  - "--kubelet-arg"
+  - "cloud-provider=external"
+  token: ${k3s_token}
+  ntp_servers:
+  - 0.de.pool.ntp.org
+  - 1.de.pool.ntp.org
+  dns_nameservers:
+  - 8.8.8.8
+  - 1.1.1.1
+  - 2001:4860:4860::8888
+  - 2606:4700:4700::1111