From 53620f6e955cf5f980f8de0031686f884e789a7e Mon Sep 17 00:00:00 2001
From: yuobrezkov <yurakirin9545@gmail.com>
Date: Fri, 24 Jan 2025 17:46:57 +0300
Subject: [PATCH] Added TODO

---
 k8s/README.md                              |  3 +++
 k8s/inventory.ini                          |  5 +++++
 k8s/roles/common-kubernetes/tasks/main.yml |  3 ++-
 k8s/roles/common-kubernetes/vars/main.yml  |  4 ++--
 k8s/roles/kubernetes-master/vars/main.yml  | 10 +++++-----
 k8s/roles/kubernetes-worker/README.md      | 18 ------------------
 6 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/k8s/README.md b/k8s/README.md
index db86fe5..0c73380 100644
--- a/k8s/README.md
+++ b/k8s/README.md
@@ -41,3 +41,6 @@ ansible-playbook -i inventory.ini k8s.yml
 ansible-playbook -i inventory.ini k8s.yml --tags join
 ```
 И эта команда присоединит все worker ноды
+### TODO:
+Необходимо расписать vars для каждой из ролей.
+Так же поменять логику сохранения кейрингов, чтобы была возможность перезаписать файл
\ No newline at end of file
diff --git a/k8s/inventory.ini b/k8s/inventory.ini
index e69de29..5f15c5e 100644
--- a/k8s/inventory.ini
+++ b/k8s/inventory.ini
@@ -0,0 +1,5 @@
+[master]
+192.168.2.34 ansible_user=user ansible_password=k8sstand1 ansible_become_pass=k8sstand1
+
+[worker]
+192.168.2.35 ansible_user=user ansible_password=k8sstand2 ansible_become_pass=k8sstand2
\ No newline at end of file
diff --git a/k8s/roles/common-kubernetes/tasks/main.yml b/k8s/roles/common-kubernetes/tasks/main.yml
index 3ca98bd..b7778ab 100644
--- a/k8s/roles/common-kubernetes/tasks/main.yml
+++ b/k8s/roles/common-kubernetes/tasks/main.yml
@@ -10,7 +10,7 @@
 - name: Disable swap
   shell: |
     swapoff -a 
-    sed -i 'swap/d' /etc/fstab 
+    sed -i '/swap/d' /etc/fstab
 - name: Load overlay kernel module
   modprobe:
     name: overlay
@@ -66,6 +66,7 @@
      - kubelet
      - kubeadm
      - kubectl
+- name: Disable auto upgrade
   command: apt-mark hold kubectl kubeadm kubelet
 - name: Download cri-o GPG key
   shell: |
diff --git a/k8s/roles/common-kubernetes/vars/main.yml b/k8s/roles/common-kubernetes/vars/main.yml
index df7fdf3..f404a0f 100644
--- a/k8s/roles/common-kubernetes/vars/main.yml
+++ b/k8s/roles/common-kubernetes/vars/main.yml
@@ -1,2 +1,2 @@
-k8s_version = v1.28
-crio_version = v1.21
\ No newline at end of file
+k8s_version: "v1.31"
+crio_version: "v1.30"
\ No newline at end of file
diff --git a/k8s/roles/kubernetes-master/vars/main.yml b/k8s/roles/kubernetes-master/vars/main.yml
index 3db423d..019440a 100644
--- a/k8s/roles/kubernetes-master/vars/main.yml
+++ b/k8s/roles/kubernetes-master/vars/main.yml
@@ -1,5 +1,5 @@
-cidr_network = 10.244.0.0/16
-host_ip_address = 192.168.2.12
-ansible_user_dir = /home/user
-ansible_user_id = 1000
-ansible_user_gid = 1000
+cidr_network: "10.244.0.0/16"
+host_ip_address: "192.168.2.34"
+ansible_user_dir: "/home/user"
+ansible_user_id: "1000"
+ansible_user_gid: "1000"
diff --git a/k8s/roles/kubernetes-worker/README.md b/k8s/roles/kubernetes-worker/README.md
index 75284a8..a1cb11c 100644
--- a/k8s/roles/kubernetes-worker/README.md
+++ b/k8s/roles/kubernetes-worker/README.md
@@ -18,21 +18,3 @@ Dependencies
 
 A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
 
-Example Playbook
-----------------
-
-Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
-
-    - hosts: servers
-      roles:
-         - { role: username.rolename, x: 42 }
-
-License
--------
-
-BSD
-
-Author Information
-------------------
-
-An optional section for the role authors to include contact information, or a website (HTML is not allowed).