add extra manifests

Author: reshnm

cmd/manageDeploymentRepo.go

@@ -17,9 +17,10 @@ import (
 )
 
 const (
-	FlagGitConfig  = "git-config"
-	FlagOcmConfig  = "ocm-config"
-	FlagKubeConfig = "kubeconfig"
+	FlagGitConfig        = "git-config"
+	FlagOcmConfig        = "ocm-config"
+	FlagKubeConfig       = "kubeconfig"
+	FlagExtraManifestDir = "extra-manifest-dir"
 )
 
 type LogWriter struct{}
@@ -69,6 +70,7 @@ openmcp-bootstrapper manageDeploymentRepo <configFile>`,
 			targetCluster,
 			cmd.Flag(FlagGitConfig).Value.String(),
 			cmd.Flag(FlagOcmConfig).Value.String(),
+			cmd.Flag(FlagExtraManifestDir).Value.String(),
 		).Initialize(cmd.Context())
 
 		defer func() {
@@ -94,6 +96,11 @@ openmcp-bootstrapper manageDeploymentRepo <configFile>`,
 			return fmt.Errorf("failed to apply custom resource definitions: %w", err)
 		}
 
+		err = deploymentRepoManager.ApplyExtraManifests(cmd.Context())
+		if err != nil {
+			return fmt.Errorf("failed to apply extra manifests: %w", err)
+		}
+
 		err = deploymentRepoManager.UpdateResourcesKustomization()
 		if err != nil {
 			return fmt.Errorf("failed to update resources kustomization: %w", err)
@@ -119,6 +126,7 @@ func init() {
 	manageDeploymentRepoCmd.Flags().String(FlagOcmConfig, "", "ocm configuration file")
 	manageDeploymentRepoCmd.Flags().String(FlagGitConfig, "", "Git configuration file")
 	manageDeploymentRepoCmd.Flags().String(FlagKubeConfig, "", "Kubernetes configuration file")
+	manageDeploymentRepoCmd.Flags().String(FlagExtraManifestDir, "", "Directory containing extra manifests to apply")
 
 	if err := manageDeploymentRepoCmd.MarkFlagRequired(FlagGitConfig); err != nil {
 		panic(err)

internal/deployment-repo/deploymentRepoManager.go

@@ -26,11 +26,12 @@ const (
 	FluxCDKustomizationControllerResourceName = "fluxcd-kustomize-controller"
 	FluxCDHelmControllerResourceName          = "fluxcd-helm-controller"
 
-	EnvsDirectoryName      = "envs"
-	ResourcesDirectoryName = "resources"
-	OpenMCPDirectoryName   = "openmcp"
-	FluxCDDirectoryName    = "fluxcd"
-	CRDsDirectoryName      = "crds"
+	EnvsDirectoryName       = "envs"
+	ResourcesDirectoryName  = "resources"
+	OpenMCPDirectoryName    = "openmcp"
+	FluxCDDirectoryName     = "fluxcd"
+	CRDsDirectoryName       = "crds"
+	ExtraManifestsDirectory = "extra"
 )
 
 // DeploymentRepoManager manages the deployment repository by applying templates and committing changes.
@@ -43,11 +44,15 @@ type DeploymentRepoManager struct {
 	// +optional
 	OcmConfigPath string
 
+	// Config is the bootstrapper configuration
 	Config *config.BootstrapperConfig
 
 	// TargetCluster is the Kubernetes cluster to which the deployment will be applied
 	TargetCluster *clusters.Cluster
 
+	// ExtraManifestDir is an optional directory containing extra manifests to be added to the deployment repository
+	ExtraManifestDir string
+
 	// Internals
 	// workDir is a temporary directory used for processing
 	workDir string
@@ -69,16 +74,18 @@ type DeploymentRepoManager struct {
 	// fluxcdCV is the component version of the fluxcd source controller component
 	fluxcdCV *ocmcli.ComponentVersion
 	// crdFiles is a list of CRD files downloaded from the openmcp-operator component
-	crdFiles []string
+	crdFiles       []string
+	extraManifests []string
 }
 
 // NewDeploymentRepoManager creates a new DeploymentRepoManager with the specified parameters.
-func NewDeploymentRepoManager(config *config.BootstrapperConfig, targetCluster *clusters.Cluster, gitConfigPath, ocmConfigPath string) *DeploymentRepoManager {
+func NewDeploymentRepoManager(config *config.BootstrapperConfig, targetCluster *clusters.Cluster, gitConfigPath, ocmConfigPath, extraManifestDir string) *DeploymentRepoManager {
 	return &DeploymentRepoManager{
-		Config:        config,
-		TargetCluster: targetCluster,
-		GitConfigPath: gitConfigPath,
-		OcmConfigPath: ocmConfigPath,
+		Config:           config,
+		TargetCluster:    targetCluster,
+		GitConfigPath:    gitConfigPath,
+		OcmConfigPath:    ocmConfigPath,
+		ExtraManifestDir: extraManifestDir,
 	}
 }
 
@@ -243,39 +250,6 @@ func (m *DeploymentRepoManager) ApplyTemplates(ctx context.Context) error {
 		return fmt.Errorf("failed to apply templates from directory %s: %w", m.templatesDir, err)
 	}
 
-	/*
-		workTree, err := m.gitRepo.Worktree()
-		if err != nil {
-			return fmt.Errorf("failed to get worktree: %w", err)
-		}
-
-		workTreePath := filepath.Join(ResourcesDirectoryName, OpenMCPDirectoryName, "extra")
-
-			for _, manifest := range m.Config.OpenMCPOperator.Manifests {
-				workTreeFile := filepath.Join(workTreePath, manifest.Name+".yaml")
-				logger.Infof("Applying openmcp-operator manifest %s to deployment repository", manifest.Name)
-
-				manifestRaw, err := yaml.Marshal(manifest.ManifestParsed)
-				if err != nil {
-					return fmt.Errorf("failed to marshal openmcp-operator manifest %s: %w", manifest.Name, err)
-				}
-
-				err = os.MkdirAll(filepath.Join(m.gitRepoDir, workTreePath), 0755)
-				if err != nil {
-					return fmt.Errorf("failed to create directory %s in deployment repository: %w", workTreePath, err)
-				}
-
-				err = os.WriteFile(filepath.Join(m.gitRepoDir, workTreeFile), manifestRaw, 0o644)
-				if err != nil {
-					return fmt.Errorf("failed to write openmcp-operator manifest %s to deployment repository: %w", manifest.Name, err)
-				}
-				_, err = workTree.Add(workTreePath)
-				if err != nil {
-					return fmt.Errorf("failed to add openmcp-operator manifest %s to git index: %w", manifest.Name, err)
-				}
-			}
-	*/
-
 	return nil
 }
 
@@ -378,15 +352,57 @@ func (m *DeploymentRepoManager) ApplyCustomResourceDefinitions(ctx context.Conte
 	return nil
 }
 
+// ApplyExtraManifests copies extra manifests from the specified directory to the deployment repository and stages them for commit.
+func (m *DeploymentRepoManager) ApplyExtraManifests(_ context.Context) error {
+	logger := log.GetLogger()
+	if len(m.ExtraManifestDir) == 0 {
+		logger.Infof("No extra manifest directory specified, skipping")
+		return nil
+	}
+
+	// if an extra manifest directory is specified, copy its contents to the deployment repository
+	logger.Infof("Applying extra manifests from %s to deployment repository", m.ExtraManifestDir)
+	err := util.CopyDir(m.ExtraManifestDir, filepath.Join(m.gitRepoDir, ResourcesDirectoryName, OpenMCPDirectoryName, ExtraManifestsDirectory))
+	if err != nil {
+		return fmt.Errorf("failed to copy extra manifests from %s to deployment repository: %w", m.ExtraManifestDir, err)
+	}
+	workTree, err := m.gitRepo.Worktree()
+	if err != nil {
+		return fmt.Errorf("failed to get worktree: %w", err)
+	}
+	_, err = workTree.Add(filepath.Join(ResourcesDirectoryName, OpenMCPDirectoryName, ExtraManifestsDirectory))
+	if err != nil {
+		return fmt.Errorf("failed to add extra manifests to git index: %w", err)
+	}
+
+	entries, err := os.ReadDir(m.ExtraManifestDir)
+	if err != nil {
+		return fmt.Errorf("failed to read extra manifest directory: %w", err)
+	}
+
+	m.extraManifests = make([]string, 0)
+	for _, entry := range entries {
+		if !entry.IsDir() {
+			fileName := entry.Name()
+			// Check if file has .yaml or .yml extension
+			if filepath.Ext(fileName) == ".yaml" || filepath.Ext(fileName) == ".yml" {
+				m.extraManifests = append(m.extraManifests, fileName)
+				logger.Tracef("Added extra manifest: %s", fileName)
+			}
+		}
+	}
+
+	return nil
+}
+
 func (m *DeploymentRepoManager) UpdateResourcesKustomization() error {
 	logger := log.GetLogger()
 	files := make([]string, 0,
 		len(m.Config.Providers.ClusterProviders)+
 			len(m.Config.Providers.ServiceProviders)+
 			len(m.Config.Providers.PlatformServices)+
-			len(m.crdFiles))
-
-	// len(m.Config.OpenMCPOperator.Manifests))
+			len(m.crdFiles)+
+			len(m.extraManifests))
 
 	for _, crdFile := range m.crdFiles {
 		files = append(files, filepath.Join(CRDsDirectoryName, filepath.Base(crdFile)))
@@ -404,11 +420,9 @@ func (m *DeploymentRepoManager) UpdateResourcesKustomization() error {
 		files = append(files, filepath.Join("platform-services", platformService+".yaml"))
 	}
 
-	/*
-		for _, manifest := range m.Config.OpenMCPOperator.Manifests {
-			files = append(files, filepath.Join("extra", manifest.Name+".yaml"))
-		}
-	*/
+	for _, manifest := range m.extraManifests {
+		files = append(files, filepath.Join(ExtraManifestsDirectory, filepath.Base(manifest)))
+	}
 
 	// open resources root customization
 	resourcesRootKustomizationPath := filepath.Join(ResourcesDirectoryName, OpenMCPDirectoryName, "kustomization.yaml")