From 066dae20e553226c78a3e8f883177d17258e4f09 Mon Sep 17 00:00:00 2001
From: ogrechko <ogrechko@top-sysops.ru>
Date: Sun, 28 Dec 2025 16:08:29 +0000
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?=
 =?UTF-8?q?=D1=8C=20ansible/k8s=5Fsetup.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible/k8s_setup.yml | 81 ++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 47 deletions(-)

diff --git a/ansible/k8s_setup.yml b/ansible/k8s_setup.yml
index 8398c70..acc1401 100644
--- a/ansible/k8s_setup.yml
+++ b/ansible/k8s_setup.yml
@@ -8,7 +8,7 @@
       shell: "while fuser /var/lib/dpkg/lock-frontend >/dev/null 2>&1; do sleep 5; done;"
       changed_when: false
 
-    - name: 1. Очистка старых репозиториев
+    - name: 1. Ядерная очистка репозиториев (Fix APT)
       shell: "rm -f /etc/apt/sources.list.d/kubernetes.list /etc/apt/sources.list.d/*k8s*"
       changed_when: true
 
@@ -24,13 +24,7 @@
         name: [apt-transport-https, ca-certificates, curl, gnupg, qemu-guest-agent, socat, conntrack]
         state: present
 
-    - name: 4. Отключение SWAP
-      shell: |
-        swapoff -a
-        sed -i '/ swap / s/^\(.*\)$/#\1/g' /etc/fstab
-      when: ansible_swaptotal_mb > 0
-
-    - name: 5. Модули ядра и Sysctl
+    - name: 4. Модули ядра и Sysctl
       shell: |
         modprobe overlay
         modprobe br_netfilter
@@ -43,12 +37,12 @@
         sysctl --system
       changed_when: false
 
-    - name: 6. Установка Containerd
+    - name: 5. Установка Containerd
       apt:
         name: containerd
         state: present
 
-    - name: 7. Конфигурация Containerd (SystemdCgroup)
+    - name: 6. Конфигурация Containerd (SystemdCgroup)
       shell: |
         mkdir -p /etc/containerd
         containerd config default > /etc/containerd/config.toml
@@ -56,54 +50,51 @@
         systemctl restart containerd
       changed_when: true
 
-    - name: 8. Добавление ключа Kubernetes
+    - name: 7. Добавление ключа Kubernetes
       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
-      delay: 5
 
-    - name: 9. Настройка официального репозитория
+    - name: 8. Настройка официального репозитория (Явная архитектура amd64)
       copy:
         dest: /etc/apt/sources.list.d/kubernetes.list
-        content: "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.32/deb/ /"
+        # ВАЖНО: Добавили arch=amd64
+        content: "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg arch=amd64] https://pkgs.k8s.io/core:/stable:/v1.32/deb/ /"
 
-    - name: 10. Принудительная установка компонентов K8s
-      apt:
-        name: [kubelet, kubeadm, kubectl]
-        state: present
-        update_cache: yes
-        allow_change_held_packages: yes
-
-    - name: 11. Фиксация версий
-      shell: apt-mark hold kubelet kubeadm kubectl
+    - name: 9. Диагностика (Проверяем, видит ли APT пакеты)
+      shell: "apt-get update && apt-cache policy kubeadm"
+      register: apt_policy
       changed_when: false
 
-    - name: 12. Поиск пути к kubeadm (Диагностика)
-      shell: which kubeadm || find /usr -name kubeadm
-      register: kubeadm_path_check
-      changed_when: false
+    - name: 10. Вывод диагностики в лог Semaphore
+      debug:
+        var: apt_policy.stdout_lines
 
-    - name: 13. Сохранение пути к kubeadm как переменной
-      set_fact:
-        kubeadm_bin: "{{ kubeadm_path_check.stdout }}"
+    - name: 11. Принудительная установка компонентов K8s
+      shell: |
+        apt-mark unhold kubelet kubeadm kubectl || true
+        apt-get install -y --allow-change-held-packages kubelet kubeadm kubectl
+        apt-mark hold kubelet kubeadm kubectl
+      register: install_shell
+
+    - name: 12. Проверка наличия бинарника (Final Check)
+      shell: "ls -la /usr/bin/kubeadm"
+      register: final_check
+      failed_when: final_check.rc != 0
 
 - name: Инициализация Master-ноды
   hosts: masters
   become: true
   tasks:
-    - name: Проверка инициализации
-      stat:
-        path: /etc/kubernetes/admin.conf
-      register: kube_init
-
     - name: Kubeadm Init
-      shell: "{{ kubeadm_bin }} init --pod-network-cidr=10.244.0.0/16 --skip-phases=addon/kube-proxy"
-      when: not kube_init.stat.exists
+      shell: "/usr/bin/kubeadm init --pod-network-cidr=10.244.0.0/16 --skip-phases=addon/kube-proxy"
+      args:
+        creates: /etc/kubernetes/admin.conf
 
-    - name: Настройка конфига для пользователя ubuntu
+    - name: Настройка конфига для ubuntu
       shell: |
         mkdir -p /home/ubuntu/.kube
         cp -f /etc/kubernetes/admin.conf /home/ubuntu/.kube/config
@@ -112,7 +103,7 @@
         creates: /home/ubuntu/.kube/config
 
     - name: Генерация команды Join
-      shell: "{{ kubeadm_bin }} token create --print-join-command"
+      shell: "/usr/bin/kubeadm token create --print-join-command"
       register: join_command_raw
 
     - name: Сохранение факта Join
@@ -123,20 +114,16 @@
   hosts: workers
   become: true
   tasks:
-    - name: Проверка подключения
-      stat:
-        path: /etc/kubernetes/kubelet.conf
-      register: kube_worker_init
-
     - name: Join к кластеру
       shell: "{{ hostvars[groups['masters'][0]]['join_command'] }}"
-      when: not kube_worker_init.stat.exists
+      args:
+        creates: /etc/kubernetes/kubelet.conf
 
-- name: Установка Cilium (eBPF)
+- name: Установка Cilium
   hosts: masters
   become: false
   tasks:
-    - name: Установка Cilium CLI и CNI
+    - name: Cilium CLI и Install
       shell: |
         if [ ! -f /usr/local/bin/cilium ]; then
           curl -L --remote-name-all https://github.com/cilium/cilium-cli/releases/latest/download/cilium-linux-amd64.tar.gz