diff --git a/inventory/group_vars/all/k8s.yml b/inventory/group_vars/all/k8s.yml index a721f64..26e0b75 100644 --- a/inventory/group_vars/all/k8s.yml +++ b/inventory/group_vars/all/k8s.yml @@ -17,3 +17,5 @@ k8s_pod_network_config: "https://cloud.weave.works/k8s/net?k8s-version=$(kubectl k8s_users: - user: pi + +k8s_version: 1.9.3 diff --git a/playbooks/bootstrap.yml b/playbooks/bootstrap.yml index 624d188..cd72693 100644 --- a/playbooks/bootstrap.yml +++ b/playbooks/bootstrap.yml @@ -236,7 +236,7 @@ # delay: 2 # with_items: "{{ groups['rpi_k8s_slaves'] }}" -- hosts: rpi_k8s_slaves +- hosts: rpi_k8s any_errors_fatal: true tasks: - name: Updating /etc/hosts diff --git a/requirements.yml b/requirements.yml index 3b9322b..4959ad2 100644 --- a/requirements.yml +++ b/requirements.yml @@ -7,6 +7,7 @@ - src: https://github.com/mrlesmithjr/ansible-glusterfs.git - src: https://github.com/mrlesmithjr/ansible-isc-dhcp.git - src: https://github.com/mrlesmithjr/ansible-k8s.git + version: v1.1.0 - src: https://github.com/mrlesmithjr/ansible-ntp.git - src: https://github.com/mrlesmithjr/ansible-sshd.git - src: https://github.com/mrlesmithjr/ansible-timezone.git diff --git a/roles/ansible-k8s/defaults/main.yml b/roles/ansible-k8s/defaults/main.yml index 19b0ae3..2ab0e31 100644 --- a/roles/ansible-k8s/defaults/main.yml +++ b/roles/ansible-k8s/defaults/main.yml @@ -58,3 +58,5 @@ k8s_token_file: /etc/kubernetes/.k8s_token k8s_users: - user: vagrant + +k8s_version: 1.10.2 diff --git a/roles/ansible-k8s/meta/.galaxy_install_info b/roles/ansible-k8s/meta/.galaxy_install_info index 806d14c..2a6272f 100644 --- a/roles/ansible-k8s/meta/.galaxy_install_info +++ b/roles/ansible-k8s/meta/.galaxy_install_info @@ -1 +1 @@ -{install_date: 'Fri Feb 16 02:20:37 2018', version: ''} +{install_date: 'Thu May 3 12:16:46 2018', version: v1.1.0} diff --git a/roles/ansible-k8s/tasks/debian.yml b/roles/ansible-k8s/tasks/debian.yml index 6b8687a..63ca7fd 100644 --- a/roles/ansible-k8s/tasks/debian.yml +++ b/roles/ansible-k8s/tasks/debian.yml @@ -20,6 +20,19 @@ state: present become: true +- name: debian | Pinning K8s Version + template: + src: etc/apt/preferences.d/k8s.pref.j2 + dest: /etc/apt/preferences.d/k8s.pref + become: true + register: _k8s_pinned_version + +- name: debian | Updating Apt Cache + apt: + update_cache: true + become: true + when: _k8s_pinned_version['changed'] + - name: debian | Installing K8s Packages apt: name: "{{ item }}"