Merge pull request #4869 from RishabhSaini/release-4.18

OCPBUGS-51132: [release-4.18] /etc/crio/crio.conf.d/00-default should contain runtime_root for runc

Author: openshift-merge-bot[bot]

templates/master/01-master-container-runtime/_base/files/crio.yaml

@@ -35,6 +35,7 @@ contents:
     drop_infra_ctr = true
 
     [crio.runtime.runtimes.runc]
+    runtime_root = "/run/runc"
     allowed_annotations = [
         "io.containers.trace-syscall",
         "io.kubernetes.cri-o.Devices",

templates/worker/01-worker-container-runtime/_base/files/crio.yaml

@@ -35,6 +35,7 @@ contents:
     drop_infra_ctr = true
 
     [crio.runtime.runtimes.runc]
+    runtime_root = "/run/runc"
     allowed_annotations = [
         "io.containers.trace-syscall",
         "io.kubernetes.cri-o.Devices",