mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-02-20 12:40:12 -03:30
Disable docker-ce yum repo by default / cleanups (#7080)
Upgrading docker / containerd without adapting the configuration might break the node, so disable docker-ce repo by default. We are already using dpkg hold for Debian. All containerd.io packages provide /usr/bin/runc, so no need to check yum_conf was never used for containerd module_hotfixes should not be needed with the EL8 repo Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
This commit is contained in:
committed by
GitHub
parent
c971debd15
commit
1945499e2f
@@ -65,18 +65,3 @@
|
||||
when:
|
||||
- ansible_distribution in ["CentOS","RedHat"]
|
||||
- yum_result.results | length == 0
|
||||
|
||||
- name: Copy yum.conf for editing
|
||||
copy:
|
||||
src: "{{ yum_conf }}"
|
||||
dest: "{{ containerd_yum_conf }}"
|
||||
remote_src: yes
|
||||
when: ansible_distribution in ["CentOS","RedHat"]
|
||||
|
||||
- name: Edit copy of yum.conf to set obsoletes=0
|
||||
lineinfile:
|
||||
path: "{{ containerd_yum_conf }}"
|
||||
state: present
|
||||
regexp: '^obsoletes='
|
||||
line: 'obsoletes=0'
|
||||
when: ansible_distribution in ["CentOS","RedHat"]
|
||||
|
||||
@@ -95,9 +95,9 @@
|
||||
args:
|
||||
pkg: "{{ item.name }}"
|
||||
force: "{{ item.force | default(omit) }}"
|
||||
conf_file: "{{ item.yum_conf | default(omit) }}"
|
||||
state: present
|
||||
update_cache: "{{ omit if ansible_distribution == 'Fedora' else True }}"
|
||||
enablerepo: "{{ item.repo | default(omit) }}"
|
||||
register: containerd_task_result
|
||||
until: containerd_task_result is succeeded
|
||||
retries: 4
|
||||
@@ -109,26 +109,6 @@
|
||||
- containerd_package_info.pkgs|length > 0
|
||||
ignore_errors: true
|
||||
|
||||
- name: Check if runc is installed
|
||||
stat:
|
||||
path: "{{ runc_binary }}"
|
||||
register: runc_stat
|
||||
|
||||
- name: Install runc package if necessary
|
||||
action: "{{ containerd_package_info.pkg_mgr }}"
|
||||
args:
|
||||
pkg: runc
|
||||
state: present
|
||||
update_cache: "{{ omit if ansible_distribution == 'Fedora' else True }}"
|
||||
register: runc_task_result
|
||||
until: runc_task_result is succeeded
|
||||
retries: 4
|
||||
delay: "{{ retry_stagger | d(3) }}"
|
||||
notify: restart containerd
|
||||
when:
|
||||
- not is_ostree
|
||||
- not runc_stat.stat.exists
|
||||
|
||||
- name: Ensure latest version of libseccomp installed # noqa 403
|
||||
package:
|
||||
name: libseccomp
|
||||
|
||||
Reference in New Issue
Block a user