Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions internal/deployment-repo/deploymentRepoManager.go
Original file line number Diff line number Diff line change
Expand Up @@ -270,9 +270,11 @@ func (m *DeploymentRepoManager) ApplyTemplates(ctx context.Context) error {
return fmt.Errorf("failed to apply fluxcd image automation controller template input: %w", err)
}

err = util.CopyDir(m.ExtraManifestDir, filepath.Join(m.templatesDir, ResourcesDirectoryName, OpenMCPDirectoryName, ExtraManifestsDirectory))
if err != nil {
return fmt.Errorf("failed to copy extra manifests from %s to deployment repository: %w", m.ExtraManifestDir, err)
if len(m.ExtraManifestDir) > 0 {
err = util.CopyDir(m.ExtraManifestDir, filepath.Join(m.templatesDir, ResourcesDirectoryName, OpenMCPDirectoryName, ExtraManifestsDirectory))
if err != nil {
return fmt.Errorf("failed to copy extra manifests from %s to deployment repository: %w", m.ExtraManifestDir, err)
}
}

err = TemplateDir(ctx, m.templatesDir, templateInput, m.compGetter, m.gitRepo)
Expand Down
2 changes: 1 addition & 1 deletion internal/ocm-cli/component_getter.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ func (g *ComponentGetter) DownloadDirectoryResourceByLocation(ctx context.Contex

cv := rootCV
for _, refName := range referenceNames {
cv, err = g.GetReferencedComponentVersion(ctx, cv, refName)
cv, err = g.GetReferencedComponentVersionRecursive(ctx, cv, refName)
if err != nil {
return fmt.Errorf("error getting referenced component version %s: %w", refName, err)
}
Expand Down