fix: [CI-19670]: remove gcr images config

.drone.yml

@@ -33,23 +33,6 @@ steps:
       exclude:
       - pull_request
 
-- name: gcr
-  image: plugins/docker
-  settings:
-    repo: plugins/kaniko-gcr
-    auto_tag: true
-    auto_tag_suffix: linux-amd64
-    daemon_off: false
-    dockerfile: docker/gcr/Dockerfile.linux.amd64
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-  when:
-    event:
-      exclude:
-      - pull_request
-
 - name: gar
   image: plugins/docker
   settings:
@@ -118,23 +101,6 @@ steps:
       exclude:
       - pull_request
 
-- name: gcr-kaniko-v1-9
-  image: plugins/docker
-  settings:
-    repo: plugins/kaniko-gcr
-    auto_tag: true
-    auto_tag_suffix: linux-amd64-kaniko1.9.1
-    daemon_off: false
-    dockerfile: docker/gcr/Dockerfile.linux.amd64.kaniko1.9.1
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-  when:
-    event:
-      exclude:
-      - pull_request
-
 - name: gar-kaniko-v1-9
   image: plugins/docker
   settings:
@@ -200,23 +166,6 @@ steps:
       exclude:
       - pull_request
 
-- name: gcr
-  image: plugins/docker
-  settings:
-    repo: plugins/kaniko-gcr
-    auto_tag: true
-    auto_tag_suffix: linux-arm64
-    daemon_off: false
-    dockerfile: docker/gcr/Dockerfile.linux.arm64
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-  when:
-    event:
-      exclude:
-      - pull_request
-
 - name: gar
   image: plugins/docker
   settings:
@@ -285,23 +234,6 @@ steps:
       exclude:
       - pull_request
 
-- name: gcr-kaniko-v1-9
-  image: plugins/docker
-  settings:
-    repo: plugins/kaniko-gcr
-    auto_tag: true
-    auto_tag_suffix: linux-arm64-kaniko1.9.1
-    daemon_off: false
-    dockerfile: docker/gcr/Dockerfile.linux.arm64.kaniko1.9.1
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-  when:
-    event:
-      exclude:
-      - pull_request
-
 - name: gar-kaniko-v1-9
   image: plugins/docker
   settings:
@@ -360,18 +292,6 @@ steps:
     username:
       from_secret: docker_username
 
-- name: manifest-gcr
-  pull: always
-  image: plugins/manifest
-  settings:
-    auto_tag: true
-    ignore_missing: true
-    password:
-      from_secret: docker_password
-    spec: docker/gcr/manifest.tmpl
-    username:
-      from_secret: docker_username
-
 - name: manifest-gar
   pull: always
   image: plugins/manifest
@@ -442,18 +362,6 @@ steps:
     username:
       from_secret: docker_username
 
-- name: manifest-gcr
-  pull: always
-  image: plugins/manifest
-  settings:
-    auto_tag: false
-    ignore_missing: true
-    password:
-      from_secret: docker_password
-    spec: docker/gcr/manifest-kaniko1.9.1.tmpl
-    username:
-      from_secret: docker_username
-
 - name: manifest-gar
   pull: always
   image: plugins/manifest
@@ -486,3 +394,4 @@ trigger:
 depends_on:
 - default
 - arm
+

.harness/harness.yaml

@@ -65,53 +65,35 @@ pipeline:
                             matrix:
                               image:
                                 - ""
-                                - "-gcr"
                                 - "-gar"
                                 - "-ecr"
                                 - "-acr"
                               repo:
                                 - docker
-                                - gcr
                                 - gar
                                 - ecr
                                 - acr
                               exclude:
-                                - image: ""
-                                  repo: gcr
                                 - image: ""
                                   repo: gar
                                 - image: ""
                                   repo: ecr
                                 - image: ""
                                   repo: acr
-                                - image: "-gcr"
-                                  repo: docker
-                                - image: "-gcr"
-                                  repo: gar
-                                - image: "-gcr"
-                                  repo: ecr
-                                - image: "-gcr"
-                                  repo: acr
                                 - image: "-gar"
                                   repo: docker
-                                - image: "-gar"
-                                  repo: gcr
                                 - image: "-gar"
                                   repo: ecr
                                 - image: "-gar"
                                   repo: acr
                                 - image: "-ecr"
                                   repo: docker
-                                - image: "-ecr"
-                                  repo: gcr
                                 - image: "-ecr"
                                   repo: gar
                                 - image: "-ecr"
                                   repo: acr
                                 - image: "-acr"
                                   repo: docker
-                                - image: "-acr"
-                                  repo: gcr
                                 - image: "-acr"
                                   repo: gar
                                 - image: "-acr"
@@ -139,37 +121,23 @@ pipeline:
                             matrix:
                               image:
                                 - ""
-                                - "-gcr"
                                 - "-gar"
                                 - "-ecr"
                               repo:
                                 - docker
-                                - gcr
                                 - gar
                                 - ecr
                               exclude:
-                                - image: ""
-                                  repo: gcr
                                 - image: ""
                                   repo: gar
                                 - image: ""
                                   repo: ecr
-                                - image: "-gcr"
-                                  repo: docker
-                                - image: "-gcr"
-                                  repo: gar
-                                - image: "-gcr"
-                                  repo: ecr
                                 - image: "-gar"
                                   repo: docker
-                                - image: "-gar"
-                                  repo: gcr
                                 - image: "-gar"
                                   repo: ecr
                                 - image: "-ecr"
                                   repo: docker
-                                - image: "-ecr"
-                                  repo: gcr
                                 - image: "-ecr"
                                   repo: gar
                               nodeName: <+matrix.repo>
@@ -192,53 +160,35 @@ pipeline:
                             matrix:
                               image:
                                 - ""
-                                - "-gcr"
                                 - "-gar"
                                 - "-ecr"
                                 - "-acr"
                               repo:
                                 - docker
-                                - gcr
                                 - gar
                                 - ecr
                                 - acr
                               exclude:
-                                - image: ""
-                                  repo: gcr
                                 - image: ""
                                   repo: gar
                                 - image: ""
                                   repo: ecr
                                 - image: ""
                                   repo: acr
-                                - image: "-gcr"
-                                  repo: docker
-                                - image: "-gcr"
-                                  repo: gar
-                                - image: "-gcr"
-                                  repo: ecr
-                                - image: "-gcr"
-                                  repo: acr
                                 - image: "-gar"
                                   repo: docker
-                                - image: "-gar"
-                                  repo: gcr
                                 - image: "-gar"
                                   repo: ecr
                                 - image: "-gar"
                                   repo: acr
                                 - image: "-ecr"
                                   repo: docker
-                                - image: "-ecr"
-                                  repo: gcr
                                 - image: "-ecr"
                                   repo: gar
                                 - image: "-ecr"
                                   repo: acr
                                 - image: "-acr"
                                   repo: docker
-                                - image: "-acr"
-                                  repo: gcr
                                 - image: "-acr"
                                   repo: gar
                                 - image: "-acr"
@@ -262,37 +212,23 @@ pipeline:
                             matrix:
                               image:
                                 - ""
-                                - "-gcr"
                                 - "-gar"
                                 - "-ecr"
                               repo:
                                 - docker
