Merge pull request #3149 from sudomakeinstall2/add-extra-manifest-to-converter

OCPBUGS-65595: ztp: siteconfig-converter: Generate extra-manifest without using siteconfig-generator binary

Author: openshift-merge-bot[bot]

ztp/tools/siteconfig-converter/Makefile

@@ -2,8 +2,8 @@
 
 # Variables
 BINARY_NAME = siteconfig-converter
-GO_FILES = main.go convert.go
-TEST_FILES = convert_test.go
+GO_FILES = main.go convert.go extraManifests.go
+TEST_FILES = convert_test.go extraManifests_test.go
 GOOS ?= $(shell go env GOOS)
 GOARCH ?= $(shell go env GOARCH)
 EXAMPLE_FILE = samples/example-sno1.yaml

ztp/tools/siteconfig-converter/README.md

@@ -15,7 +15,6 @@ The manifests will be generated in the `./output` directory
 
 ```
 podman run -d --rm --name ztp ${IMAGE} tail -f /dev/null
-podman cp ztp:/usr/bin/siteconfig-generator ./
 podman cp ztp:/usr/bin/siteconfig-converter ./
 podman stop ztp
 sudo cp siteconfig-converter siteconfig-generator /usr/local/bin
@@ -25,7 +24,7 @@ tree output-cluster-instance
 output-cluster-instance
 ├── cnfdf26.yaml
 ├── extra-manifests
-│   └── cnfdf26_machineconfig_98-var-lib-containers-partitioned.yaml
+│   └── 98-var-lib-containers-partitioned.yaml
 └── kustomization-configMapGenerator-snippet.yaml
 ```
 
@@ -233,7 +232,7 @@ The `siteconfig-converter` tool automatically generates ConfigMap kustomization
 
 This process:
 1. Creates the `extra-manifests` directory in the output directory
-2. Extracts all the extra manifests using the `siteconfig-generator` binary into this directory
+2. Extracts all the extra manifests into this directory
 3. Creates a `kustomization-configMapGenerator-snippet.yaml` file which includes a kustomize `configMapGenerator` that will sync the extra manifests ConfigMap on the hub cluster.
 
 The extra manifest ConfigMap is automatically added to the `extraManifestRefs` field of the `ClusterInstance`.
@@ -257,16 +256,13 @@ $ tree output
 output
 ├── cnfdf28.yaml
 ├── extra-manifests
-│   ├── cnfdf28_machineconfig_98-var-lib-containers-partitioned.yaml
-│   └── cnfdf28_machineconfig_99-set-core-user-password.yaml
+│   ├── 98-var-lib-containers-partitioned.yaml
+│   └── set-core-user-password.yaml
 └── kustomization-configMapGenerator-snippet.yaml
 ```
 
 You can merge the generated kustomization file with your original one to generate the ConfigMap and the `ClusterInstance`.
 
-**Requirements:**
-- The `siteconfig-generator` binary must be available in your system PATH (available in the `ztp-site-generator` container)
-
 For the complete directory structure and detailed workflow, refer to the [SiteConfig documentation](https://github.com/stolostron/siteconfig/blob/main/docs/argocd.md#generate-extra-manifests-configmap-using-kustomize).
 
 ### Suppressed Manifests

ztp/tools/siteconfig-converter/convert.go

@@ -453,22 +453,14 @@ func convertToClusterInstance(siteConfig *SiteConfig, outputDir string, clusterT
 				"Use a ConfigMap which contains the already merged MachineConfigs and reference it through extraManifestsRefs instead.\n")
 		}
 
-		// Check for extraManifestOnly
 		if cluster.ExtraManifestOnly {
-			warningsCollector.AddWarning("WARNING: extraManifestOnly field is not supported in ClusterInstance and will be ignored. \n")
+			warningsCollector.AddWarning("WARNING: extraManifestOnly field is not part of ClusterInstance spec. " +
+				"Extra manifests will be generated from this SiteConfig and included in the extraManifestsRefs ConfigMap, but the full ClusterInstance CR set will also be generated.\n")
 		}
 
-		// Check for extraManifests
-		if (cluster.ExtraManifests.SearchPaths != nil && len(*cluster.ExtraManifests.SearchPaths) > 0) ||
-			(cluster.ExtraManifests.Filter != nil && len(cluster.ExtraManifests.Filter.Exclude) > 0) {
-			warningsCollector.AddWarning("WARNING: extraManifests field is not supported in ClusterInstance and will be ignored. " +
-				"Create one or more configmaps with the exact desired set of CRs for the cluster and include them in the extraManifestsRefs.\n")
-		}
-
-		// Check for extraManifestPath
 		if cluster.ExtraManifestPath != "" {
 			warningsCollector.AddWarning(fmt.Sprintf("WARNING: extraManifestPath field '%s' is not supported in ClusterInstance and will be ignored. "+
-				"Create one or more configmaps with the exact desired set of CRs for the cluster and include them in the extraManifestsRefs.\n",
+				"Use extraManifests field instead\n",
 				cluster.ExtraManifestPath))
 		}