diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml index 7eaf639..be10842 100644 --- a/tasks/RedHat.yml +++ b/tasks/RedHat.yml @@ -57,3 +57,25 @@ # - need_firewall|bool # - firewall_name == "firewalld" - kubernetes_server|bool + +- name: Install kubernetes tools + dnf: + name: "{{ kubernetes_package_name }}" + enablerepo: "kubernetes" + state: present + update_cache: yes +# notify: Restart kubelet + when: + - ansible_pkg_mgr == "dnf" + - (not kubernetes_server|bool) or ( kubernetes_server|bool and kubernetes_cri != "k3s") + +- name: Install kubernetes tools + yum: + name: "{{ kubernetes_package_name }}" + enablerepo: "kubernetes" + state: present + update_cache: yes +# notify: Restart kubelet + when: + - ansible_pkg_mgr == "yum" + - (not kubernetes_server|bool) or ( kubernetes_server|bool and kubernetes_cri != "k3s") diff --git a/tasks/main.yml b/tasks/main.yml index b57a12b..5fe21e7 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -39,14 +39,14 @@ - name: Install kubernetes rules for {{ ansible_os_family }} OS family include_tasks: "{{ ansible_os_family }}.yml" -- name: Install kubernetes tools - package: - name: "{{ kubernetes_package_name }}" - state: present - update_cache: yes -# notify: Restart kubelet - when: - - (not kubernetes_server|bool) or ( kubernetes_server|bool and kubernetes_cri != "k3s") +#- name: Install kubernetes tools +# package: +# name: "{{ kubernetes_package_name }}" +# state: present +# update_cache: yes +## notify: Restart kubelet +# when: +# - (not kubernetes_server|bool) or ( kubernetes_server|bool and kubernetes_cri != "k3s") - name: Include kubernetes server rules include_tasks: "install_server.yml" diff --git a/templates/etc/yum.repos.d/kubernetes.repo.j2 b/templates/etc/yum.repos.d/kubernetes.repo.j2 index 7ac0fdb..b04037a 100644 --- a/templates/etc/yum.repos.d/kubernetes.repo.j2 +++ b/templates/etc/yum.repos.d/kubernetes.repo.j2 @@ -1,7 +1,7 @@ [kubernetes] name=Kubernetes baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-{{ ansible_machine }} -enabled=1 +enabled=0 gpgcheck=1 repo_gpgcheck=1 gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg