feat(install): support merged config overlays and pc-apps values (#522)

Allow repeated --config flags for install codesphere commands and merge
the rendered YAML files in order before invoking the installer.

Also expose pc-apps config on the normal config file and values files on
the dependencies flow and pass them into the BOM-based pc-apps
installer.

config:
```yaml
pcApps:
  chartRegistry: example.com/charts
```

---------

Signed-off-by: schrodit <7979201+schrodit@users.noreply.github.com>
Co-authored-by: schrodit <7979201+schrodit@users.noreply.github.com>

Author: schrodit

cli/cmd/install_codesphere.go

@@ -4,12 +4,24 @@
 package cmd
 
 import (
+	"fmt"
+	"os"
+	"path/filepath"
+
 	"github.com/codesphere-cloud/cs-go/pkg/io"
+	"github.com/codesphere-cloud/oms/internal/configtemplating"
 	"github.com/codesphere-cloud/oms/internal/env"
 	"github.com/codesphere-cloud/oms/internal/installer"
 	"github.com/codesphere-cloud/oms/internal/installer/argocd"
+	"github.com/codesphere-cloud/oms/internal/installer/files"
 	"github.com/codesphere-cloud/oms/internal/util"
 	"github.com/spf13/cobra"
+	"go.yaml.in/yaml/v3"
+)
+
+const (
+	mergedInstallConfigDirPattern = "oms-install-config-*"
+	mergedInstallConfigFileName   = "config.yaml"
 )
 
 // InstallCodesphereCmd represents the codesphere command
@@ -23,7 +35,8 @@ type InstallCodesphereOpts struct {
 	*GlobalOptions
 	Package          string
 	Force            bool
-	Config           string
+	Configs          []string
+	ConfigPath       string
 	Vault            string
 	PrivKey          string
 	SkipSteps        []string
@@ -36,10 +49,11 @@ type InstallCodesphereOpts struct {
 	ArgoCDForceConflicts bool
 	ArgoCDRepoURL        string
 	ArgoCDValues         []string
+	PCAppsValues         []string
 }
 
 func (c *InstallCodesphereCmd) RunE(_ *cobra.Command, _ []string) error {
-	cfg, cleanup, err := parseInstallConfig(c.Opts, installer.NewConfig())
+	effectiveOpts, cfg, cleanup, err := prepareInstallConfig(c.Opts, installer.NewConfig())
 	if err != nil {
 		return err
 	}
@@ -59,17 +73,17 @@ func (c *InstallCodesphereCmd) RunE(_ *cobra.Command, _ []string) error {
 	}
 
 	if c.Opts.CodesphereOnly {
-		return installCodespherePlatform(c.Opts, c.Env)
+		return installCodespherePlatform(effectiveOpts, c.Env)
 	}
 
 	if infraInstaller.HasExecutableSteps(cfg) {
-		if err := installCodesphereInfra(c.Opts, c.Env); err != nil {
+		if err := installCodesphereInfra(effectiveOpts, c.Env); err != nil {
 			return err
 		}
 	}
 
 	if dependenciesInstaller.HasExecutableSteps(cfg) || !installer.IsStepSkipped(cfg, c.Opts.SkipSteps, installer.ArgoCDStep) {
-		if err := installCodesphereDepencies(c.Opts, c.Env); err != nil {
+		if err := installCodesphereDepencies(effectiveOpts, cfg, c.Env); err != nil {
 			return err
 		}
 	}
@@ -78,7 +92,7 @@ func (c *InstallCodesphereCmd) RunE(_ *cobra.Command, _ []string) error {
 		return nil
 	}
 
-	return installCodespherePlatform(c.Opts, c.Env)
+	return installCodespherePlatform(effectiveOpts, c.Env)
 }
 
 func AddInstallCodesphereCmd(install *cobra.Command, opts *GlobalOptions) {
@@ -104,7 +118,7 @@ func AddInstallCodesphereCmd(install *cobra.Command, opts *GlobalOptions) {
 	}
 	codesphere.cmd.PersistentFlags().StringVarP(&codesphere.Opts.Package, "package", "p", "", "Package file (e.g. codesphere-v1.2.3-installer.tar.gz) to load binaries, installer etc. from")
 	codesphere.cmd.PersistentFlags().BoolVarP(&codesphere.Opts.Force, "force", "f", false, "Enforce package extraction")
-	codesphere.cmd.PersistentFlags().StringVarP(&codesphere.Opts.Config, "config", "c", "", "Path to the Codesphere Private Cloud configuration file (yaml)")
+	codesphere.cmd.PersistentFlags().StringArrayVarP(&codesphere.Opts.Configs, "config", "c", nil, "Path to a Codesphere Private Cloud configuration file (yaml). Can be specified multiple times and merged in order")
 	codesphere.cmd.PersistentFlags().StringVar(&codesphere.Opts.Vault, "vault", "", "Path to the SOPS-encrypted prod.vault.yaml file used for config templating")
 	codesphere.cmd.PersistentFlags().StringVarP(&codesphere.Opts.PrivKey, "priv-key", "k", "", "Path to the private key to encrypt/decrypt secrets")
 	codesphere.cmd.PersistentFlags().StringSliceVarP(&codesphere.Opts.SkipSteps, "skip-steps", "s", []string{}, "Steps to be skipped. E.g. copy-dependencies, extract-dependencies, load-container-images, ceph, postgres, kubernetes, docker, argocd")
@@ -116,6 +130,7 @@ func AddInstallCodesphereCmd(install *cobra.Command, opts *GlobalOptions) {
 	codesphere.cmd.PersistentFlags().BoolVar(&codesphere.Opts.ArgoCDForceConflicts, "argo-force-conflicts", false, "Force SSA ownership conflicts during ArgoCD install")
 	codesphere.cmd.PersistentFlags().StringVar(&codesphere.Opts.ArgoCDRepoURL, "argo-repo", argocd.DefaultRepoURL, "ArgoCD Helm chart repository URL")
 	codesphere.cmd.PersistentFlags().StringArrayVar(&codesphere.Opts.ArgoCDValues, "argo-values", nil, "ArgoCD values YAML file (can be specified multiple times)")
+	codesphere.cmd.PersistentFlags().StringArrayVar(&codesphere.Opts.PCAppsValues, "pc-apps-values", nil, "pc-apps values YAML file (can be specified multiple times)")
 
 	util.MarkPersistentFlagRequired(codesphere.cmd, "package")
 	util.MarkPersistentFlagRequired(codesphere.cmd, "config")
@@ -133,3 +148,103 @@ func AddInstallCodesphereCmd(install *cobra.Command, opts *GlobalOptions) {
 func sharedInstallCodesphereSteps() []string {
 	return []string{"copy-dependencies", "extract-dependencies"}
 }
+
+// prepareInstallConfig resolves the install command's repeated --config inputs
+// into a single config file for downstream installer steps.
+//
+// For each input config it optionally renders vault-backed template expressions,
+// parses the YAML into a generic map, and deep-merges the maps in flag order so
+// later --config values override earlier ones. The merged YAML is then written
+// to a dedicated temporary directory at a stable file name,
+// "<tmp>/config.yaml", parsed once through the config manager, and returned via
+// effectiveOpts.ConfigPath. The returned cleanup function removes any rendered
+// per-file temps as well as the merged config directory.
+func prepareInstallConfig(opts *InstallCodesphereOpts, cm installer.ConfigManager) (*InstallCodesphereOpts, files.RootConfig, func(), error) {
+	configFiles := append([]string(nil), opts.Configs...)
+	if len(configFiles) == 0 {
+		return nil, files.RootConfig{}, func() {}, fmt.Errorf("no config.yaml input provided: at least one config file is required")
+	}
+
+	store := installer.NewLazyVaultTemplatingSecretStore(opts.Vault, opts.PrivKey)
+	cleanupFns := []func(){}
+	cleanup := func() {
+		for i := len(cleanupFns) - 1; i >= 0; i-- {
+			cleanupFns[i]()
+		}
+	}
+
+	merged := map[string]any{}
+	for _, configPath := range configFiles {
+		renderedPath := configPath
+		if opts.Vault != "" {
+			tmpPath, renderCleanup, err := configtemplating.RenderConfigFileToTemp(configPath, store)
+			if err != nil {
+				cleanup()
+				return nil, files.RootConfig{}, func() {}, fmt.Errorf("failed to render config template %s: %w", configPath, err)
+			}
+			cleanupFns = append(cleanupFns, renderCleanup)
+			renderedPath = tmpPath
+		}
+
+		data, err := os.ReadFile(renderedPath)
+		if err != nil {
+			cleanup()
+			return nil, files.RootConfig{}, func() {}, fmt.Errorf("failed to read config file %s: %w", renderedPath, err)
+		}
+
+		var partial map[string]any
+		if err := yaml.Unmarshal(data, &partial); err != nil {
+			cleanup()
+			return nil, files.RootConfig{}, func() {}, fmt.Errorf("failed to parse config file %s: %w", renderedPath, err)
+		}
+		if partial == nil {
+			partial = map[string]any{}
+		}
+		merged = util.DeepMergeMaps(merged, partial)
+	}
+
+	mergedBytes, err := yaml.Marshal(merged)
+	if err != nil {
+		cleanup()
+		return nil, files.RootConfig{}, func() {}, fmt.Errorf("failed to marshal merged config.yaml: %w", err)
+	}
+
+	mergedDir, err := os.MkdirTemp("", mergedInstallConfigDirPattern)
+	if err != nil {
+		cleanup()
+		return nil, files.RootConfig{}, func() {}, fmt.Errorf("failed to create merged config directory: %w", err)
+	}
+	mergedPath := filepath.Join(mergedDir, mergedInstallConfigFileName)
+	tmp, err := os.OpenFile(mergedPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0600)
+	if err != nil {
+		cleanup()
+		_ = os.RemoveAll(mergedDir)
+		return nil, files.RootConfig{}, func() {}, fmt.Errorf("failed to create merged config file %s: %w", mergedPath, err)
+	}
+	if _, err := tmp.Write(mergedBytes); err != nil {
+		_ = tmp.Close()
+		_ = os.RemoveAll(mergedDir)
+		cleanup()
+		return nil, files.RootConfig{}, func() {}, fmt.Errorf("failed to write merged config file: %w", err)
+	}
+	if err := tmp.Close(); err != nil {
+		_ = os.RemoveAll(mergedDir)
+		cleanup()
+		return nil, files.RootConfig{}, func() {}, fmt.Errorf("failed to close merged config file: %w", err)
+	}
+	cleanupFns = append(cleanupFns, func() {
+		_ = os.RemoveAll(mergedDir)
+	})
+
+	cfg, err := cm.ParseConfigYaml(mergedPath)
+	if err != nil {
+		cleanup()
+		return nil, files.RootConfig{}, func() {}, fmt.Errorf("failed to parse merged config.yaml: %w", err)
+	}
+
+	effectiveOpts := *opts
+	effectiveOpts.ConfigPath = mergedPath
+	effectiveOpts.Configs = append([]string(nil), configFiles...)
+
+	return &effectiveOpts, cfg, cleanup, nil
+}