From fdb798e7ea3649531a1002e54d87380cd6e3a222 Mon Sep 17 00:00:00 2001 From: MohammadReza Date: Tue, 20 Oct 2026 10:05:11 +0330 Subject: [PATCH] fix(cri-o): remove kubic repo cleanup that breaks CRI-O reset on Debian (#13675) --- inventory/sample/group_vars/all/offline.yml | 2 - roles/container-engine/cri-o/tasks/reset.yml | 49 -------------------- 2 files changed, 51 deletions(-) diff --git a/inventory/sample/group_vars/all/offline.yml b/inventory/sample/group_vars/all/offline.yml index a0a64d95e..6ef61831c 100644 --- a/inventory/sample/group_vars/all/offline.yml +++ b/inventory/sample/group_vars/all/offline.yml @@ -65,8 +65,6 @@ # runc_download_url: "{{ files_repo }}/github.com/opencontainers/runc/releases/download/v{{ runc_version }}/runc.{{ image_arch }}" # [Optional] cri-o: only if you set container_manager: crio -# crio_download_base: "download.opensuse.org/repositories/devel:kubic:libcontainers:stable" -# crio_download_crio: "http://{{ crio_download_base }}:/cri-o:/" # crio_download_url: "{{ files_repo }}/storage.googleapis.com/cri-o/artifacts/cri-o.{{ image_arch }}.v{{ crio_version }}.tar.gz" # skopeo_download_url: "{{ files_repo }}/github.com/lework/skopeo-binary/releases/download/v{{ skopeo_version }}/skopeo-linux-{{ image_arch }}" diff --git a/roles/container-engine/cri-o/tasks/reset.yml b/roles/container-engine/cri-o/tasks/reset.yml index f84df2fd1..38de99c7e 100644 --- a/roles/container-engine/cri-o/tasks/reset.yml +++ b/roles/container-engine/cri-o/tasks/reset.yml @@ -2,55 +2,6 @@ - name: Cri-o | load vars import_tasks: load_vars.yml -- name: CRI-O | Kubic repo name for debian os family - set_fact: - crio_kubic_debian_repo_name: "{{ ((ansible_facts['distribution'] == 'Ubuntu') | ternary('x', '')) ~ ansible_facts['distribution'] ~ '_' ~ ansible_facts['distribution_version'] }}" - when: ansible_facts['os_family'] == "Debian" - tags: - - reset_crio - -- name: CRI-O | Remove kubic apt repo - apt_repository: - repo: "deb http://{{ crio_download_base }}/{{ crio_kubic_debian_repo_name }}/ /" - state: absent - when: crio_kubic_debian_repo_name is defined - tags: - - reset_crio - -- name: CRI-O | Remove cri-o apt repo - apt_repository: - repo: "deb {{ crio_download_crio }}v{{ crio_version }}/{{ crio_kubic_debian_repo_name }}/ /" - state: absent - filename: devel-kubic-libcontainers-stable-cri-o - when: crio_kubic_debian_repo_name is defined - tags: - - reset_crio - -- name: CRI-O | Remove CRI-O kubic yum repo - yum_repository: - name: devel_kubic_libcontainers_stable - state: absent - when: ansible_facts['distribution'] in ["Amazon"] - tags: - - reset_crio - -- name: CRI-O | Remove CRI-O kubic yum repo - yum_repository: - name: "devel_kubic_libcontainers_stable_cri-o_v{{ crio_version }}" - state: absent - when: - - ansible_facts['os_family'] == "RedHat" - - ansible_facts['distribution'] not in ["Amazon", "Fedora"] - tags: - - reset_crio - -- name: CRI-O | Run yum-clean-metadata - command: yum clean metadata - when: - - ansible_facts['os_family'] == "RedHat" - tags: - - reset_crio - - name: CRI-O | Remove crictl file: name: "{{ item }}"