-                                - gcr
                                 - gar
                                 - ecr
                               exclude:
-                                - image: ""
-                                  repo: gcr
                                 - image: ""
                                   repo: gar
                                 - image: ""
                                   repo: ecr
-                                - image: "-gcr"
-                                  repo: docker
-                                - image: "-gcr"
-                                  repo: gar
-                                - image: "-gcr"
-                                  repo: ecr
                                 - image: "-gar"
                                   repo: docker
-                                - image: "-gar"
-                                  repo: gcr
                                 - image: "-gar"
                                   repo: ecr
                                 - image: "-ecr"
                                   repo: docker
-                                - image: "-ecr"
-                                  repo: gcr
                                 - image: "-ecr"
                                   repo: gar
                               nodeName: _<+matrix.repo>
@@ -350,53 +286,35 @@ pipeline:
                             matrix:
                               image:
                                 - ""
-                                - "-gcr"
                                 - "-gar"
                                 - "-ecr"
                                 - "-acr"
                               repo:
                                 - docker
-                                - gcr
                                 - gar
                                 - ecr
                                 - acr
                               exclude:
-                                - image: ""
-                                  repo: gcr
                                 - image: ""
                                   repo: gar
                                 - image: ""
                                   repo: ecr
                                 - image: ""
                                   repo: acr
-                                - image: "-gcr"
-                                  repo: docker
-                                - image: "-gcr"
-                                  repo: gar
-                                - image: "-gcr"
-                                  repo: ecr
-                                - image: "-gcr"
-                                  repo: acr
                                 - image: "-gar"
                                   repo: docker
-                                - image: "-gar"
-                                  repo: gcr
                                 - image: "-gar"
                                   repo: ecr
                                 - image: "-gar"
                                   repo: acr
                                 - image: "-ecr"
                                   repo: docker
-                                - image: "-ecr"
-                                  repo: gcr
                                 - image: "-ecr"
                                   repo: gar
                                 - image: "-ecr"
                                   repo: acr
                                 - image: "-acr"
                                   repo: docker
-                                - image: "-acr"
-                                  repo: gcr
                                 - image: "-acr"
                                   repo: gar
                                 - image: "-acr"
@@ -424,37 +342,23 @@ pipeline:
                             matrix:
                               image:
                                 - ""
-                                - "-gcr"
                                 - "-gar"
                                 - "-ecr"
                               repo:
                                 - docker
-                                - gcr
                                 - gar
                                 - ecr
                               exclude:
-                                - image: ""
-                                  repo: gcr
                                 - image: ""
                                   repo: gar
                                 - image: ""
                                   repo: ecr
-                                - image: "-gcr"
-                                  repo: docker
-                                - image: "-gcr"
-                                  repo: gar
-                                - image: "-gcr"
-                                  repo: ecr
                                 - image: "-gar"
                                   repo: docker
-                                - image: "-gar"
-                                  repo: gcr
                                 - image: "-gar"
                                   repo: ecr
                                 - image: "-ecr"
                                   repo: docker
-                                - image: "-ecr"
-                                  repo: gcr
                                 - image: "-ecr"
                                   repo: gar
                               nodeName: _<+matrix.repo>
@@ -477,57 +381,25 @@ pipeline:
                             matrix:
                               image:
                                 - ""
-                                - "-gcr"
                                 - "-gar"
                                 - "-ecr"
-                                - "-acr"
                               repo:
                                 - docker
-                                - gcr
                                 - gar
                                 - ecr
-                                - acr
                               exclude:
-                                - image: ""
-                                  repo: gcr
                                 - image: ""
                                   repo: gar
                                 - image: ""
                                   repo: ecr
-                                - image: ""
-                                  repo: acr
-                                - image: "-gcr"
-                                  repo: docker
-                                - image: "-gcr"
-                                  repo: gar
-                                - image: "-gcr"
-                                  repo: ecr
-                                - image: "-gcr"
-                                  repo: acr
                                 - image: "-gar"
                                   repo: docker
-                                - image: "-gar"
-                                  repo: gcr
                                 - image: "-gar"
                                   repo: ecr
-                                - image: "-gar"
-                                  repo: acr
                                 - image: "-ecr"
                                   repo: docker
-                                - image: "-ecr"
-                                  repo: gcr
                                 - image: "-ecr"
                                   repo: gar
-                                - image: "-ecr"
-                                  repo: acr
-                                - image: "-acr"
-                                  repo: docker
-                                - image: "-acr"
-                                  repo: gcr
-                                - image: "-acr"
-                                  repo: gar
-                                - image: "-acr"
-                                  repo: ecr
                               nodeName: <+matrix.repo>
                       - step:
                           type: BuildAndPushDockerRegistry
@@ -547,37 +419,23 @@ pipeline:
                             matrix:
                               image:
                                 - ""
-                                - "-gcr"
                                 - "-gar"
                                 - "-ecr"
                               repo:
                                 - docker
-                                - gcr
                                 - gar
                                 - ecr
                               exclude:
-                                - image: ""
-                                  repo: gcr
                                 - image: ""
                                   repo: gar
                                 - image: ""
                                   repo: ecr
-                                - image: "-gcr"
-                                  repo: docker
-                                - image: "-gcr"
-                                  repo: gar
-                                - image: "-gcr"
-                                  repo: ecr
                                 - image: "-gar"
                                   repo: docker
-                                - image: "-gar"
-                                  repo: gcr
                                 - image: "-gar"
                                   repo: ecr
                                 - image: "-ecr"
                                   repo: docker
-                                - image: "-ecr"
-                                  repo: gcr
                                 - image: "-ecr"
                                   repo: gar
                               nodeName: _<+matrix.repo>
@@ -622,7 +480,6 @@ pipeline:
                         matrix:
                           repo:
                             - docker
-                            - gcr
                             - gar
                             - ecr
                             - acr
@@ -647,7 +504,6 @@ pipeline:
                         matrix:
                           repo:
                             - docker
-                            - gcr
                             - gar
                             - ecr
                           nodeName: manifest_<+matrix.repo>

README.md

