From 6c923dd8dbf33740e92fd61a30d031e025dd2cf4 Mon Sep 17 00:00:00 2001 From: Diego Gonzalez Alvarez Date: Thu, 31 Mar 2022 12:48:53 +0000 Subject: [PATCH 1/2] Use canonical image architectures. Closes #1995. Prior to this change, Kaniko was not using the platform's canonical value. --- cmd/executor/cmd/root.go | 2 +- cmd/warmer/cmd/root.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/executor/cmd/root.go b/cmd/executor/cmd/root.go index 298340faff..ee6bdf4b5b 100644 --- a/cmd/executor/cmd/root.go +++ b/cmd/executor/cmd/root.go @@ -218,7 +218,7 @@ func addKanikoOptionsFlags() { // Default the custom platform flag to our current platform, and validate it. if opts.CustomPlatform == "" { - opts.CustomPlatform = platforms.DefaultString() + opts.CustomPlatform = platforms.Format(platforms.Normalize(platforms.DefaultSpec())) } if _, err := v1.ParsePlatform(opts.CustomPlatform); err != nil { logrus.Fatalf("Invalid platform %q: %v", opts.CustomPlatform, err) diff --git a/cmd/warmer/cmd/root.go b/cmd/warmer/cmd/root.go index 4e50ff6576..6051746833 100644 --- a/cmd/warmer/cmd/root.go +++ b/cmd/warmer/cmd/root.go @@ -90,7 +90,7 @@ func addKanikoOptionsFlags() { // Default the custom platform flag to our current platform, and validate it. if opts.CustomPlatform == "" { - opts.CustomPlatform = platforms.DefaultString() + opts.CustomPlatform = platforms.Format(platforms.Normalize(platforms.DefaultSpec())) } if _, err := v1.ParsePlatform(opts.CustomPlatform); err != nil { logrus.Fatalf("Invalid platform %q: %v", opts.CustomPlatform, err) From 01a70d5b21a60759ddc834312220dd3ffb597d3d Mon Sep 17 00:00:00 2001 From: Diego Gonzalez Alvarez Date: Thu, 31 Mar 2022 12:52:46 +0000 Subject: [PATCH 2/2] Update platform unit test. --- pkg/executor/build_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/executor/build_test.go b/pkg/executor/build_test.go index 1c383f3f91..678e747f81 100644 --- a/pkg/executor/build_test.go +++ b/pkg/executor/build_test.go @@ -372,7 +372,7 @@ COPY --from=second /bar /bat ioutil.WriteFile(f.Name(), []byte(tt.args.dockerfile), 0755) opts := &config.KanikoOptions{ DockerfilePath: f.Name(), - CustomPlatform: platforms.DefaultString(), + CustomPlatform: platforms.Format(platforms.Normalize(platforms.DefaultSpec())), } testStages, metaArgs, err := dockerfile.ParseStages(opts) if err != nil {