From fe8eb3ae2b8cc9376207a225d152cdfb53be8459 Mon Sep 17 00:00:00 2001 From: Haitao Pan Date: Wed, 31 May 2023 12:45:23 +0800 Subject: [PATCH] playbook/roles/k3s/files/setup-cni-cilium.sh: add flannel clean opts --- playbook/jobs/init_k3s_cluster_apisix | 2 +- playbook/roles/k3s/files/setup-cni-cilium.sh | 19 +++++++++++++++++++ playbook/roles/k3s/files/setup-cni-kubeovn.sh | 13 +++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 playbook/roles/k3s/files/setup-cni-cilium.sh diff --git a/playbook/jobs/init_k3s_cluster_apisix b/playbook/jobs/init_k3s_cluster_apisix index d37010ee..5f0a5d28 100644 --- a/playbook/jobs/init_k3s_cluster_apisix +++ b/playbook/jobs/init_k3s_cluster_apisix @@ -11,7 +11,7 @@ cluster_domain: 'cluster.local' version: 'v1.24.7+k3s1' ingress: apisix - cni: default + cni: kubeovn pod_cidr: '10.100.0.0/16' pod_gateway: '10.100.0.1' svc_cidr: '172.16.0.0/16' diff --git a/playbook/roles/k3s/files/setup-cni-cilium.sh b/playbook/roles/k3s/files/setup-cni-cilium.sh new file mode 100644 index 00000000..34c9ac2f --- /dev/null +++ b/playbook/roles/k3s/files/setup-cni-cilium.sh @@ -0,0 +1,19 @@ + +# 移除cni命名空间 +ip netns show 2>/dev/null | grep cni- | xargs -r -t -n 1 ip netns delete +# 移除cnio网卡 +ip link show 2>/dev/null | grep 'master cni0' | while read ignore iface ignore; do + iface=${iface%%@*} + [ -z "$iface" ] || ip link delete $iface +done +ip link delete cni0 +ip link delete flannel.1 +rm -rf /var/lib/cni/ +# 清理iptables +iptables-save | grep -v KUBE- | grep -v CNI- | iptables-restore + +helm repo add cilium https://helm.cilium.io/ +helm install cilium cilium/cilium --version 1.10.4 \ + --namespace kube-system\ + --set hubble.relay.enabled=true \ + --set hubble.ui.enabled=true diff --git a/playbook/roles/k3s/files/setup-cni-kubeovn.sh b/playbook/roles/k3s/files/setup-cni-kubeovn.sh index b1f8139a..78c8950e 100644 --- a/playbook/roles/k3s/files/setup-cni-kubeovn.sh +++ b/playbook/roles/k3s/files/setup-cni-kubeovn.sh @@ -9,6 +9,19 @@ modprobe iptable_nat rm -rvf /etc/cni/net.d/* +# 移除cni命名空间 +ip netns show 2>/dev/null | grep cni- | xargs -r -t -n 1 ip netns delete +# 移除cnio网卡 +ip link show 2>/dev/null | grep 'master cni0' | while read ignore iface ignore; do + iface=${iface%%@*} + [ -z "$iface" ] || ip link delete $iface +done +ip link delete cni0 +ip link delete flannel.1 +rm -rf /var/lib/cni/ +# 清理iptables +iptables-save | grep -v KUBE- | grep -v CNI- | iptables-restore + kubectl taint node $node_name node-role.kubernetes.io/control-plane:NoSchedule- kubectl label node $node_name kubernetes.io/os=linux --overwrite kubectl label node $node_name kube-ovn/role=master --overwrite