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.

Sign up for GitHub

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

Jump to bottom

fix: hotfix skeleton publish #2398

Merged
merged 3 commits into from
Mar 22, 2024
Merged

fix: hotfix skeleton publish #2398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79025bf
hotfix skeleton
Noxsios Mar 22, 2024
768cf8d
Merge branch 'main' into hotfix-skeleton
Noxsios Mar 22, 2024
56f63d5
hotfix skeleton
Noxsios Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/pkg/packager/composer/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,9 +347,6 @@ func (ic *ImportChain) MergeConstants(existing []types.ZarfPackageConstant) (mer

// CompatibleComponent determines if this component is compatible with the given create options
func CompatibleComponent(c types.ZarfComponent, arch, flavor string) bool {
if arch == zoci.SkeletonArch {
return true
}
satisfiesArch := c.Only.Cluster.Architecture == "" || c.Only.Cluster.Architecture == arch
satisfiesFlavor := c.Only.Flavor == "" || c.Only.Flavor == flavor
return satisfiesArch && satisfiesFlavor
Expand Down
4 changes: 3 additions & 1 deletion src/pkg/packager/creator/skeleton.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,16 @@ func (sc *SkeletonCreator) LoadPackageDefinition(dst *layout.PackagePaths) (pkg
return types.ZarfPackage{}, nil, err
}

pkg.Metadata.Architecture = zoci.SkeletonArch
pkg.Metadata.Architecture = config.GetArch()

// Compose components into a single zarf.yaml file
pkg, composeWarnings, err := ComposeComponents(pkg, sc.createOpts.Flavor)
if err != nil {
return types.ZarfPackage{}, nil, err
}

pkg.Metadata.Architecture = zoci.SkeletonArch

warnings = append(warnings, composeWarnings...)

pkg.Components, err = sc.processExtensions(pkg.Components, dst)
Expand Down