From 1b59a296a8e2f1e1bdc6d248b7cb8038d0cc5a70 Mon Sep 17 00:00:00 2001 From: Diego Gonzalez Date: Thu, 31 Mar 2022 21:15:24 +0200 Subject: [PATCH] Use canonical platform values. Fix 1995. (#2025) * Use canonical image architectures. Closes #1995. Prior to this change, Kaniko was not using the platform's canonical value. * Update platform unit test. --- cmd/executor/cmd/root.go | 2 +- cmd/warmer/cmd/root.go | 2 +- pkg/executor/build_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/executor/cmd/root.go b/cmd/executor/cmd/root.go index 3033d5368..a5867578f 100644 --- a/cmd/executor/cmd/root.go +++ b/cmd/executor/cmd/root.go @@ -224,7 +224,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 4e50ff657..605174683 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) diff --git a/pkg/executor/build_test.go b/pkg/executor/build_test.go index 1c383f3f9..678e747f8 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 {