Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update value of localPath for composable packages #1154

Merged
merged 18 commits into from
Feb 1, 2023
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
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
4 changes: 2 additions & 2 deletions packages/zarf-registry/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ components:
charts:
- name: docker-registry
releaseName: zarf-docker-registry
localPath: packages/zarf-registry/chart
localPath: chart
version: 1.0.0
namespace: zarf
valuesFiles:
Expand All @@ -53,7 +53,7 @@ components:
charts:
- name: docker-registry
releaseName: zarf-docker-registry
localPath: packages/zarf-registry/chart
localPath: chart
version: 1.0.0
namespace: zarf
valuesFiles:
Expand Down
5 changes: 4 additions & 1 deletion src/pkg/packager/compose.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,14 @@ func (p *Packager) fixComposedFilepaths(parent, child types.ZarfComponent) types
child.Files[fileIdx].Source = p.getComposedFilePath(file.Source, parent.Import.Path)
}

// Prefix non-url composed component chart values files.
// Prefix non-url composed component chart values files and localPath.
for chartIdx, chart := range child.Charts {
for valuesIdx, valuesFile := range chart.ValuesFiles {
child.Charts[chartIdx].ValuesFiles[valuesIdx] = p.getComposedFilePath(valuesFile, parent.Import.Path)
}
if child.Charts[chartIdx].LocalPath != "" {
tworcester marked this conversation as resolved.
Show resolved Hide resolved
child.Charts[chartIdx].LocalPath = p.getComposedFilePath(child.Charts[chartIdx].LocalPath, parent.Import.Path)
jeff-mccoy marked this conversation as resolved.
Show resolved Hide resolved
}
}

// Prefix non-url composed manifest files and kustomizations.
Expand Down