From 79ce1d458bb1d38f57519dfb95cb1c9a93f3dec5 Mon Sep 17 00:00:00 2001 From: Martin Zihlmann Date: Sun, 16 Feb 2025 14:07:12 +0000 Subject: [PATCH 1/3] fix: intermediate images should not be labelled --- pkg/executor/build.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/executor/build.go b/pkg/executor/build.go index 73b2f0df2..f50aa813d 100644 --- a/pkg/executor/build.go +++ b/pkg/executor/build.go @@ -760,6 +760,9 @@ func DoBuild(opts *config.KanikoOptions) (v1.Image, error) { configFile.OS = strings.Split(opts.CustomPlatform, "/")[0] configFile.Architecture = strings.Split(opts.CustomPlatform, "/")[1] } + if !stage.Final { + configFile.Config.Labels = map[string]string{} + } sourceImage, err = mutate.ConfigFile(sourceImage, configFile) if err != nil { return nil, err From 8b499400169b3611d7dc97577e98c61acb6049e4 Mon Sep 17 00:00:00 2001 From: Martin Zihlmann Date: Sun, 25 May 2025 10:48:16 +0100 Subject: [PATCH 2/3] fix: preserve labels from base images --- pkg/executor/build.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/executor/build.go b/pkg/executor/build.go index f50aa813d..77a6071ec 100644 --- a/pkg/executor/build.go +++ b/pkg/executor/build.go @@ -92,7 +92,11 @@ func newStageBuilder(args *dockerfile.BuildArgs, opts *config.KanikoOptions, sta return nil, err } - imageConfig, err := initializeConfig(sourceImage, opts) + _opts := *opts + if !stage.Final { + _opts.Labels = []string{} + } + imageConfig, err := initializeConfig(sourceImage, &_opts) if err != nil { return nil, err } @@ -760,9 +764,7 @@ func DoBuild(opts *config.KanikoOptions) (v1.Image, error) { configFile.OS = strings.Split(opts.CustomPlatform, "/")[0] configFile.Architecture = strings.Split(opts.CustomPlatform, "/")[1] } - if !stage.Final { - configFile.Config.Labels = map[string]string{} - } + sourceImage, err = mutate.ConfigFile(sourceImage, configFile) if err != nil { return nil, err From 7a6d0f67db2a9b82e8a53b852f2f98fc49e6d876 Mon Sep 17 00:00:00 2001 From: Martin Zihlmann Date: Sun, 25 May 2025 11:12:36 +0100 Subject: [PATCH 3/3] drop whitespace diff --- pkg/executor/build.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/executor/build.go b/pkg/executor/build.go index 77a6071ec..2017645e8 100644 --- a/pkg/executor/build.go +++ b/pkg/executor/build.go @@ -764,7 +764,6 @@ func DoBuild(opts *config.KanikoOptions) (v1.Image, error) { configFile.OS = strings.Split(opts.CustomPlatform, "/")[0] configFile.Architecture = strings.Split(opts.CustomPlatform, "/")[1] } - sourceImage, err = mutate.ConfigFile(sourceImage, configFile) if err != nil { return nil, err