Bump version to 2.0.1

* fix: spark application check fails on missing section

Signed-off-by: Petr Drastil <petr.drastil@gmail.com>

.github/workflows/ci-build.yaml

@@ -259,6 +259,7 @@ jobs:
           yarn build
         env:
           NODE_ENV: production
+          NODE_ONLINE_ENV: online
         working-directory: ui/
       - name: Run ESLint
         run: yarn lint

.github/workflows/release.yaml

@@ -18,7 +18,7 @@ jobs:
       # The name of the tag as supplied by the GitHub event
       SOURCE_TAG: ${{ github.ref }}
       # The image namespace where Docker image will be published to
-      IMAGE_NAMESPACE: argoproj
+      IMAGE_NAMESPACE: quay.io/argoproj
       # Whether to create & push image and release assets
       DRY_RUN: false
       # Whether a draft release should be created, instead of public one
@@ -197,11 +197,12 @@ jobs:
           QUAY_TOKEN: ${{ secrets.RELEASE_QUAY_TOKEN }}
         run: |
           set -ue
-          docker login --username "${DOCKER_USERNAME}" --password "${DOCKER_TOKEN}"
-          docker push ${IMAGE_NAMESPACE}/argocd:v${TARGET_VERSION}
           docker login quay.io --username "${QUAY_USERNAME}" --password "${QUAY_TOKEN}"
-          docker tag ${IMAGE_NAMESPACE}/argocd:v${TARGET_VERSION} quay.io/${IMAGE_NAMESPACE}/argocd:v${TARGET_VERSION}
+          docker push ${IMAGE_NAMESPACE}/argocd:v${TARGET_VERSION}
-          docker push quay.io/${IMAGE_NAMESPACE}/argocd:v${TARGET_VERSION}
+          # Remove the following when Docker Hub is gone
+          docker login --username "${DOCKER_USERNAME}" --password "${DOCKER_TOKEN}"
+          docker tag ${IMAGE_NAMESPACE}/argocd:v${TARGET_VERSION} argoproj/argocd:v${TARGET_VERSION}
+          docker push argoproj/argocd:v${TARGET_VERSION}
         if: ${{ env.DRY_RUN != 'true' }}
 
       - name: Read release notes file

Dockerfile

@@ -97,7 +97,7 @@ ADD ["ui/", "."]
 
 ARG ARGO_VERSION=latest
 ENV ARGO_VERSION=$ARGO_VERSION
-RUN NODE_ENV='production' yarn build
+RUN NODE_ENV='production' NODE_ONLINE_ENV='online' yarn build
 
 ####################################################################################################
 # Argo CD Build stage which performs the actual build of Argo CD binaries

Makefile

@@ -1,4 +1,4 @@
-PACKAGE=github.com/argoproj/argo-cd/common
+PACKAGE=github.com/argoproj/argo-cd/v2/common
 CURRENT_DIR=$(shell pwd)
 DIST_DIR=${CURRENT_DIR}/dist
 CLI_NAME=argocd
@@ -309,7 +309,7 @@ mod-download: test-tools-image
 
 .PHONY: mod-download-local
 mod-download-local:
-	go mod download
+	go mod download && go mod tidy # go mod download changes go.sum https://github.com/golang/go/issues/42970
 
 .PHONY: mod-vendor
 mod-vendor: test-tools-image

Procfile

@@ -1,6 +1,6 @@
 controller: sh -c "FORCE_LOG_COLORS=1 ARGOCD_FAKE_IN_CLUSTER=true ARGOCD_TLS_DATA_PATH=${ARGOCD_TLS_DATA_PATH:-/tmp/argocd-local/tls} ARGOCD_SSH_DATA_PATH=${ARGOCD_SSH_DATA_PATH:-/tmp/argocd-local/ssh} ARGOCD_BINARY_NAME=argocd-application-controller go run ./cmd/main.go --loglevel debug --redis localhost:${ARGOCD_E2E_REDIS_PORT:-6379} --repo-server localhost:${ARGOCD_E2E_REPOSERVER_PORT:-8081}"
 api-server: sh -c "FORCE_LOG_COLORS=1 ARGOCD_FAKE_IN_CLUSTER=true ARGOCD_TLS_DATA_PATH=${ARGOCD_TLS_DATA_PATH:-/tmp/argocd-local/tls} ARGOCD_SSH_DATA_PATH=${ARGOCD_SSH_DATA_PATH:-/tmp/argocd-local/ssh} ARGOCD_BINARY_NAME=argocd-server go run ./cmd/main.go --loglevel debug --redis localhost:${ARGOCD_E2E_REDIS_PORT:-6379} --disable-auth=${ARGOCD_E2E_DISABLE_AUTH:-'true'} --insecure --dex-server http://localhost:${ARGOCD_E2E_DEX_PORT:-5556} --repo-server localhost:${ARGOCD_E2E_REPOSERVER_PORT:-8081} --port ${ARGOCD_E2E_APISERVER_PORT:-8080} --staticassets ui/dist/app"
-dex: sh -c "ARGOCD_BINARY_NAME=argocd-dex go run github.com/argoproj/argo-cd/cmd gendexcfg -o `pwd`/dist/dex.yaml && docker run --rm -p ${ARGOCD_E2E_DEX_PORT:-5556}:${ARGOCD_E2E_DEX_PORT:-5556} -v `pwd`/dist/dex.yaml:/dex.yaml ghcr.io/dexidp/dex:v2.27.0 serve /dex.yaml"
+dex: sh -c "ARGOCD_BINARY_NAME=argocd-dex go run github.com/argoproj/argo-cd/v2/cmd gendexcfg -o `pwd`/dist/dex.yaml && docker run --rm -p ${ARGOCD_E2E_DEX_PORT:-5556}:${ARGOCD_E2E_DEX_PORT:-5556} -v `pwd`/dist/dex.yaml:/dex.yaml ghcr.io/dexidp/dex:v2.27.0 serve /dex.yaml"
 redis: docker run --rm --name argocd-redis -i -p ${ARGOCD_E2E_REDIS_PORT:-6379}:${ARGOCD_E2E_REDIS_PORT:-6379} redis:6.2.1-alpine --save "" --appendonly no --port ${ARGOCD_E2E_REDIS_PORT:-6379}
 repo-server: sh -c "FORCE_LOG_COLORS=1 ARGOCD_FAKE_IN_CLUSTER=true ARGOCD_GNUPGHOME=${ARGOCD_GNUPGHOME:-/tmp/argocd-local/gpg/keys} ARGOCD_GPG_DATA_PATH=${ARGOCD_GPG_DATA_PATH:-/tmp/argocd-local/gpg/source} ARGOCD_TLS_DATA_PATH=${ARGOCD_TLS_DATA_PATH:-/tmp/argocd-local/tls} ARGOCD_SSH_DATA_PATH=${ARGOCD_SSH_DATA_PATH:-/tmp/argocd-local/ssh} ARGOCD_BINARY_NAME=argocd-repo-server go run ./cmd/main.go --loglevel debug --port ${ARGOCD_E2E_REPOSERVER_PORT:-8081} --redis localhost:${ARGOCD_E2E_REDIS_PORT:-6379}"
 ui: sh -c 'cd ui && ${ARGOCD_E2E_YARN_CMD:-yarn} start'

VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

assets/swagger.json

