Merge pull request crossplane#6222 from web-seven/bugfix/build-labels

jbw976 · web-flow · commit c97099bbb47d · 2025-01-27T11:01:13.000-08:00
xpkg build command use base image labels if present
diff --git a/internal/xpkg/build.go b/internal/xpkg/build.go
@@ -184,7 +184,9 @@ func (b *Builder) Build(ctx context.Context, opts ...BuildOpt) (v1.Image, runtim
 	}
 
 	cfg := cfgFile.Config
-	cfg.Labels = make(map[string]string)
+	if cfg.Labels == nil {
+		cfg.Labels = make(map[string]string)
+	}
 
 	pkgBytes, err := encode(pkg)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,9 @@ func (b *Builder) Build(ctx context.Context, opts ...BuildOpt) (v1.Image, runtim`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`cfg := cfgFile.Config`
`187`		`- cfg.Labels = make(map[string]string)`
	`187`	`+ if cfg.Labels == nil {`
	`188`	`+ cfg.Labels = make(map[string]string)`
	`189`	`+ }`
`188`	`190`
`189`	`191`	`pkgBytes, err := encode(pkg)`
`190`	`192`	`if err != nil {`