Merge pull request #1322 from openshift-cherrypick-robot/cherry-pick-…

…1320-to-release-4.3 [release-4.3] Bug 1782149: templates/container-storage: Add a "this is generated" note
openshift · Dec 12, 2019 · 9fd53bd · 9fd53bd
2 parents 2789973 + ecc7d61
commit 9fd53bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 120 deletions.
diff --git a/...untime/_base/files/container-storage.yaml → ...common/_base/files/container-storage.yaml b/...untime/_base/files/container-storage.yaml → ...common/_base/files/container-storage.yaml
@@ -3,6 +3,8 @@ mode: 0644
 path: "/etc/containers/storage.conf"
 contents:
   inline: |
+    # This file is generated by the Machine Config Operator's containerruntimeconfig controller.
+    #
     # storage.conf is the configuration file for all tools
     # that share the containers/storage libraries
     # See man 5 containers-storage.conf for more information

diff --git a/templates/worker/01-worker-container-runtime/_base/files/container-storage.yaml b/templates/worker/01-worker-container-runtime/_base/files/container-storage.yaml