Merge pull request #72694 from rohennes/OCPBUGS-29309

Adding folder to directory structure for custom user CRs

Author: maxwelldb

modules/ztp-preparing-the-ztp-git-repository-ver-ind.adoc

@@ -17,10 +17,12 @@ This means that the version of {product-title} running on the hub cluster can be
 For each version, create the following resources:
 * `kustomization.yaml` file that explicitly includes the files in that directory
 * `source-crs` directory to contain reference CR configuration files from the `ztp-site-generate` container
++
+If you want to work with user-provided CRs, you must create a separate directory for them.
 
-. In the `/siteconfig` directory, create a subdirectory for each {product-title} version you want to make available. For each version, create at least one directory for reference CRs to be copied from the container. There is no restriction on the naming of directories or on the number of reference directories. If you want to work with user-provided CRs, you must create a separate directory for those.
+. In the `/siteconfig` directory, create a subdirectory for each {product-title} version you want to make available. For each version, create at least one directory for reference CRs to be copied from the container. There is no restriction on the naming of directories or on the number of reference directories. If you want to work with custom manifests, you must create a separate directory for them.
 +
-The following example describes a structure using user-provided CRs for different versions of {product-title}:
+The following example describes a structure using user-provided manifests and CRs for different versions of {product-title}:
 +
 [source,text]
 ----
@@ -33,7 +35,9 @@ The following example describes a structure using user-provided CRs for differen
 │   │   ├── helix56-v413.yaml
 │   │   ├── kustomization.yaml <3>
 │   │   ├── ns.yaml
-│   │   └── source-crs/  <4>
+│   │   └── source-crs/ <4>
+│   │      └── reference-crs/ <5>
+│   │      └── custom-crs/ <6>
 │   └── version_4.14 <2>
 │       ├── common-ranGen.yaml
 │       ├── group-du-sno-ranGen.yaml
@@ -42,26 +46,30 @@ The following example describes a structure using user-provided CRs for differen
 │       ├── kustomization.yaml <3>
 │       ├── ns.yaml
 │       └── source-crs/ <4>
+│         └── reference-crs/ <5>
+│         └── custom-crs/ <6>
 └── siteconfig
     ├── kustomization.yaml
     ├── version_4.13
     │   ├── helix56-v413.yaml
     │   ├── kustomization.yaml
-    │   ├── extra-manifest/ <5>
-    │   └── custom-manifest/ <6>
+    │   ├── extra-manifest/ <7>
+    │   └── custom-manifest/ <8>
     └── version_4.14
         ├── helix57-v414.yaml
         ├── kustomization.yaml
-        ├── extra-manifest/ <5>
-        └── custom-manifest/ <6>
+        ├── extra-manifest/ <7>
+        └── custom-manifest/ <8>
 
 ----
-<1> Create a top-level `kustomization` yaml file.
+<1> Create a top-level `kustomization` YAML file.
 <2> Create the version-specific directories within the custom `/policygentemplates` directory.
 <3> Create a `kustomization.yaml` file for each version.
 <4> Create a `source-crs` directory for each version to contain reference CRs from the `ztp-site-generate` container.
-<5> Create a directory within the custom `/siteconfig` directory to contain extra manifests from the `ztp-site-generate` container.
-<6> Create a folder to hold user-provided CRs.
+<5> Create the `reference-crs` directory for policy CRs that are extracted from the ZTP container.
+<6> Optional: Create a `custom-crs` directory for user-provided CRs.
+<7> Create a directory within the custom `/siteconfig` directory to contain extra manifests from the `ztp-site-generate` container.
+<8> Create a folder to hold user-provided manifests.
 +
 [NOTE]
 ====