Skip to content

Commit ad02c24

Browse files
committed
chore: update pr per comments
Signed-off-by: Allen Conlon <[email protected]>
1 parent 63854e4 commit ad02c24

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/pkg/packager/deploy.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ type DeployResult struct {
8383
// Deploy takes a reference to a `layout.PackageLayout` and deploys the package. If successful, returns a list of components that were successfully deployed and the associated variable config.
8484
func Deploy(ctx context.Context, pkgLayout *layout.PackageLayout, opts DeployOptions) (DeployResult, error) {
8585
l := logger.From(ctx)
86-
l.Info("starting deploy", "package", pkgLayout.Pkg.Metadata.Name, "architecture", pkgLayout.Pkg.Metadata.Architecture)
86+
l.Info("starting deploy", "package", pkgLayout.Pkg.Metadata.Name, "architecture", pkgLayout.Pkg.Build.Architecture)
8787
start := time.Now()
8888
if opts.NamespaceOverride != "" {
8989
if err := OverridePackageNamespace(pkgLayout.Pkg, opts.NamespaceOverride); err != nil {
@@ -289,7 +289,7 @@ func (d *deployer) deployInitComponent(ctx context.Context, pkgLayout *layout.Pa
289289

290290
// Before deploying the seed registry, start the injector
291291
if isSeedRegistry {
292-
err := d.c.StartInjection(ctx, pkgLayout.DirPath(), pkgLayout.GetImageDirPath(), pkgLayout.Pkg.Metadata.Architecture, component.Images)
292+
err := d.c.StartInjection(ctx, pkgLayout.DirPath(), pkgLayout.GetImageDirPath(), pkgLayout.Pkg.Build.Architecture, component.Images)
293293
if err != nil {
294294
return nil, err
295295
}
@@ -355,7 +355,7 @@ func (d *deployer) deployComponent(ctx context.Context, pkgLayout *layout.Packag
355355
// This variable needs to be set from the package metadata architecture
356356
// This might be able to be expanded to include all the .metadata settings
357357
applicationTemplates["###ZARF_PKG_ARCHITECTURE###"] = &variables.TextTemplate{
358-
Value: pkgLayout.Pkg.Metadata.Architecture,
358+
Value: pkgLayout.Pkg.Build.Architecture,
359359
}
360360

361361
if err != nil {
@@ -633,7 +633,6 @@ func setupState(ctx context.Context, c *cluster.Cluster, pkg v1alpha1.ZarfPackag
633633
if s == nil {
634634
return nil, errors.New("cluster state should not be nil")
635635
}
636-
s.Architecture = pkg.Metadata.Architecture
637636
if pkg.Metadata.YOLO && s.Distro != "YOLO" {
638637
l.Warn("This package is in YOLO mode, but the cluster was already initialized with 'zarf init'. " +
639638
"This may cause issues if the package does not exclude any charts or manifests from the Zarf Agent using " +

0 commit comments

Comments
 (0)