@@ -2,7 +2,7 @@
 
 Drone kaniko plugin uses [kaniko](https://github.com/GoogleContainerTools/kaniko) to build and publish Docker images to a container registry.
 
-Plugin images are published with 1.6.0 as well as 1.9.1 kaniko version from 1.5.1 release tag. `plugins/kaniko:<release-tag>` uses 1.6.0 version while `plugins/kaniko:<release-tag>-kaniko1.9.1` uses 1.9.1 version. Similar convention is used for plugins/kaniko-ecr & plugins/kaniko-gcr images as well.
+Plugin images are published with 1.6.0 as well as 1.9.1 kaniko version from 1.5.1 release tag. `plugins/kaniko:<release-tag>` uses 1.6.0 version while `plugins/kaniko:<release-tag>-kaniko1.9.1` uses 1.9.1 version. Similar convention is used for plugins/kaniko-ecr & plugins/kaniko-gar images as well.
 
 Run the following script to install git-leaks support to this repo.
 
@@ -22,7 +22,6 @@ export CGO_ENABLED=0
 export GO111MODULE=on
 
 go build -v -a -tags netgo -o release/linux/amd64/kaniko-docker ./cmd/kaniko-docker
-go build -v -a -tags netgo -o release/linux/amd64/kaniko-gcr ./cmd/kaniko-gcr
 go build -v -a -tags netgo -o release/linux/amd64/kaniko-ecr ./cmd/kaniko-ecr
 go build -v -a -tags netgo -o release/linux/amd64/kaniko-acr ./cmd/kaniko-acr
 ```
@@ -42,11 +41,6 @@ docker build \
   --label org.label-schema.vcs-ref=$(git rev-parse --short HEAD) \
   --file docker/acr/Dockerfile.linux.amd64 --tag plugins/kaniko-acr .
 
-docker build \
-  --label org.label-schema.build-date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
-  --label org.label-schema.vcs-ref=$(git rev-parse --short HEAD) \
-  --file docker/gcr/Dockerfile.linux.amd64 --tag plugins/kaniko-gcr .
-
 docker build \
   --label org.label-schema.build-date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
   --label org.label-schema.vcs-ref=$(git rev-parse --short HEAD) \
@@ -62,7 +56,6 @@ The drone-kaniko plugin now supports an improved build arguments system with the
 A new custom CLI flag type that allows passing multiple build arguments using semicolon (`;`) as a delimiter. This flag is available across all registry implementations:
 
 - `kaniko-docker`
-- `kaniko-gcr` (Google Container Registry)
 - `kaniko-ecr` (Amazon Elastic Container Registry)
 - `kaniko-acr` (Azure Container Registry)
 - `kaniko-gar` (Google Artifact Registry)

cmd/kaniko-gcr/main.go

@@ -1,482 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-
-	"github.com/joho/godotenv"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli"
-
-	kaniko "github.com/drone/drone-kaniko"
-	"github.com/drone/drone-kaniko/pkg/artifact"
-	"github.com/drone/drone-kaniko/pkg/docker"
-	"github.com/drone/drone-kaniko/pkg/utils"
-)
-
-const (
-	dockerConfigPath string = "/kaniko/.docker"
-	// GCR JSON key file path
-	gcrKeyPath     string = "/kaniko/config.json"
-	gcrEnvVariable string = "GOOGLE_APPLICATION_CREDENTIALS"
-
-	defaultDigestFile string = "/kaniko/digest-file"
-)
-
-var (
-	version = "unknown"
-)
-
-func main() {
-	// Load env-file if it exists first
-	if env := os.Getenv("PLUGIN_ENV_FILE"); env != "" {
-		if err := godotenv.Load(env); err != nil {
-			logrus.Fatal(err)
-		}
-	}
-
-	app := cli.NewApp()
-	app.Name = "kaniko gcr plugin"
-	app.Usage = "kaniko gcr plugin"
-	app.Action = run
-	app.Version = version
-	app.Flags = []cli.Flag{
-		cli.StringFlag{
-			Name:   "dockerfile",
-			Usage:  "build dockerfile",
-			Value:  "Dockerfile",
-			EnvVar: "PLUGIN_DOCKERFILE",
-		},
-		cli.StringFlag{
-			Name:   "context",
-			Usage:  "build context",
-			Value:  ".",
-			EnvVar: "PLUGIN_CONTEXT",
-		},
-		cli.StringFlag{
-			Name:   "drone-commit-ref",
-			Usage:  "git commit ref passed by Drone",
-			EnvVar: "DRONE_COMMIT_REF",
-		},
-		cli.StringFlag{
-			Name:   "drone-repo-branch",
-			Usage:  "git repository default branch passed by Drone",
-			EnvVar: "DRONE_REPO_BRANCH",
-		},
-		cli.StringSliceFlag{
-			Name:     "tags",
-			Usage:    "build tags",
-			Value:    &cli.StringSlice{"latest"},
-			EnvVar:   "PLUGIN_TAGS",
-			FilePath: ".tags",
-		},
-		cli.BoolFlag{
-			Name:   "expand-tag",
-			Usage:  "enable for semver tagging",
-			EnvVar: "PLUGIN_EXPAND_TAG",
-		},
-		cli.BoolFlag{
-			Name:   "auto-tag",
-			Usage:  "enable auto generation of build tags",
-			EnvVar: "PLUGIN_AUTO_TAG",
-		},
-		cli.StringFlag{
-			Name:   "auto-tag-suffix",
-			Usage:  "the suffix of auto build tags",
-			EnvVar: "PLUGIN_AUTO_TAG_SUFFIX",
-		},
-		cli.StringSliceFlag{
-			Name:   "args",
-			Usage:  "build args",
-			EnvVar: "PLUGIN_BUILD_ARGS",
-		},
-		cli.StringFlag{
-			Name:   "target",
-			Usage:  "build target",
-			EnvVar: "PLUGIN_TARGET",
-		},
-		cli.StringFlag{
-			Name:   "repo",
-			Usage:  "gcr repository",
-			EnvVar: "PLUGIN_REPO",
-		},
-		cli.StringSliceFlag{
-			Name:   "custom-labels",
-			Usage:  "additional k=v labels",
-			EnvVar: "PLUGIN_CUSTOM_LABELS",
-		},
-		cli.StringFlag{
-			Name:   "registry",
-			Usage:  "gcr registry",
-			Value:  "gcr.io",
-			EnvVar: "PLUGIN_REGISTRY,BASE_REGISTRY",
-		},
-		cli.StringFlag{
-			Name:   "base-image-username",
-			Usage:  "Docker username for base image registry",
-			EnvVar: "PLUGIN_DOCKER_USERNAME,PLUGIN_BASE_IMAGE_USERNAME,DOCKER_USERNAME",
-		},
-		cli.StringFlag{
-			Name:   "base-image-password",
-			Usage:  "Docker password for base image registry",
-			EnvVar: "PLUGIN_DOCKER_PASSWORD,PLUGIN_BASE_IMAGE_PASSWORD,DOCKER_PASSWORD",
-		},
-		cli.StringFlag{
-			Name:   "base-image-registry",
-			Usage:  "Docker registry for base image registry",
-			EnvVar: "PLUGIN_DOCKER_REGISTRY,PLUGIN_BASE_IMAGE_REGISTRY,DOCKER_REGISTRY",
-		},
-		cli.StringSliceFlag{
-			Name:   "registry-mirrors",
-			Usage:  "docker registry mirrors",
-			EnvVar: "PLUGIN_REGISTRY_MIRRORS",
-		},
-		cli.StringFlag{
-			Name:   "json-key",
-			Usage:  "docker username",
-			EnvVar: "PLUGIN_JSON_KEY",
-		},
-		cli.StringFlag{
-			Name:   "snapshot-mode",
-			Usage:  "Specify one of full, redo or time as snapshot mode",
-			EnvVar: "PLUGIN_SNAPSHOT_MODE",
-		},
-		cli.BoolFlag{
-			Name:   "enable-cache",
-			Usage:  "Set this flag to opt into caching with kaniko",
-			EnvVar: "PLUGIN_ENABLE_CACHE",
-		},
-		cli.StringFlag{
-			Name:   "cache-repo",
-			Usage:  "Remote repository that will be used to store cached layers. Cache repo should be present in specified registry. enable-cache needs to be set to use this flag",
-			EnvVar: "PLUGIN_CACHE_REPO",
-		},
-		cli.IntFlag{
-			Name:   "cache-ttl",
-			Usage:  "Cache timeout in hours. Defaults to two weeks.",
-			EnvVar: "PLUGIN_CACHE_TTL",
-		},
-		cli.StringFlag{
-			Name:   "artifact-file",
-			Usage:  "Artifact file location that will be generated by the plugin. This file will include information of docker images that are uploaded by the plugin.",
-			EnvVar: "PLUGIN_ARTIFACT_FILE",
-		},
-		cli.BoolFlag{
-			Name:   "no-push",
-			Usage:  "Set this flag if you only want to build the image, without pushing to a registry",
-			EnvVar: "PLUGIN_NO_PUSH",
-		},
-		cli.StringFlag{
-			Name:   "verbosity",
-			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",
-		},
-		cli.BoolFlag{
-			Name:   "skip-unused-stages",
-			Usage:  "build only used stages",
-			EnvVar: "PLUGIN_SKIP_UNUSED_STAGES",
-		},
-		cli.StringFlag{
-			Name:   "cache-dir",
-			Usage:  "Set this flag to specify a local directory cache for base images",
-			EnvVar: "PLUGIN_CACHE_DIR",
-		},
-
-		cli.BoolFlag{
-			Name:   "cache-copy-layers",
-			Usage:  "Enable or disable copying layers from the cache.",
-			EnvVar: "PLUGIN_CACHE_COPY_LAYERS",
-		},
-		cli.BoolFlag{
-			Name:   "cache-run-layers",
-			Usage:  "Enable or disable running layers from the cache.",
-			EnvVar: "PLUGIN_CACHE_RUN_LAYERS",
-		},
-		cli.BoolFlag{
-			Name:   "cleanup",
-			Usage:  "Enable or disable cleanup of temporary files.",
-			EnvVar: "PLUGIN_CLEANUP",
-		},
-		cli.BoolFlag{
-			Name:   "compressed-caching",
-			Usage:  "Enable or disable compressed caching.",
-			EnvVar: "PLUGIN_COMPRESSED_CACHING",
-		},
-		cli.StringFlag{
-			Name:   "context-sub-path",
-			Usage:  "Sub-path within the context to build.",
-			EnvVar: "PLUGIN_CONTEXT_SUB_PATH",
-		},
-		cli.StringFlag{
-			Name:   "custom-platform",
-			Usage:  "Platform to use for building.",
-			EnvVar: "PLUGIN_CUSTOM_PLATFORM",
-		},
-		cli.BoolFlag{
-			Name:   "force",
-			Usage:  "Force building the image even if it already exists.",
-			EnvVar: "PLUGIN_FORCE",
-		},
-		cli.StringFlag{
-			Name:   "image-name-with-digest-file",
-			Usage:  "Write image name with digest to a file.",
-			EnvVar: "PLUGIN_IMAGE_NAME_WITH_DIGEST_FILE",
-		},
-		cli.StringFlag{
-			Name:   "image-name-tag-with-digest-file",
-			Usage:  "Write image name with tag and digest to a file.",
-			EnvVar: "PLUGIN_IMAGE_NAME_TAG_WITH_DIGEST_FILE",
-		},
-		cli.BoolFlag{
-			Name:   "insecure",
-			Usage:  "Allow connecting to registries without TLS.",
-			EnvVar: "PLUGIN_INSECURE",
-		},
-		cli.BoolFlag{
-			Name:   "insecure-pull",
-			Usage:  "Allow insecure pulls from the registry.",
-			EnvVar: "PLUGIN_INSECURE_PULL",
-		},
-		cli.StringFlag{
-			Name:   "insecure-registry",
-			Usage:  "Use plain HTTP for registry communication.",
-			EnvVar: "PLUGIN_INSECURE_REGISTRY",
-		},
-		cli.StringFlag{
-			Name:   "log-format",
-			Usage:  "Set the log format for build output.",
-			EnvVar: "PLUGIN_LOG_FORMAT",
-		},
-		cli.BoolFlag{
-			Name:   "log-timestamp",
-			Usage:  "Show timestamps in build output.",
-			EnvVar: "PLUGIN_LOG_TIMESTAMP",
-		},
-		cli.StringFlag{
-			Name:   "oci-layout-path",
-			Usage:  "Directory to store OCI layout.",
-			EnvVar: "PLUGIN_OCI_LAYOUT_PATH",
-		},
-		cli.IntFlag{
-			Name:   "push-retry",
-			Usage:  "Number of times to retry pushing an image.",
-			EnvVar: "PLUGIN_PUSH_RETRY",
-		},
-		cli.StringFlag{
-			Name:   "registry-certificate",
-			Usage:  "Path to a file containing a registry certificate.",
-			EnvVar: "PLUGIN_REGISTRY_CERTIFICATE",
-		},
-		cli.StringFlag{
-			Name:   "registry-client-cert",
-			Usage:  "Path to a file containing a registry client certificate.",
-			EnvVar: "PLUGIN_REGISTRY_CLIENT_CERT",
-		},
-		cli.BoolFlag{
-			Name:   "skip-default-registry-fallback",
-			Usage:  "Skip Docker Hub and default registry fallback.",
-			EnvVar: "PLUGIN_SKIP_DEFAULT_REGISTRY_FALLBACK",
-		},
-		cli.BoolFlag{
-			Name:   "reproducible",
-			Usage:  "Create a reproducible image.",
-			EnvVar: "PLUGIN_REPRODUCIBLE",
-		},
-		cli.BoolFlag{
-			Name:   "single-snapshot",
-			Usage:  "Only create a single snapshot of the image.",
-			EnvVar: "PLUGIN_SINGLE_SNAPSHOT",
-		},
-		cli.BoolFlag{
-			Name:   "skip-push-permission-check",
-			Usage:  "Skip permission check when pushing.",
-			EnvVar: "PLUGIN_SKIP_PUSH_PERMISSION_CHECK",
-		},
-		cli.BoolFlag{
-			Name:   "skip-tls-verify-pull",
-			Usage:  "Skip TLS verification when pulling.",
-			EnvVar: "PLUGIN_SKIP_TLS_VERIFY_PULL",
-		},
-		cli.BoolFlag{
-			Name:   "skip-tls-verify-registry",
-			Usage:  "Skip TLS verification when connecting to a registry.",
-			EnvVar: "PLUGIN_SKIP_TLS_VERIFY_REGISTRY",
-		},
-		cli.BoolFlag{
-			Name:   "use-new-run",
-			Usage:  "Skip TLS verification when connecting to a registry.",
-			EnvVar: "PLUGIN_USE_NEW_RUN",
-		},
-		cli.BoolFlag{
-			Name:   "ignore-var-run",
-			Usage:  "Ignore the /var/run directory during build.",
-			EnvVar: "PLUGIN_IGNORE_VAR_RUN",
-		},
-		cli.StringFlag{
-			Name:   "ignore-path",
-			Usage:  "Path to ignore during the build.",
-			EnvVar: "PLUGIN_IGNORE_PATH",
-		},
-		cli.IntFlag{
-			Name:   "image-fs-extract-retry",
-			Usage:  "Number of retries for extracting filesystem layers.",
-			EnvVar: "PLUGIN_IMAGE_FS_EXTRACT_RETRY",
-		},
-		cli.IntFlag{
-			Name:   "image-download-retry",
-			Usage:  "Number of retries for downloading base images.",
-			EnvVar: "PLUGIN_IMAGE_DOWNLOAD_RETRY",
-		},
-		cli.GenericFlag{
-			Name:   "args-new",
-			Usage:  "build args new",
-			EnvVar: "PLUGIN_BUILD_ARGS_NEW",
-			Value:  new(utils.CustomStringSliceFlag),
-		},
-		cli.BoolFlag{
-			Name:   "plugin-multiple-build-agrs",
-			Usage:  "plugin multiple build agrs",
-			EnvVar: "PLUGIN_MULTIPLE_BUILD_ARGS",
-		},
-		
-	}
-
-	if err := app.Run(os.Args); err != nil {
-		logrus.Fatal(err)
-	}
-}
-
-func run(c *cli.Context) error {
-	noPush := c.Bool("no-push")
-	jsonKey := c.String("json-key")
-
-	// JSON key may not be set in the following cases:
-	// 1. Image does not need to be pushed to GCR.
-	// 2. Workload identity is set on GKE in which pod will inherit the credentials via service account.
-	if jsonKey != "" {
-		if err := setupGCRAuth(jsonKey); err != nil {
-			return err
-		}
-
-		// setup docker config only when base image registry is specified
-		if c.String("base-image-registry") != "" {
-			if err := setDockerAuth(
-				c.String("base-image-username"),
-				c.String("base-image-password"),
-				c.String("base-image-registry"),
-			); err != nil {
-				return errors.Wrap(err, "failed to create docker config")
-			}
-		} else {
-			fmt.Println("\033[33mTo ensure consistent and reliable pipeline execution, we recommend setting up a Base Image Connector.\033[0m\n" +
-				"\033[33mWhile optional at this time, configuring it helps prevent failures caused by Docker Hub's rate limits.\033[0m")
-		}
-	}
-
-	plugin := kaniko.Plugin{
-		Build: kaniko.Build{
-			DroneCommitRef:              c.String("drone-commit-ref"),
-			DroneRepoBranch:             c.String("drone-repo-branch"),
-			Dockerfile:                  c.String("dockerfile"),
-			Context:                     c.String("context"),
-			Tags:                        c.StringSlice("tags"),
-			AutoTag:                     c.Bool("auto-tag"),
-			AutoTagSuffix:               c.String("auto-tag-suffix"),
-			ExpandTag:                   c.Bool("expand-tag"),
-			Args:                        c.StringSlice("args"),
-			ArgsNew:                     c.Generic("args-new").(*utils.CustomStringSliceFlag).GetValue(),
-			IsMultipleBuildArgs:         c.Bool("plugin-multiple-build-agrs"),
-			Target:                      c.String("target"),
-			Repo:                        fmt.Sprintf("%s/%s", c.String("registry"), c.String("repo")),
-			Mirrors:                     c.StringSlice("registry-mirrors"),
-			Labels:                      c.StringSlice("custom-labels"),
-			SnapshotMode:                c.String("snapshot-mode"),
-			EnableCache:                 c.Bool("enable-cache"),
-			CacheRepo:                   fmt.Sprintf("%s/%s", c.String("registry"), c.String("cache-repo")),
-			CacheTTL:                    c.Int("cache-ttl"),
-			DigestFile:                  defaultDigestFile,
-			NoPush:                      noPush,
-			Verbosity:                   c.String("verbosity"),
-			Platform:                    c.String("platform"),
-			SkipUnusedStages:            c.Bool("skip-unused-stages"),
-			CacheDir:                    c.String("cache-dir"),
-			CacheCopyLayers:             c.Bool("cache-copy-layers"),
-			CacheRunLayers:              c.Bool("cache-run-layers"),
-			Cleanup:                     c.Bool("cleanup"),
-			ContextSubPath:              c.String("context-sub-path"),
-			CustomPlatform:              c.String("custom-platform"),
-			Force:                       c.Bool("force"),
-			ImageNameWithDigestFile:     c.String("image-name-with-digest-file"),
-			ImageNameTagWithDigestFile:  c.String("image-name-tag-with-digest-file"),
-			Insecure:                    c.Bool("insecure"),
-			InsecurePull:                c.Bool("insecure-pull"),
-			InsecureRegistry:            c.String("insecure-registry"),
-			Label:                       c.String("label"),
-			LogFormat:                   c.String("log-format"),
-			LogTimestamp:                c.Bool("log-timestamp"),
-			OCILayoutPath:               c.String("oci-layout-path"),
-			PushRetry:                   c.Int("push-retry"),
-			RegistryCertificate:         c.String("registry-certificate"),
-			RegistryClientCert:          c.String("registry-client-cert"),
-			SkipDefaultRegistryFallback: c.Bool("skip-default-registry-fallback"),
-			Reproducible:                c.Bool("reproducible"),
-			SingleSnapshot:              c.Bool("single-snapshot"),
-			SkipTLSVerify:               c.Bool("skip-tls-verify"),
-			SkipPushPermissionCheck:     c.Bool("skip-push-permission-check"),
-			SkipTLSVerifyPull:           c.Bool("skip-tls-verify-pull"),
-			SkipTLSVerifyRegistry:       c.Bool("skip-tls-verify-registry"),
-			UseNewRun:                   c.Bool("use-new-run"),
-			IgnorePath:                  c.String("ignore-path"),
-			IgnorePaths:                 c.StringSlice("ignore-paths"),
-			ImageFSExtractRetry:         c.Int("image-fs-extract-retry"),
-			ImageDownloadRetry:          c.Int("image-download-retry"),
-		},
-		Artifact: kaniko.Artifact{
-			Tags:         c.StringSlice("tags"),
-			Repo:         c.String("repo"),
-			Registry:     c.String("registry"),
-			ArtifactFile: c.String("artifact-file"),
-			RegistryType: artifact.GCR,
-		},
-	}
-	if c.IsSet("compressed-caching") {
-		flag := c.Bool("compressed-caching")
-		plugin.Build.CompressedCaching = &flag
-	}
-	if c.IsSet("ignore-var-run") {
-		flag := c.Bool("ignore-var-run")
-		plugin.Build.IgnoreVarRun = &flag
-	}
-	return plugin.Exec()
-}
-
-func setDockerAuth(dockerUsername, dockerPassword, dockerRegistry string) error {
-	dockerConfig := docker.NewConfig()
-	dockerRegistryCreds := docker.RegistryCredentials{
-		Registry: dockerRegistry,
-		Username: dockerUsername,
-		Password: dockerPassword,
-	}
-	credentials := []docker.RegistryCredentials{dockerRegistryCreds}
-	return dockerConfig.CreateDockerConfig(credentials, dockerConfigPath)
-}
-
-func setupGCRAuth(jsonKey string) error {
-	err := ioutil.WriteFile(gcrKeyPath, []byte(jsonKey), 0644)
-	if err != nil {
-		return errors.Wrap(err, "failed to write GCR JSON key")
-	}
-
-	err = os.Setenv(gcrEnvVariable, gcrKeyPath)
-	if err != nil {
-		return errors.Wrap(err, fmt.Sprintf("failed to set %s environment variable", gcrEnvVariable))
-	}
-	return nil
-}

cmd/kaniko-gcr/main_test.go

@@ -1,270 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"os"
-	"testing"
-
-	"github.com/drone/drone-kaniko/pkg/utils"
-	"github.com/urfave/cli"
-)
-
-func TestCustomStringSliceFlagIntegration(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    string
-		expected []string
-	}{
-		{
-			name:     "single build arg",
-			input:    "ARG1=value1",
-			expected: []string{"ARG1=value1"},
-		},
-		{
-			name:     "multiple build args with semicolon",
-			input:    "ARG1=value1;ARG2=value2;ARG3=value3",
-			expected: []string{"ARG1=value1", "ARG2=value2", "ARG3=value3"},
-		},
-		{
-			name:     "build args with spaces",
-			input:    "ARG1=value with spaces;ARG2=another value",
-			expected: []string{"ARG1=value with spaces", "ARG2=another value"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Test the CustomStringSliceFlag directly
-			flag := &utils.CustomStringSliceFlag{}
-			err := flag.Set(tt.input)
-			if err != nil {
-				t.Errorf("Set() error = %v, want nil", err)
-				return
-			}
-
-			result := flag.GetValue()
-			if len(result) != len(tt.expected) {
-				t.Errorf("Got %d args, want %d", len(result), len(tt.expected))
-				return
-			}
-
-			for i, expected := range tt.expected {
-				if result[i] != expected {
-					t.Errorf("Got arg[%d] = %v, want %v", i, result[i], expected)
-				}
-			}
-		})
-	}
-}
-
-func TestEnvironmentVariableIntegration(t *testing.T) {
-	// Test that environment variables work with CustomStringSliceFlag
-	originalEnv := os.Getenv("PLUGIN_BUILD_ARGS_NEW")
-	defer func() {
-		if originalEnv != "" {
-			os.Setenv("PLUGIN_BUILD_ARGS_NEW", originalEnv)
-		} else {
-			os.Unsetenv("PLUGIN_BUILD_ARGS_NEW")
-		}
-	}()
-
-	os.Setenv("PLUGIN_BUILD_ARGS_NEW", "ENV_ARG1=env_value1;ENV_ARG2=env_value2")
-
-	app := cli.NewApp()
-	app.Flags = []cli.Flag{
-		cli.GenericFlag{
-			Name:   "args-new",
-			Usage:  "build args new",
-			EnvVar: "PLUGIN_BUILD_ARGS_NEW",
-			Value:  new(utils.CustomStringSliceFlag),
-		},
-	}
-
-	var capturedArgs []string
-	app.Action = func(c *cli.Context) error {
-		if flag := c.Generic("args-new"); flag != nil {
-			if customFlag, ok := flag.(*utils.CustomStringSliceFlag); ok {
-				capturedArgs = customFlag.GetValue()
-			}
-		}
-		return nil
-	}
-
-	err := app.Run([]string{"test"})
-	if err != nil {
-		t.Errorf("App.Run() error = %v, want nil", err)
-		return
-	}
-
-	expected := []string{"ENV_ARG1=env_value1", "ENV_ARG2=env_value2"}
-	if len(capturedArgs) != len(expected) {
-		t.Errorf("Environment variable test: got %d args, want %d", len(capturedArgs), len(expected))
-		return
-	}
-
-	for i, exp := range expected {
-		if capturedArgs[i] != exp {
-			t.Errorf("Environment variable test: got arg[%d] = %v, want %v", i, capturedArgs[i], exp)
-		}
-	}
-}
-
-func TestGCRBuildArgsProcessing(t *testing.T) {
-	// Test that build args are correctly processed in the context of GCR plugin
-	tests := []struct {
-		name          string
-		argsNew       string
-		expectedCount int
-		expectedFirst string
-	}{
-		{
-			name:          "docker build args format",
-			argsNew:       "GOOS=linux;GOARCH=amd64;CGO_ENABLED=0",
-			expectedCount: 3,
-			expectedFirst: "GOOS=linux",
-		},
-		{
-			name:          "google cloud specific args",
-			argsNew:       "GOOGLE_APPLICATION_CREDENTIALS=/path/to/creds.json;PROJECT_ID=my-project",
-			expectedCount: 2,
-			expectedFirst: "GOOGLE_APPLICATION_CREDENTIALS=/path/to/creds.json",
-		},
-		{
-			name:          "single complex arg with special characters",
-			argsNew:       "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')",
-			expectedCount: 1,
-			expectedFirst: "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			flag := &utils.CustomStringSliceFlag{}
-			err := flag.Set(tt.argsNew)
-			if err != nil {
-				t.Errorf("Set() error = %v, want nil", err)
-				return
-			}
-
-			args := flag.GetValue()
-			if len(args) != tt.expectedCount {
-				t.Errorf("Got %d args, want %d", len(args), tt.expectedCount)
-				return
-			}
-
-			if len(args) > 0 && args[0] != tt.expectedFirst {
-				t.Errorf("Got first arg = %v, want %v", args[0], tt.expectedFirst)
-			}
-		})
-	}
-}
-
-func TestGCRRegistryFormatting(t *testing.T) {
-	// Test GCR-specific registry formatting
-	tests := []struct {
-		name     string
-		registry string
-		repo     string
-		expected string
-	}{
-		{
-			name:     "standard GCR format",
-			registry: "gcr.io",
-			repo:     "my-project/my-image",
-			expected: "gcr.io/my-project/my-image",
-		},
-		{
-			name:     "regional GCR",
-			registry: "us.gcr.io",
-			repo:     "project123/image456",
-			expected: "us.gcr.io/project123/image456",
-		},
-		{
-			name:     "european GCR",
-			registry: "eu.gcr.io",
-			repo:     "my-eu-project/my-app",
-			expected: "eu.gcr.io/my-eu-project/my-app",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// This would be the format used in the GCR plugin
-			result := tt.registry + "/" + tt.repo
-			if result != tt.expected {
-				t.Errorf("GCR formatting: got %v, want %v", result, tt.expected)
-			}
-		})
-	}
-}
-
-func TestGCRJSONKeyValidation(t *testing.T) {
-	// Test JSON key validation for GCR authentication
-	tests := []struct {
-		name      string
-		jsonKey   string
-		expectErr bool
-	}{
-		{
-			name:      "empty json key",
-			jsonKey:   "",
-			expectErr: false, // Empty is allowed (workload identity)
-		},
-		{
-			name:      "valid json structure",
-			jsonKey:   `{"type":"service_account","project_id":"test","private_key_id":"123"}`,
-			expectErr: false,
-		},
-		{
-			name:      "invalid json",
-			jsonKey:   `{invalid json}`,
-			expectErr: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// This simulates the JSON key validation that would happen in GCR
-			if tt.jsonKey != "" {
-				var data map[string]interface{}
-				err := json.Unmarshal([]byte(tt.jsonKey), &data)
-				if err != nil && !tt.expectErr {
-					t.Errorf("Expected no error for JSON key, got %v", err)
-				}
-				if err == nil && tt.expectErr {
-					t.Errorf("Expected error for JSON key, got nil")
-				}
-			}
-		})
-	}
-}
-
-func TestGCRAuthSetup(t *testing.T) {
-	// Test GCR authentication setup
-	tests := []struct {
-		name           string
-		jsonKey        string
-		expectAuthFile bool
-	}{
-		{
-			name:           "with json key",
-			jsonKey:        `{"type":"service_account","project_id":"test"}`,
-			expectAuthFile: true,
-		},
-		{
-			name:           "without json key (workload identity)",
-			jsonKey:        "",
-			expectAuthFile: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// This simulates the auth setup logic
-			hasAuthFile := tt.jsonKey != ""
-			if hasAuthFile != tt.expectAuthFile {
-				t.Errorf("Auth file expectation: got %v, want %v", hasAuthFile, tt.expectAuthFile)
-			}
-		})
-	}
-}

docker/gcr/Dockerfile.linux.amd64

@@ -1,5 +0,0 @@
-FROM gcr.io/kaniko-project/executor:v1.23.2
-
-ENV KANIKO_VERSION=1.23.2
-ADD release/linux/amd64/kaniko-gcr /kaniko/
-ENTRYPOINT ["/kaniko/kaniko-gcr"]

docker/gcr/Dockerfile.linux.amd64.kaniko1.9.1

@@ -1,5 +0,0 @@
-FROM gcr.io/kaniko-project/executor:v1.9.1
-
-ENV KANIKO_VERSION=1.9.1
-ADD release/linux/amd64/kaniko-gcr /kaniko/
-ENTRYPOINT ["/kaniko/kaniko-gcr"]

docker/gcr/Dockerfile.linux.arm64

@@ -1,8 +0,0 @@
-FROM gcr.io/kaniko-project/executor:v1.23.2
-
-ENV HOME /root
-ENV USER root
-ENV KANIKO_VERSION=1.23.2
-
-ADD release/linux/arm64/kaniko-gcr /kaniko/
-ENTRYPOINT ["/kaniko/kaniko-gcr"]

docker/gcr/Dockerfile.linux.arm64.kaniko1.9.1

@@ -1,5 +0,0 @@
-FROM gcr.io/kaniko-project/executor:v1.9.1
-
-ENV KANIKO_VERSION=1.9.1
-ADD release/linux/arm64/kaniko-gcr /kaniko/
-ENTRYPOINT ["/kaniko/kaniko-gcr"]

docker/gcr/manifest-kaniko1.9.1.tmpl

@@ -1,18 +0,0 @@
-image: plugins/kaniko-gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-kaniko1.9.1{{else}}latest-kaniko1.9.1{{/if}}
-{{#if build.tags}}
-tags:
-{{#each build.tags}}
-  - {{this}}
-{{/each}}
-{{/if}}
-manifests:
-  -
-    image: plugins/kaniko-gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64-kaniko1.9.1
-    platform:
-      architecture: amd64
-      os: linux
-  -
-    image: plugins/kaniko-gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64-kaniko1.9.1
-    platform:
-      architecture: arm64
-      os: linux

docker/gcr/manifest.tmpl

@@ -1,18 +0,0 @@
-image: plugins/kaniko-gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
-{{#if build.tags}}
-tags:
-{{#each build.tags}}
-  - {{this}}
-{{/each}}
-{{/if}}
-manifests:
-  -
-    image: plugins/kaniko-gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64
-    platform:
-      architecture: amd64
-      os: linux
-  -
-    image: plugins/kaniko-gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64
-    platform:
-      architecture: arm64
-      os: linux

go.mod

@@ -1,8 +1,8 @@
 module github.com/drone/drone-kaniko
 
 require (
-	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.20.0
-	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1
+	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.1
+	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0
 	github.com/aws/aws-sdk-go v1.44.52
 	github.com/aws/aws-sdk-go-v2 v1.16.7
 	github.com/aws/aws-sdk-go-v2/config v1.15.14
@@ -16,14 +16,14 @@ require (
 	github.com/joho/godotenv v1.4.0
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.3
-	github.com/stretchr/testify v1.11.1
+	github.com/stretchr/testify v1.9.0
 	github.com/urfave/cli v1.22.15
-	golang.org/x/mod v0.26.0
+	golang.org/x/mod v0.22.0
 )
 
 require (
-	github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
-	github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0 // indirect
+	github.com/AzureAD/microsoft-authentication-library-for-go v0.5.3 // indirect
 	github.com/aws/aws-sdk-go-v2/credentials v1.12.9 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.8 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.14 // indirect
@@ -38,23 +38,23 @@ require (
 	github.com/docker/cli v27.5.0+incompatible // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.8.2 // indirect
-	github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
-	github.com/google/uuid v1.6.0 // indirect
+	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
+	github.com/google/uuid v1.3.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0 // indirect
-	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
+	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/vbatts/tar-split v0.11.6 // indirect
-	golang.org/x/crypto v0.41.0 // indirect
-	golang.org/x/net v0.43.0 // indirect
-	golang.org/x/sync v0.16.0 // indirect
-	golang.org/x/sys v0.35.0 // indirect
-	golang.org/x/text v0.28.0 // indirect
+	golang.org/x/crypto v0.14.0 // indirect
+	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/sys v0.29.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 

go.sum

@@ -1,15 +1,11 @@
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.20.0 h1:JXg2dwJUmPB9JmtVmdEB16APJ7jurfbY5jnfXpJoRMc=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.20.0/go.mod h1:YD5h/ldMsG0XiIw7PdyNhLxaM317eFh5yNLccNfGdyw=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 h1:Hk5QBxZQC1jb2Fwj6mpzme37xbCDdNTxU7O9eb5+LB4=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1/go.mod h1:IYus9qsFobWIc2YVwe/WPjcnyCkPKtnHAqUYeebc8z0=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2 h1:yz1bePFlP5Vws5+8ez6T3HWXPmwOK7Yvq8QxDBD3SKY=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2/go.mod h1:Pa9ZNPuoNu/GztvBSKk9J1cDJW6vk/n0zLtV4mgd8N8=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 h1:9iefClla7iYpfYWdzPCRDozdmndjTm8DXdpCzPajMgA=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2/go.mod h1:XtLgD3ZD34DAaVIIAyG3objl5DynM3CQ/vMcbBNJZGI=
-github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1 h1:WJTmL004Abzc5wDB5VtZG2PJk5ndYDgVacGqfirKxjM=
-github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1/go.mod h1:tCcJZ0uHAmvjsVYzEFivsRTN00oz5BEsRgQHu5JZ9WE=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 h1:XRzhVemXdgvJqCH0sFfrBUTnUJSBrBf7++ypk+twtRs=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0/go.mod h1:HKpQxkWaGLJ+D/5H8QRpyQXA1eKjxkFlOMwck5+33Jk=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.1 h1:tz19qLF65vuu2ibfTqGVJxG/zZAI27NEIIbvAOQwYbw=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.1.1/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0 h1:QkAcEIAKbNL4KoFr4SathZPhDhF4mVwpBMFlYjyAqy8=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.1.0/go.mod h1:bhXu1AjYL+wutSL/kpSq6s7733q2Rb0yuot9Zgfqa/0=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0 h1:jp0dGvZ7ZK0mgqnTSClMxa5xuRL7NZgHameVYF6BurY=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.0.0/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w=
+github.com/AzureAD/microsoft-authentication-library-for-go v0.5.3 h1:TsFCaaF5tR4XN8b4zLVl/J4qMb0nf80Q4CXcpXDNJDY=
+github.com/AzureAD/microsoft-authentication-library-for-go v0.5.3/go.mod h1:Vt9sXTKwMyGcOxSmLDMnGPgqsUg7m8pe215qMLrDXw4=
 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/aws/aws-sdk-go v1.44.52 h1:kHLbYJj59C7VrsLM4gm7pxsvaNIvhXCCIDYEFFoQ+VE=
 github.com/aws/aws-sdk-go v1.44.52/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
@@ -49,21 +45,27 @@ github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6N
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dnaeon/go-vcr v1.1.0 h1:ReYa/UBrRyQdant9B4fNHGoCNKw6qh6P0fsdGmZpR7c=
+github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko=
 github.com/docker/cli v27.5.0+incompatible h1:aMphQkcGtpHixwwhAXJT1rrK/detk2JIvDaFkLctbGM=
 github.com/docker/cli v27.5.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
 github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
 github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
-github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
-github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
+github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
+github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
+github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
+github.com/golang-jwt/jwt/v4 v4.2.0 h1:besgBTC8w8HjP6NzQdxwKH9Z5oQMZ24ThTrHp3cZ8eU=
+github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-containerregistry v0.20.3 h1:oNx7IdTI936V8CQRveCjaxOiegWwvM7kqkbXTpyiovI=
 github.com/google/go-containerregistry v0.20.3/go.mod h1:w00pIgBRDVUDFM6bq+Qx8lwNWK+cxgCuX1vd3PIBDNI=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek=
 github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
@@ -72,30 +74,24 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGw
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg=
 github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
-github.com/keybase/go-keychain v0.0.1 h1:way+bWYa6lDppZoZcgMbYsvC7GxljxrskdNInRtuthU=
-github.com/keybase/go-keychain v0.0.1/go.mod h1:PdEILRW3i9D8JcdM+FmY6RwkHGnhHxXwkPPMeUgOK1k=
 github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
 github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/montanaflynn/stats v0.6.6/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
 github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
-github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
-github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
+github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4/go.mod h1:N6UoU20jOqggOuDwUaBQpluzLNDqif3kq9z2wpdYEfQ=
+github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
+github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
-github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
@@ -108,36 +104,35 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/urfave/cli v1.22.15 h1:nuqt+pdC/KqswQKhETJjo7pvn/k4xMUxgW6liI7XpnM=
 github.com/urfave/cli v1.22.15/go.mod h1:wSan1hmo5zeyLGBjRJbzRTNk8gwoYa2B9n4q9dmRIc0=
 github.com/vbatts/tar-split v0.11.6 h1:4SjTW5+PU11n6fZenf2IPoV8/tz3AaYHMWjf23envGs=
 github.com/vbatts/tar-split v0.11.6/go.mod h1:dqKNtesIOr2j2Qv3W/cHjnvk9I8+G7oAkFDFN6TCBEI=
-golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
-golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
-golang.org/x/mod v0.26.0 h1:EGMPT//Ezu+ylkCijjPc+f4Aih7sZvaAr+O3EHBxvZg=
-golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
+golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
-golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
-golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
-golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
-golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
-golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=

pkg/artifact/artifact.go

@@ -19,7 +19,6 @@ type RegistryTypeEnum string
 const (
 	Docker RegistryTypeEnum = "Docker"
 	ECR    RegistryTypeEnum = "ECR"
-	GCR    RegistryTypeEnum = "GCR"
 	GAR    RegistryTypeEnum = "GAR"
 )
 
@@ -75,3 +74,4 @@ func WritePluginArtifactFile(registryType RegistryTypeEnum, artifactFilePath, re
 	}
 	return nil
 }
+

pkg/docker/config_test.go

@@ -33,7 +33,7 @@ func TestConfig(t *testing.T) {
 			Password: "pass1",
 		},
 		{
-			Registry: "gcr.io",
+			Registry: "us-docker.pkg.dev",
 			Username: "user2",
 			Password: "pass2",
 		},

scripts/build.sh

@@ -10,19 +10,16 @@ set -e
 set -x
 
 # linux
-GOOS=linux GOARCH=amd64 go build -o release/linux/amd64/kaniko-gcr    ./cmd/kaniko-gcr
 GOOS=linux GOARCH=amd64 go build -o release/linux/amd64/kaniko-acr    ./cmd/kaniko-acr
 GOOS=linux GOARCH=amd64 go build -o release/linux/amd64/kaniko-ecr    ./cmd/kaniko-ecr
 GOOS=linux GOARCH=amd64 go build -o release/linux/amd64/kaniko-docker ./cmd/kaniko-docker
 GOOS=linux GOARCH=amd64 go build -o release/linux/amd64/kaniko-gar    ./cmd/kaniko-gar
 
-GOOS=linux GOARCH=arm64 go build -o release/linux/arm64/kaniko-gcr    ./cmd/kaniko-gcr
 GOOS=linux GOARCH=arm64 go build -o release/linux/arm64/kaniko-acr    ./cmd/kaniko-acr
 GOOS=linux GOARCH=arm64 go build -o release/linux/arm64/kaniko-ecr    ./cmd/kaniko-ecr
 GOOS=linux GOARCH=arm64 go build -o release/linux/arm64/kaniko-docker ./cmd/kaniko-docker
 GOOS=linux GOARCH=arm64 go build -o release/linux/arm64/kaniko-gar    ./cmd/kaniko-gar
 
-GOOS=linux GOARCH=arm   go build -o release/linux/arm/kaniko-gcr      ./cmd/kaniko-gcr
 GOOS=linux GOARCH=arm   go build -o release/linux/arm/kaniko-acr      ./cmd/kaniko-acr
 GOOS=linux GOARCH=arm   go build -o release/linux/arm/kaniko-ecr      ./cmd/kaniko-ecr
 GOOS=linux GOARCH=arm   go build -o release/linux/arm/kaniko-docker   ./cmd/kaniko-docker

scripts/docker.sh

@@ -14,13 +14,11 @@ set -e
 set -x
 
 # build the binary
-go build -o release/linux/amd64/kaniko-gcr    ./cmd/kaniko-gcr
 go build -o release/linux/amd64/kaniko-gar    ./cmd/kaniko-gar
 go build -o release/linux/amd64/kaniko-ecr    ./cmd/kaniko-ecr
 go build -o release/linux/amd64/kaniko-docker ./cmd/kaniko-docker
 
 # build the docker image
-docker build -f docker/gcr/Dockerfile.linux.amd64    -t plugins/kaniko-gcr .
 docker build -f docker/gar/Dockerfile.linux.amd64    -t plugins/kaniko-gar .
 docker build -f docker/ecr/Dockerfile.linux.amd64    -t plugins/kaniko-ecr .
 docker build -f docker/docker/Dockerfile.linux.amd64 -t plugins/kaniko .