update

Author: reshnm

cmd/manageDeploymentRepo.go

@@ -139,14 +139,31 @@ openmcp-bootstrapper manageDeploymentRepo <componentLocation> <templateResourceL
 
 		logger.Infof("Applying templates from %s to deployment repository", templateResourceLocation)
 
-		err = deploymentrepo.TemplateDir(templateDir, repo)
+		imagePullSecrets, err := cmd.Flags().GetStringArray(FlagImagePullSecret)
 		if err != nil {
-			return fmt.Errorf("failed to apply templates from directory %s: %w", templateDir, err)
+			return fmt.Errorf("failed to get image pull secrets flag: %w", err)
 		}
 
-		imagePullSecrets, err := cmd.Flags().GetStringArray(FlagImagePullSecret)
+		templateInput := make(map[string]interface{})
+		openMCPOperatorCV, err := ocmGetter.GetReferencedComponentVersion(cmd.Context(), "openmcp-operator")
+		if err == nil {
+			logger.Infof("Found openmcp-operator component version: %s:%s", openMCPOperatorCV.Component.Name, openMCPOperatorCV.Component.Version)
+
+			imageResources := openMCPOperatorCV.GetResourcesByType(ocmcli.OCIImageResourceType)
+			if len(imageResources) == 0 || imageResources[0].Access.ImageReference == nil {
+				return fmt.Errorf("no image resource found for openmcp-operator component version %s:%s", openMCPOperatorCV.Component.Name, openMCPOperatorCV.Component.Version)
+			}
+
+			templateInput["openmcpOperator"] = map[string]interface{}{
+				"version":          openMCPOperatorCV.Component.Version,
+				"image":            *imageResources[0].Access.ImageReference,
+				"imagePullSecrets": imagePullSecrets,
+			}
+		}
+
+		err = deploymentrepo.TemplateDir(templateDir, templateInput, repo)
 		if err != nil {
-			return fmt.Errorf("failed to get image pull secrets flag: %w", err)
+			return fmt.Errorf("failed to apply templates from directory %s: %w", templateDir, err)
 		}
 
 		clusterProviders, err := cmd.Flags().GetStringArray(FlagClusterProvider)

internal/deployment-repo/repo.go

@@ -87,7 +87,7 @@ func CommitChanges(repo *git.Repository, message, name, email string) error {
 		return fmt.Errorf("failed to get worktree: %w", err)
 	}
 
