From ee6a792ec07159a94b7803e26509bd601fd46fed Mon Sep 17 00:00:00 2001
From: Mahendra Reddy <mahendra77024@gmail.com>
Date: Tue, 14 Oct 2025 06:45:32 +0530
Subject: [PATCH] feat: add support crio additional mounts (#12561)

removed default since it's already set in variables

fix pre commit issue in the pipeline
---
 roles/container-engine/cri-o/defaults/main.yml        | 1 +
 roles/container-engine/cri-o/files/mounts.conf        | 1 -
 roles/container-engine/cri-o/tasks/main.yaml          | 4 ++--
 roles/container-engine/cri-o/templates/mounts.conf.j2 | 4 ++++
 4 files changed, 7 insertions(+), 3 deletions(-)
 delete mode 100644 roles/container-engine/cri-o/files/mounts.conf
 create mode 100644 roles/container-engine/cri-o/templates/mounts.conf.j2

diff --git a/roles/container-engine/cri-o/defaults/main.yml b/roles/container-engine/cri-o/defaults/main.yml
index ac95f4dbf..7589505f5 100644
--- a/roles/container-engine/cri-o/defaults/main.yml
+++ b/roles/container-engine/cri-o/defaults/main.yml
@@ -112,3 +112,4 @@ crio_default_capabilities:
   - SETPCAP
   - NET_BIND_SERVICE
   - KILL
+crio_additional_mounts: []
diff --git a/roles/container-engine/cri-o/files/mounts.conf b/roles/container-engine/cri-o/files/mounts.conf
deleted file mode 100644
index b7cde9d8a..000000000
--- a/roles/container-engine/cri-o/files/mounts.conf
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/rhel/secrets:/run/secrets
diff --git a/roles/container-engine/cri-o/tasks/main.yaml b/roles/container-engine/cri-o/tasks/main.yaml
index 9a7e95989..bf8996664 100644
--- a/roles/container-engine/cri-o/tasks/main.yaml
+++ b/roles/container-engine/cri-o/tasks/main.yaml
@@ -184,8 +184,8 @@
   notify: Restart crio
 
 - name: Cri-o | copy mounts.conf
-  copy:
-    src: mounts.conf
+  template:
+    src: mounts.conf.j2
     dest: /etc/containers/mounts.conf
     mode: "0644"
   when:
diff --git a/roles/container-engine/cri-o/templates/mounts.conf.j2 b/roles/container-engine/cri-o/templates/mounts.conf.j2
new file mode 100644
index 000000000..11aab1337
--- /dev/null
+++ b/roles/container-engine/cri-o/templates/mounts.conf.j2
@@ -0,0 +1,4 @@
+/usr/share/rhel/secrets:/run/secrets
+{% for mount in crio_additional_mounts %}
+{{ mount }}
+{% endfor %}