Make json key optional for GCR push

cmd/kaniko-docker/main.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"strings"
 
 	"github.com/joho/godotenv"
 	"github.com/pkg/errors"
@@ -146,11 +145,6 @@ func main() {
 			Usage:  "Set this flag with value as oneof <panic|fatal|error|warn|info|debug|trace> to set the logging level for kaniko. Defaults to info.",
 			EnvVar: "PLUGIN_VERBOSITY",
 		},
-		cli.StringFlag{
-			Name:   "platform",
-			Usage:  "Allows to build with another default platform than the host, similarly to docker build --platform",
-			EnvVar: "PLUGIN_PLATFORM",
-		},
 	}
 
 	if err := app.Run(os.Args); err != nil {
@@ -187,11 +181,10 @@ func run(c *cli.Context) error {
 			DigestFile:    defaultDigestFile,
 			NoPush:        noPush,
 			Verbosity:     c.String("verbosity"),
-			Platform:      c.String("platform"),
 		},
 		Artifact: kaniko.Artifact{
 			Tags:         c.StringSlice("tags"),
-			Repo:         buildRepo(c.String("registry"), c.String("repo")),
+			Repo:         c.String("repo"),
 			Registry:     c.String("registry"),
 			ArtifactFile: c.String("artifact-file"),
 			RegistryType: artifact.Docker,
@@ -232,17 +225,3 @@ func createDockerCfgFile(username, password, registry string) error {
 	}
 	return nil
 }
-
-func buildRepo(registry, repo string) string {
-	if registry == "" {
-		// No custom registry, just return the repo name
-		return repo
-	}
-	if strings.HasPrefix(repo, registry + "/") {
-		// Repo already includes the registry prefix
-		// For backward compatibility, we won't add the prefix again.
-		return repo
-	}
-	// Prefix the repo with the registry
-	return registry + "/" + repo
-}

cmd/kaniko-docker/main_test.go

@@ -1,37 +0,0 @@
-package main
-
-import "testing"
-
-func Test_buildRepo(t *testing.T) {
-	tests := []struct {
-		name     string
-		registry string
-		repo     string
-		want     string
-	}{
-		{
-			name: "dockerhub",
-			repo: "golang",
-			want: "golang",
-		},
-		{
-			name:     "internal",
-			registry: "artifactory.example.com",
-			repo:     "service",
-			want:     "artifactory.example.com/service",
-		},
-		{
-			name:     "backward_compatibility",
-			registry: "artifactory.example.com",
-			repo:     "artifactory.example.com/service",
-			want:     "artifactory.example.com/service",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := buildRepo(tt.registry, tt.repo); got != tt.want {
-				t.Errorf("buildRepo(%q, %q) = %v, want %v", tt.registry, tt.repo, got, tt.want)
-			}
-		})
-	}
-}

cmd/kaniko-ecr/main.go

@@ -174,11 +174,6 @@ func main() {
 			Usage:  "Set this flag with value as oneof <panic|fatal|error|warn|info|debug|trace> to set the logging level for kaniko. Defaults to info.",
 			EnvVar: "PLUGIN_VERBOSITY",
 		},
