Added TODO

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 для каждой из ролей.
+Так же поменять логику сохранения кейрингов, чтобы была возможность перезаписать файл

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

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: |

k8s/roles/common-kubernetes/vars/main.yml

@@ -1,2 +1,2 @@
-k8s_version = v1.28
-crio_version = v1.21
+k8s_version: "v1.31"
+crio_version: "v1.30"

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"

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).