@@ -3948,6 +3948,9 @@
       "type": "object",
       "title": "RepoAppDetailsQuery contains query information for app details request",
       "properties": {
+        "appName": {
+          "type": "string"
+        },
         "source": {
           "$ref": "#/definitions/v1alpha1ApplicationSource"
         }

cmd/argocd-application-controller/commands/argocd_application_controller.go

@@ -13,21 +13,21 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
 
-	cmdutil "github.com/argoproj/argo-cd/cmd/util"
+	cmdutil "github.com/argoproj/argo-cd/v2/cmd/util"
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	"github.com/argoproj/argo-cd/controller"
+	"github.com/argoproj/argo-cd/v2/controller"
-	"github.com/argoproj/argo-cd/controller/sharding"
+	"github.com/argoproj/argo-cd/v2/controller/sharding"
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned"
+	appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned"
-	"github.com/argoproj/argo-cd/reposerver/apiclient"
+	"github.com/argoproj/argo-cd/v2/reposerver/apiclient"
-	cacheutil "github.com/argoproj/argo-cd/util/cache"
+	cacheutil "github.com/argoproj/argo-cd/v2/util/cache"
-	appstatecache "github.com/argoproj/argo-cd/util/cache/appstate"
+	appstatecache "github.com/argoproj/argo-cd/v2/util/cache/appstate"
-	"github.com/argoproj/argo-cd/util/cli"
+	"github.com/argoproj/argo-cd/v2/util/cli"
-	"github.com/argoproj/argo-cd/util/env"
+	"github.com/argoproj/argo-cd/v2/util/env"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	kubeutil "github.com/argoproj/argo-cd/util/kube"
+	kubeutil "github.com/argoproj/argo-cd/v2/util/kube"
-	"github.com/argoproj/argo-cd/util/settings"
+	"github.com/argoproj/argo-cd/v2/util/settings"
-	"github.com/argoproj/argo-cd/util/tls"
+	"github.com/argoproj/argo-cd/v2/util/tls"
 )
 
 const (

cmd/argocd-dex/commands/argocd_dex.go

@@ -14,11 +14,11 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
 
-	cmdutil "github.com/argoproj/argo-cd/cmd/util"
+	cmdutil "github.com/argoproj/argo-cd/v2/cmd/util"
-	"github.com/argoproj/argo-cd/util/cli"
+	"github.com/argoproj/argo-cd/v2/util/cli"
-	"github.com/argoproj/argo-cd/util/dex"
+	"github.com/argoproj/argo-cd/v2/util/dex"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	"github.com/argoproj/argo-cd/util/settings"
+	"github.com/argoproj/argo-cd/v2/util/settings"
 )
 
 const (

cmd/argocd-repo-server/commands/argocd_repo_server.go

@@ -14,21 +14,21 @@ import (
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc/health/grpc_health_v1"
 
-	cmdutil "github.com/argoproj/argo-cd/cmd/util"
+	cmdutil "github.com/argoproj/argo-cd/v2/cmd/util"
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	"github.com/argoproj/argo-cd/reposerver"
+	"github.com/argoproj/argo-cd/v2/reposerver"
-	"github.com/argoproj/argo-cd/reposerver/apiclient"
+	"github.com/argoproj/argo-cd/v2/reposerver/apiclient"
-	reposervercache "github.com/argoproj/argo-cd/reposerver/cache"
+	reposervercache "github.com/argoproj/argo-cd/v2/reposerver/cache"
-	"github.com/argoproj/argo-cd/reposerver/metrics"
+	"github.com/argoproj/argo-cd/v2/reposerver/metrics"
-	"github.com/argoproj/argo-cd/reposerver/repository"
+	"github.com/argoproj/argo-cd/v2/reposerver/repository"
-	cacheutil "github.com/argoproj/argo-cd/util/cache"
+	cacheutil "github.com/argoproj/argo-cd/v2/util/cache"
-	"github.com/argoproj/argo-cd/util/cli"
+	"github.com/argoproj/argo-cd/v2/util/cli"
-	"github.com/argoproj/argo-cd/util/env"
+	"github.com/argoproj/argo-cd/v2/util/env"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	"github.com/argoproj/argo-cd/util/gpg"
+	"github.com/argoproj/argo-cd/v2/util/gpg"
-	"github.com/argoproj/argo-cd/util/healthz"
+	"github.com/argoproj/argo-cd/v2/util/healthz"
-	ioutil "github.com/argoproj/argo-cd/util/io"
+	ioutil "github.com/argoproj/argo-cd/v2/util/io"
-	"github.com/argoproj/argo-cd/util/tls"
+	"github.com/argoproj/argo-cd/v2/util/tls"
 )
 
 const (

cmd/argocd-server/commands/argocd_server.go

@@ -12,18 +12,18 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
 
-	cmdutil "github.com/argoproj/argo-cd/cmd/util"
+	cmdutil "github.com/argoproj/argo-cd/v2/cmd/util"
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned"
+	appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned"
-	"github.com/argoproj/argo-cd/reposerver/apiclient"
+	"github.com/argoproj/argo-cd/v2/reposerver/apiclient"
-	"github.com/argoproj/argo-cd/server"
+	"github.com/argoproj/argo-cd/v2/server"
-	servercache "github.com/argoproj/argo-cd/server/cache"
+	servercache "github.com/argoproj/argo-cd/v2/server/cache"
-	"github.com/argoproj/argo-cd/util/cli"
+	"github.com/argoproj/argo-cd/v2/util/cli"
-	"github.com/argoproj/argo-cd/util/env"
+	"github.com/argoproj/argo-cd/v2/util/env"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	"github.com/argoproj/argo-cd/util/kube"
+	"github.com/argoproj/argo-cd/v2/util/kube"
-	"github.com/argoproj/argo-cd/util/tls"
+	"github.com/argoproj/argo-cd/v2/util/tls"
 )
 
 const (

cmd/argocd-util/commands/app.go

@@ -20,23 +20,23 @@ import (
 	kubecache "k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/clientcmd"
 
-	cmdutil "github.com/argoproj/argo-cd/cmd/util"
+	cmdutil "github.com/argoproj/argo-cd/v2/cmd/util"
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	"github.com/argoproj/argo-cd/controller"
+	"github.com/argoproj/argo-cd/v2/controller"
-	"github.com/argoproj/argo-cd/controller/cache"
+	"github.com/argoproj/argo-cd/v2/controller/cache"
-	"github.com/argoproj/argo-cd/controller/metrics"
+	"github.com/argoproj/argo-cd/v2/controller/metrics"
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned"
+	appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned"
-	appinformers "github.com/argoproj/argo-cd/pkg/client/informers/externalversions"
+	appinformers "github.com/argoproj/argo-cd/v2/pkg/client/informers/externalversions"
-	"github.com/argoproj/argo-cd/reposerver/apiclient"
+	"github.com/argoproj/argo-cd/v2/reposerver/apiclient"
-	cacheutil "github.com/argoproj/argo-cd/util/cache"
+	cacheutil "github.com/argoproj/argo-cd/v2/util/cache"
-	appstatecache "github.com/argoproj/argo-cd/util/cache/appstate"
+	appstatecache "github.com/argoproj/argo-cd/v2/util/cache/appstate"
-	"github.com/argoproj/argo-cd/util/cli"
+	"github.com/argoproj/argo-cd/v2/util/cli"
-	"github.com/argoproj/argo-cd/util/config"
+	"github.com/argoproj/argo-cd/v2/util/config"
-	"github.com/argoproj/argo-cd/util/db"
+	"github.com/argoproj/argo-cd/v2/util/db"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	kubeutil "github.com/argoproj/argo-cd/util/kube"
+	kubeutil "github.com/argoproj/argo-cd/v2/util/kube"
-	"github.com/argoproj/argo-cd/util/settings"
+	"github.com/argoproj/argo-cd/v2/util/settings"
 )
 
 func NewAppCommand() *cobra.Command {

cmd/argocd-util/commands/app_test.go

@@ -3,7 +3,7 @@ package commands
 import (
 	"testing"
 
-	"github.com/argoproj/argo-cd/test"
+	"github.com/argoproj/argo-cd/v2/test"
 
 	clustermocks "github.com/argoproj/gitops-engine/pkg/cache/mocks"
 	"github.com/argoproj/gitops-engine/pkg/health"
@@ -16,16 +16,16 @@ import (
 	kubefake "k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/tools/cache"
 
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	statecache "github.com/argoproj/argo-cd/controller/cache"
+	statecache "github.com/argoproj/argo-cd/v2/controller/cache"
-	cachemocks "github.com/argoproj/argo-cd/controller/cache/mocks"
+	cachemocks "github.com/argoproj/argo-cd/v2/controller/cache/mocks"
-	"github.com/argoproj/argo-cd/controller/metrics"
+	"github.com/argoproj/argo-cd/v2/controller/metrics"
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	appfake "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/fake"
+	appfake "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/fake"
-	"github.com/argoproj/argo-cd/reposerver/apiclient"
+	"github.com/argoproj/argo-cd/v2/reposerver/apiclient"
-	"github.com/argoproj/argo-cd/reposerver/apiclient/mocks"
+	"github.com/argoproj/argo-cd/v2/reposerver/apiclient/mocks"
-	"github.com/argoproj/argo-cd/util/db"
+	"github.com/argoproj/argo-cd/v2/util/db"
-	"github.com/argoproj/argo-cd/util/settings"
+	"github.com/argoproj/argo-cd/v2/util/settings"
 )
 
 func TestGetReconcileResults(t *testing.T) {

cmd/argocd-util/commands/argocd_util.go

@@ -13,11 +13,11 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 
-	cmdutil "github.com/argoproj/argo-cd/cmd/util"
+	cmdutil "github.com/argoproj/argo-cd/v2/cmd/util"
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	"github.com/argoproj/argo-cd/util/cli"
+	"github.com/argoproj/argo-cd/v2/util/cli"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	"github.com/argoproj/argo-cd/util/settings"
+	"github.com/argoproj/argo-cd/v2/util/settings"
 )
 
 const (

cmd/argocd-util/commands/backup.go

@@ -18,9 +18,9 @@ import (
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/tools/clientcmd"
 
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	"github.com/argoproj/argo-cd/util/cli"
+	"github.com/argoproj/argo-cd/v2/util/cli"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
 )
 
 // NewExportCommand defines a new command for exporting Kubernetes and Argo CD resources.

cmd/argocd-util/commands/cluster.go

@@ -16,17 +16,17 @@ import (
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/tools/clientcmd"
 
-	cmdutil "github.com/argoproj/argo-cd/cmd/util"
+	cmdutil "github.com/argoproj/argo-cd/v2/cmd/util"
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	"github.com/argoproj/argo-cd/controller/sharding"
+	"github.com/argoproj/argo-cd/v2/controller/sharding"
-	argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	cacheutil "github.com/argoproj/argo-cd/util/cache"
+	cacheutil "github.com/argoproj/argo-cd/v2/util/cache"
-	appstatecache "github.com/argoproj/argo-cd/util/cache/appstate"
+	appstatecache "github.com/argoproj/argo-cd/v2/util/cache/appstate"
-	"github.com/argoproj/argo-cd/util/cli"
+	"github.com/argoproj/argo-cd/v2/util/cli"
-	"github.com/argoproj/argo-cd/util/db"
+	"github.com/argoproj/argo-cd/v2/util/db"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	kubeutil "github.com/argoproj/argo-cd/util/kube"
+	kubeutil "github.com/argoproj/argo-cd/v2/util/kube"
-	"github.com/argoproj/argo-cd/util/settings"
+	"github.com/argoproj/argo-cd/v2/util/settings"
 )
 
 func NewClusterCommand(pathOpts *clientcmd.PathOptions) *cobra.Command {

cmd/argocd-util/commands/project.go

@@ -7,12 +7,12 @@ import (
 	"path/filepath"
 	"strings"
 
-	cmdutil "github.com/argoproj/argo-cd/cmd/util"
+	cmdutil "github.com/argoproj/argo-cd/v2/cmd/util"
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned"
+	appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned"
-	appclient "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/typed/application/v1alpha1"
+	appclient "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/typed/application/v1alpha1"
-	"github.com/argoproj/argo-cd/util/cli"
+	"github.com/argoproj/argo-cd/v2/util/cli"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
 
 	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 	"github.com/spf13/cobra"

cmd/argocd-util/commands/project_allowlist.go

@@ -17,10 +17,10 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/tools/clientcmd"
 
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
 
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"github.com/argoproj/argo-cd/util/cli"
+	"github.com/argoproj/argo-cd/v2/util/cli"
 
 	// load the gcp plugin (required to authenticate against GKE clusters).
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"

cmd/argocd-util/commands/project_test.go

@@ -7,8 +7,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"github.com/argoproj/argo-cd/pkg/client/clientset/versioned/fake"
+	"github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/fake"
 )
 
 const (

cmd/argocd-util/commands/repo.go

@@ -13,13 +13,13 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
 
-	cmdutil "github.com/argoproj/argo-cd/cmd/util"
+	cmdutil "github.com/argoproj/argo-cd/v2/cmd/util"
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	"github.com/argoproj/argo-cd/util/cli"
+	"github.com/argoproj/argo-cd/v2/util/cli"
-	"github.com/argoproj/argo-cd/util/db"
+	"github.com/argoproj/argo-cd/v2/util/db"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	"github.com/argoproj/argo-cd/util/git"
+	"github.com/argoproj/argo-cd/v2/util/git"
-	"github.com/argoproj/argo-cd/util/settings"
+	"github.com/argoproj/argo-cd/v2/util/settings"
 )
 
 const (

cmd/argocd-util/commands/settings.go

@@ -23,13 +23,13 @@ import (
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/tools/clientcmd"
 
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"github.com/argoproj/argo-cd/util/argo/normalizers"
+	"github.com/argoproj/argo-cd/v2/util/argo/normalizers"
-	"github.com/argoproj/argo-cd/util/cli"
+	"github.com/argoproj/argo-cd/v2/util/cli"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	"github.com/argoproj/argo-cd/util/lua"
+	"github.com/argoproj/argo-cd/v2/util/lua"
-	"github.com/argoproj/argo-cd/util/settings"
+	"github.com/argoproj/argo-cd/v2/util/settings"
 )
 
 type settingsOpts struct {

cmd/argocd-util/commands/settings_rbac.go

@@ -14,11 +14,11 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
 
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	"github.com/argoproj/argo-cd/server/rbacpolicy"
+	"github.com/argoproj/argo-cd/v2/server/rbacpolicy"
-	"github.com/argoproj/argo-cd/util/assets"
+	"github.com/argoproj/argo-cd/v2/util/assets"
-	"github.com/argoproj/argo-cd/util/cli"
+	"github.com/argoproj/argo-cd/v2/util/cli"
-	"github.com/argoproj/argo-cd/util/rbac"
+	"github.com/argoproj/argo-cd/v2/util/rbac"
 )
 
 // Provide a mapping of short-hand resource names to their RBAC counterparts
@@ -101,19 +101,19 @@ something.
 		Example: `
 # Check whether role some:role has permissions to create an application in the
 # 'default' project, using a local policy.csv file
-argocd-util rbac can some:role create application 'default/app' --policy-file policy.csv
+argocd-util settings rbac can some:role create application 'default/app' --policy-file policy.csv
 
 # Policy file can also be K8s config map with data keys like argocd-rbac-cm,
 # i.e. 'policy.csv' and (optionally) 'policy.default'
-argocd-util rbac can some:role create application 'default/app' --policy-file argocd-rbac-cm.yaml
+argocd-util settings rbac can some:role create application 'default/app' --policy-file argocd-rbac-cm.yaml
 
 # If --policy-file is not given, the ConfigMap 'argocd-rbac-cm' from K8s is
 # used. You need to specify the argocd namespace, and make sure that your
 # current Kubernetes context is pointing to the cluster Argo CD is running in
-argocd-util rbac can some:role create application 'default/app' --namespace argocd
+argocd-util settings rbac can some:role create application 'default/app' --namespace argocd
 
 # You can override a possibly configured default role
-argocd-util rbac can someuser create application 'default/app' --default-role role:readonly
+argocd-util settings rbac can someuser create application 'default/app' --default-role role:readonly
 
 `,
 		Run: func(c *cobra.Command, args []string) {

cmd/argocd-util/commands/settings_rbac_test.go

@@ -10,7 +10,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
 
-	"github.com/argoproj/argo-cd/util/assets"
+	"github.com/argoproj/argo-cd/v2/util/assets"
 )
 
 func Test_isValidRBACAction(t *testing.T) {

cmd/argocd-util/commands/settings_test.go

@@ -9,9 +9,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	utils "github.com/argoproj/argo-cd/util/io"
+	utils "github.com/argoproj/argo-cd/v2/util/io"
-	"github.com/argoproj/argo-cd/util/settings"
+	"github.com/argoproj/argo-cd/v2/util/settings"
 
 	"github.com/stretchr/testify/assert"
 	v1 "k8s.io/api/core/v1"

cmd/argocd/commands/account.go

@@ -16,15 +16,15 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/crypto/ssh/terminal"
 
-	argocdclient "github.com/argoproj/argo-cd/pkg/apiclient"
+	argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient"
-	accountpkg "github.com/argoproj/argo-cd/pkg/apiclient/account"
+	accountpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/account"
-	"github.com/argoproj/argo-cd/pkg/apiclient/session"
+	"github.com/argoproj/argo-cd/v2/pkg/apiclient/session"
-	"github.com/argoproj/argo-cd/server/rbacpolicy"
+	"github.com/argoproj/argo-cd/v2/server/rbacpolicy"
-	"github.com/argoproj/argo-cd/util/cli"
+	"github.com/argoproj/argo-cd/v2/util/cli"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	"github.com/argoproj/argo-cd/util/io"
+	"github.com/argoproj/argo-cd/v2/util/io"
-	"github.com/argoproj/argo-cd/util/localconfig"
+	"github.com/argoproj/argo-cd/v2/util/localconfig"
-	sessionutil "github.com/argoproj/argo-cd/util/session"
+	sessionutil "github.com/argoproj/argo-cd/v2/util/session"
 )
 
 func NewAccountCommand(clientOpts *argocdclient.ClientOptions) *cobra.Command {
@@ -99,7 +99,7 @@ func NewAccountUpdatePasswordCommand(clientOpts *argocdclient.ClientOptions) *co
 				errors.CheckError(err)
 				claims, err := configCtx.User.Claims()
 				errors.CheckError(err)
-				tokenString := passwordLogin(acdClient, claims.Subject, newPassword)
+				tokenString := passwordLogin(acdClient, localconfig.GetUsername(claims.Subject), newPassword)
 				localCfg.UpsertUser(localconfig.User{
 					Name:      localCfg.CurrentContext,
 					AuthToken: tokenString,

cmd/argocd/commands/app.go

@@ -30,28 +30,28 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/utils/pointer"
 
-	cmdutil "github.com/argoproj/argo-cd/cmd/util"
+	cmdutil "github.com/argoproj/argo-cd/v2/cmd/util"
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	"github.com/argoproj/argo-cd/controller"
+	"github.com/argoproj/argo-cd/v2/controller"
-	"github.com/argoproj/argo-cd/pkg/apiclient"
+	"github.com/argoproj/argo-cd/v2/pkg/apiclient"
-	argocdclient "github.com/argoproj/argo-cd/pkg/apiclient"
+	argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient"
-	"github.com/argoproj/argo-cd/pkg/apiclient/application"
+	"github.com/argoproj/argo-cd/v2/pkg/apiclient/application"
-	applicationpkg "github.com/argoproj/argo-cd/pkg/apiclient/application"
+	applicationpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/application"
-	clusterpkg "github.com/argoproj/argo-cd/pkg/apiclient/cluster"
+	clusterpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/cluster"
-	projectpkg "github.com/argoproj/argo-cd/pkg/apiclient/project"
+	projectpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/project"
-	"github.com/argoproj/argo-cd/pkg/apiclient/settings"
+	"github.com/argoproj/argo-cd/v2/pkg/apiclient/settings"
-	settingspkg "github.com/argoproj/argo-cd/pkg/apiclient/settings"
+	settingspkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/settings"
-	argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	repoapiclient "github.com/argoproj/argo-cd/reposerver/apiclient"
+	repoapiclient "github.com/argoproj/argo-cd/v2/reposerver/apiclient"
-	"github.com/argoproj/argo-cd/reposerver/repository"
+	"github.com/argoproj/argo-cd/v2/reposerver/repository"
-	"github.com/argoproj/argo-cd/util/argo"
+	"github.com/argoproj/argo-cd/v2/util/argo"
-	"github.com/argoproj/argo-cd/util/cli"
+	"github.com/argoproj/argo-cd/v2/util/cli"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	"github.com/argoproj/argo-cd/util/git"
+	"github.com/argoproj/argo-cd/v2/util/git"
-	argoio "github.com/argoproj/argo-cd/util/io"
+	argoio "github.com/argoproj/argo-cd/v2/util/io"
-	argokube "github.com/argoproj/argo-cd/util/kube"
+	argokube "github.com/argoproj/argo-cd/v2/util/kube"
-	"github.com/argoproj/argo-cd/util/templates"
+	"github.com/argoproj/argo-cd/v2/util/templates"
-	"github.com/argoproj/argo-cd/util/text/label"
+	"github.com/argoproj/argo-cd/v2/util/text/label"
 )
 
 var (
@@ -798,6 +798,7 @@ func NewApplicationDiffCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co
 	var (
 		refresh       bool
 		hardRefresh   bool
+		exitCode      bool
 		local         string
 		revision      string
 		localRepoRoot string
@@ -901,7 +902,7 @@ func NewApplicationDiffCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co
 					_ = cli.PrintDiff(item.key.Name, live, target)
 				}
 			}
-			if foundDiffs {
+			if foundDiffs && exitCode {
 				os.Exit(1)
 			}
 
@@ -909,6 +910,7 @@ func NewApplicationDiffCommand(clientOpts *argocdclient.ClientOptions) *cobra.Co
 	}
 	command.Flags().BoolVar(&refresh, "refresh", false, "Refresh application data when retrieving")
 	command.Flags().BoolVar(&hardRefresh, "hard-refresh", false, "Refresh application data as well as target manifests cache")
+	command.Flags().BoolVar(&exitCode, "exit-code", true, "Return non-zero exit code when there is a diff")
 	command.Flags().StringVar(&local, "local", "", "Compare live app to a local manifests")
 	command.Flags().StringVar(&revision, "revision", "", "Compare live app to a particular revision")
 	command.Flags().StringVar(&localRepoRoot, "local-repo-root", "/", "Path to the repository root. Used together with --local allows setting the repository root")

cmd/argocd/commands/app_actions.go

@@ -12,10 +12,10 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	argocdclient "github.com/argoproj/argo-cd/pkg/apiclient"
+	argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient"
-	applicationpkg "github.com/argoproj/argo-cd/pkg/apiclient/application"
+	applicationpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/application"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	"github.com/argoproj/argo-cd/util/io"
+	"github.com/argoproj/argo-cd/v2/util/io"
 )
 
 type DisplayedAction struct {

cmd/argocd/commands/cert.go

@@ -11,12 +11,12 @@ import (
 
 	"github.com/spf13/cobra"
 
-	argocdclient "github.com/argoproj/argo-cd/pkg/apiclient"
+	argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient"
-	certificatepkg "github.com/argoproj/argo-cd/pkg/apiclient/certificate"
+	certificatepkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/certificate"
-	appsv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	appsv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	certutil "github.com/argoproj/argo-cd/util/cert"
+	certutil "github.com/argoproj/argo-cd/v2/util/cert"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	"github.com/argoproj/argo-cd/util/io"
+	"github.com/argoproj/argo-cd/v2/util/io"
 )
 
 // NewCertCommand returns a new instance of an `argocd repo` command

cmd/argocd/commands/cluster.go

@@ -12,14 +12,14 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
 
-	cmdutil "github.com/argoproj/argo-cd/cmd/util"
+	cmdutil "github.com/argoproj/argo-cd/v2/cmd/util"
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	argocdclient "github.com/argoproj/argo-cd/pkg/apiclient"
+	argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient"
-	clusterpkg "github.com/argoproj/argo-cd/pkg/apiclient/cluster"
+	clusterpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/cluster"
-	argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"github.com/argoproj/argo-cd/util/clusterauth"
+	"github.com/argoproj/argo-cd/v2/util/clusterauth"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	"github.com/argoproj/argo-cd/util/io"
+	"github.com/argoproj/argo-cd/v2/util/io"
 )
 
 // NewClusterCommand returns a new instance of an `argocd cluster` command

cmd/argocd/commands/cluster_test.go

@@ -5,7 +5,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 )
 
 func Test_printClusterTable(t *testing.T) {

cmd/argocd/commands/context.go

@@ -11,9 +11,9 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	argocdclient "github.com/argoproj/argo-cd/pkg/apiclient"
+	argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	"github.com/argoproj/argo-cd/util/localconfig"
+	"github.com/argoproj/argo-cd/v2/util/localconfig"
 )
 
 // NewContextCommand returns a new instance of an `argocd ctx` command

cmd/argocd/commands/context_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/argoproj/argo-cd/util/localconfig"
+	"github.com/argoproj/argo-cd/v2/util/localconfig"
 )
 
 const testConfig = `contexts:

cmd/argocd/commands/gpg.go

@@ -10,11 +10,11 @@ import (
 
 	"github.com/spf13/cobra"
 
-	argocdclient "github.com/argoproj/argo-cd/pkg/apiclient"
+	argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient"
-	gpgkeypkg "github.com/argoproj/argo-cd/pkg/apiclient/gpgkey"
+	gpgkeypkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/gpgkey"
-	appsv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	appsv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	argoio "github.com/argoproj/argo-cd/util/io"
+	argoio "github.com/argoproj/argo-cd/v2/util/io"
 )
 
 // NewGPGCommand returns a new instance of an `argocd repo` command

cmd/argocd/commands/login.go

@@ -19,17 +19,17 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/oauth2"
 
-	argocdclient "github.com/argoproj/argo-cd/pkg/apiclient"
+	argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient"
-	sessionpkg "github.com/argoproj/argo-cd/pkg/apiclient/session"
+	sessionpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/session"
-	settingspkg "github.com/argoproj/argo-cd/pkg/apiclient/settings"
+	settingspkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/settings"
-	"github.com/argoproj/argo-cd/util/cli"
+	"github.com/argoproj/argo-cd/v2/util/cli"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	grpc_util "github.com/argoproj/argo-cd/util/grpc"
+	grpc_util "github.com/argoproj/argo-cd/v2/util/grpc"
-	"github.com/argoproj/argo-cd/util/io"
+	"github.com/argoproj/argo-cd/v2/util/io"
-	jwtutil "github.com/argoproj/argo-cd/util/jwt"
+	jwtutil "github.com/argoproj/argo-cd/v2/util/jwt"
-	"github.com/argoproj/argo-cd/util/localconfig"
+	"github.com/argoproj/argo-cd/v2/util/localconfig"
-	oidcutil "github.com/argoproj/argo-cd/util/oidc"
+	oidcutil "github.com/argoproj/argo-cd/v2/util/oidc"
-	"github.com/argoproj/argo-cd/util/rand"
+	"github.com/argoproj/argo-cd/v2/util/rand"
 )
 
 // NewLoginCommand returns a new instance of `argocd login` command

cmd/argocd/commands/logout.go

@@ -7,9 +7,9 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	argocdclient "github.com/argoproj/argo-cd/pkg/apiclient"
+	argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	"github.com/argoproj/argo-cd/util/localconfig"
+	"github.com/argoproj/argo-cd/v2/util/localconfig"
 )
 
 // NewLogoutCommand returns a new instance of `argocd logout` command

cmd/argocd/commands/logout_test.go

@@ -5,11 +5,11 @@ import (
 	"os"
 	"testing"
 
-	"github.com/argoproj/argo-cd/pkg/apiclient"
+	"github.com/argoproj/argo-cd/v2/pkg/apiclient"
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/argoproj/argo-cd/util/localconfig"
+	"github.com/argoproj/argo-cd/v2/util/localconfig"
 )
 
 func TestLogout(t *testing.T) {

cmd/argocd/commands/project.go

@@ -17,15 +17,15 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	cmdutil "github.com/argoproj/argo-cd/cmd/util"
+	cmdutil "github.com/argoproj/argo-cd/v2/cmd/util"
-	argocdclient "github.com/argoproj/argo-cd/pkg/apiclient"
+	argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient"
-	projectpkg "github.com/argoproj/argo-cd/pkg/apiclient/project"
+	projectpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/project"
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"github.com/argoproj/argo-cd/util/cli"
+	"github.com/argoproj/argo-cd/v2/util/cli"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	"github.com/argoproj/argo-cd/util/git"
+	"github.com/argoproj/argo-cd/v2/util/git"
-	"github.com/argoproj/argo-cd/util/gpg"
+	"github.com/argoproj/argo-cd/v2/util/gpg"
-	argoio "github.com/argoproj/argo-cd/util/io"
+	argoio "github.com/argoproj/argo-cd/v2/util/io"
 )
 
 type policyOpts struct {

cmd/argocd/commands/project_role.go

@@ -12,12 +12,12 @@ import (
 	jwtgo "github.com/dgrijalva/jwt-go/v4"
 	"github.com/spf13/cobra"
 
-	argocdclient "github.com/argoproj/argo-cd/pkg/apiclient"
+	argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient"
-	projectpkg "github.com/argoproj/argo-cd/pkg/apiclient/project"
+	projectpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/project"
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	"github.com/argoproj/argo-cd/util/io"
+	"github.com/argoproj/argo-cd/v2/util/io"
-	"github.com/argoproj/argo-cd/util/jwt"
+	"github.com/argoproj/argo-cd/v2/util/jwt"
 )
 
 const (

cmd/argocd/commands/projectwindows.go

@@ -10,11 +10,11 @@ import (
 
 	"github.com/spf13/cobra"
 
-	argocdclient "github.com/argoproj/argo-cd/pkg/apiclient"
+	argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient"
-	projectpkg "github.com/argoproj/argo-cd/pkg/apiclient/project"
+	projectpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/project"
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	"github.com/argoproj/argo-cd/util/io"
+	"github.com/argoproj/argo-cd/v2/util/io"
 )
 
 // NewProjectWindowsCommand returns a new instance of the `argocd proj windows` command

cmd/argocd/commands/relogin.go

@@ -9,12 +9,12 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	argocdclient "github.com/argoproj/argo-cd/pkg/apiclient"
+	argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient"
-	settingspkg "github.com/argoproj/argo-cd/pkg/apiclient/settings"
+	settingspkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/settings"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	argoio "github.com/argoproj/argo-cd/util/io"
+	argoio "github.com/argoproj/argo-cd/v2/util/io"
-	"github.com/argoproj/argo-cd/util/localconfig"
+	"github.com/argoproj/argo-cd/v2/util/localconfig"
-	"github.com/argoproj/argo-cd/util/session"
+	"github.com/argoproj/argo-cd/v2/util/session"
 )
 
 // NewReloginCommand returns a new instance of `argocd relogin` command
@@ -55,8 +55,8 @@ func NewReloginCommand(globalClientOpts *argocdclient.ClientOptions) *cobra.Comm
 			claims, err := configCtx.User.Claims()
 			errors.CheckError(err)
 			if claims.Issuer == session.SessionManagerClaimsIssuer {
-				fmt.Printf("Relogging in as '%s'\n", claims.Subject)
+				fmt.Printf("Relogging in as '%s'\n", localconfig.GetUsername(claims.Subject))
-				tokenString = passwordLogin(acdClient, claims.Subject, password)
+				tokenString = passwordLogin(acdClient, localconfig.GetUsername(claims.Subject), password)
 			} else {
 				fmt.Println("Reinitiating SSO login")
 				setConn, setIf := acdClient.NewSettingsClientOrDie()

cmd/argocd/commands/repo.go

@@ -10,14 +10,14 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	cmdutil "github.com/argoproj/argo-cd/cmd/util"
+	cmdutil "github.com/argoproj/argo-cd/v2/cmd/util"
-	argocdclient "github.com/argoproj/argo-cd/pkg/apiclient"
+	argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient"
-	repositorypkg "github.com/argoproj/argo-cd/pkg/apiclient/repository"
+	repositorypkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/repository"
-	appsv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	appsv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"github.com/argoproj/argo-cd/util/cli"
+	"github.com/argoproj/argo-cd/v2/util/cli"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	"github.com/argoproj/argo-cd/util/git"
+	"github.com/argoproj/argo-cd/v2/util/git"
-	"github.com/argoproj/argo-cd/util/io"
+	"github.com/argoproj/argo-cd/v2/util/io"
 )
 
 // NewRepoCommand returns a new instance of an `argocd repo` command

cmd/argocd/commands/repocreds.go

@@ -10,13 +10,13 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	argocdclient "github.com/argoproj/argo-cd/pkg/apiclient"
+	argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient"
-	repocredspkg "github.com/argoproj/argo-cd/pkg/apiclient/repocreds"
+	repocredspkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/repocreds"
-	appsv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	appsv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"github.com/argoproj/argo-cd/util/cli"
+	"github.com/argoproj/argo-cd/v2/util/cli"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	"github.com/argoproj/argo-cd/util/git"
+	"github.com/argoproj/argo-cd/v2/util/git"
-	"github.com/argoproj/argo-cd/util/io"
+	"github.com/argoproj/argo-cd/v2/util/io"
 )
 
 // NewRepoCredsCommand returns a new instance of an `argocd repocreds` command

cmd/argocd/commands/root.go

@@ -4,12 +4,12 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/client-go/tools/clientcmd"
 
-	cmdutil "github.com/argoproj/argo-cd/cmd/util"
+	cmdutil "github.com/argoproj/argo-cd/v2/cmd/util"
-	argocdclient "github.com/argoproj/argo-cd/pkg/apiclient"
+	argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient"
-	"github.com/argoproj/argo-cd/util/cli"
+	"github.com/argoproj/argo-cd/v2/util/cli"
-	"github.com/argoproj/argo-cd/util/config"
+	"github.com/argoproj/argo-cd/v2/util/config"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	"github.com/argoproj/argo-cd/util/localconfig"
+	"github.com/argoproj/argo-cd/v2/util/localconfig"
 )
 
 func init() {

cmd/argocd/commands/version.go

@@ -8,11 +8,11 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	argocdclient "github.com/argoproj/argo-cd/pkg/apiclient"
+	argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient"
-	"github.com/argoproj/argo-cd/pkg/apiclient/version"
+	"github.com/argoproj/argo-cd/v2/pkg/apiclient/version"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	argoio "github.com/argoproj/argo-cd/util/io"
+	argoio "github.com/argoproj/argo-cd/v2/util/io"
 )
 
 // NewVersionCmd returns a new `version` command to be used as a sub-command to root

cmd/main.go

@@ -7,12 +7,12 @@ import (
 
 	"github.com/spf13/cobra"
 
-	appcontroller "github.com/argoproj/argo-cd/cmd/argocd-application-controller/commands"
+	appcontroller "github.com/argoproj/argo-cd/v2/cmd/argocd-application-controller/commands"
-	dex "github.com/argoproj/argo-cd/cmd/argocd-dex/commands"
+	dex "github.com/argoproj/argo-cd/v2/cmd/argocd-dex/commands"
-	reposerver "github.com/argoproj/argo-cd/cmd/argocd-repo-server/commands"
+	reposerver "github.com/argoproj/argo-cd/v2/cmd/argocd-repo-server/commands"
-	apiserver "github.com/argoproj/argo-cd/cmd/argocd-server/commands"
+	apiserver "github.com/argoproj/argo-cd/v2/cmd/argocd-server/commands"
-	util "github.com/argoproj/argo-cd/cmd/argocd-util/commands"
+	util "github.com/argoproj/argo-cd/v2/cmd/argocd-util/commands"
-	cli "github.com/argoproj/argo-cd/cmd/argocd/commands"
+	cli "github.com/argoproj/argo-cd/v2/cmd/argocd/commands"
 )
 
 const (

cmd/util/app.go

@@ -15,12 +15,12 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/pointer"
 
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	"github.com/argoproj/argo-cd/pkg/apis/application"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application"
-	argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"github.com/argoproj/argo-cd/util/config"
+	"github.com/argoproj/argo-cd/v2/util/config"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	"github.com/argoproj/argo-cd/util/text/label"
+	"github.com/argoproj/argo-cd/v2/util/text/label"
 )
 
 type AppOptions struct {
@@ -111,10 +111,10 @@ func AddAppFlags(command *cobra.Command, opts *AppOptions) {
 	command.Flags().StringArrayVar(&opts.kustomizeCommonAnnotations, "kustomize-common-annotation", []string{}, "Set common labels in Kustomize")
 	command.Flags().StringVar(&opts.directoryExclude, "directory-exclude", "", "Set glob expression used to exclude files from application source path")
 	command.Flags().StringVar(&opts.directoryInclude, "directory-include", "", "Set glob expression used to include files from application source path")
-	command.Flags().Int64Var(&opts.retryLimit, "retry-limit", 0, "Max number of allowed sync retries")
+	command.Flags().Int64Var(&opts.retryLimit, "sync-retry-limit", 0, "Max number of allowed sync retries")
-	command.Flags().DurationVar(&opts.retryBackoffDuration, "retry-backoff-duration", common.DefaultSyncRetryDuration, "Retry backoff base duration. Input needs to be a duration (e.g. 2m, 1h)")
+	command.Flags().DurationVar(&opts.retryBackoffDuration, "sync-retry-backoff-duration", common.DefaultSyncRetryDuration, "Sync retry backoff base duration. Input needs to be a duration (e.g. 2m, 1h)")
-	command.Flags().DurationVar(&opts.retryBackoffMaxDuration, "retry-backoff-max-duration", common.DefaultSyncRetryMaxDuration, "Max retry backoff duration. Input needs to be a duration (e.g. 2m, 1h)")
+	command.Flags().DurationVar(&opts.retryBackoffMaxDuration, "sync-retry-backoff-max-duration", common.DefaultSyncRetryMaxDuration, "Max sync retry backoff duration. Input needs to be a duration (e.g. 2m, 1h)")
-	command.Flags().Int64Var(&opts.retryBackoffFactor, "retry-backoff-factor", common.DefaultSyncRetryFactor, "Factor multiplies the base duration after each failed retry")
+	command.Flags().Int64Var(&opts.retryBackoffFactor, "sync-retry-backoff-factor", common.DefaultSyncRetryFactor, "Factor multiplies the base duration after each failed sync retry")
 }
 
 func SetAppSpecOptions(flags *pflag.FlagSet, spec *argoappv1.ApplicationSpec, appOpts *AppOptions) int {
@@ -248,7 +248,7 @@ func SetAppSpecOptions(flags *pflag.FlagSet, spec *argoappv1.ApplicationSpec, ap
 			if spec.SyncPolicy.IsZero() {
 				spec.SyncPolicy = nil
 			}
-		case "retry-limit":
+		case "sync-retry-limit":
 			if appOpts.retryLimit > 0 {
 				if spec.SyncPolicy == nil {
 					spec.SyncPolicy = &argoappv1.SyncPolicy{}
@@ -268,7 +268,7 @@ func SetAppSpecOptions(flags *pflag.FlagSet, spec *argoappv1.ApplicationSpec, ap
 					spec.SyncPolicy.Retry = nil
 				}
 			} else {
-				log.Fatalf("Invalid retry-limit [%d]", appOpts.retryLimit)
+				log.Fatalf("Invalid sync-retry-limit [%d]", appOpts.retryLimit)
 			}
 		}
 	})

cmd/util/app_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 )
 
 func Test_setHelmOpt(t *testing.T) {
@@ -165,10 +165,10 @@ func Test_setAppSpecOptions(t *testing.T) {
 		assert.Nil(t, f.spec.SyncPolicy)
 	})
 	t.Run("RetryLimit", func(t *testing.T) {
-		assert.NoError(t, f.SetFlag("retry-limit", "5"))
+		assert.NoError(t, f.SetFlag("sync-retry-limit", "5"))
 		assert.True(t, f.spec.SyncPolicy.Retry.Limit == 5)
 
-		assert.NoError(t, f.SetFlag("retry-limit", "0"))
+		assert.NoError(t, f.SetFlag("sync-retry-limit", "0"))
-		assert.Nil(t, f.spec.SyncPolicy)
+		assert.Nil(t, f.spec.SyncPolicy.Retry)
 	})
 }

cmd/util/cluster.go

@@ -12,8 +12,8 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 
-	argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
 )
 
 func PrintKubeContexts(ca clientcmd.ConfigAccess) {

cmd/util/cluster_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"k8s.io/client-go/rest"
 
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 )
 
 func Test_newCluster(t *testing.T) {

cmd/util/project.go

@@ -13,10 +13,10 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/pointer"
 
-	"github.com/argoproj/argo-cd/pkg/apis/application"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application"
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"github.com/argoproj/argo-cd/util/config"
+	"github.com/argoproj/argo-cd/v2/util/config"
-	"github.com/argoproj/argo-cd/util/gpg"
+	"github.com/argoproj/argo-cd/v2/util/gpg"
 )
 
 type ProjectOpts struct {

cmd/util/repo.go

@@ -3,8 +3,8 @@ package util
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	appsv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	appsv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 )
 
 type RepoOptions struct {

controller/appcontroller.go

@@ -39,22 +39,22 @@ import (
 	// make sure to register workqueue prometheus metrics
 	_ "k8s.io/component-base/metrics/prometheus/workqueue"
 
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	statecache "github.com/argoproj/argo-cd/controller/cache"
+	statecache "github.com/argoproj/argo-cd/v2/controller/cache"
-	"github.com/argoproj/argo-cd/controller/metrics"
+	"github.com/argoproj/argo-cd/v2/controller/metrics"
-	"github.com/argoproj/argo-cd/pkg/apis/application"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application"
-	appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned"
+	appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned"
-	"github.com/argoproj/argo-cd/pkg/client/informers/externalversions/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/client/informers/externalversions/application/v1alpha1"
-	applisters "github.com/argoproj/argo-cd/pkg/client/listers/application/v1alpha1"
+	applisters "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1"
-	"github.com/argoproj/argo-cd/reposerver/apiclient"
+	"github.com/argoproj/argo-cd/v2/reposerver/apiclient"
-	"github.com/argoproj/argo-cd/util/argo"
+	"github.com/argoproj/argo-cd/v2/util/argo"
-	appstatecache "github.com/argoproj/argo-cd/util/cache/appstate"
+	appstatecache "github.com/argoproj/argo-cd/v2/util/cache/appstate"
-	"github.com/argoproj/argo-cd/util/db"
+	"github.com/argoproj/argo-cd/v2/util/db"
-	"github.com/argoproj/argo-cd/util/errors"
+	"github.com/argoproj/argo-cd/v2/util/errors"
-	"github.com/argoproj/argo-cd/util/glob"
+	"github.com/argoproj/argo-cd/v2/util/glob"
-	logutils "github.com/argoproj/argo-cd/util/log"
+	logutils "github.com/argoproj/argo-cd/v2/util/log"
-	settings_util "github.com/argoproj/argo-cd/util/settings"
+	settings_util "github.com/argoproj/argo-cd/v2/util/settings"
 )
 
 const (

controller/appcontroller_test.go

@@ -10,7 +10,7 @@ import (
 
 	clustercache "github.com/argoproj/gitops-engine/pkg/cache"
 
-	statecache "github.com/argoproj/argo-cd/controller/cache"
+	statecache "github.com/argoproj/argo-cd/v2/controller/cache"
 
 	"github.com/argoproj/gitops-engine/pkg/cache/mocks"
 	synccommon "github.com/argoproj/gitops-engine/pkg/sync/common"
@@ -29,16 +29,16 @@ import (
 	kubetesting "k8s.io/client-go/testing"
 	"k8s.io/client-go/tools/cache"
 
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	mockstatecache "github.com/argoproj/argo-cd/controller/cache/mocks"
+	mockstatecache "github.com/argoproj/argo-cd/v2/controller/cache/mocks"
-	argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/fake"
+	appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/fake"
-	"github.com/argoproj/argo-cd/reposerver/apiclient"
+	"github.com/argoproj/argo-cd/v2/reposerver/apiclient"
-	mockrepoclient "github.com/argoproj/argo-cd/reposerver/apiclient/mocks"
+	mockrepoclient "github.com/argoproj/argo-cd/v2/reposerver/apiclient/mocks"
-	"github.com/argoproj/argo-cd/test"
+	"github.com/argoproj/argo-cd/v2/test"
-	cacheutil "github.com/argoproj/argo-cd/util/cache"
+	cacheutil "github.com/argoproj/argo-cd/v2/util/cache"
-	appstatecache "github.com/argoproj/argo-cd/util/cache/appstate"
+	appstatecache "github.com/argoproj/argo-cd/v2/util/cache/appstate"
-	"github.com/argoproj/argo-cd/util/settings"
+	"github.com/argoproj/argo-cd/v2/util/settings"
 )
 
 type namespacedResource struct {

controller/cache/cache.go

@@ -18,14 +18,14 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/tools/cache"
 
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	"github.com/argoproj/argo-cd/controller/metrics"
+	"github.com/argoproj/argo-cd/v2/controller/metrics"
-	appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"github.com/argoproj/argo-cd/util/argo"
+	"github.com/argoproj/argo-cd/v2/util/argo"
-	"github.com/argoproj/argo-cd/util/db"
+	"github.com/argoproj/argo-cd/v2/util/db"
-	logutils "github.com/argoproj/argo-cd/util/log"
+	logutils "github.com/argoproj/argo-cd/v2/util/log"
-	"github.com/argoproj/argo-cd/util/lua"
+	"github.com/argoproj/argo-cd/v2/util/lua"
-	"github.com/argoproj/argo-cd/util/settings"
+	"github.com/argoproj/argo-cd/v2/util/settings"
 )
 
 type LiveStateCache interface {

controller/cache/cache_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/argoproj/gitops-engine/pkg/cache/mocks"
 	"github.com/stretchr/testify/mock"
 
-	appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 )
 
 func TestHandleModEvent_HasChanges(t *testing.T) {

controller/cache/info.go

@@ -11,9 +11,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	resourcehelper "k8s.io/kubectl/pkg/util/resource"
 
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"github.com/argoproj/argo-cd/util/resource"
+	"github.com/argoproj/argo-cd/v2/util/resource"
 )
 
 func populateNodeInfo(un *unstructured.Unstructured, res *ResourceInfo) {

controller/cache/info_test.go

@@ -15,7 +15,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 )
 
 func strToUnstructured(jsonStr string) *unstructured.Unstructured {

controller/cache/mocks/LiveStateCache.go

@@ -7,7 +7,7 @@ import (
 
 	cache "github.com/argoproj/gitops-engine/pkg/cache"
 
-	controllercache "github.com/argoproj/argo-cd/controller/cache"
+	controllercache "github.com/argoproj/argo-cd/v2/controller/cache"
 
 	kube "github.com/argoproj/gitops-engine/pkg/utils/kube"
 
@@ -19,7 +19,7 @@ import (
 
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 )
 
 // LiveStateCache is an autogenerated mock type for the LiveStateCache type

controller/clusterinfoupdater.go

@@ -10,12 +10,12 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 
-	"github.com/argoproj/argo-cd/controller/metrics"
+	"github.com/argoproj/argo-cd/v2/controller/metrics"
-	appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"github.com/argoproj/argo-cd/pkg/client/listers/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1"
-	"github.com/argoproj/argo-cd/util/argo"
+	"github.com/argoproj/argo-cd/v2/util/argo"
-	appstatecache "github.com/argoproj/argo-cd/util/cache/appstate"
+	appstatecache "github.com/argoproj/argo-cd/v2/util/cache/appstate"
-	"github.com/argoproj/argo-cd/util/db"
+	"github.com/argoproj/argo-cd/v2/util/db"
 )
 
 const (

controller/clusterinfoupdater_test.go

@@ -6,14 +6,14 @@ import (
 	"testing"
 	"time"
 
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	appsfake "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/fake"
+	appsfake "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/fake"
-	appinformers "github.com/argoproj/argo-cd/pkg/client/informers/externalversions/application/v1alpha1"
+	appinformers "github.com/argoproj/argo-cd/v2/pkg/client/informers/externalversions/application/v1alpha1"
-	applisters "github.com/argoproj/argo-cd/pkg/client/listers/application/v1alpha1"
+	applisters "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1"
-	cacheutil "github.com/argoproj/argo-cd/util/cache"
+	cacheutil "github.com/argoproj/argo-cd/v2/util/cache"
-	"github.com/argoproj/argo-cd/util/cache/appstate"
+	"github.com/argoproj/argo-cd/v2/util/cache/appstate"
-	"github.com/argoproj/argo-cd/util/db"
+	"github.com/argoproj/argo-cd/v2/util/db"
-	"github.com/argoproj/argo-cd/util/settings"
+	"github.com/argoproj/argo-cd/v2/util/settings"
 
 	clustercache "github.com/argoproj/gitops-engine/pkg/cache"
 	"github.com/stretchr/testify/assert"

controller/metrics/metrics.go

@@ -16,10 +16,10 @@ import (
 	log "github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/labels"
 
-	argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	applister "github.com/argoproj/argo-cd/pkg/client/listers/application/v1alpha1"
+	applister "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1"
-	"github.com/argoproj/argo-cd/util/git"
+	"github.com/argoproj/argo-cd/v2/util/git"
-	"github.com/argoproj/argo-cd/util/healthz"
+	"github.com/argoproj/argo-cd/v2/util/healthz"
 )
 
 type MetricsServer struct {

controller/metrics/metrics_test.go

@@ -17,10 +17,10 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/cache"
 
-	argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/fake"
+	appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/fake"
-	appinformer "github.com/argoproj/argo-cd/pkg/client/informers/externalversions"
+	appinformer "github.com/argoproj/argo-cd/v2/pkg/client/informers/externalversions"
-	applister "github.com/argoproj/argo-cd/pkg/client/listers/application/v1alpha1"
+	applister "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1"
 )
 
 const fakeApp = `

controller/metrics/transportwrapper.go

@@ -6,7 +6,7 @@ import (
 	"github.com/argoproj/pkg/kubeclientmetrics"
 	"k8s.io/client-go/rest"
 
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 )
 
 // AddMetricsTransportWrapper adds a transport wrapper which increments 'argocd_app_k8s_request_total' counter on each kubernetes request

controller/sharding/sharding.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 )
 
 func InferShard() (int, error) {

controller/sharding/sharding_test.go

@@ -3,7 +3,7 @@ package sharding
 import (
 	"testing"
 
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 
 	"github.com/stretchr/testify/assert"
 )

controller/state.go

@@ -22,21 +22,21 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/tools/cache"
 
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	statecache "github.com/argoproj/argo-cd/controller/cache"
+	statecache "github.com/argoproj/argo-cd/v2/controller/cache"
-	"github.com/argoproj/argo-cd/controller/metrics"
+	"github.com/argoproj/argo-cd/v2/controller/metrics"
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned"
+	appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned"
-	"github.com/argoproj/argo-cd/reposerver/apiclient"
+	"github.com/argoproj/argo-cd/v2/reposerver/apiclient"
-	"github.com/argoproj/argo-cd/util/argo"
+	"github.com/argoproj/argo-cd/v2/util/argo"
-	appstatecache "github.com/argoproj/argo-cd/util/cache/appstate"
+	appstatecache "github.com/argoproj/argo-cd/v2/util/cache/appstate"
-	"github.com/argoproj/argo-cd/util/db"
+	"github.com/argoproj/argo-cd/v2/util/db"
-	"github.com/argoproj/argo-cd/util/gpg"
+	"github.com/argoproj/argo-cd/v2/util/gpg"
-	argohealth "github.com/argoproj/argo-cd/util/health"
+	argohealth "github.com/argoproj/argo-cd/v2/util/health"
-	"github.com/argoproj/argo-cd/util/io"
+	"github.com/argoproj/argo-cd/v2/util/io"
-	"github.com/argoproj/argo-cd/util/settings"
+	"github.com/argoproj/argo-cd/v2/util/settings"
-	"github.com/argoproj/argo-cd/util/stats"
+	"github.com/argoproj/argo-cd/v2/util/stats"
 )
 
 type resourceInfoProviderStub struct {
@@ -348,9 +348,11 @@ func (m *appStateManager) diffArrayCached(configArray []*unstructured.Unstructur
 			}
 			dr = res
 		}
-		diffResultList.Diffs[i] = *dr
+		if dr != nil {
-		if dr != nil && dr.Modified {
+			diffResultList.Diffs[i] = *dr
-			diffResultList.Modified = true
+			if dr.Modified {
+				diffResultList.Modified = true
+			}
 		}
 	}
 

controller/state_test.go

@@ -17,10 +17,10 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"github.com/argoproj/argo-cd/reposerver/apiclient"
+	"github.com/argoproj/argo-cd/v2/reposerver/apiclient"
-	"github.com/argoproj/argo-cd/test"
+	"github.com/argoproj/argo-cd/v2/test"
 )
 
 // TestCompareAppStateEmpty tests comparison when both git and live have no objects

controller/sync.go

@@ -16,14 +16,14 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
-	cdcommon "github.com/argoproj/argo-cd/common"
+	cdcommon "github.com/argoproj/argo-cd/v2/common"
-	"github.com/argoproj/argo-cd/controller/metrics"
+	"github.com/argoproj/argo-cd/v2/controller/metrics"
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	listersv1alpha1 "github.com/argoproj/argo-cd/pkg/client/listers/application/v1alpha1"
+	listersv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1"
-	"github.com/argoproj/argo-cd/util/argo"
+	"github.com/argoproj/argo-cd/v2/util/argo"
-	logutils "github.com/argoproj/argo-cd/util/log"
+	logutils "github.com/argoproj/argo-cd/v2/util/log"
-	"github.com/argoproj/argo-cd/util/lua"
+	"github.com/argoproj/argo-cd/v2/util/lua"
-	"github.com/argoproj/argo-cd/util/rand"
+	"github.com/argoproj/argo-cd/v2/util/rand"
 )
 
 var syncIdPrefix uint64 = 0

controller/sync_test.go

@@ -11,9 +11,9 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"github.com/argoproj/argo-cd/reposerver/apiclient"
+	"github.com/argoproj/argo-cd/v2/reposerver/apiclient"
-	"github.com/argoproj/argo-cd/test"
+	"github.com/argoproj/argo-cd/v2/test"
 )
 
 func TestPersistRevisionHistory(t *testing.T) {

docs/operator-manual/argocd-cm.yaml

@@ -224,7 +224,11 @@ data:
   # Build options/parameters to use with `kustomize build` (optional)
   kustomize.buildOptions: --load_restrictor none
 
-  # Additional Kustomize versions and corresponding binary paths
+  # Per-version build options and binary paths
+  kustomize.path.v3.9.1: /custom-tools/kustomize_3_9
+  kustomize.buildOptions.v3.9.1: --enable_kyaml true
+
+  # Additional Kustomize versions and corresponding binary paths (deprecated)
   kustomize.version.v3.5.1: /custom-tools/kustomize_3_5_1
   kustomize.version.v3.5.4: /custom-tools/kustomize_3_5_4
 

docs/operator-manual/server-commands/argocd-util_app_generate-spec.md

@@ -33,55 +33,55 @@ argocd-util app generate-spec APPNAME [flags]
 ### Options
 
 ```
-      --allow-empty                               Set allow zero live resources when sync is automated
+      --allow-empty                                Set allow zero live resources when sync is automated
-      --auto-prune                                Set automatic pruning when sync is automated
+      --auto-prune                                 Set automatic pruning when sync is automated
-      --config-management-plugin string           Config management plugin name
+      --config-management-plugin string            Config management plugin name
-      --dest-name string                          K8s cluster Name (e.g. minikube)
+      --dest-name string                           K8s cluster Name (e.g. minikube)
-      --dest-namespace string                     K8s target namespace (overrides the namespace specified in the ksonnet app.yaml)
+      --dest-namespace string                      K8s target namespace (overrides the namespace specified in the ksonnet app.yaml)
-      --dest-server string                        K8s cluster URL (e.g. https://kubernetes.default.svc)
+      --dest-server string                         K8s cluster URL (e.g. https://kubernetes.default.svc)
-      --directory-exclude string                  Set glob expression used to exclude files from application source path
+      --directory-exclude string                   Set glob expression used to exclude files from application source path
-      --directory-include string                  Set glob expression used to include files from application source path
+      --directory-include string                   Set glob expression used to include files from application source path
-      --directory-recurse                         Recurse directory
+      --directory-recurse                          Recurse directory
-      --env string                                Application environment to monitor
+      --env string                                 Application environment to monitor
-  -f, --file string                               Filename or URL to Kubernetes manifests for the app
+  -f, --file string                                Filename or URL to Kubernetes manifests for the app
-      --helm-chart string                         Helm Chart name
+      --helm-chart string                          Helm Chart name
-      --helm-set stringArray                      Helm set values on the command line (can be repeated to set several values: --helm-set key1=val1 --helm-set key2=val2)
+      --helm-set stringArray                       Helm set values on the command line (can be repeated to set several values: --helm-set key1=val1 --helm-set key2=val2)
-      --helm-set-file stringArray                 Helm set values from respective files specified via the command line (can be repeated to set several values: --helm-set-file key1=path1 --helm-set-file key2=path2)
+      --helm-set-file stringArray                  Helm set values from respective files specified via the command line (can be repeated to set several values: --helm-set-file key1=path1 --helm-set-file key2=path2)
-      --helm-set-string stringArray               Helm set STRING values on the command line (can be repeated to set several values: --helm-set-string key1=val1 --helm-set-string key2=val2)
+      --helm-set-string stringArray                Helm set STRING values on the command line (can be repeated to set several values: --helm-set-string key1=val1 --helm-set-string key2=val2)
-      --helm-version string                       Helm version
+      --helm-version string                        Helm version
-  -h, --help                                      help for generate-spec
+  -h, --help                                       help for generate-spec
-      --jsonnet-ext-var-code stringArray          Jsonnet ext var
+      --jsonnet-ext-var-code stringArray           Jsonnet ext var
-      --jsonnet-ext-var-str stringArray           Jsonnet string ext var
+      --jsonnet-ext-var-str stringArray            Jsonnet string ext var
-      --jsonnet-libs stringArray                  Additional jsonnet libs (prefixed by repoRoot)
+      --jsonnet-libs stringArray                   Additional jsonnet libs (prefixed by repoRoot)
-      --jsonnet-tla-code stringArray              Jsonnet top level code arguments
+      --jsonnet-tla-code stringArray               Jsonnet top level code arguments
-      --jsonnet-tla-str stringArray               Jsonnet top level string arguments
+      --jsonnet-tla-str stringArray                Jsonnet top level string arguments
-      --kustomize-common-annotation stringArray   Set common labels in Kustomize
+      --kustomize-common-annotation stringArray    Set common labels in Kustomize
-      --kustomize-common-label stringArray        Set common labels in Kustomize
+      --kustomize-common-label stringArray         Set common labels in Kustomize
-      --kustomize-image stringArray               Kustomize images (e.g. --kustomize-image node:8.15.0 --kustomize-image mysql=mariadb,alpine@sha256:24a0c4b4a4c0eb97a1aabb8e29f18e917d05abfe1b7a7c07857230879ce7d3d)
+      --kustomize-image stringArray                Kustomize images (e.g. --kustomize-image node:8.15.0 --kustomize-image mysql=mariadb,alpine@sha256:24a0c4b4a4c0eb97a1aabb8e29f18e917d05abfe1b7a7c07857230879ce7d3d)
-      --kustomize-version string                  Kustomize version
+      --kustomize-version string                   Kustomize version
-  -l, --label stringArray                         Labels to apply to the app
+  -l, --label stringArray                          Labels to apply to the app
-      --name string                               A name for the app, ignored if a file is set (DEPRECATED)
+      --name string                                A name for the app, ignored if a file is set (DEPRECATED)
-      --nameprefix string                         Kustomize nameprefix
+      --nameprefix string                          Kustomize nameprefix
-      --namesuffix string                         Kustomize namesuffix
+      --namesuffix string                          Kustomize namesuffix
-  -o, --output string                             Output format. One of: json|yaml (default "yaml")
+  -o, --output string                              Output format. One of: json|yaml (default "yaml")
-  -p, --parameter stringArray                     set a parameter override (e.g. -p guestbook=image=example/guestbook:latest)
+  -p, --parameter stringArray                      set a parameter override (e.g. -p guestbook=image=example/guestbook:latest)
-      --path string                               Path in repository to the app directory, ignored if a file is set
+      --path string                                Path in repository to the app directory, ignored if a file is set
-      --plugin-env stringArray                    Additional plugin envs
+      --plugin-env stringArray                     Additional plugin envs
-      --project string                            Application project name
+      --project string                             Application project name
-      --release-name string                       Helm release-name
+      --release-name string                        Helm release-name
-      --repo string                               Repository URL, ignored if a file is set
+      --repo string                                Repository URL, ignored if a file is set
-      --retry-backoff-duration duration           Retry backoff base duration. Input needs to be a duration (e.g. 2m, 1h) (default 5s)
+      --revision string                            The tracking source branch, tag, commit or Helm chart version the application will sync to
-      --retry-backoff-factor int                  Factor multiplies the base duration after each failed retry (default 2)
+      --revision-history-limit int                 How many items to keep in revision history (default 10)
-      --retry-backoff-max-duration duration       Max retry backoff duration. Input needs to be a duration (e.g. 2m, 1h) (default 3m0s)
+      --self-heal                                  Set self healing when sync is automated
-      --retry-limit int                           Max number of allowed sync retries
+      --sync-option Prune=false                    Add or remove a sync option, e.g add Prune=false. Remove using `!` prefix, e.g. `!Prune=false`
-      --revision string                           The tracking source branch, tag, commit or Helm chart version the application will sync to
+      --sync-policy string                         Set the sync policy (one of: none, automated (aliases of automated: auto, automatic))
-      --revision-history-limit int                How many items to keep in revision history (default 10)
+      --sync-retry-backoff-duration duration       Sync retry backoff base duration. Input needs to be a duration (e.g. 2m, 1h) (default 5s)
-      --self-heal                                 Set self healing when sync is automated
+      --sync-retry-backoff-factor int              Factor multiplies the base duration after each failed sync retry (default 2)
-      --sync-option Prune=false                   Add or remove a sync option, e.g add Prune=false. Remove using `!` prefix, e.g. `!Prune=false`
+      --sync-retry-backoff-max-duration duration   Max sync retry backoff duration. Input needs to be a duration (e.g. 2m, 1h) (default 3m0s)
-      --sync-policy string                        Set the sync policy (one of: none, automated (aliases of automated: auto, automatic))
+      --sync-retry-limit int                       Max number of allowed sync retries
-      --validate                                  Validation of repo and cluster (default true)
+      --validate                                   Validation of repo and cluster (default true)
-      --values stringArray                        Helm values file(s) to use
+      --values stringArray                         Helm values file(s) to use
-      --values-literal-file string                Filename or URL to import as a literal Helm values block
+      --values-literal-file string                 Filename or URL to import as a literal Helm values block
 ```
 
 ### SEE ALSO

docs/operator-manual/server-commands/argocd-util_rbac.md

@@ -1,20 +0,0 @@
-## argocd-util rbac
-
-Validate and test RBAC configuration
-
-```
-argocd-util rbac [flags]
-```
-
-### Options
-
-```
-  -h, --help   help for rbac
-```
-
-### SEE ALSO
-
-* [argocd-util](argocd-util.md)	 - argocd-util tools used by Argo CD
-* [argocd-util rbac can](argocd-util_rbac_can.md)	 - Check RBAC permissions for a role or subject
-* [argocd-util rbac validate](argocd-util_rbac_validate.md)	 - Validate RBAC policy
-

docs/operator-manual/server-commands/argocd-util_rbac_can.md

@@ -1,70 +0,0 @@
-## argocd-util rbac can
-
-Check RBAC permissions for a role or subject
-
-### Synopsis
-
-
-Check whether a given role or subject has appropriate RBAC permissions to do
-something.
-
-
-```
-argocd-util rbac can ROLE/SUBJECT ACTION RESOURCE [SUB-RESOURCE] [flags]
-```
-
-### Examples
-
-```
-
-# Check whether role some:role has permissions to create an application in the
-# 'default' project, using a local policy.csv file
-argocd-util rbac can some:role create application 'default/app' --policy-file policy.csv
-
-# Policy file can also be K8s config map with data keys like argocd-rbac-cm,
-# i.e. 'policy.csv' and (optionally) 'policy.default'
-argocd-util rbac can some:role create application 'default/app' --policy-file argocd-rbac-cm.yaml
-
-# If --policy-file is not given, the ConfigMap 'argocd-rbac-cm' from K8s is
-# used. You need to specify the argocd namespace, and make sure that your
-# current Kubernetes context is pointing to the cluster Argo CD is running in
-argocd-util rbac can some:role create application 'default/app' --namespace argocd
-
-# You can override a possibly configured default role
-argocd-util rbac can someuser create application 'default/app' --default-role role:readonly
-
-
-```
-
-### Options
-
-```
-      --as string                      Username to impersonate for the operation
-      --as-group stringArray           Group to impersonate for the operation, this flag can be repeated to specify multiple groups.
-      --certificate-authority string   Path to a cert file for the certificate authority
-      --client-certificate string      Path to a client certificate file for TLS
-      --client-key string              Path to a client key file for TLS
-      --cluster string                 The name of the kubeconfig cluster to use
-      --context string                 The name of the kubeconfig context to use
-      --default-role string            name of the default role to use
-  -h, --help                           help for can
-      --insecure-skip-tls-verify       If true, the server's certificate will not be checked for validity. This will make your HTTPS connections insecure
-      --kubeconfig string              Path to a kube config. Only required if out-of-cluster
-  -n, --namespace string               If present, the namespace scope for this CLI request
-      --password string                Password for basic authentication to the API server
-      --policy-file string             path to the policy file to use
-  -q, --quiet                          quiet mode - do not print results to stdout
-      --request-timeout string         The length of time to wait before giving up on a single server request. Non-zero values should contain a corresponding time unit (e.g. 1s, 2m, 3h). A value of zero means don't timeout requests. (default "0")
-      --server string                  The address and port of the Kubernetes API server
-      --strict                         whether to perform strict check on action and resource names (default true)
-      --tls-server-name string         If provided, this name will be used to validate server certificate. If this is not provided, hostname used to contact the server is used.
-      --token string                   Bearer token for authentication to the API server
-      --use-builtin-policy             whether to also use builtin-policy (default true)
-      --user string                    The name of the kubeconfig user to use
-      --username string                Username for basic authentication to the API server
-```
-
-### SEE ALSO
-
-* [argocd-util rbac](argocd-util_rbac.md)	 - Validate and test RBAC configuration
-

docs/operator-manual/server-commands/argocd-util_rbac_validate.md

@@ -1,26 +0,0 @@
-## argocd-util rbac validate
-
-Validate RBAC policy
-
-### Synopsis
-
-
-Validates an RBAC policy for being syntactically correct. The policy must be
-a local file, and in either CSV or K8s ConfigMap format.
-
-
-```
-argocd-util rbac validate --policy-file=POLICYFILE [flags]
-```
-
-### Options
-
-```
-  -h, --help                 help for validate
-      --policy-file string   path to the policy file to use
-```
-
-### SEE ALSO
-
-* [argocd-util rbac](argocd-util_rbac.md)	 - Validate and test RBAC configuration
-

docs/operator-manual/server-commands/argocd-util_settings_rbac_can.md

@@ -19,19 +19,19 @@ argocd-util settings rbac can ROLE/SUBJECT ACTION RESOURCE [SUB-RESOURCE] [flags
 
 # Check whether role some:role has permissions to create an application in the
 # 'default' project, using a local policy.csv file
-argocd-util rbac can some:role create application 'default/app' --policy-file policy.csv
+argocd-util settings rbac can some:role create application 'default/app' --policy-file policy.csv
 
 # Policy file can also be K8s config map with data keys like argocd-rbac-cm,
 # i.e. 'policy.csv' and (optionally) 'policy.default'
-argocd-util rbac can some:role create application 'default/app' --policy-file argocd-rbac-cm.yaml
+argocd-util settings rbac can some:role create application 'default/app' --policy-file argocd-rbac-cm.yaml
 
 # If --policy-file is not given, the ConfigMap 'argocd-rbac-cm' from K8s is
 # used. You need to specify the argocd namespace, and make sure that your
 # current Kubernetes context is pointing to the cluster Argo CD is running in
-argocd-util rbac can some:role create application 'default/app' --namespace argocd
+argocd-util settings rbac can some:role create application 'default/app' --namespace argocd
 
 # You can override a possibly configured default role
-argocd-util rbac can someuser create application 'default/app' --default-role role:readonly
+argocd-util settings rbac can someuser create application 'default/app' --default-role role:readonly
 
 
 ```

docs/user-guide/commands/argocd_app_create.md

@@ -33,55 +33,55 @@ argocd app create APPNAME [flags]
 ### Options
 
 ```
-      --allow-empty                               Set allow zero live resources when sync is automated
+      --allow-empty                                Set allow zero live resources when sync is automated
-      --auto-prune                                Set automatic pruning when sync is automated
+      --auto-prune                                 Set automatic pruning when sync is automated
-      --config-management-plugin string           Config management plugin name
+      --config-management-plugin string            Config management plugin name
-      --dest-name string                          K8s cluster Name (e.g. minikube)
+      --dest-name string                           K8s cluster Name (e.g. minikube)
-      --dest-namespace string                     K8s target namespace (overrides the namespace specified in the ksonnet app.yaml)
+      --dest-namespace string                      K8s target namespace (overrides the namespace specified in the ksonnet app.yaml)
-      --dest-server string                        K8s cluster URL (e.g. https://kubernetes.default.svc)
+      --dest-server string                         K8s cluster URL (e.g. https://kubernetes.default.svc)
-      --directory-exclude string                  Set glob expression used to exclude files from application source path
+      --directory-exclude string                   Set glob expression used to exclude files from application source path
-      --directory-include string                  Set glob expression used to include files from application source path
+      --directory-include string                   Set glob expression used to include files from application source path
-      --directory-recurse                         Recurse directory
+      --directory-recurse                          Recurse directory
-      --env string                                Application environment to monitor
+      --env string                                 Application environment to monitor
-  -f, --file string                               Filename or URL to Kubernetes manifests for the app
+  -f, --file string                                Filename or URL to Kubernetes manifests for the app
-      --helm-chart string                         Helm Chart name
+      --helm-chart string                          Helm Chart name
-      --helm-set stringArray                      Helm set values on the command line (can be repeated to set several values: --helm-set key1=val1 --helm-set key2=val2)
+      --helm-set stringArray                       Helm set values on the command line (can be repeated to set several values: --helm-set key1=val1 --helm-set key2=val2)
-      --helm-set-file stringArray                 Helm set values from respective files specified via the command line (can be repeated to set several values: --helm-set-file key1=path1 --helm-set-file key2=path2)
+      --helm-set-file stringArray                  Helm set values from respective files specified via the command line (can be repeated to set several values: --helm-set-file key1=path1 --helm-set-file key2=path2)
-      --helm-set-string stringArray               Helm set STRING values on the command line (can be repeated to set several values: --helm-set-string key1=val1 --helm-set-string key2=val2)
+      --helm-set-string stringArray                Helm set STRING values on the command line (can be repeated to set several values: --helm-set-string key1=val1 --helm-set-string key2=val2)
-      --helm-version string                       Helm version
+      --helm-version string                        Helm version
-  -h, --help                                      help for create
+  -h, --help                                       help for create
-      --jsonnet-ext-var-code stringArray          Jsonnet ext var
+      --jsonnet-ext-var-code stringArray           Jsonnet ext var
-      --jsonnet-ext-var-str stringArray           Jsonnet string ext var
+      --jsonnet-ext-var-str stringArray            Jsonnet string ext var
-      --jsonnet-libs stringArray                  Additional jsonnet libs (prefixed by repoRoot)
+      --jsonnet-libs stringArray                   Additional jsonnet libs (prefixed by repoRoot)
-      --jsonnet-tla-code stringArray              Jsonnet top level code arguments
+      --jsonnet-tla-code stringArray               Jsonnet top level code arguments
-      --jsonnet-tla-str stringArray               Jsonnet top level string arguments
+      --jsonnet-tla-str stringArray                Jsonnet top level string arguments
-      --kustomize-common-annotation stringArray   Set common labels in Kustomize
+      --kustomize-common-annotation stringArray    Set common labels in Kustomize
-      --kustomize-common-label stringArray        Set common labels in Kustomize
+      --kustomize-common-label stringArray         Set common labels in Kustomize
-      --kustomize-image stringArray               Kustomize images (e.g. --kustomize-image node:8.15.0 --kustomize-image mysql=mariadb,alpine@sha256:24a0c4b4a4c0eb97a1aabb8e29f18e917d05abfe1b7a7c07857230879ce7d3d)
+      --kustomize-image stringArray                Kustomize images (e.g. --kustomize-image node:8.15.0 --kustomize-image mysql=mariadb,alpine@sha256:24a0c4b4a4c0eb97a1aabb8e29f18e917d05abfe1b7a7c07857230879ce7d3d)
-      --kustomize-version string                  Kustomize version
+      --kustomize-version string                   Kustomize version
-  -l, --label stringArray                         Labels to apply to the app
+  -l, --label stringArray                          Labels to apply to the app
-      --name string                               A name for the app, ignored if a file is set (DEPRECATED)
+      --name string                                A name for the app, ignored if a file is set (DEPRECATED)
-      --nameprefix string                         Kustomize nameprefix
+      --nameprefix string                          Kustomize nameprefix
-      --namesuffix string                         Kustomize namesuffix
+      --namesuffix string                          Kustomize namesuffix
-  -p, --parameter stringArray                     set a parameter override (e.g. -p guestbook=image=example/guestbook:latest)
+  -p, --parameter stringArray                      set a parameter override (e.g. -p guestbook=image=example/guestbook:latest)
-      --path string                               Path in repository to the app directory, ignored if a file is set
+      --path string                                Path in repository to the app directory, ignored if a file is set
-      --plugin-env stringArray                    Additional plugin envs
+      --plugin-env stringArray                     Additional plugin envs
-      --project string                            Application project name
+      --project string                             Application project name
-      --release-name string                       Helm release-name
+      --release-name string                        Helm release-name
-      --repo string                               Repository URL, ignored if a file is set
+      --repo string                                Repository URL, ignored if a file is set
-      --retry-backoff-duration duration           Retry backoff base duration. Input needs to be a duration (e.g. 2m, 1h) (default 5s)
+      --revision string                            The tracking source branch, tag, commit or Helm chart version the application will sync to
-      --retry-backoff-factor int                  Factor multiplies the base duration after each failed retry (default 2)
+      --revision-history-limit int                 How many items to keep in revision history (default 10)
-      --retry-backoff-max-duration duration       Max retry backoff duration. Input needs to be a duration (e.g. 2m, 1h) (default 3m0s)
+      --self-heal                                  Set self healing when sync is automated
-      --retry-limit int                           Max number of allowed sync retries
+      --sync-option Prune=false                    Add or remove a sync option, e.g add Prune=false. Remove using `!` prefix, e.g. `!Prune=false`
-      --revision string                           The tracking source branch, tag, commit or Helm chart version the application will sync to
+      --sync-policy string                         Set the sync policy (one of: none, automated (aliases of automated: auto, automatic))
-      --revision-history-limit int                How many items to keep in revision history (default 10)
+      --sync-retry-backoff-duration duration       Sync retry backoff base duration. Input needs to be a duration (e.g. 2m, 1h) (default 5s)
-      --self-heal                                 Set self healing when sync is automated
+      --sync-retry-backoff-factor int              Factor multiplies the base duration after each failed sync retry (default 2)
-      --sync-option Prune=false                   Add or remove a sync option, e.g add Prune=false. Remove using `!` prefix, e.g. `!Prune=false`
+      --sync-retry-backoff-max-duration duration   Max sync retry backoff duration. Input needs to be a duration (e.g. 2m, 1h) (default 3m0s)
-      --sync-policy string                        Set the sync policy (one of: none, automated (aliases of automated: auto, automatic))
+      --sync-retry-limit int                       Max number of allowed sync retries
-      --upsert                                    Allows to override application with the same name even if supplied application spec is different from existing spec
+      --upsert                                     Allows to override application with the same name even if supplied application spec is different from existing spec
-      --validate                                  Validation of repo and cluster (default true)
+      --validate                                   Validation of repo and cluster (default true)
-      --values stringArray                        Helm values file(s) to use
+      --values stringArray                         Helm values file(s) to use
-      --values-literal-file string                Filename or URL to import as a literal Helm values block
+      --values-literal-file string                 Filename or URL to import as a literal Helm values block
 ```
 
 ### Options inherited from parent commands

docs/user-guide/commands/argocd_app_diff.md

@@ -15,6 +15,7 @@ argocd app diff APPNAME [flags]
 ### Options
 
 ```
+      --exit-code                Return non-zero exit code when there is a diff (default true)
       --hard-refresh             Refresh application data as well as target manifests cache
   -h, --help                     help for diff
       --local string             Compare live app to a local manifests

docs/user-guide/commands/argocd_app_set.md

@@ -9,51 +9,51 @@ argocd app set APPNAME [flags]
 ### Options
 
 ```
-      --allow-empty                               Set allow zero live resources when sync is automated
+      --allow-empty                                Set allow zero live resources when sync is automated
-      --auto-prune                                Set automatic pruning when sync is automated
+      --auto-prune                                 Set automatic pruning when sync is automated
-      --config-management-plugin string           Config management plugin name
+      --config-management-plugin string            Config management plugin name
-      --dest-name string                          K8s cluster Name (e.g. minikube)
+      --dest-name string                           K8s cluster Name (e.g. minikube)
-      --dest-namespace string                     K8s target namespace (overrides the namespace specified in the ksonnet app.yaml)
+      --dest-namespace string                      K8s target namespace (overrides the namespace specified in the ksonnet app.yaml)
-      --dest-server string                        K8s cluster URL (e.g. https://kubernetes.default.svc)
+      --dest-server string                         K8s cluster URL (e.g. https://kubernetes.default.svc)
-      --directory-exclude string                  Set glob expression used to exclude files from application source path
+      --directory-exclude string                   Set glob expression used to exclude files from application source path
-      --directory-include string                  Set glob expression used to include files from application source path
+      --directory-include string                   Set glob expression used to include files from application source path
-      --directory-recurse                         Recurse directory
+      --directory-recurse                          Recurse directory
-      --env string                                Application environment to monitor
+      --env string                                 Application environment to monitor
-      --helm-chart string                         Helm Chart name
+      --helm-chart string                          Helm Chart name
-      --helm-set stringArray                      Helm set values on the command line (can be repeated to set several values: --helm-set key1=val1 --helm-set key2=val2)
+      --helm-set stringArray                       Helm set values on the command line (can be repeated to set several values: --helm-set key1=val1 --helm-set key2=val2)
-      --helm-set-file stringArray                 Helm set values from respective files specified via the command line (can be repeated to set several values: --helm-set-file key1=path1 --helm-set-file key2=path2)
+      --helm-set-file stringArray                  Helm set values from respective files specified via the command line (can be repeated to set several values: --helm-set-file key1=path1 --helm-set-file key2=path2)
-      --helm-set-string stringArray               Helm set STRING values on the command line (can be repeated to set several values: --helm-set-string key1=val1 --helm-set-string key2=val2)
+      --helm-set-string stringArray                Helm set STRING values on the command line (can be repeated to set several values: --helm-set-string key1=val1 --helm-set-string key2=val2)
-      --helm-version string                       Helm version
+      --helm-version string                        Helm version
-  -h, --help                                      help for set
+  -h, --help                                       help for set
-      --jsonnet-ext-var-code stringArray          Jsonnet ext var
+      --jsonnet-ext-var-code stringArray           Jsonnet ext var
-      --jsonnet-ext-var-str stringArray           Jsonnet string ext var
+      --jsonnet-ext-var-str stringArray            Jsonnet string ext var
-      --jsonnet-libs stringArray                  Additional jsonnet libs (prefixed by repoRoot)
+      --jsonnet-libs stringArray                   Additional jsonnet libs (prefixed by repoRoot)
-      --jsonnet-tla-code stringArray              Jsonnet top level code arguments
+      --jsonnet-tla-code stringArray               Jsonnet top level code arguments
-      --jsonnet-tla-str stringArray               Jsonnet top level string arguments
+      --jsonnet-tla-str stringArray                Jsonnet top level string arguments
-      --kustomize-common-annotation stringArray   Set common labels in Kustomize
+      --kustomize-common-annotation stringArray    Set common labels in Kustomize
-      --kustomize-common-label stringArray        Set common labels in Kustomize
+      --kustomize-common-label stringArray         Set common labels in Kustomize
-      --kustomize-image stringArray               Kustomize images (e.g. --kustomize-image node:8.15.0 --kustomize-image mysql=mariadb,alpine@sha256:24a0c4b4a4c0eb97a1aabb8e29f18e917d05abfe1b7a7c07857230879ce7d3d)
+      --kustomize-image stringArray                Kustomize images (e.g. --kustomize-image node:8.15.0 --kustomize-image mysql=mariadb,alpine@sha256:24a0c4b4a4c0eb97a1aabb8e29f18e917d05abfe1b7a7c07857230879ce7d3d)
-      --kustomize-version string                  Kustomize version
+      --kustomize-version string                   Kustomize version
-      --nameprefix string                         Kustomize nameprefix
+      --nameprefix string                          Kustomize nameprefix
-      --namesuffix string                         Kustomize namesuffix
+      --namesuffix string                          Kustomize namesuffix
-  -p, --parameter stringArray                     set a parameter override (e.g. -p guestbook=image=example/guestbook:latest)
+  -p, --parameter stringArray                      set a parameter override (e.g. -p guestbook=image=example/guestbook:latest)
-      --path string                               Path in repository to the app directory, ignored if a file is set
+      --path string                                Path in repository to the app directory, ignored if a file is set
-      --plugin-env stringArray                    Additional plugin envs
+      --plugin-env stringArray                     Additional plugin envs
-      --project string                            Application project name
+      --project string                             Application project name
-      --release-name string                       Helm release-name
+      --release-name string                        Helm release-name
-      --repo string                               Repository URL, ignored if a file is set
+      --repo string                                Repository URL, ignored if a file is set
-      --retry-backoff-duration duration           Retry backoff base duration. Input needs to be a duration (e.g. 2m, 1h) (default 5s)
+      --revision string                            The tracking source branch, tag, commit or Helm chart version the application will sync to
-      --retry-backoff-factor int                  Factor multiplies the base duration after each failed retry (default 2)
+      --revision-history-limit int                 How many items to keep in revision history (default 10)
-      --retry-backoff-max-duration duration       Max retry backoff duration. Input needs to be a duration (e.g. 2m, 1h) (default 3m0s)
+      --self-heal                                  Set self healing when sync is automated
-      --retry-limit int                           Max number of allowed sync retries
+      --sync-option Prune=false                    Add or remove a sync option, e.g add Prune=false. Remove using `!` prefix, e.g. `!Prune=false`
-      --revision string                           The tracking source branch, tag, commit or Helm chart version the application will sync to
+      --sync-policy string                         Set the sync policy (one of: none, automated (aliases of automated: auto, automatic))
-      --revision-history-limit int                How many items to keep in revision history (default 10)
+      --sync-retry-backoff-duration duration       Sync retry backoff base duration. Input needs to be a duration (e.g. 2m, 1h) (default 5s)
-      --self-heal                                 Set self healing when sync is automated
+      --sync-retry-backoff-factor int              Factor multiplies the base duration after each failed sync retry (default 2)
-      --sync-option Prune=false                   Add or remove a sync option, e.g add Prune=false. Remove using `!` prefix, e.g. `!Prune=false`
+      --sync-retry-backoff-max-duration duration   Max sync retry backoff duration. Input needs to be a duration (e.g. 2m, 1h) (default 3m0s)
-      --sync-policy string                        Set the sync policy (one of: none, automated (aliases of automated: auto, automatic))
+      --sync-retry-limit int                       Max number of allowed sync retries
-      --validate                                  Validation of repo and cluster (default true)
+      --validate                                   Validation of repo and cluster (default true)
-      --values stringArray                        Helm values file(s) to use
+      --values stringArray                         Helm values file(s) to use
-      --values-literal-file string                Filename or URL to import as a literal Helm values block
+      --values-literal-file string                 Filename or URL to import as a literal Helm values block
 ```
 
 ### Options inherited from parent commands

docs/user-guide/kustomize.md

@@ -23,7 +23,7 @@ Read more about [private repos](private-repositories.md).
 
 ## `kustomize build` Options/Parameters
 
-To provide build options to `kustomize build` add a property to the ArgoCD CM under data:
+To provide build options to `kustomize build` of default kustomize version, use `kustomize.buildOptions` field of `argocd-cm` ConfigMap. Use `kustomize.buildOptions.<version>` to register version specific build options.
 
 ```yaml
 apiVersion: v1
@@ -36,12 +36,13 @@ metadata:
     app.kubernetes.io/part-of: argocd
 data:
     kustomize.buildOptions: --load_restrictor none
+    kustomize.buildOptions.v3.9.1: --output /tmp
 ```
 ## Custom Kustomize versions
 
 Argo CD supports using multiple kustomize versions simultaneously and specifies required version per application.
 To add additional versions make sure required versions are [bundled](../operator-manual/custom_tools.md) and then
-use `kustomize.version.<version>` fields of `argocd-cm` ConfigMap to register bundled additional versions.   
+use `kustomize.path.<version>` fields of `argocd-cm` ConfigMap to register bundled additional versions. 
 
 ```yaml
 apiVersion: v1
@@ -53,8 +54,8 @@ metadata:
     app.kubernetes.io/name: argocd-cm
     app.kubernetes.io/part-of: argocd
 data:
-    kustomize.version.v3.5.1: /custom-tools/kustomize_3_5_1
+    kustomize.path.v3.5.1: /custom-tools/kustomize_3_5_1
-    kustomize.version.v3.5.4: /custom-tools/kustomize_3_5_4
+    kustomize.path.v3.5.4: /custom-tools/kustomize_3_5_4
 ```
 
 Once a new version is configured you can reference it in Application spec as following:

go.mod

@@ -1,13 +1,13 @@
-module github.com/argoproj/argo-cd
+module github.com/argoproj/argo-cd/v2
 
-go 1.14
+go 1.16
 
 require (
 	github.com/Masterminds/semver v1.5.0
 	github.com/TomOnTime/utfutil v0.0.0-20180511104225-09c41003ee1d
 	github.com/alicebob/miniredis v2.5.0+incompatible
 	github.com/alicebob/miniredis/v2 v2.14.2
-	github.com/argoproj/gitops-engine v0.3.0
+	github.com/argoproj/gitops-engine v0.3.2
 	github.com/argoproj/pkg v0.2.0
 	github.com/bombsimon/logrusr v1.0.0
 	github.com/bradleyfalzon/ghinstallation v1.1.1

go.sum

@@ -86,8 +86,8 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/argoproj/gitops-engine v0.3.0 h1:emDED8sHRX81mQOi8C24oW1wTJ3peXRHI6RJlvZWHkk=
+github.com/argoproj/gitops-engine v0.3.2 h1:m5bjOk/bWwMsFBGFpurdK31/hC5UuLMQn0hAd51TlEk=
-github.com/argoproj/gitops-engine v0.3.0/go.mod h1:IBHhAkqlC+3r/wBWUitWSidQhPzlLoSTWp2htq3dyQk=
+github.com/argoproj/gitops-engine v0.3.2/go.mod h1:IBHhAkqlC+3r/wBWUitWSidQhPzlLoSTWp2htq3dyQk=
 github.com/argoproj/pkg v0.2.0 h1:ETgC600kr8WcAi3MEVY5sA1H7H/u1/IysYOobwsZ8No=
 github.com/argoproj/pkg v0.2.0/go.mod h1:F4TZgInLUEjzsWFB/BTJBsewoEy0ucnKSq6vmQiD/yc=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
@@ -218,7 +218,6 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ=
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk=

hack/dev-mounter/main.go

@@ -19,7 +19,7 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/clientcmd"
 
-	"github.com/argoproj/argo-cd/util/cli"
+	"github.com/argoproj/argo-cd/v2/util/cli"
 
 	// load the gcp plugin (required to authenticate against GKE clusters).
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"

hack/gen-crd-spec/main.go

@@ -8,7 +8,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/argoproj/argo-cd/pkg/apis/application"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application"
 
 	"github.com/argoproj/gitops-engine/pkg/utils/kube"
 	"github.com/ghodss/yaml"

hack/generate-proto.sh

@@ -32,7 +32,7 @@ go build -i -o dist/protoc-gen-gogo ./vendor/k8s.io/code-generator/cmd/go-to-pro
 # --apimachinery-packages= option so that go-to-protobuf can locate the types, but prefixed with a
 # '-' so that go-to-protobuf will not generate .proto files for it.
 PACKAGES=(
-    github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1
+    github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1
 )
 APIMACHINERY_PKGS=(
     +k8s.io/apimachinery/pkg/util/intstr
@@ -43,6 +43,9 @@ APIMACHINERY_PKGS=(
     k8s.io/api/core/v1
 )
 
+export GO111MODULE=on
+[ -e ./v2 ] || ln -s . v2
+
 ${PROJECT_ROOT}/dist/go-to-protobuf \
     --go-header-file=${PROJECT_ROOT}/hack/custom-boilerplate.go.txt \
     --packages=$(IFS=, ; echo "${PACKAGES[*]}") \
@@ -85,6 +88,7 @@ for i in ${PROTO_FILES}; do
         --swagger_out=logtostderr=true:. \
         $i
 done
+[ -e ./v2 ] && rm -rf v2
 
 # collect_swagger gathers swagger files into a subdirectory
 collect_swagger() {

hack/installers/install-lint-tools.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 set -eux -o pipefail
 
-GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.26.0
+GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.38.0

hack/known_types/main.go

@@ -7,7 +7,6 @@ import (
 	"go/types"
 	"io/ioutil"
 	"os"
-	"runtime"
 	"strings"
 
 	"github.com/spf13/cobra"
@@ -38,14 +37,8 @@ func newCommand() *cobra.Command {
 			packagePath := args[1]
 			outputPath := args[2]
 
-			var imprt types.Importer
+			// nolint:staticcheck
-			if runtime.GOOS == "linux" {
+			imprt := importer.For("source", nil)
-				// nolint:staticcheck
-				imprt = importer.For("source", nil)
-			} else {
-				imprt = importer.Default()
-			}
-
 			pkg, err := imprt.Import(packagePath)
 			if err != nil {
 				return err

hack/test.sh

@@ -6,7 +6,7 @@ which godepgraph || go get github.com/kisielk/godepgraph
 which go-junit-report || go get github.com/jstemmer/go-junit-report
 
 export GO111MODULE=off
-if godepgraph -s github.com/argoproj/argo-cd/pkg/apiclient | grep packr; then
+if godepgraph -s github.com/argoproj/argo-cd/v2/pkg/apiclient | grep packr; then
   echo apiclient package should not depend on packr
   exit 1
 fi

hack/update-codegen.sh

@@ -33,7 +33,11 @@ export GO111MODULE=off
 
 sed -e '/go install/d' ${CODEGEN_PKG}/generate-groups.sh > ${TARGET_SCRIPT}
 
+export GO111MODULE=on
+
+[ -e ./v2 ] || ln -s . v2
 bash -x ${TARGET_SCRIPT} "deepcopy,client,informer,lister" \
-  github.com/argoproj/argo-cd/pkg/client github.com/argoproj/argo-cd/pkg/apis \
+  github.com/argoproj/argo-cd/v2/pkg/client github.com/argoproj/argo-cd/v2/pkg/apis \
   "application:v1alpha1" \
   --go-header-file ${SCRIPT_ROOT}/hack/custom-boilerplate.go.txt
+[ -e ./v2 ] && rm -rf v2

hack/update-openapi.sh

@@ -12,12 +12,17 @@ VERSION="v1alpha1"
 export GO111MODULE=off
 go build -o dist/openapi-gen ${CODEGEN_PKG}/cmd/openapi-gen
 
+export GO111MODULE=on
+
+[ -e ./v2 ] || ln -s . v2
 ./dist/openapi-gen \
   --go-header-file ${PROJECT_ROOT}/hack/custom-boilerplate.go.txt \
-  --input-dirs github.com/argoproj/argo-cd/pkg/apis/application/${VERSION} \
+  --input-dirs github.com/argoproj/argo-cd/v2/pkg/apis/application/${VERSION} \
-  --output-package github.com/argoproj/argo-cd/pkg/apis/application/${VERSION} \
+  --output-package github.com/argoproj/argo-cd/v2/pkg/apis/application/${VERSION} \
   --report-filename pkg/apis/api-rules/violation_exceptions.list \
   $@
+[ -e ./v2 ] && rm -rf v2
 
+export GO111MODULE=off
 go build -o ./dist/gen-crd-spec ${PROJECT_ROOT}/hack/gen-crd-spec
 ./dist/gen-crd-spec

manifests/base/kustomization.yaml

@@ -5,7 +5,7 @@ kind: Kustomization
 images:
 - name: quay.io/argoproj/argocd
   newName: quay.io/argoproj/argocd
-  newTag: latest
+  newTag: v2.0.1
 resources:
 - ./application-controller
 - ./dex

manifests/ha/base/kustomization.yaml

@@ -11,7 +11,7 @@ patchesStrategicMerge:
 images:
 - name: quay.io/argoproj/argocd
   newName: quay.io/argoproj/argocd
-  newTag: latest
+  newTag: v2.0.1
 resources:
 - ../../base/application-controller
 - ../../base/dex

manifests/ha/base/redis-ha/chart/upstream.yaml

@@ -39,6 +39,7 @@ data:
   redis.conf: |
     dir "/data"
     port 6379
+    bind 0.0.0.0
     maxmemory 0
     maxmemory-policy volatile-lru
     min-replicas-max-lag 5
@@ -55,6 +56,7 @@ data:
         sentinel failover-timeout argocd 180000
         maxclients 10000
         sentinel parallel-syncs argocd 5
+    bind 0.0.0.0
 
   init.sh: |
     echo "$(date) Start..."
@@ -852,7 +854,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/init-config: f967dc53802e37a7bd0a7097785686e65cefc3002881b7c2a1936b3988698c11
+        checksum/init-config: 7128bfbb51eafaffe3c33b1b463e15f0cf6514cec570f9d9c4f2396f28c724ac
       labels:
         release: argocd
         app: redis-ha

manifests/ha/base/redis-ha/chart/values.yaml

@@ -5,9 +5,13 @@ redis-ha:
     masterGroupName: argocd
     config:
       save: "\"\""
+      bind: "0.0.0.0"
   haproxy:
     enabled: true
     image:
       tag: 2.0.20-alpine
   image:
     tag: 6.2.1-alpine
+  sentinel:
+    config:
+      replaceme: "0.0.0.0"

manifests/ha/base/redis-ha/generate.sh

@@ -12,5 +12,6 @@ helm template argocd ./chart \
   >> ./chart/upstream_orig.yaml
 
 sed -e 's/check inter 1s/check inter 3s/' ./chart/upstream_orig.yaml >> ./chart/upstream.yaml && rm ./chart/upstream_orig.yaml
-sed -i 's/timeout server 30s/timeout server 6m/' ./chart/upstream.yaml
+sed -i.bak 's/timeout server 30s/timeout server 6m/' ./chart/upstream.yaml && rm ./chart/upstream.yaml.bak
-sed -i 's/timeout client 30s/timeout client 6m/' ./chart/upstream.yaml
+sed -i.bak 's/timeout client 30s/timeout client 6m/' ./chart/upstream.yaml && rm ./chart/upstream.yaml.bak
+sed -i.bak -E 's/^([[:space:]]){8}sentinel replaceme argocd/    bind/' ./chart/upstream.yaml && rm ./chart/upstream.yaml.bak

manifests/ha/install.yaml

@@ -2850,6 +2850,7 @@ data:
   redis.conf: |
     dir "/data"
     port 6379
+    bind 0.0.0.0
     maxmemory 0
     maxmemory-policy volatile-lru
     min-replicas-max-lag 5
@@ -2865,6 +2866,7 @@ data:
         sentinel failover-timeout argocd 180000
         maxclients 10000
         sentinel parallel-syncs argocd 5
+    bind 0.0.0.0
 kind: ConfigMap
 metadata:
   labels:
@@ -3176,7 +3178,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:latest
+        image: quay.io/argoproj/argocd:v2.0.1
         imagePullPolicy: Always
         name: copyutil
         volumeMounts:
@@ -3310,7 +3312,7 @@ spec:
         - argocd-repo-server
         - --redis
         - argocd-redis-ha-haproxy:6379
-        image: quay.io/argoproj/argocd:latest
+        image: quay.io/argoproj/argocd:v2.0.1
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -3411,7 +3413,7 @@ spec:
         env:
         - name: ARGOCD_API_SERVER_REPLICAS
           value: "2"
-        image: quay.io/argoproj/argocd:latest
+        image: quay.io/argoproj/argocd:v2.0.1
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -3506,7 +3508,7 @@ spec:
         - "10"
         - --redis
         - argocd-redis-ha-haproxy:6379
-        image: quay.io/argoproj/argocd:latest
+        image: quay.io/argoproj/argocd:v2.0.1
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -3564,7 +3566,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/init-config: f967dc53802e37a7bd0a7097785686e65cefc3002881b7c2a1936b3988698c11
+        checksum/init-config: 7128bfbb51eafaffe3c33b1b463e15f0cf6514cec570f9d9c4f2396f28c724ac
       labels:
         app.kubernetes.io/name: argocd-redis-ha
     spec:

manifests/ha/namespace-install.yaml

@@ -2765,6 +2765,7 @@ data:
   redis.conf: |
     dir "/data"
     port 6379
+    bind 0.0.0.0
     maxmemory 0
     maxmemory-policy volatile-lru
     min-replicas-max-lag 5
@@ -2780,6 +2781,7 @@ data:
         sentinel failover-timeout argocd 180000
         maxclients 10000
         sentinel parallel-syncs argocd 5
+    bind 0.0.0.0
 kind: ConfigMap
 metadata:
   labels:
@@ -3091,7 +3093,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:latest
+        image: quay.io/argoproj/argocd:v2.0.1
         imagePullPolicy: Always
         name: copyutil
         volumeMounts:
@@ -3225,7 +3227,7 @@ spec:
         - argocd-repo-server
         - --redis
         - argocd-redis-ha-haproxy:6379
-        image: quay.io/argoproj/argocd:latest
+        image: quay.io/argoproj/argocd:v2.0.1
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -3326,7 +3328,7 @@ spec:
         env:
         - name: ARGOCD_API_SERVER_REPLICAS
           value: "2"
-        image: quay.io/argoproj/argocd:latest
+        image: quay.io/argoproj/argocd:v2.0.1
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -3421,7 +3423,7 @@ spec:
         - "10"
         - --redis
         - argocd-redis-ha-haproxy:6379
-        image: quay.io/argoproj/argocd:latest
+        image: quay.io/argoproj/argocd:v2.0.1
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -3479,7 +3481,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/init-config: f967dc53802e37a7bd0a7097785686e65cefc3002881b7c2a1936b3988698c11
+        checksum/init-config: 7128bfbb51eafaffe3c33b1b463e15f0cf6514cec570f9d9c4f2396f28c724ac
       labels:
         app.kubernetes.io/name: argocd-redis-ha
     spec:

manifests/install.yaml

@@ -2544,7 +2544,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:latest
+        image: quay.io/argoproj/argocd:v2.0.1
         imagePullPolicy: Always
         name: copyutil
         volumeMounts:
@@ -2644,7 +2644,7 @@ spec:
         - argocd-repo-server
         - --redis
         - argocd-redis:6379
-        image: quay.io/argoproj/argocd:latest
+        image: quay.io/argoproj/argocd:v2.0.1
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -2740,7 +2740,7 @@ spec:
         - argocd-server
         - --staticassets
         - /shared/app
-        image: quay.io/argoproj/argocd:latest
+        image: quay.io/argoproj/argocd:v2.0.1
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -2833,7 +2833,7 @@ spec:
         - "20"
         - --operation-processors
         - "10"
-        image: quay.io/argoproj/argocd:latest
+        image: quay.io/argoproj/argocd:v2.0.1
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

manifests/namespace-install.yaml

@@ -2459,7 +2459,7 @@ spec:
         - -n
         - /usr/local/bin/argocd
         - /shared/argocd-dex
-        image: quay.io/argoproj/argocd:latest
+        image: quay.io/argoproj/argocd:v2.0.1
         imagePullPolicy: Always
         name: copyutil
         volumeMounts:
@@ -2559,7 +2559,7 @@ spec:
         - argocd-repo-server
         - --redis
         - argocd-redis:6379
-        image: quay.io/argoproj/argocd:latest
+        image: quay.io/argoproj/argocd:v2.0.1
         imagePullPolicy: Always
         livenessProbe:
           failureThreshold: 3
@@ -2655,7 +2655,7 @@ spec:
         - argocd-server
         - --staticassets
         - /shared/app
-        image: quay.io/argoproj/argocd:latest
+        image: quay.io/argoproj/argocd:v2.0.1
         imagePullPolicy: Always
         livenessProbe:
           httpGet:
@@ -2748,7 +2748,7 @@ spec:
         - "20"
         - --operation-processors
         - "10"
-        image: quay.io/argoproj/argocd:latest
+        image: quay.io/argoproj/argocd:v2.0.1
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

pkg/apiclient/account/account.pb.go

@@ -779,54 +779,54 @@ func init() {
 func init() { proto.RegisterFile("server/account/account.proto", fileDescriptor_56d089a9b5e998c0) }
 
 var fileDescriptor_56d089a9b5e998c0 = []byte{
-	// 742 bytes of a gzipped FileDescriptorProto
+	// 743 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xdd, 0x6e, 0xd3, 0x4a,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x4d, 0x6f, 0xd3, 0x4c,
-	0x10, 0x96, 0x93, 0xa6, 0x3f, 0x93, 0x9c, 0xf4, 0x74, 0x4f, 0x9a, 0x63, 0xf9, 0xe4, 0x84, 0x74,
+	0x10, 0x96, 0x93, 0xa6, 0x1f, 0x93, 0xbc, 0xe9, 0xdb, 0x25, 0x0d, 0x96, 0x09, 0x21, 0xdd, 0x56,
-	0x5b, 0xb5, 0xa1, 0xa8, 0xb5, 0x5a, 0x24, 0xfe, 0x6e, 0xaa, 0x52, 0x10, 0xaa, 0xc4, 0x05, 0x84,
+	0x6d, 0x28, 0x6a, 0x2d, 0x02, 0xe2, 0xeb, 0x82, 0xda, 0x82, 0x50, 0x25, 0x0e, 0x10, 0x3e, 0x0e,
-	0x9f, 0x8b, 0x72, 0xb5, 0x71, 0x46, 0x61, 0x69, 0x62, 0xbb, 0xde, 0x75, 0x0a, 0x8a, 0x72, 0x03,
+	0xe5, 0xb4, 0x71, 0x56, 0x61, 0x69, 0x62, 0xbb, 0xde, 0x75, 0x0a, 0x8a, 0x72, 0x81, 0x9f, 0xc0,
-	0x8f, 0xc0, 0x15, 0x6f, 0xc4, 0x25, 0x12, 0x2f, 0x80, 0x2a, 0x1e, 0x04, 0x79, 0xbd, 0x76, 0x9c,
+	0x89, 0x7f, 0xc4, 0x11, 0x89, 0x3f, 0x80, 0x2a, 0x7e, 0x08, 0xf2, 0x7a, 0xd7, 0x71, 0x9c, 0x14,
-	0x9f, 0x22, 0xae, 0xbc, 0x33, 0xb3, 0x3b, 0xdf, 0x37, 0xb3, 0xdf, 0x78, 0xa1, 0x26, 0x30, 0x18,
+	0x71, 0xf2, 0xce, 0xcc, 0xee, 0x3c, 0xcf, 0xcc, 0x3e, 0xe3, 0x85, 0x1a, 0xa7, 0xc1, 0x90, 0x06,
-	0x60, 0x60, 0x33, 0xc7, 0xf1, 0x42, 0x57, 0x26, 0xdf, 0x7d, 0x3f, 0xf0, 0xa4, 0x47, 0x96, 0xb4,
+	0x36, 0x71, 0x1c, 0x2f, 0x74, 0x85, 0xfe, 0xee, 0xfb, 0x81, 0x27, 0x3c, 0xb4, 0xa4, 0x4c, 0xab,
-	0x69, 0x55, 0xba, 0x5e, 0xd7, 0x53, 0x3e, 0x3b, 0x5a, 0xc5, 0x61, 0xab, 0xd6, 0xf5, 0xbc, 0x6e,
+	0xd2, 0xf3, 0x7a, 0x9e, 0xf4, 0xd9, 0xd1, 0x2a, 0x0e, 0x5b, 0xb5, 0x9e, 0xe7, 0xf5, 0xfa, 0xd4,
-	0x0f, 0x6d, 0xe6, 0x73, 0x9b, 0xb9, 0xae, 0x27, 0x99, 0xe4, 0x9e, 0x2b, 0xe2, 0x28, 0xbd, 0x84,
+	0x26, 0x3e, 0xb3, 0x89, 0xeb, 0x7a, 0x82, 0x08, 0xe6, 0xb9, 0x3c, 0x8e, 0xe2, 0x73, 0x58, 0x7f,
-	0xf5, 0x57, 0x7e, 0x87, 0x49, 0x7c, 0xc6, 0x84, 0xb8, 0xf4, 0x82, 0x4e, 0x0b, 0x2f, 0x42, 0x14,
+	0xe3, 0x77, 0x89, 0xa0, 0x2f, 0x08, 0xe7, 0xe7, 0x5e, 0xd0, 0x6d, 0xd3, 0xb3, 0x90, 0x72, 0x81,
-	0x92, 0x34, 0xa0, 0xe8, 0xe2, 0x65, 0xe2, 0x35, 0x8d, 0x86, 0xd1, 0x5c, 0x69, 0x65, 0x5d, 0xa4,
+	0x1a, 0x50, 0x74, 0xe9, 0xb9, 0xf6, 0x9a, 0x46, 0xc3, 0x68, 0xae, 0xb4, 0xd3, 0x2e, 0xd4, 0x84,
-	0x09, 0xab, 0x4e, 0x18, 0x04, 0xe8, 0xca, 0x74, 0x57, 0x4e, 0xed, 0x9a, 0x76, 0x13, 0x02, 0x0b,
+	0x55, 0x27, 0x0c, 0x02, 0xea, 0x8a, 0x64, 0x57, 0x4e, 0xee, 0xca, 0xba, 0x11, 0x82, 0x05, 0x97,
-	0x2e, 0xeb, 0xa3, 0x99, 0x57, 0x61, 0xb5, 0xa6, 0x26, 0x54, 0xa7, 0x81, 0x85, 0xef, 0xb9, 0x02,
+	0x0c, 0xa8, 0x99, 0x97, 0x61, 0xb9, 0xc6, 0x26, 0x54, 0xb3, 0xc0, 0xdc, 0xf7, 0x5c, 0x4e, 0xb1,
-	0xa9, 0x03, 0xc5, 0x13, 0xe6, 0x9e, 0x26, 0x44, 0x2c, 0x58, 0x0e, 0x50, 0x78, 0x61, 0xe0, 0xa0,
+	0x03, 0xc5, 0x23, 0xe2, 0x1e, 0x6b, 0x22, 0x16, 0x2c, 0x07, 0x94, 0x7b, 0x61, 0xe0, 0x50, 0xc5,
-	0x66, 0x91, 0xda, 0xa4, 0x0a, 0x8b, 0xcc, 0x89, 0xca, 0xd1, 0xc8, 0xda, 0x8a, 0xc8, 0x8b, 0xb0,
+	0x22, 0xb1, 0x51, 0x15, 0x16, 0x89, 0x13, 0x95, 0xa3, 0x90, 0x95, 0x15, 0x91, 0xe7, 0x61, 0x27,
-	0x9d, 0x1e, 0x8b, 0x71, 0xb3, 0x2e, 0xba, 0x05, 0xa5, 0x18, 0x24, 0x06, 0x25, 0x15, 0x28, 0x0c,
+	0x39, 0x16, 0xe3, 0xa6, 0x5d, 0x78, 0x0b, 0x4a, 0x31, 0x48, 0x0c, 0x8a, 0x2a, 0x50, 0x18, 0x92,
-	0x58, 0x2f, 0x4c, 0x20, 0x62, 0x83, 0xee, 0xc0, 0xda, 0x13, 0x94, 0xc7, 0x71, 0x7f, 0x13, 0x42,
+	0x7e, 0xa8, 0x21, 0x62, 0x03, 0xef, 0xc0, 0xda, 0x33, 0x2a, 0x0e, 0xe2, 0xfe, 0x6a, 0x42, 0xba,
-	0x49, 0x35, 0x46, 0xa6, 0x9a, 0x4f, 0x06, 0x2c, 0xe9, 0x6d, 0xf3, 0xe2, 0xc4, 0x84, 0x25, 0x74,
+	0x1a, 0x23, 0x55, 0xcd, 0x17, 0x03, 0x96, 0xd4, 0xb6, 0x79, 0x71, 0x64, 0xc2, 0x12, 0x75, 0x49,
-	0x59, 0xbb, 0x87, 0x71, 0x8f, 0x96, 0x5b, 0x89, 0x49, 0x28, 0x94, 0x1c, 0xe6, 0xb3, 0x36, 0xef,
+	0xa7, 0x4f, 0xe3, 0x1e, 0x2d, 0xb7, 0xb5, 0x89, 0x30, 0x94, 0x1c, 0xe2, 0x93, 0x0e, 0xeb, 0x33,
-	0x71, 0xc9, 0x51, 0x98, 0xf9, 0x46, 0xbe, 0xb9, 0xd2, 0x9a, 0xf0, 0x91, 0x6d, 0x58, 0x94, 0xde,
+	0xc1, 0x28, 0x37, 0xf3, 0x8d, 0x7c, 0x73, 0xa5, 0x3d, 0xe5, 0x43, 0xdb, 0xb0, 0x28, 0xbc, 0x53,
-	0x39, 0xba, 0xc2, 0x5c, 0x68, 0xe4, 0x9b, 0xc5, 0xc3, 0xf2, 0x7e, 0xa2, 0x80, 0x97, 0x91, 0xbb,
+	0xea, 0x72, 0x73, 0xa1, 0x91, 0x6f, 0x16, 0x5b, 0xe5, 0x7d, 0xad, 0x80, 0xd7, 0x91, 0xbb, 0xad,
-	0xa5, 0xa3, 0xf4, 0x0e, 0x94, 0x34, 0x09, 0xf1, 0x94, 0x0b, 0x49, 0xb6, 0xa1, 0xc0, 0x25, 0xf6,
+	0xa2, 0xf8, 0x1e, 0x94, 0x14, 0x09, 0xfe, 0x9c, 0x71, 0x81, 0xb6, 0xa1, 0xc0, 0x04, 0x1d, 0x70,
-	0x85, 0x69, 0xa8, 0x63, 0x7f, 0xa7, 0xc7, 0x92, 0x8a, 0xe2, 0x30, 0x7d, 0x0e, 0x05, 0x95, 0x88,
+	0xd3, 0x90, 0xc7, 0xfe, 0x4f, 0x8e, 0xe9, 0x8a, 0xe2, 0x30, 0x7e, 0x09, 0x05, 0x99, 0x08, 0x95,
-	0x94, 0x21, 0xc7, 0x93, 0xbb, 0xce, 0xf1, 0x4e, 0xd4, 0x7b, 0x2e, 0x44, 0x88, 0x9d, 0x63, 0xa9,
+	0x21, 0xc7, 0xf4, 0x5d, 0xe7, 0x58, 0x37, 0xea, 0x3d, 0xe3, 0x3c, 0xa4, 0xdd, 0x03, 0x21, 0x79,
-	0x78, 0xe7, 0x5b, 0xa9, 0x4d, 0x6a, 0xb0, 0x82, 0xef, 0x7d, 0x1e, 0xa0, 0x38, 0x96, 0xaa, 0xc3,
+	0xe7, 0xdb, 0x89, 0x8d, 0x6a, 0xb0, 0x42, 0x3f, 0xfa, 0x2c, 0xa0, 0xfc, 0x40, 0xc8, 0x0e, 0xe7,
-	0xf9, 0xd6, 0xd8, 0x41, 0x0f, 0x01, 0x54, 0xca, 0x98, 0xc8, 0xd6, 0x24, 0x91, 0x69, 0xfe, 0x9a,
+	0xdb, 0x13, 0x07, 0x6e, 0x01, 0xc8, 0x94, 0x31, 0x91, 0xad, 0x69, 0x22, 0x59, 0xfe, 0x8a, 0xc6,
-	0xc6, 0x6b, 0x20, 0x27, 0x01, 0x32, 0x89, 0xb1, 0xf7, 0xfa, 0x76, 0x67, 0xb0, 0x4f, 0x5d, 0x4d,
+	0x5b, 0x40, 0x47, 0x01, 0x25, 0x82, 0xc6, 0xde, 0xcb, 0xdb, 0x9d, 0xc2, 0x3e, 0x76, 0x15, 0xb1,
-	0x6c, 0xec, 0xd0, 0x55, 0xe4, 0x93, 0x2a, 0xe8, 0x2d, 0xf8, 0x67, 0x22, 0xef, 0xf8, 0xca, 0x55,
+	0x89, 0x43, 0x55, 0x91, 0xd7, 0x55, 0xe0, 0x5b, 0x70, 0x65, 0x2a, 0xef, 0xe4, 0xca, 0x65, 0xdf,
-	0xdf, 0x92, 0x2b, 0x57, 0x06, 0xbd, 0x07, 0xe4, 0x11, 0xf6, 0xf0, 0x0f, 0x48, 0xc4, 0x30, 0xb9,
+	0xf4, 0x95, 0x4b, 0x03, 0x3f, 0x00, 0xf4, 0x84, 0xf6, 0xe9, 0x3f, 0x90, 0x88, 0x61, 0x72, 0x09,
-	0x14, 0xa6, 0x02, 0x24, 0x2a, 0x76, 0x52, 0x2d, 0x74, 0x15, 0xfe, 0x7a, 0xdc, 0xf7, 0xe5, 0x87,
+	0x4c, 0x05, 0x50, 0x54, 0xec, 0xb4, 0x5a, 0xf0, 0x2a, 0xfc, 0xf7, 0x74, 0xe0, 0x8b, 0x4f, 0x1a,
-	0x04, 0xf6, 0xf0, 0x4b, 0x01, 0xca, 0x7a, 0xcf, 0x0b, 0x0c, 0x06, 0xdc, 0x41, 0x22, 0x61, 0x21,
+	0xb6, 0xf5, 0xad, 0x00, 0x65, 0xb5, 0xe7, 0x15, 0x0d, 0x86, 0xcc, 0xa1, 0x48, 0xc0, 0x42, 0x24,
-	0x12, 0x23, 0xa9, 0xa4, 0x7d, 0xc9, 0x0c, 0x80, 0xb5, 0x3e, 0xe5, 0xd5, 0x63, 0x72, 0xf4, 0xf1,
+	0x46, 0x54, 0x49, 0xfa, 0x92, 0x1a, 0x00, 0x6b, 0x3d, 0xe3, 0x55, 0x63, 0xf2, 0xf8, 0xf3, 0xcf,
-	0xfb, 0xcf, 0xcf, 0xb9, 0xfb, 0xe4, 0xae, 0x9a, 0xec, 0xc1, 0x41, 0xfa, 0x77, 0x70, 0x98, 0xbb,
+	0xdf, 0x5f, 0x73, 0x0f, 0xd1, 0x7d, 0x39, 0xd9, 0xc3, 0xdb, 0xc9, 0xdf, 0xc1, 0x21, 0xee, 0x1e,
-	0xc7, 0xed, 0x61, 0x22, 0xf5, 0x91, 0x3d, 0x8c, 0xa7, 0x62, 0x64, 0x0f, 0x33, 0x13, 0x30, 0x22,
+	0xb3, 0x47, 0x5a, 0xea, 0x63, 0x7b, 0x14, 0x4f, 0xc5, 0xd8, 0x1e, 0xa5, 0x26, 0x60, 0x8c, 0x86,
-	0x03, 0x28, 0x4f, 0x4e, 0x20, 0xa9, 0xa7, 0x48, 0x73, 0xff, 0x09, 0xd6, 0x8d, 0x6b, 0xe3, 0x9a,
+	0x50, 0x9e, 0x9e, 0x40, 0x54, 0x4f, 0x90, 0xe6, 0xfe, 0x13, 0xac, 0x1b, 0x97, 0xc6, 0x15, 0xa7,
-	0xd3, 0xa6, 0xe2, 0xf4, 0xbf, 0x65, 0x4e, 0x73, 0xf2, 0xf5, 0xce, 0x07, 0xc6, 0x2e, 0x79, 0x03,
+	0x4d, 0xc9, 0xe9, 0xba, 0x65, 0x66, 0x39, 0xf9, 0x6a, 0xe7, 0x23, 0x63, 0x17, 0xbd, 0x83, 0x52,
-	0xa5, 0x4c, 0x9f, 0x04, 0xf9, 0x2f, 0xcd, 0x3a, 0xdb, 0xbe, 0x4c, 0xf1, 0x59, 0x65, 0xd3, 0x7f,
+	0xaa, 0x4f, 0x1c, 0x5d, 0x4b, 0xb2, 0xce, 0xb6, 0x2f, 0x55, 0x7c, 0x5a, 0xd9, 0xf8, 0xaa, 0x04,
-	0x15, 0xd0, 0x1a, 0x59, 0x9d, 0x02, 0x22, 0x67, 0x00, 0xe3, 0x89, 0x25, 0x56, 0x7a, 0x7a, 0x66,
+	0x5a, 0x43, 0xab, 0x19, 0x20, 0x74, 0x02, 0x30, 0x99, 0x58, 0x64, 0x25, 0xa7, 0x67, 0xc6, 0xd8,
-	0x8c, 0xad, 0x99, 0x69, 0xa0, 0x75, 0x95, 0xd4, 0x24, 0xd5, 0x69, 0xf6, 0xc3, 0xe8, 0xbe, 0x47,
+	0x9a, 0x99, 0x06, 0x5c, 0x97, 0x49, 0x4d, 0x54, 0xcd, 0xb2, 0x1f, 0x45, 0xf7, 0x3d, 0x46, 0x67,
-	0xe4, 0x02, 0x8a, 0x19, 0x1d, 0x65, 0x78, 0xcf, 0xaa, 0xd6, 0xaa, 0xcd, 0x0f, 0xea, 0x3e, 0xed,
+	0x50, 0x4c, 0xe9, 0x28, 0xc5, 0x7b, 0x56, 0xb5, 0x56, 0x6d, 0x7e, 0x50, 0xf5, 0x69, 0x47, 0x22,
-	0x28, 0xa4, 0x0d, 0x5a, 0x9b, 0x8f, 0x64, 0x2b, 0x29, 0x46, 0xbd, 0xea, 0x43, 0x31, 0xa3, 0xc6,
+	0x6d, 0xe0, 0xda, 0x7c, 0x24, 0x5b, 0x4a, 0x31, 0xea, 0xd5, 0x00, 0x8a, 0x29, 0x35, 0xa6, 0x20,
-	0x0c, 0xe4, 0xac, 0x46, 0xad, 0x6a, 0x1a, 0x9c, 0x10, 0x1c, 0xbd, 0xa9, 0xc0, 0x36, 0x77, 0x37,
+	0x67, 0x35, 0x6a, 0x55, 0x93, 0xe0, 0x94, 0xe0, 0xf0, 0x4d, 0x09, 0xb6, 0xb9, 0xbb, 0xf1, 0x37,
-	0x7e, 0x07, 0x66, 0x0f, 0x79, 0x67, 0xf4, 0xf0, 0xe8, 0xeb, 0x55, 0xdd, 0xf8, 0x76, 0x55, 0x37,
+	0x30, 0x7b, 0xc4, 0xba, 0xe3, 0xc3, 0xc3, 0xef, 0x17, 0x75, 0xe3, 0xc7, 0x45, 0xdd, 0xf8, 0x75,
-	0x7e, 0x5c, 0xd5, 0x8d, 0xb3, 0x83, 0x2e, 0x97, 0x6f, 0xc3, 0xf6, 0xbe, 0xe3, 0xf5, 0x6d, 0x16,
+	0x51, 0x37, 0x4e, 0xee, 0xf6, 0x98, 0x78, 0x1f, 0x76, 0xf6, 0x1d, 0x6f, 0x60, 0x93, 0x40, 0x3e,
-	0xa8, 0xa7, 0xe5, 0x9d, 0x5a, 0xec, 0x39, 0x1d, 0xdb, 0x3f, 0xef, 0x46, 0xf9, 0x9c, 0x1e, 0xc7,
+	0x2d, 0x1f, 0xe4, 0x62, 0xcf, 0xe9, 0xda, 0xc3, 0x96, 0xed, 0x9f, 0xf6, 0xa2, 0x94, 0x4e, 0x9f,
-	0xf1, 0x8b, 0xd4, 0x5e, 0x54, 0xaf, 0xca, 0xed, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xcc, 0xa8,
+	0xd1, 0xc9, 0xa3, 0xd4, 0x59, 0x94, 0x0f, 0xcb, 0x9d, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa7,
-	0x25, 0x6b, 0xb2, 0x06, 0x00, 0x00,
+	0xbc, 0x40, 0x6e, 0xb5, 0x06, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.

pkg/apiclient/apiclient.go

@@ -27,27 +27,27 @@ import (
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
 
-	"github.com/argoproj/argo-cd/common"
+	"github.com/argoproj/argo-cd/v2/common"
-	accountpkg "github.com/argoproj/argo-cd/pkg/apiclient/account"
+	accountpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/account"
-	applicationpkg "github.com/argoproj/argo-cd/pkg/apiclient/application"
+	applicationpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/application"
-	certificatepkg "github.com/argoproj/argo-cd/pkg/apiclient/certificate"
+	certificatepkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/certificate"
-	clusterpkg "github.com/argoproj/argo-cd/pkg/apiclient/cluster"
+	clusterpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/cluster"
-	gpgkeypkg "github.com/argoproj/argo-cd/pkg/apiclient/gpgkey"
+	gpgkeypkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/gpgkey"
-	projectpkg "github.com/argoproj/argo-cd/pkg/apiclient/project"
+	projectpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/project"
-	repocredspkg "github.com/argoproj/argo-cd/pkg/apiclient/repocreds"
+	repocredspkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/repocreds"
-	repositorypkg "github.com/argoproj/argo-cd/pkg/apiclient/repository"
+	repositorypkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/repository"
-	sessionpkg "github.com/argoproj/argo-cd/pkg/apiclient/session"
+	sessionpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/session"
-	settingspkg "github.com/argoproj/argo-cd/pkg/apiclient/settings"
+	settingspkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/settings"
-	versionpkg "github.com/argoproj/argo-cd/pkg/apiclient/version"
+	versionpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/version"
-	"github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1"
+	argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"github.com/argoproj/argo-cd/util/env"
+	"github.com/argoproj/argo-cd/v2/util/env"
-	grpc_util "github.com/argoproj/argo-cd/util/grpc"
+	grpc_util "github.com/argoproj/argo-cd/v2/util/grpc"
-	argoio "github.com/argoproj/argo-cd/util/io"
+	argoio "github.com/argoproj/argo-cd/v2/util/io"
-	"github.com/argoproj/argo-cd/util/kube"
+	"github.com/argoproj/argo-cd/v2/util/kube"
-	"github.com/argoproj/argo-cd/util/localconfig"
+	"github.com/argoproj/argo-cd/v2/util/localconfig"
-	oidcutil "github.com/argoproj/argo-cd/util/oidc"
+	oidcutil "github.com/argoproj/argo-cd/v2/util/oidc"
-	tls_util "github.com/argoproj/argo-cd/util/tls"
+	tls_util "github.com/argoproj/argo-cd/v2/util/tls"
 )
 
 const (