-		cli.StringFlag{
-			Name:   "platform",
-			Usage:  "Allows to build with another default platform than the host, similarly to docker build --platform",
-			EnvVar: "PLUGIN_PLATFORM",
-		},
 	}
 
 	if err := app.Run(os.Args); err != nil {
@@ -257,7 +252,6 @@ func run(c *cli.Context) error {
 			DigestFile:   defaultDigestFile,
 			NoPush:       noPush,
 			Verbosity:    c.String("verbosity"),
-			Platform:     c.String("platform"),
 		},
 		Artifact: kaniko.Artifact{
 			Tags:         c.StringSlice("tags"),

cmd/kaniko-gcr/main.go

@@ -130,11 +130,6 @@ func main() {
 			Usage:  "Set this flag as --verbosity=<panic|fatal|error|warn|info|debug|trace> to set the logging level for kaniko. Defaults to info.",
 			EnvVar: "PLUGIN_VERBOSITY",
 		},
-		cli.StringFlag{
-			Name:   "platform",
-			Usage:  "Allows to build with another default platform than the host, similarly to docker build --platform",
-			EnvVar: "PLUGIN_PLATFORM",
-		},
 	}
 
 	if err := app.Run(os.Args); err != nil {
@@ -172,7 +167,6 @@ func run(c *cli.Context) error {
 			DigestFile:   defaultDigestFile,
 			NoPush:       noPush,
 			Verbosity:    c.String("verbosity"),
-			Platform:     c.String("platform"),
 		},
 		Artifact: kaniko.Artifact{
 			Tags:         c.StringSlice("tags"),

docker/docker/Dockerfile.linux.amd64

@@ -1,4 +1,4 @@
-FROM gcr.io/kaniko-project/executor:v1.7.0
+FROM gcr.io/kaniko-project/executor:v1.6.0
 
 ADD release/linux/amd64/kaniko-docker /kaniko/
 ENTRYPOINT ["/kaniko/kaniko-docker"]

docker/docker/Dockerfile.linux.arm64

@@ -1,4 +1,4 @@
-FROM gcr.io/kaniko-project/executor:v1.7.0
+FROM gcr.io/kaniko-project/executor:arm64-v1.6.0
 
 ENV HOME /root
 ENV USER root

docker/ecr/Dockerfile.linux.amd64

@@ -1,4 +1,4 @@
-FROM gcr.io/kaniko-project/executor:v1.7.0
+FROM gcr.io/kaniko-project/executor:v1.6.0
 
 ADD release/linux/amd64/kaniko-ecr /kaniko/
 ENTRYPOINT ["/kaniko/kaniko-ecr"]

docker/ecr/Dockerfile.linux.arm64

@@ -1,4 +1,4 @@
-FROM gcr.io/kaniko-project/executor:v1.7.0
+FROM gcr.io/kaniko-project/executor:arm64-v1.6.0
 
 ENV HOME /root
 ENV USER root

docker/gcr/Dockerfile.linux.amd64

@@ -1,4 +1,4 @@
-FROM gcr.io/kaniko-project/executor:v1.7.0
+FROM gcr.io/kaniko-project/executor:v1.6.0
 
 ADD release/linux/amd64/kaniko-gcr /kaniko/
 ENTRYPOINT ["/kaniko/kaniko-gcr"]

docker/gcr/Dockerfile.linux.arm64

@@ -1,4 +1,4 @@
-FROM gcr.io/kaniko-project/executor:v1.7.0
+FROM gcr.io/kaniko-project/executor:arm64-v1.6.0
 
 ENV HOME /root
 ENV USER root

kaniko.go

@@ -30,7 +30,6 @@ type (
 		DigestFile    string   // Digest file location
 		NoPush        bool     // Set this flag if you only want to build the image, without pushing to a registry
 		Verbosity     string   // Log level
-		Platform      string   // Allows to build with another default platform than the host, similarly to docker build --platform
 	}
 
 	// Artifact defines content of artifact file
@@ -143,7 +142,7 @@ func (p Plugin) Exec() error {
 	}
 
 	if p.Build.CacheTTL != 0 {
-		cmdArgs = append(cmdArgs, fmt.Sprintf("--cache-ttl=%dh", p.Build.CacheTTL))
+		cmdArgs = append(cmdArgs, fmt.Sprintf("--cache-ttl=%d", p.Build.CacheTTL))
 	}
 
 	if p.Build.DigestFile != "" {
@@ -158,10 +157,6 @@ func (p Plugin) Exec() error {
 		cmdArgs = append(cmdArgs, fmt.Sprintf("--verbosity=%s", p.Build.Verbosity))
 	}
 
-	if p.Build.Platform != "" {
-		cmdArgs = append(cmdArgs, fmt.Sprintf("--customPlatform=%s", p.Build.Platform))
-	}
-
 	cmd := exec.Command("/kaniko/executor", cmdArgs...)
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr