add extra manifests

Author: reshnm

cmd/manageDeploymentRepo.go

@@ -10,12 +10,8 @@ import (
 )
 
 const (
-	FlagGitConfig       = "git-config"
-	FlagOcmConfig       = "ocm-config"
-	FlagClusterProvider = "cluster-provider"
-	FlagServiceProvider = "service-provider"
-	FlagPlatformService = "platform-service"
-	FlagImagePullSecret = "image-pull-secret"
+	FlagGitConfig = "git-config"
+	FlagOcmConfig = "ocm-config"
 )
 
 type LogWriter struct{}

internal/deployment-repo/config.go

@@ -42,6 +42,14 @@ type Providers struct {
 type OpenMCPOperator struct {
 	Config       json.RawMessage `json:"config"`
 	ConfigParsed map[string]interface{}
+
+	Manifests []Manifest `json:"manifests"`
+}
+
+type Manifest struct {
+	Name           string          `json:"name"`
+	Manifest       json.RawMessage `json:"manifest"`
+	ManifestParsed map[string]interface{}
 }
 
 func (c *DeploymentRepoConfig) ReadFromFile(path string) error {
@@ -67,33 +75,54 @@ func (c *DeploymentRepoConfig) Validate() error {
 	errs := field.ErrorList{}
 
 	if len(c.Environment) == 0 {
-		errs = append(errs, field.Required(field.NewPath("environment"), "environment is required (environment)"))
+		errs = append(errs, field.Required(field.NewPath("environment"), "environment is required"))
 	}
 
 	if len(c.Component.OpenMCPComponentLocation) == 0 {
-		errs = append(errs, field.Required(field.NewPath("component.location"), "component location is required (component.location)"))
+		errs = append(errs, field.Required(field.NewPath("component.location"), "component location is required"))
 	}
 
 	if len(c.DeploymentRepository.RepoURL) == 0 {
-		errs = append(errs, field.Required(field.NewPath("repository.url"), "repository url is required (repository.url)"))
+		errs = append(errs, field.Required(field.NewPath("repository.url"), "repository url is required"))
 	}
 
 	if len(c.DeploymentRepository.RepoBranch) == 0 {
-		errs = append(errs, field.Required(field.NewPath("repository.branch"), "repository branch is required (repository.branch)"))
+		errs = append(errs, field.Required(field.NewPath("repository.branch"), "repository branch is required"))
 	}
 
 	if len(c.TargetCluster.KubeconfigPath) == 0 {
-		errs = append(errs, field.Required(field.NewPath("targetCluster.kubeconfigPath"), "kubeconfig path is required (targetCluster.kubeconfigPath)"))
+		errs = append(errs, field.Required(field.NewPath("targetCluster.kubeconfigPath"), "kubeconfig path is required"))
 	}
 
 	if len(c.OpenMCPOperator.Config) == 0 {
-		errs = append(errs, field.Required(field.NewPath("openmcpOperator.config"), "openmcp operator config is required (openmcpOperator.config)"))
+		errs = append(errs, field.Required(field.NewPath("openmcpOperator.config"), "openmcp operator config is required"))
 	}
 
 	err := yaml.Unmarshal(c.OpenMCPOperator.Config, &c.OpenMCPOperator.ConfigParsed)
 	if err != nil {
 		errs = append(errs, field.Invalid(field.NewPath("openmcpOperator.config"), string(c.OpenMCPOperator.Config), "openmcp operator config is not valid yaml"))
 	}
 
+	if len(c.OpenMCPOperator.Manifests) > 0 {
+		for i, manifest := range c.OpenMCPOperator.Manifests {
+			if len(manifest.Name) == 0 {
+				errs = append(errs, field.Required(field.NewPath("openmcpOperator.manifests").Index(i).Child("name"), "manifest name is required"))
+			}
+
+			if len(manifest.Manifest) == 0 {
+				errs = append(errs, field.Required(field.NewPath("openmcpOperator.manifests").Index(i).Child("manifest"), "manifest content is required"))
+				continue
+			}
+
+			var parsed map[string]interface{}
+			err = yaml.Unmarshal(manifest.Manifest, &parsed)
+			if err != nil {
+				errs = append(errs, field.Invalid(field.NewPath("openmcpOperator.manifests").Index(i), string(manifest.Manifest), "openmcp operator manifest is not valid yaml"))
+			} else {
+				c.OpenMCPOperator.Manifests[i].ManifestParsed = parsed
+			}
+		}
+	}
+
 	return errs.ToAggregate()
 }

internal/deployment-repo/deploymentRepoManager.go

@@ -12,6 +12,7 @@ import (
 	"github.com/openmcp-project/controller-utils/pkg/clusters"
 	"k8s.io/apimachinery/pkg/runtime"
 	controllerruntime "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/yaml"
 
 	"sigs.k8s.io/kustomize/api/krusty"
 	"sigs.k8s.io/kustomize/kyaml/filesys"
@@ -258,6 +259,37 @@ 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
 }
 
@@ -362,7 +394,12 @@ func (m *DeploymentRepoManager) ApplyCustomResourceDefinitions(ctx context.Conte
 
 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))
+	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))
 
 	for _, crdFile := range m.crdFiles {
 		files = append(files, filepath.Join(CRDsDirectoryName, filepath.Base(crdFile)))
@@ -380,6 +417,10 @@ 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"))
+	}
+
 	// open resources root customization
 	resourcesRootKustomizationPath := filepath.Join(ResourcesDirectoryName, OpenMCPDirectoryName, "kustomization.yaml")