kubeadm: additional files for flannel

karmab · Sep 7, 2023 · b1a8eff · b1a8eff
1 parent 259a092
commit b1a8eff
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 12 deletions.
diff --git a/kvirt/cluster/kubeadm/10-flannel.link b/kvirt/cluster/kubeadm/10-flannel.link
@@ -0,0 +1,4 @@
+[Match]
+OriginalName=flannel*
+[Link]
+MACAddressPolicy=none
diff --git a/kvirt/cluster/kubeadm/90-flannel.rules b/kvirt/cluster/kubeadm/90-flannel.rules
@@ -0,0 +1,2 @@
+SUBSYSTEM=="net", ACTION=="add|change|move", ENV{INTERFACE}=="flannel.1", RUN+="/bin/bash -c \"/usr/sbin/ethtool -K flannel.1 tx-checksum-ip-generic off\""
+SUBSYSTEM=="net", ACTION=="add|change|move", ENV{INTERFACE}=="cni0", RUN+="/bin/bash -c \"/usr/sbin/ethtool -K cni0 tx-checksum-ip-generic off\""
diff --git a/kvirt/cluster/kubeadm/bootstrap.yml b/kvirt/cluster/kubeadm/bootstrap.yml
@@ -46,10 +46,13 @@
  - deploy.sh
 {% if engine == 'containerd' %}
  - path: /etc/crictl.yaml
-   content: |
-     runtime-endpoint: unix:///run/containerd/containerd.sock
-     image-endpoint: unix:///run/containerd/containerd.sock
-     timeout: 10
+   origin: crictl.yaml
+{% endif %}
+{% if sdn == 'flannel' %}
+ - path: /etc/systemd/network/10-flannel.link
+   origin: 10-flannel.link
+ - path: /etc/udev/rules.d/90-flannel.rules
+   origin: 90-flannel.rules
 {% endif %}
  cmds:
  - bash /root/deploy.sh
diff --git a/kvirt/cluster/kubeadm/crictl.yaml b/kvirt/cluster/kubeadm/crictl.yaml
@@ -0,0 +1,3 @@
+runtime-endpoint: unix:///run/containerd/containerd.sock
+image-endpoint: unix:///run/containerd/containerd.sock
+timeout: 10
diff --git a/kvirt/cluster/kubeadm/ctlplanes.yml b/kvirt/cluster/kubeadm/ctlplanes.yml
@@ -28,10 +28,13 @@
  - deploy.sh
 {% if engine == 'containerd' %}
  - path: /etc/crictl.yaml
-   content: |
-     runtime-endpoint: unix:///run/containerd/containerd.sock
-     image-endpoint: unix:///run/containerd/containerd.sock
-     timeout: 10
+   origin: crictl.yaml
+{% endif %}
+{% if sdn == 'flannel' %}
+ - path: /etc/systemd/network/10-flannel.link
+   origin: 10-flannel.link
+ - path: /etc/udev/rules.d/90-flannel.rules
+   origin: 90-flannel.rules
 {% endif %}
  cmds:
  - bash /root/deploy.sh

diff --git a/kvirt/cluster/kubeadm/workers.yml b/kvirt/cluster/kubeadm/workers.yml
@@ -23,10 +23,13 @@
  - join.sh
 {% if engine == 'containerd' %}
  - path: /etc/crictl.yaml
-   content: |
-     runtime-endpoint: unix:///run/containerd/containerd.sock
-     image-endpoint: unix:///run/containerd/containerd.sock
-     timeout: 10
+   origin: crictl.yaml
+{% endif %}
+{% if sdn == 'flannel' %}
+ - path: /etc/systemd/network/10-flannel.link
+   origin: 10-flannel.link
+ - path: /etc/udev/rules.d/90-flannel.rules
+   origin: 90-flannel.rules
 {% endif %}
  cmds:
  - bash /root/deploy.sh