-	_, err = workTree.Commit(message, &git.CommitOptions{
+	hash, err := workTree.Commit(message, &git.CommitOptions{
 		Author: &object.Signature{
 			Name:  name,
 			Email: email,
@@ -102,6 +102,10 @@ func CommitChanges(repo *git.Repository, message, name, email string) error {
 		}
 	}
 
+	if !hash.IsZero() {
+		logger.Infof("Created commit: %s", hash.String())
+	}
+
 	return nil
 }
 

internal/deployment-repo/templater.go

@@ -17,7 +17,7 @@ import (
 // TemplateDir processes the template files in the specified directory and writes
 // the rendered content to the corresponding files in the Git repository's worktree.
 // It uses the provided template directory and Git repository to perform the operations.
-func TemplateDir(templateDirectory string, repo *git.Repository) error {
+func TemplateDir(templateDirectory string, templateInput map[string]interface{}, repo *git.Repository) error {
 	logger := log.GetLogger()
 
 	workTree, err := repo.Worktree()
@@ -36,7 +36,6 @@ func TemplateDir(templateDirectory string, repo *git.Repository) error {
 	}()
 
 	te := template.NewTemplateExecution()
-	templateInput := make(map[string]interface{})
 
 	// Recursively walk through all files in the template directory
 	err = filepath.WalkDir(templateDirectory, func(path string, d os.DirEntry, walkError error) error {
@@ -63,14 +62,18 @@ func TemplateDir(templateDirectory string, repo *git.Repository) error {
 				return fmt.Errorf("failed to read template file %s: %w", relativePath, err)
 			}
 
-			templateResult, errInWalk = te.Execute(path, string(templateFromFile), templateInput)
-			if err != nil {
-				return fmt.Errorf("failed to execute template %s: %w", relativePath, err)
+			wrappedTemplateInput := map[string]interface{}{
+				"values": templateInput,
+			}
+
+			templateResult, errInWalk = te.Execute(path, string(templateFromFile), wrappedTemplateInput)
+			if errInWalk != nil {
+				return fmt.Errorf("failed to execute template %s: %w", relativePath, errInWalk)
 			}
 
 			fileInWorkTree, errInWalk = workTree.Filesystem.OpenFile(relativePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
 			if errInWalk != nil {
-				return fmt.Errorf("failed to open file in worktree %s: %w", relativePath, err)
+				return fmt.Errorf("failed to open file in worktree %s: %w", relativePath, errInWalk)
 			}
 			defer func(pathInRepo billy.File) {
 				err := pathInRepo.Close()
@@ -81,12 +84,12 @@ func TemplateDir(templateDirectory string, repo *git.Repository) error {
 
 			_, errInWalk = fileInWorkTree.Write(templateResult)
 			if errInWalk != nil {
-				return fmt.Errorf("failed to write to file in worktree %s: %w", relativePath, err)
+				return fmt.Errorf("failed to write to file in worktree %s: %w", relativePath, errInWalk)
 			}
 
 			// Add the file to the git index
 			if _, errInWalk = workTree.Add(relativePath); errInWalk != nil {
-				return fmt.Errorf("failed to add file to git index: %w", err)
+				return fmt.Errorf("failed to add file to git index: %w", errInWalk)
 			}
 		}
 		return nil
@@ -188,11 +191,12 @@ func TemplateProviders(ctx context.Context, clusterProviders, serviceProviders,
 }
 
 func getImageResource(cv *ocmcli.ComponentVersion) (*ocmcli.Resource, error) {
-	for _, resource := range cv.Component.Resources {
-		if resource.Type == "ociImage" {
-			return &resource, nil
-		}
+	resources := cv.GetResourcesByType(ocmcli.OCIImageResourceType)
+
+	if len(resources) > 0 {
+		return &resources[0], nil
 	}
+
 	return nil, fmt.Errorf("image resource not found for component %s", cv.Component.Name)
 }
 
@@ -219,8 +223,8 @@ func templateProvider(options *ProviderOptions, templateSource, dir string, repo
 		"values": map[string]interface{}{
 			"name": options.Name,
 			"image": map[string]interface{}{
-				"location":    options.Image,
-				"pullSecrets": options.ImagePullSecrets,
+				"location":         options.Image,
+				"imagePullSecrets": options.ImagePullSecrets,
 			},
 		},
 	}

internal/deployment-repo/templates/clusterProvider.yaml

@@ -4,9 +4,9 @@ metadata:
   name: "{{ .values.name }}"
 spec:
   image: "{{ .values.image.location }}"
-{{- if dig "image" "pullSecrets" "" .values }}
-{{- range $index, $value := .values.image.pullSecrets }}
+{{- if dig "image" "imagePullSecrets" "" .values }}
   imagePullSecrets:
+{{- range $index, $value := .values.image.imagePullSecrets }}
     - name: "{{ $value }}"
 {{- end }}
 {{- end }}

internal/deployment-repo/templates/platformService.yaml

@@ -4,9 +4,9 @@ metadata:
   name: "{{ .values.name }}"
 spec:
   image: "{{ .values.image.location }}"
-{{- if dig "image" "pullSecrets" "" .values }}
-{{- range $index, $value := .values.image.pullSecrets }}
+{{- if dig "image" "imagePullSecrets" "" .values }}
   imagePullSecrets:
+{{- range $index, $value := .values.image.imagePullSecrets }}
     - name: "{{ $value }}"
 {{- end }}
 {{- end }}

internal/deployment-repo/templates/serviceProvider.yaml

@@ -4,9 +4,9 @@ metadata:
   name: "{{ .values.name }}"
 spec:
   image: "{{ .values.image.location }}"
-{{- if dig "image" "pullSecrets" "" .values }}
-{{- range $index, $value := .values.image.pullSecrets }}
+{{- if dig "image" "imagePullSecrets" "" .values }}
   imagePullSecrets:
+{{- range $index, $value := .values.image.imagePullSecrets }}
     - name: "{{ $value }}"
 {{- end }}
 {{- end }}

internal/ocm-cli/ocm.go

@@ -102,6 +102,10 @@ type Access struct {
 	MediaType *string `json:"mediaType"`
 }
 
+var (
+	OCIImageResourceType = "ociImage"
+)
+
 // GetResource retrieves a resource by its name from the component version.
 func (cv *ComponentVersion) GetResource(name string) (*Resource, error) {
 	for _, resource := range cv.Component.Resources {
@@ -112,6 +116,16 @@ func (cv *ComponentVersion) GetResource(name string) (*Resource, error) {
 	return nil, fmt.Errorf("resource %s not found in component version %s", name, cv.Component.Name)
 }
 
+func (cv *ComponentVersion) GetResourcesByType(resourceType string) []Resource {
+	var resources []Resource
+	for _, resource := range cv.Component.Resources {
+		if resource.Type == resourceType {
+			resources = append(resources, resource)
+		}
+	}
+	return resources
+}
+
 // GetComponentReference retrieves a component reference by its name from the component version.
 func (cv *ComponentVersion) GetComponentReference(name string) (*ComponentReference, error) {
 	for _, ref := range cv.Component.ComponentReferences {