Fix dnf warning by k8s tools
Some checks reported errors
continuous-integration/drone/push Build encountered an error
Some checks reported errors
continuous-integration/drone/push Build encountered an error
This commit is contained in:
parent
6fa60172df
commit
1e4d82d403
3 changed files with 31 additions and 9 deletions
|
|
@ -57,3 +57,25 @@
|
||||||
# - need_firewall|bool
|
# - need_firewall|bool
|
||||||
# - firewall_name == "firewalld"
|
# - firewall_name == "firewalld"
|
||||||
- kubernetes_server|bool
|
- 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")
|
||||||
|
|
|
||||||
|
|
@ -39,14 +39,14 @@
|
||||||
- name: Install kubernetes rules for {{ ansible_os_family }} OS family
|
- name: Install kubernetes rules for {{ ansible_os_family }} OS family
|
||||||
include_tasks: "{{ ansible_os_family }}.yml"
|
include_tasks: "{{ ansible_os_family }}.yml"
|
||||||
|
|
||||||
- name: Install kubernetes tools
|
#- name: Install kubernetes tools
|
||||||
package:
|
# package:
|
||||||
name: "{{ kubernetes_package_name }}"
|
# name: "{{ kubernetes_package_name }}"
|
||||||
state: present
|
# state: present
|
||||||
update_cache: yes
|
# update_cache: yes
|
||||||
# notify: Restart kubelet
|
## notify: Restart kubelet
|
||||||
when:
|
# when:
|
||||||
- (not kubernetes_server|bool) or ( kubernetes_server|bool and kubernetes_cri != "k3s")
|
# - (not kubernetes_server|bool) or ( kubernetes_server|bool and kubernetes_cri != "k3s")
|
||||||
|
|
||||||
- name: Include kubernetes server rules
|
- name: Include kubernetes server rules
|
||||||
include_tasks: "install_server.yml"
|
include_tasks: "install_server.yml"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
[kubernetes]
|
[kubernetes]
|
||||||
name=Kubernetes
|
name=Kubernetes
|
||||||
baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-{{ ansible_machine }}
|
baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-{{ ansible_machine }}
|
||||||
enabled=1
|
enabled=0
|
||||||
gpgcheck=1
|
gpgcheck=1
|
||||||
repo_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
|
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue