From dd7ff6713ad5c09f44c66955f7d8ef7e1f0b9d7e Mon Sep 17 00:00:00 2001
From: yuobrezkov <yurakirin9545@gmail.com>
Date: Mon, 27 Jan 2025 12:44:38 +0300
Subject: [PATCH] Added deleting kerings and repositories list before
 installing, changed became rules for some tasks

---
 k8s/k8s.yml                                |  1 -
 k8s/roles/common-kubernetes/tasks/main.yml | 21 ++++++++++++++++++++-
 k8s/roles/kubernetes-master/tasks/main.yml |  4 ++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/k8s/k8s.yml b/k8s/k8s.yml
index 6e52285..7335218 100644
--- a/k8s/k8s.yml
+++ b/k8s/k8s.yml
@@ -7,7 +7,6 @@
 
 - name: Initialize master node
   hosts: master
-  become: yes
   roles:
     - role: kubernetes-master
       tags: master
diff --git a/k8s/roles/common-kubernetes/tasks/main.yml b/k8s/roles/common-kubernetes/tasks/main.yml
index b7778ab..3e62bb8 100644
--- a/k8s/roles/common-kubernetes/tasks/main.yml
+++ b/k8s/roles/common-kubernetes/tasks/main.yml
@@ -7,6 +7,25 @@
     update_cache: yes
     upgrade: dist
     autoremove: yes
+- name: Remove existing Kubernetes repository if it exists
+  file:
+    path: /etc/apt/sources.list.d/kubernetes.list
+    state: absent
+
+- name: Remove existing Kubernetes GPG key if it exists
+  file:
+    path: /etc/apt/keyrings/kubernetes-apt-keyring.gpg
+    state: absent
+
+- name: Remove existing CRI-O repository if it exists
+  file:
+    path: /etc/apt/sources.list.d/cri-o.list
+    state: absent
+
+- name: Remove existing CRI-O GPG key if it exists
+  file:
+    path: /etc/apt/keyrings/cri-o-apt-keyring.gpg
+    state: absent
 - name: Disable swap
   shell: |
     swapoff -a 
@@ -73,7 +92,7 @@
     curl -fsSL https://pkgs.k8s.io/addons:/cri-o:/stable:/{{crio_version}}/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/cri-o-apt-keyring.gpg 
 - name: Add cri-o repository
   shell: |
-    echo "deb [signed-by=/etc/apt/keyrings/cri-o-apt-keyring.gpg] https://pkgs.k8s.io/addons:/cri-o:/stable:/$CRIO_VERSION/deb/ /" | tee /etc/apt/sources.list.d/cri-o.list
+    echo "deb [signed-by=/etc/apt/keyrings/cri-o-apt-keyring.gpg] https://pkgs.k8s.io/addons:/cri-o:/stable:/{{crio_version}}/deb/ /" | tee /etc/apt/sources.list.d/cri-o.list
 - name: Installing cri-o
   apt:
     update_cache: yes
diff --git a/k8s/roles/kubernetes-master/tasks/main.yml b/k8s/roles/kubernetes-master/tasks/main.yml
index 198fe70..7d531f0 100644
--- a/k8s/roles/kubernetes-master/tasks/main.yml
+++ b/k8s/roles/kubernetes-master/tasks/main.yml
@@ -12,10 +12,10 @@
 - name: Ensure .kube directory exists on the target machine
   command: mkdir -p {{ ansible_user_dir }}/.kube
 
-- name: Copy kubeconfig from master node to target machine
+- name: Copy kubeconfig to home directory
   become: yes
   command: >
-    cp /etc/kubernetes/admin.conf {{ ansible_user_dir }}/.kube/config
+    cp -f /etc/kubernetes/admin.conf {{ ansible_user_dir }}/.kube/config
 
 - name: Set correct ownership for kubeconfig
   become: yes