Merge pull request #1305 from haircommander/hooks_dir-4.3

Bug 1777838: [release-4.3] CRI-O: add old default hook directories
openshift · Dec 5, 2019 · 2789973 · 2789973
2 parents d6e6990 + abc6d0a
commit 2789973
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/templates/master/01-master-container-runtime/_base/files/crio.yaml b/templates/master/01-master-container-runtime/_base/files/crio.yaml
@@ -157,8 +157,12 @@ contents:
     # ]
 
     # Path to OCI hooks directories for automatically executed hooks.
-    # hooks_dir = [
-    # ]
+    # Note: the default is just /usr/share/containers/oci/hooks.d, but /usr is immutable in RHCOS
+    # so we add /etc/containers/oci/hooks.d as well
+    hooks_dir = [
+        "/etc/containers/oci/hooks.d",
+        "/usr/share/containers/oci/hooks.d",
+    ]
 
     # List of default mounts for each container. **Deprecated:** this option will
     # be removed in future versions in favor of default_mounts_file.

diff --git a/templates/worker/01-worker-container-runtime/_base/files/crio.yaml b/templates/worker/01-worker-container-runtime/_base/files/crio.yaml
@@ -157,8 +157,12 @@ contents:
     # ]
 
     # Path to OCI hooks directories for automatically executed hooks.
-    # hooks_dir = [
-    # ]
+    # Note: the default is just /usr/share/containers/oci/hooks.d, but /usr is immutable in RHCOS
+    # so we add /etc/containers/oci/hooks.d as well
+    hooks_dir = [
+        "/etc/containers/oci/hooks.d",
+        "/usr/share/containers/oci/hooks.d",
+    ]
 
     # List of default mounts for each container. **Deprecated:** this option will
     # be removed in future versions in favor of default_mounts_file.