Обновить ansible/k8s_setup.yml

ansible/k8s_setup.yml

@@ -1,24 +1,13 @@
 ---
-- name: Подготовка всех узлов (Master и Workers)
+- name: Подготовка всех узлов
   hosts: k8s_nodes
   become: true
-  gather_facts: true
   tasks:
-    - name: 0. Ожидание разблокировки APT (усиленное)
-      shell: "while fuser /var/lib/dpkg/lock-frontend /var/lib/apt/lists/lock /var/lib/dpkg/lock >/dev/null 2>&1; do sleep 5; done;"
+    - name: Ожидание разблокировки APT
+      shell: "while fuser /var/lib/dpkg/lock-frontend >/dev/null 2>&1; do sleep 5; done;"
       changed_when: false
 
-    - name: 1. Очистка старых конфигов K8s
-      shell: "rm -f /etc/apt/sources.list.d/kubernetes.list /etc/apt/sources.list.d/*k8s*"
-      changed_when: true
-
-    - name: 2. Настройка APT (Force IPv4 и MTU)
-      shell: |
-        echo 'Acquire::ForceIPv4 "true";' > /etc/apt/apt.conf.d/99force-ipv4
-        ip link set dev eth0 mtu 1442 || true
-      changed_when: false
-
-    - name: 3. Установка системных зависимостей (с повторами)
+    - name: Установка системных зависимостей
       apt:
         update_cache: yes
         name: [apt-transport-https, ca-certificates, curl, gnupg, qemu-guest-agent, socat, conntrack]
@@ -28,16 +17,10 @@
       retries: 20
       delay: 10
 
-    - name: 4. Отключение SWAP
+    - name: Настройка модулей и sysctl
       shell: |
-        swapoff -a
-        sed -i '/ swap / s/^\(.*\)$/#\1/g' /etc/fstab
-      when: ansible_swaptotal_mb > 0
-
-    - name: 5. Модули ядра и Sysctl
-      shell: |
-        modprobe overlay
-        modprobe br_netfilter
+        modprobe overlay && modprobe br_netfilter
+        echo -e "overlay\nbr_netfilter" > /etc/modules-load.d/k8s.conf
         cat <<EOF > /etc/sysctl.d/k8s.conf
         net.bridge.bridge-nf-call-iptables  = 1
         net.bridge.bridge-nf-call-ip6tables = 1
@@ -46,16 +29,12 @@
         sysctl --system
       changed_when: false
 
-    - name: 6. Установка Containerd
+    - name: Установка Containerd
       apt:
         name: containerd
         state: present
-      register: cont_res
-      until: cont_res is success
-      retries: 10
-      delay: 5
 
-    - name: 7. Конфигурация Containerd (SystemdCgroup)
+    - name: Конфигурация Containerd
       shell: |
         mkdir -p /etc/containerd
         containerd config default > /etc/containerd/config.toml
@@ -63,35 +42,22 @@
         systemctl restart containerd
       changed_when: true
 
-    - name: 8. Добавление ключа Kubernetes
+    - name: Добавление репозитория Kubernetes (Tsinghua)
       shell: |
-        mkdir -p /etc/apt/keyrings
         curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.32/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg --yes
-      register: key_res
-      until: key_res is success
-      retries: 5
+        echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg arch=amd64] https://mirrors.tuna.tsinghua.edu.cn/kubernetes/core:/stable:/v1.32/deb/ /" > /etc/apt/sources.list.d/kubernetes.list
 
-    - name: 9. Настройка репозитория (Tsinghua)
-      copy:
-        dest: /etc/apt/sources.list.d/kubernetes.list
-        content: "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg arch=amd64] https://mirrors.tuna.tsinghua.edu.cn/kubernetes/core:/stable:/v1.32/deb/ /"
-
-    - name: 10. Установка компонентов K8s
+    - name: Установка пакетов Kubernetes
       apt:
         name: [kubelet, kubeadm, kubectl]
         state: present
         update_cache: yes
-        allow_change_held_packages: yes
-      register: k8s_res
-      until: k8s_res is success
-      retries: 10
+      register: k8s_apt
+      until: k8s_apt is success
+      retries: 15
       delay: 10
 
-    - name: 11. Фиксация версий
-      shell: apt-mark hold kubelet kubeadm kubectl
-      changed_when: false
-
-- name: Инициализация Master-ноды
+- name: Инициализация Master
   hosts: masters_group
   become: true
   tasks:
@@ -100,30 +66,21 @@
       args:
         creates: /etc/kubernetes/admin.conf
 
-    - name: Настройка конфига для ubuntu
+    - name: Config for ubuntu user
       shell: |
         mkdir -p /home/ubuntu/.kube
         cp -f /etc/kubernetes/admin.conf /home/ubuntu/.kube/config
         chown ubuntu:ubuntu /home/ubuntu/.kube/config
-      args:
-        creates: /home/ubuntu/.kube/config
 
-    - name: Генерация команды Join
+    - name: Generate Join Command
       shell: "kubeadm token create --print-join-command"
-      register: join_command_raw
+      register: join_cmd
 
-    - name: Сохранение факта Join
-      set_fact:
-        join_command: "{{ join_command_raw.stdout }}"
-
-- name: Подключение Worker-нод
+- name: Join Workers
   hosts: workers_group
   become: true
   tasks:
-    - name: Join к кластеру
-      shell: "{{ hostvars[groups['masters_group'][0]]['join_command'] }}"
+    - name: Join to cluster
+      shell: "{{ hostvars['k8s-master']['join_cmd']['stdout'] }}"
       args:
         creates: /etc/kubernetes/kubelet.conf
-
-- name: Stage 4 - Post-install (CNI & MetalLB)
-  import_playbook: k8s_post_install.yml