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

ansible/k8s_setup.yml

@@ -8,12 +8,8 @@
       shell: "while fuser /var/lib/dpkg/lock-frontend >/dev/null 2>&1; do sleep 5; done;"
       changed_when: false
 
-    - name: 1. Ядерная очистка APT и блокировок K8s
+    - name: 1. Очистка старых репозиториев
-      shell: |
+      shell: "rm -f /etc/apt/sources.list.d/kubernetes.list /etc/apt/sources.list.d/*k8s*"
-        apt-mark unhold kubelet kubeadm kubectl || true
-        rm -f /etc/apt/sources.list.d/kubernetes.list /etc/apt/sources.list.d/*k8s*
-        apt-get remove --purge -y kubelet kubeadm kubectl kubernetes-cni cri-tools || true
-        apt-get autoremove -y
       changed_when: true
 
     - name: 2. Настройка APT (Force IPv4 и MTU)
@@ -75,14 +71,24 @@
         content: "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.32/deb/ /"
 
     - name: 10. Принудительная установка компонентов K8s
-      shell: |
+      apt:
-        apt-get update
+        name: [kubelet, kubeadm, kubectl]
-        apt-get install -y --allow-change-held-packages kubelet kubeadm kubectl
+        state: present
-        apt-mark hold kubelet kubeadm kubectl
+        update_cache: yes
-      register: install_res
+        allow_change_held_packages: yes
-      until: install_res is success
+
-      retries: 3
+    - name: 11. Фиксация версий
-      delay: 10
+      shell: apt-mark hold kubelet kubeadm kubectl
+      changed_when: false
+
+    - name: 12. Поиск пути к kubeadm (Диагностика)
+      shell: which kubeadm || find /usr -name kubeadm
+      register: kubeadm_path_check
+      changed_when: false
+
+    - name: 13. Сохранение пути к kubeadm как переменной
+      set_fact:
+        kubeadm_bin: "{{ kubeadm_path_check.stdout }}"
 
 - name: Инициализация Master-ноды
   hosts: masters
@@ -93,8 +99,8 @@
         path: /etc/kubernetes/admin.conf
       register: kube_init
 
-    - name: Kubeadm Init (Абсолютный путь)
+    - name: Kubeadm Init
-      shell: /usr/bin/kubeadm init --pod-network-cidr=10.244.0.0/16 --skip-phases=addon/kube-proxy
+      shell: "{{ kubeadm_bin }} init --pod-network-cidr=10.244.0.0/16 --skip-phases=addon/kube-proxy"
       when: not kube_init.stat.exists
 
     - name: Настройка конфига для пользователя ubuntu
@@ -106,7 +112,7 @@
         creates: /home/ubuntu/.kube/config
 
     - name: Генерация команды Join
-      shell: /usr/bin/kubeadm token create --print-join-command
+      shell: "{{ kubeadm_bin }} token create --print-join-command"
       register: join_command_raw
 
     - name: Сохранение факта Join
@@ -122,8 +128,8 @@
         path: /etc/kubernetes/kubelet.conf
       register: kube_worker_init
 
-    - name: Join к кластеру (Абсолютный путь)
+    - name: Join к кластеру
-      shell: "/usr/bin/{{ hostvars[groups['masters'][0]]['join_command'] }}"
+      shell: "{{ hostvars[groups['masters'][0]]['join_command'] }}"
       when: not kube_worker_init.stat.exists
 
 - name: Установка Cilium (eBPF)