minor fix

roles/prepare/tasks/common.yml

@@ -10,6 +10,18 @@
     state: absent
     backup: 'yes'
 
+- name: 转换内核版本为浮点数
+  set_fact:
+     KERNEL_VER: "{{ ansible_kernel.split('-')[0].split('.')[0]|int + ansible_kernel.split('-')[0].split('.')[1]|int/100 }}"
+
+- name: 设置 nf_conntrack 模块名
+  set_fact: NF_CONNTRACK="nf_conntrack"
+  when: "KERNEL_VER|float >= 4.19"
+
+- name: 设置 nf_conntrack_ipv4 模块名
+  set_fact: NF_CONNTRACK="nf_conntrack_ipv4"
+  when: "KERNEL_VER|float < 4.19"
+
 - name: 加载内核模块
   modprobe: name={{ item }} state=present
   with_items:
@@ -18,20 +30,7 @@
     - ip_vs_rr
     - ip_vs_wrr
     - ip_vs_sh
-  ignore_errors: true
-
-- name: 转换内核版本为浮点数
-  set_fact:
-     KERNEL_VER: "{{ ansible_kernel.split('-')[0].split('.')[0]|int + ansible_kernel.split('-')[0].split('.')[1]|int/100 }}"
-
-- name: 加载内核模块 nf_conntrack
-  modprobe: name=nf_conntrack state=present
-  when: "KERNEL_VER|float >= 4.19"
-  ignore_errors: true
-
-- name: 加载内核模块 nf_conntrack_ipv4
-  modprobe: name=nf_conntrack_ipv4 state=present
-  when: "KERNEL_VER|float < 4.19"
+    - "{{ NF_CONNTRACK }}"
   ignore_errors: true
 
 - name: 启用systemd自动加载模块服务

roles/prepare/templates/10-k8s-modules.conf.j2

@@ -3,5 +3,4 @@ ip_vs
 ip_vs_rr
 ip_vs_wrr
 ip_vs_sh
-nf_conntrack_ipv4
-nf_conntrack
+{{ NF_CONNTRACK }}

tools/02.addnode.yml

@@ -22,7 +22,7 @@
     with_fileglob:
     - "{{ base_dir }}/down/coredns*.tar"
     - "{{ base_dir }}/down/dashboard*.tar"
-    - "{{ base_dir }}/down/heapster*.tar"
+    - "{{ base_dir }}/down/metrics-scraper*.tar"
     - "{{ base_dir }}/down/metrics*.tar"
     - "{{ base_dir }}/down/traefik*.tar"
     ignore_errors: true