From 11a27eeea5958cbd9a7dc0f68b28675c1fd00153 Mon Sep 17 00:00:00 2001 From: fedy95 Date: Tue, 27 Apr 2021 18:24:43 +0300 Subject: [PATCH] temp --- .drone.yml | 9 ++-- Makefile | 13 ++++- ansible.cfg | 2 + group_vars/all.yml | 5 -- inventory/hosts | 1 + playbooks/k8s/init.yml | 25 +++++----- roles/common/tasks/main.yml | 1 - roles/k8s-init-machines/tasks/main.yml | 43 +++++++++++++++++ .../tasks/other.yml} | 0 roles/k8s/tasks/01_prepare.yml | 48 ------------------- roles/k8s/vars/main.yml | 3 -- 11 files changed, 75 insertions(+), 75 deletions(-) delete mode 100644 group_vars/all.yml create mode 100644 roles/k8s-init-machines/tasks/main.yml rename roles/{k8s/tasks/main.yml => k8s-init-machines/tasks/other.yml} (100%) delete mode 100644 roles/k8s/tasks/01_prepare.yml delete mode 100644 roles/k8s/vars/main.yml diff --git a/.drone.yml b/.drone.yml index 4958385..df36a74 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,15 +10,16 @@ steps: image: registry.fedy95.com/baseimage-yamllint:latest commands: - yamllint -c /yamllint/relaxed.yaml group_vars/all.yml + - yamllint -c /yamllint/relaxed.yaml playbooks/docker-units/init.yml + - yamllint -c /yamllint/relaxed.yaml playbooks/k8s/init.yml - yamllint -c /yamllint/relaxed.yaml roles/common/tasks/main.yml - yamllint -c /yamllint/relaxed.yaml roles/docker/defaults/main.yml - yamllint -c /yamllint/relaxed.yaml roles/docker/handlers/main.yml - - yamllint -c /yamllint/relaxed.yaml roles/docker/tasks/docker.yml - - yamllint -c /yamllint/relaxed.yaml roles/docker/tasks/docker-compose.yml - yamllint -c /yamllint/relaxed.yaml roles/docker/tasks/main.yml - - yamllint -c /yamllint/relaxed.yaml roles/docker/vars/main.yml + - yamllint -c /yamllint/relaxed.yaml roles/docker-compose/tasks/main.yml + - yamllint -c /yamllint/relaxed.yaml roles/docker-compose/vars/main.yml + - yamllint -c /yamllint/relaxed.yaml roles/k8s-init-machines/tasks/main.yml - yamllint -c /yamllint/relaxed.yaml .drone.yml - - yamllint -c /yamllint/relaxed.yaml ansible-desktop.yml when: event: pull_request ... diff --git a/Makefile b/Makefile index bbb97fd..19843a8 100644 --- a/Makefile +++ b/Makefile @@ -10,19 +10,28 @@ LINT-YAML-CMD=docker run --rm -it -v $(PWD):/data ${REGISTRY}/${YAMLLINT_TAG} lint-yaml: docker pull ${REGISTRY}/${YAMLLINT_TAG} $(LINT-YAML-CMD) group_vars/all.yml - $(LINT-YAML-CMD) playbooks/ansible-desktop.yml + $(LINT-YAML-CMD) playbooks/docker-units/init.yml + $(LINT-YAML-CMD) playbooks/k8s/init.yml $(LINT-YAML-CMD) roles/common/tasks/main.yml $(LINT-YAML-CMD) roles/docker/defaults/main.yml $(LINT-YAML-CMD) roles/docker/handlers/main.yml $(LINT-YAML-CMD) roles/docker/tasks/main.yml $(LINT-YAML-CMD) roles/docker-compose/tasks/main.yml $(LINT-YAML-CMD) roles/docker-compose/vars/main.yml + $(LINT-YAML-CMD) roles/k8s-init-machines/tasks/main.yml $(LINT-YAML-CMD) .drone.yml +check-playbooks-syntax: + ansible-playbook playbooks/docker-units/init.yml -i inventory/hosts --syntax-check + ansible-playbook playbooks/k8s/init.yml -i inventory/hosts --syntax-check + docker-units-init: ansible-playbook playbooks/docker-units/init.yml -i inventory/hosts --ask-become-pass +k8s-units-init: + ansible-playbook playbooks/k8s/init.yml -i inventory/hosts --ask-become-pass + ping: - ansible -i hosts all -m ping + ansible -i inventory/hosts all -m ping .DEFAULT_GOAL := lint diff --git a/ansible.cfg b/ansible.cfg index f89b190..2a0c0fc 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -1,6 +1,8 @@ [defaults] hostfile = hosts nocows = 1 +inventory = inventory +roles_path = roles [privilege_escalation] become_method = sudo diff --git a/group_vars/all.yml b/group_vars/all.yml deleted file mode 100644 index 4eda9d0..0000000 --- a/group_vars/all.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -aptcachetime: 3600 -locale: "en_US.UTF-8" -timezone: "Europe/Moscow" -... diff --git a/inventory/hosts b/inventory/hosts index 13baaef..808046e 100644 --- a/inventory/hosts +++ b/inventory/hosts @@ -18,3 +18,4 @@ pi-hole ansible_host=192.168.1.151 ansible_connection=ssh ansible_ssh_private_key_file=/home/fedy95/.ssh/id_rsa ansible_user=fedy95 +aptcachetime=3600 diff --git a/playbooks/k8s/init.yml b/playbooks/k8s/init.yml index 2dbbc93..7ab0d8f 100644 --- a/playbooks/k8s/init.yml +++ b/playbooks/k8s/init.yml @@ -1,18 +1,19 @@ --- - name: k8s-units playbook hosts: k8s + become: true roles: - - { role: common, become: true } - - { role: docker, become: true } - - { role: k8s, become: true } + - common + - docker + - k8s-init-machines -- name: k8s playbook - hosts: k8s-master - roles: - - { role: common, become: true } - -- name: k8s playbook - hosts: k8s-worker - roles: - - { role: common, become: true } +#- name: k8s playbook +# hosts: k8s-master +# roles: +# - { role: common, become: true } +# +#- name: k8s playbook +# hosts: k8s-worker +# roles: +# - { role: common, become: true } ... diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 9899889..e4c0b45 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -25,5 +25,4 @@ - name: Upgrade installed packages apt: upgrade=yes - ... diff --git a/roles/k8s-init-machines/tasks/main.yml b/roles/k8s-init-machines/tasks/main.yml new file mode 100644 index 0000000..6abeec5 --- /dev/null +++ b/roles/k8s-init-machines/tasks/main.yml @@ -0,0 +1,43 @@ +--- +- name: Disable all swaps from /proc/swaps + shell: | + swapoff --all + +- name: Disable SWAP in fstab + lineinfile: + path: /etc/fstab + regexp: 'swap' + state: absent + +- name: Add Google GPG key + apt_key: + url: https://packages.cloud.google.com/apt/doc/apt-key.gpg + state: present + +- name: Add Kubernetes' APT repository + apt_repository: + repo: deb http://apt.kubernetes.io/ kubernetes-xenial main + state: present + filename: 'kubernetes' + mode: 0600 + +- name: Installing Kubernetes Cluster Packages + apt: + name: "{{ item }}" + state: present + cache_valid_time: "{{ aptcachetime }}" + loop: [ 'kubeadm', 'kubectl', 'kubelet' ] + +- name: Enable service kubelet persistently + service: + name: kubelet + enabled: yes + +# TODO ??? +#- name: Reboot all the kubernetes nodes. +# reboot: +# post_reboot_delay: 10 +# reboot_timeout: 40 +# connect_timeout: 60 +# test_command: uptime +... diff --git a/roles/k8s/tasks/main.yml b/roles/k8s-init-machines/tasks/other.yml similarity index 100% rename from roles/k8s/tasks/main.yml rename to roles/k8s-init-machines/tasks/other.yml diff --git a/roles/k8s/tasks/01_prepare.yml b/roles/k8s/tasks/01_prepare.yml deleted file mode 100644 index 98eeb2c..0000000 --- a/roles/k8s/tasks/01_prepare.yml +++ /dev/null @@ -1,48 +0,0 @@ ---- -- hosts: k8s - - name: Disable all swaps from /proc/swaps - shell: | - swapoff --all - - - name: Disable SWAP in fstab - lineinfile: - path: /etc/fstab - regexp: 'swap' - state: absent - - - name: Add Google GPG key - apt_key: - url: https://packages.cloud.google.com/apt/doc/apt-key.gpg - state: present - - - name: Add Kubernetes' APT repository - apt_repository: - repo: deb http://apt.kubernetes.io/ kubernetes-xenial main - state: present - filename: 'kubernetes' - mode: 0600 - - - name: Installing Kubernetes Cluster Packages - apt: - name: "{{ item }}" - state: present - cache_valid_time: "{{ aptcachetime }}" - with_items: - - kubelet-{{kubelet_version}} - - kubeadm - - kubectl - loop: [ 'kubeadm', 'kubectl', 'kubelet' ] - - - name: Enable service kubelet persistently - service: - name: kubelet - enabled: yes - -# TODO ??? -# - name: Reboot all the kubernetes nodes. -# reboot: -# post_reboot_delay: 10 -# reboot_timeout: 40 -# connect_timeout: 60 -# test_command: uptime -... diff --git a/roles/k8s/vars/main.yml b/roles/k8s/vars/main.yml deleted file mode 100644 index c0c1eca..0000000 --- a/roles/k8s/vars/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -kubelet_version: "1.14.0-00" -...