From b41157cad06b3867af4f7b600aab54755d613443 Mon Sep 17 00:00:00 2001
From: Tushar240503 <98592305+Tushar240503@users.noreply.github.com>
Date: Sat, 14 Feb 2026 19:46:04 +0530
Subject: [PATCH] Refactor container-engine dependencies (#12946)

Signed-off-by: Tushar Sharma <tusharkumargzb6@gmail.com>
---
 roles/container-engine/meta/main.yml  | 58 ---------------------------
 roles/container-engine/tasks/main.yml | 48 ++++++++++++++++++++++
 2 files changed, 48 insertions(+), 58 deletions(-)
 delete mode 100644 roles/container-engine/meta/main.yml
 create mode 100644 roles/container-engine/tasks/main.yml

diff --git a/roles/container-engine/meta/main.yml b/roles/container-engine/meta/main.yml
deleted file mode 100644
index 3e068d60a..000000000
--- a/roles/container-engine/meta/main.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-# noqa role-name - this is a meta role that doesn't need a name
----
-dependencies:
-  - role: container-engine/validate-container-engine
-    tags:
-      - container-engine
-      - validate-container-engine
-
-  - role: container-engine/kata-containers
-    when:
-      - kata_containers_enabled
-    tags:
-      - container-engine
-      - kata-containers
-
-  - role: container-engine/gvisor
-    when:
-      - gvisor_enabled
-      - container_manager in ['docker', 'containerd']
-    tags:
-      - container-engine
-      - gvisor
-
-  - role: container-engine/crun
-    when:
-      - crun_enabled
-    tags:
-      - container-engine
-      - crun
-
-  - role: container-engine/youki
-    when:
-      - youki_enabled
-      - container_manager == 'crio'
-    tags:
-      - container-engine
-      - youki
-
-  - role: container-engine/cri-o
-    when:
-      - container_manager == 'crio'
-    tags:
-      - container-engine
-      - crio
-
-  - role: container-engine/containerd
-    when:
-      - container_manager == 'containerd'
-    tags:
-      - container-engine
-      - containerd
-
-  - role: container-engine/cri-dockerd
-    when:
-      - container_manager == 'docker'
-    tags:
-      - container-engine
-      - docker
diff --git a/roles/container-engine/tasks/main.yml b/roles/container-engine/tasks/main.yml
new file mode 100644
index 000000000..3f1d4d821
--- /dev/null
+++ b/roles/container-engine/tasks/main.yml
@@ -0,0 +1,48 @@
+---
+- name: Validate container engine
+  import_role:
+    name: container-engine/validate-container-engine
+  tags:
+    - container-engine
+    - validate-container-engine
+
+- name: Container runtimes
+  include_role:
+    name: "container-engine/{{ item.role }}"
+    apply:
+      tags:
+        - container-engine
+        - "{{ item.role }}"
+  loop:
+    - { role: 'kata-containers', enabled: "{{ kata_containers_enabled }}" }
+    - { role: 'gvisor', enabled: "{{ gvisor_enabled and container_manager in ['docker', 'containerd'] }}" }
+    - { role: 'crun', enabled: "{{ crun_enabled }}" }
+    - { role: 'youki', enabled: "{{ youki_enabled and container_manager == 'crio' }}" }
+  # TODO: Technically, this is more container-runtime than engine
+  when: item.enabled
+  tags:
+    - container-engine
+    - kata-containers
+    - gvisor
+    - crun
+    - youki
+
+- name: Container Manager
+  vars:
+    container_manager_role:
+      crio: cri-o
+      docker: cri-dockerd
+      containerd: containerd
+  include_role:
+    name: "container-engine/{{ container_manager_role[container_manager] }}"
+    apply:
+      tags:
+        - container-engine
+        - crio
+        - docker
+        - containerd
+  tags:
+    - container-engine
+    - crio
+    - docker
+    - containerd