diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml index 598706b5b8e2e..343877b3c649f 100644 --- a/.github/workflows/image.yaml +++ b/.github/workflows/image.yaml @@ -26,13 +26,13 @@ jobs: # build - run: | docker images -a --format "{{.ID}}" | xargs -I {} docker rmi {} - make image DEV_IMAGE=true DOCKER_PUSH=false IMAGE_NAMESPACE=docker.pkg.github.com/argoproj/argo-cd IMAGE_TAG=${{ steps.image.outputs.tag }} + make image DEV_IMAGE=true DOCKER_PUSH=false IMAGE_NAMESPACE=ghcr.io/argoproj IMAGE_TAG=${{ steps.image.outputs.tag }} working-directory: ./src/github.com/argoproj/argo-cd # publish - run: | - docker login docker.pkg.github.com --username $USERNAME --password $PASSWORD - docker push docker.pkg.github.com/argoproj/argo-cd/argocd:${{ steps.image.outputs.tag }} + docker login ghcr.io --username $USERNAME --password $PASSWORD + docker push ghcr.io/argoproj/argocd:${{ steps.image.outputs.tag }} env: USERNAME: ${{ secrets.USERNAME }} PASSWORD: ${{ secrets.TOKEN }} @@ -42,7 +42,7 @@ jobs: env: TOKEN: ${{ secrets.TOKEN }} - run: | - docker run -v $(pwd):/src -w /src --rm -t lyft/kustomizer:v3.3.0 kustomize edit set image quay.io/argoproj/argocd=docker.pkg.github.com/argoproj/argo-cd/argocd:${{ steps.image.outputs.tag }} + docker run -v $(pwd):/src -w /src --rm -t lyft/kustomizer:v3.3.0 kustomize edit set image quay.io/argoproj/argocd=ghcr.io/argoproj/argocd:${{ steps.image.outputs.tag }} git config --global user.email 'ci@argoproj.com' git config --global user.name 'CI' git diff --exit-code && echo 'Already deployed' || (git commit -am 'Upgrade argocd to ${{ steps.image.outputs.tag }}' && git push) diff --git a/.gitignore b/.gitignore index c3885badb3355..aed35e25f6d1e 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ test-results .scannerwork .scratch node_modules/ +.kube/ # ignore built binaries cmd/argocd/argocd diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile new file mode 100644 index 0000000000000..39867cb159156 --- /dev/null +++ b/.gitpod.Dockerfile @@ -0,0 +1,17 @@ +FROM gitpod/workspace-full + +USER root + +RUN curl -o /usr/local/bin/kubectl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \ + chmod +x /usr/local/bin/kubectl + +RUN curl -L https://go.kubebuilder.io/dl/2.3.1/$(go env GOOS)/$(go env GOARCH) | \ + tar -xz -C /tmp/ && mv /tmp/kubebuilder_2.3.1_$(go env GOOS)_$(go env GOARCH) /usr/local/kubebuilder + +RUN apt-get install redis-server -y +RUN go get github.com/mattn/goreman + +USER gitpod + +ENV ARGOCD_REDIS_LOCAL=true +ENV KUBECONFIG=/tmp/kubeconfig \ No newline at end of file diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 0000000000000..4001e29ffea04 --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,6 @@ +image: + file: .gitpod.Dockerfile + +tasks: + - init: make mod-download-local dep-ui-local && GO111MODULE=off go get github.com/mattn/goreman + command: make start-test-k8s \ No newline at end of file diff --git a/Makefile b/Makefile index c846beb7ebefd..69efc88b521e1 100644 --- a/Makefile +++ b/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 @@ -548,3 +548,6 @@ dep-ui: test-tools-image dep-ui-local: cd ui && yarn install + +start-test-k8s: + go run ./hack/k8s diff --git a/Procfile b/Procfile index 010c7abe5e566..f4a5867c1a823 100644 --- a/Procfile +++ b/Procfile @@ -1,7 +1,7 @@ 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" -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} +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: bash -c "if [ $ARGOCD_REDIS_LOCAL == 'true' ]; then redis-server --save '' --appendonly no --port ${ARGOCD_E2E_REDIS_PORT:-6379}; else 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}; fi" 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' git-server: test/fixture/testrepos/start-git.sh diff --git a/USERS.md b/USERS.md index 591b153cc7dd8..1b1cae5698c0f 100644 --- a/USERS.md +++ b/USERS.md @@ -8,6 +8,7 @@ Currently, the following organizations are **officially** using Argo CD: 1. [3Rein](https://www.3rein.com/) 1. [7shifts](https://www.7shifts.com/) 1. [Adevinta](https://www.adevinta.com/) +1. [Adventure](https://jp.adventurekk.com/) 1. [Ambassador Labs](https://www.getambassador.io/) 1. [ANSTO - Australian Synchrotron](https://www.synchrotron.org.au/) 1. [AppDirect](https://www.appdirect.com) @@ -124,3 +125,4 @@ Currently, the following organizations are **officially** using Argo CD: 1. [Yieldlab](https://www.yieldlab.de/) 1. [Sap Labs](http://sap.com) 1. [Smilee.io](https://smilee.io) +1. [Metanet](http://www.metanet.co.kr/en/) diff --git a/cmd/argocd-application-controller/commands/argocd_application_controller.go b/cmd/argocd-application-controller/commands/argocd_application_controller.go index e7a2acd7e8fd4..2e6c5d24bfbd7 100644 --- a/cmd/argocd-application-controller/commands/argocd_application_controller.go +++ b/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" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/controller" - "github.com/argoproj/argo-cd/controller/sharding" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned" - "github.com/argoproj/argo-cd/reposerver/apiclient" - cacheutil "github.com/argoproj/argo-cd/util/cache" - appstatecache "github.com/argoproj/argo-cd/util/cache/appstate" - "github.com/argoproj/argo-cd/util/cli" - "github.com/argoproj/argo-cd/util/env" - "github.com/argoproj/argo-cd/util/errors" - kubeutil "github.com/argoproj/argo-cd/util/kube" - "github.com/argoproj/argo-cd/util/settings" - "github.com/argoproj/argo-cd/util/tls" + cmdutil "github.com/argoproj/argo-cd/v2/cmd/util" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/controller" + "github.com/argoproj/argo-cd/v2/controller/sharding" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + cacheutil "github.com/argoproj/argo-cd/v2/util/cache" + appstatecache "github.com/argoproj/argo-cd/v2/util/cache/appstate" + "github.com/argoproj/argo-cd/v2/util/cli" + "github.com/argoproj/argo-cd/v2/util/env" + "github.com/argoproj/argo-cd/v2/util/errors" + kubeutil "github.com/argoproj/argo-cd/v2/util/kube" + "github.com/argoproj/argo-cd/v2/util/settings" + "github.com/argoproj/argo-cd/v2/util/tls" ) const ( diff --git a/cmd/argocd-dex/commands/argocd_dex.go b/cmd/argocd-dex/commands/argocd_dex.go index 94fc3f96fad00..f52b59e8b54e3 100644 --- a/cmd/argocd-dex/commands/argocd_dex.go +++ b/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" - "github.com/argoproj/argo-cd/util/cli" - "github.com/argoproj/argo-cd/util/dex" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/settings" + cmdutil "github.com/argoproj/argo-cd/v2/cmd/util" + "github.com/argoproj/argo-cd/v2/util/cli" + "github.com/argoproj/argo-cd/v2/util/dex" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/settings" ) const ( diff --git a/cmd/argocd-repo-server/commands/argocd_repo_server.go b/cmd/argocd-repo-server/commands/argocd_repo_server.go index 0476119c2791f..eba1f6c72072a 100644 --- a/cmd/argocd-repo-server/commands/argocd_repo_server.go +++ b/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" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/reposerver" - "github.com/argoproj/argo-cd/reposerver/apiclient" - reposervercache "github.com/argoproj/argo-cd/reposerver/cache" - "github.com/argoproj/argo-cd/reposerver/metrics" - "github.com/argoproj/argo-cd/reposerver/repository" - cacheutil "github.com/argoproj/argo-cd/util/cache" - "github.com/argoproj/argo-cd/util/cli" - "github.com/argoproj/argo-cd/util/env" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/gpg" - "github.com/argoproj/argo-cd/util/healthz" - ioutil "github.com/argoproj/argo-cd/util/io" - "github.com/argoproj/argo-cd/util/tls" + cmdutil "github.com/argoproj/argo-cd/v2/cmd/util" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/reposerver" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + reposervercache "github.com/argoproj/argo-cd/v2/reposerver/cache" + "github.com/argoproj/argo-cd/v2/reposerver/metrics" + "github.com/argoproj/argo-cd/v2/reposerver/repository" + cacheutil "github.com/argoproj/argo-cd/v2/util/cache" + "github.com/argoproj/argo-cd/v2/util/cli" + "github.com/argoproj/argo-cd/v2/util/env" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/gpg" + "github.com/argoproj/argo-cd/v2/util/healthz" + ioutil "github.com/argoproj/argo-cd/v2/util/io" + "github.com/argoproj/argo-cd/v2/util/tls" ) const ( diff --git a/cmd/argocd-server/commands/argocd_server.go b/cmd/argocd-server/commands/argocd_server.go index 03df34d0ddb9a..128d5665e6b23 100644 --- a/cmd/argocd-server/commands/argocd_server.go +++ b/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" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned" - "github.com/argoproj/argo-cd/reposerver/apiclient" - "github.com/argoproj/argo-cd/server" - servercache "github.com/argoproj/argo-cd/server/cache" - "github.com/argoproj/argo-cd/util/cli" - "github.com/argoproj/argo-cd/util/env" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/kube" - "github.com/argoproj/argo-cd/util/tls" + cmdutil "github.com/argoproj/argo-cd/v2/cmd/util" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + "github.com/argoproj/argo-cd/v2/server" + servercache "github.com/argoproj/argo-cd/v2/server/cache" + "github.com/argoproj/argo-cd/v2/util/cli" + "github.com/argoproj/argo-cd/v2/util/env" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/kube" + "github.com/argoproj/argo-cd/v2/util/tls" ) const ( diff --git a/cmd/argocd-util/commands/app.go b/cmd/argocd-util/commands/app.go index 10b3acd1e67c4..3a4425e191782 100644 --- a/cmd/argocd-util/commands/app.go +++ b/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" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/controller" - "github.com/argoproj/argo-cd/controller/cache" - "github.com/argoproj/argo-cd/controller/metrics" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned" - appinformers "github.com/argoproj/argo-cd/pkg/client/informers/externalversions" - "github.com/argoproj/argo-cd/reposerver/apiclient" - cacheutil "github.com/argoproj/argo-cd/util/cache" - appstatecache "github.com/argoproj/argo-cd/util/cache/appstate" - "github.com/argoproj/argo-cd/util/cli" - "github.com/argoproj/argo-cd/util/config" - "github.com/argoproj/argo-cd/util/db" - "github.com/argoproj/argo-cd/util/errors" - kubeutil "github.com/argoproj/argo-cd/util/kube" - "github.com/argoproj/argo-cd/util/settings" + cmdutil "github.com/argoproj/argo-cd/v2/cmd/util" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/controller" + "github.com/argoproj/argo-cd/v2/controller/cache" + "github.com/argoproj/argo-cd/v2/controller/metrics" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned" + appinformers "github.com/argoproj/argo-cd/v2/pkg/client/informers/externalversions" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + cacheutil "github.com/argoproj/argo-cd/v2/util/cache" + appstatecache "github.com/argoproj/argo-cd/v2/util/cache/appstate" + "github.com/argoproj/argo-cd/v2/util/cli" + "github.com/argoproj/argo-cd/v2/util/config" + "github.com/argoproj/argo-cd/v2/util/db" + "github.com/argoproj/argo-cd/v2/util/errors" + kubeutil "github.com/argoproj/argo-cd/v2/util/kube" + "github.com/argoproj/argo-cd/v2/util/settings" ) func NewAppCommand() *cobra.Command { @@ -247,7 +247,8 @@ func NewReconcileCommand() *cobra.Command { if refresh { if repoServerAddress == "" { printLine("Repo server is not provided, trying to port-forward to argocd-repo-server pod.") - repoServerPort, err := kubeutil.PortForward("app.kubernetes.io/name=argocd-repo-server", 8081, namespace) + overrides := clientcmd.ConfigOverrides{} + repoServerPort, err := kubeutil.PortForward("app.kubernetes.io/name=argocd-repo-server", 8081, namespace, &overrides) errors.CheckError(err) repoServerAddress = fmt.Sprintf("localhost:%d", repoServerPort) } diff --git a/cmd/argocd-util/commands/app_test.go b/cmd/argocd-util/commands/app_test.go index d0e6d13f2668a..50ed5bee961e6 100644 --- a/cmd/argocd-util/commands/app_test.go +++ b/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" - statecache "github.com/argoproj/argo-cd/controller/cache" - cachemocks "github.com/argoproj/argo-cd/controller/cache/mocks" - "github.com/argoproj/argo-cd/controller/metrics" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - appfake "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/fake" - "github.com/argoproj/argo-cd/reposerver/apiclient" - "github.com/argoproj/argo-cd/reposerver/apiclient/mocks" - "github.com/argoproj/argo-cd/util/db" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + statecache "github.com/argoproj/argo-cd/v2/controller/cache" + cachemocks "github.com/argoproj/argo-cd/v2/controller/cache/mocks" + "github.com/argoproj/argo-cd/v2/controller/metrics" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + appfake "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/fake" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient/mocks" + "github.com/argoproj/argo-cd/v2/util/db" + "github.com/argoproj/argo-cd/v2/util/settings" ) func TestGetReconcileResults(t *testing.T) { diff --git a/cmd/argocd-util/commands/argocd_util.go b/cmd/argocd-util/commands/argocd_util.go index 5a7cbba0128b9..c03e2e87cb575 100644 --- a/cmd/argocd-util/commands/argocd_util.go +++ b/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" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/util/cli" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/settings" + cmdutil "github.com/argoproj/argo-cd/v2/cmd/util" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/util/cli" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/settings" ) const ( diff --git a/cmd/argocd-util/commands/backup.go b/cmd/argocd-util/commands/backup.go index 0e9fac72bf8ff..fa33359f917f7 100644 --- a/cmd/argocd-util/commands/backup.go +++ b/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/util/cli" - "github.com/argoproj/argo-cd/util/errors" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/util/cli" + "github.com/argoproj/argo-cd/v2/util/errors" ) // NewExportCommand defines a new command for exporting Kubernetes and Argo CD resources. diff --git a/cmd/argocd-util/commands/cluster.go b/cmd/argocd-util/commands/cluster.go index ca4d2087f503b..5885a6b5012e2 100644 --- a/cmd/argocd-util/commands/cluster.go +++ b/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" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/controller/sharding" - argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - cacheutil "github.com/argoproj/argo-cd/util/cache" - appstatecache "github.com/argoproj/argo-cd/util/cache/appstate" - "github.com/argoproj/argo-cd/util/cli" - "github.com/argoproj/argo-cd/util/db" - "github.com/argoproj/argo-cd/util/errors" - kubeutil "github.com/argoproj/argo-cd/util/kube" - "github.com/argoproj/argo-cd/util/settings" + cmdutil "github.com/argoproj/argo-cd/v2/cmd/util" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/controller/sharding" + argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + cacheutil "github.com/argoproj/argo-cd/v2/util/cache" + appstatecache "github.com/argoproj/argo-cd/v2/util/cache/appstate" + "github.com/argoproj/argo-cd/v2/util/cli" + "github.com/argoproj/argo-cd/v2/util/db" + "github.com/argoproj/argo-cd/v2/util/errors" + kubeutil "github.com/argoproj/argo-cd/v2/util/kube" + "github.com/argoproj/argo-cd/v2/util/settings" ) func NewClusterCommand(pathOpts *clientcmd.PathOptions) *cobra.Command { @@ -79,7 +79,8 @@ func NewClusterStatsCommand() *cobra.Command { errors.CheckError(err) var cache *appstatecache.Cache if portForwardRedis { - port, err := kubeutil.PortForward("app.kubernetes.io/name=argocd-redis-ha-haproxy", 6379, namespace) + overrides := clientcmd.ConfigOverrides{} + port, err := kubeutil.PortForward("app.kubernetes.io/name=argocd-redis-ha-haproxy", 6379, namespace, &overrides) errors.CheckError(err) client := redis.NewClient(&redis.Options{Addr: fmt.Sprintf("localhost:%d", port)}) cache = appstatecache.NewCache(cacheutil.NewCache(cacheutil.NewRedisCache(client, time.Hour)), time.Hour) diff --git a/cmd/argocd-util/commands/project.go b/cmd/argocd-util/commands/project.go index c464e3e2a8638..e4f484c610528 100644 --- a/cmd/argocd-util/commands/project.go +++ b/cmd/argocd-util/commands/project.go @@ -7,12 +7,12 @@ import ( "path/filepath" "strings" - cmdutil "github.com/argoproj/argo-cd/cmd/util" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned" - appclient "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/typed/application/v1alpha1" - "github.com/argoproj/argo-cd/util/cli" - "github.com/argoproj/argo-cd/util/errors" + cmdutil "github.com/argoproj/argo-cd/v2/cmd/util" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned" + appclient "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/typed/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/cli" + "github.com/argoproj/argo-cd/v2/util/errors" "github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/spf13/cobra" diff --git a/cmd/argocd-util/commands/project_allowlist.go b/cmd/argocd-util/commands/project_allowlist.go index 8f6a103f64942..96d52e15573fb 100644 --- a/cmd/argocd-util/commands/project_allowlist.go +++ b/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/util/cli" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "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" diff --git a/cmd/argocd-util/commands/project_test.go b/cmd/argocd-util/commands/project_test.go index db07c35a9032b..8447b755af31f 100644 --- a/cmd/argocd-util/commands/project_test.go +++ b/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/pkg/client/clientset/versioned/fake" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/fake" ) const ( diff --git a/cmd/argocd-util/commands/repo.go b/cmd/argocd-util/commands/repo.go index 878fa6efaf2ea..6ff43801fba75 100644 --- a/cmd/argocd-util/commands/repo.go +++ b/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" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/util/cli" - "github.com/argoproj/argo-cd/util/db" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/git" - "github.com/argoproj/argo-cd/util/settings" + cmdutil "github.com/argoproj/argo-cd/v2/cmd/util" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/util/cli" + "github.com/argoproj/argo-cd/v2/util/db" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/git" + "github.com/argoproj/argo-cd/v2/util/settings" ) const ( diff --git a/cmd/argocd-util/commands/settings.go b/cmd/argocd-util/commands/settings.go index dce4602872d43..e6b8e276f9815 100644 --- a/cmd/argocd-util/commands/settings.go +++ b/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/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/argo/normalizers" - "github.com/argoproj/argo-cd/util/cli" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/lua" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/argo/normalizers" + "github.com/argoproj/argo-cd/v2/util/cli" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/lua" + "github.com/argoproj/argo-cd/v2/util/settings" ) type settingsOpts struct { diff --git a/cmd/argocd-util/commands/settings_rbac.go b/cmd/argocd-util/commands/settings_rbac.go index cbf0dec144916..50113d99845f8 100644 --- a/cmd/argocd-util/commands/settings_rbac.go +++ b/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/server/rbacpolicy" - "github.com/argoproj/argo-cd/util/assets" - "github.com/argoproj/argo-cd/util/cli" - "github.com/argoproj/argo-cd/util/rbac" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/server/rbacpolicy" + "github.com/argoproj/argo-cd/v2/util/assets" + "github.com/argoproj/argo-cd/v2/util/cli" + "github.com/argoproj/argo-cd/v2/util/rbac" ) // Provide a mapping of short-hand resource names to their RBAC counterparts diff --git a/cmd/argocd-util/commands/settings_rbac_test.go b/cmd/argocd-util/commands/settings_rbac_test.go index c8874d1fa387e..6cae85b89a9e7 100644 --- a/cmd/argocd-util/commands/settings_rbac_test.go +++ b/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) { diff --git a/cmd/argocd-util/commands/settings_test.go b/cmd/argocd-util/commands/settings_test.go index 9fce15feff2e8..3e1fd7bad4f0e 100644 --- a/cmd/argocd-util/commands/settings_test.go +++ b/cmd/argocd-util/commands/settings_test.go @@ -9,9 +9,9 @@ import ( "os" "testing" - "github.com/argoproj/argo-cd/common" - utils "github.com/argoproj/argo-cd/util/io" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + utils "github.com/argoproj/argo-cd/v2/util/io" + "github.com/argoproj/argo-cd/v2/util/settings" "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" diff --git a/cmd/argocd/commands/account.go b/cmd/argocd/commands/account.go index 257a648b07c43..52bbe38b3a050 100644 --- a/cmd/argocd/commands/account.go +++ b/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" - accountpkg "github.com/argoproj/argo-cd/pkg/apiclient/account" - "github.com/argoproj/argo-cd/pkg/apiclient/session" - "github.com/argoproj/argo-cd/server/rbacpolicy" - "github.com/argoproj/argo-cd/util/cli" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/io" - "github.com/argoproj/argo-cd/util/localconfig" - sessionutil "github.com/argoproj/argo-cd/util/session" + argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient" + accountpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/account" + "github.com/argoproj/argo-cd/v2/pkg/apiclient/session" + "github.com/argoproj/argo-cd/v2/server/rbacpolicy" + "github.com/argoproj/argo-cd/v2/util/cli" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/io" + "github.com/argoproj/argo-cd/v2/util/localconfig" + sessionutil "github.com/argoproj/argo-cd/v2/util/session" ) func NewAccountCommand(clientOpts *argocdclient.ClientOptions) *cobra.Command { diff --git a/cmd/argocd/commands/app.go b/cmd/argocd/commands/app.go index 2aa6fbe6039b3..f9c233277f522 100644 --- a/cmd/argocd/commands/app.go +++ b/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" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/controller" - "github.com/argoproj/argo-cd/pkg/apiclient" - argocdclient "github.com/argoproj/argo-cd/pkg/apiclient" - "github.com/argoproj/argo-cd/pkg/apiclient/application" - applicationpkg "github.com/argoproj/argo-cd/pkg/apiclient/application" - clusterpkg "github.com/argoproj/argo-cd/pkg/apiclient/cluster" - projectpkg "github.com/argoproj/argo-cd/pkg/apiclient/project" - "github.com/argoproj/argo-cd/pkg/apiclient/settings" - settingspkg "github.com/argoproj/argo-cd/pkg/apiclient/settings" - argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - repoapiclient "github.com/argoproj/argo-cd/reposerver/apiclient" - "github.com/argoproj/argo-cd/reposerver/repository" - "github.com/argoproj/argo-cd/util/argo" - "github.com/argoproj/argo-cd/util/cli" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/git" - argoio "github.com/argoproj/argo-cd/util/io" - argokube "github.com/argoproj/argo-cd/util/kube" - "github.com/argoproj/argo-cd/util/templates" - "github.com/argoproj/argo-cd/util/text/label" + cmdutil "github.com/argoproj/argo-cd/v2/cmd/util" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/controller" + "github.com/argoproj/argo-cd/v2/pkg/apiclient" + argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient" + "github.com/argoproj/argo-cd/v2/pkg/apiclient/application" + applicationpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/application" + clusterpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/cluster" + projectpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/project" + "github.com/argoproj/argo-cd/v2/pkg/apiclient/settings" + settingspkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/settings" + argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + repoapiclient "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + "github.com/argoproj/argo-cd/v2/reposerver/repository" + "github.com/argoproj/argo-cd/v2/util/argo" + "github.com/argoproj/argo-cd/v2/util/cli" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/git" + argoio "github.com/argoproj/argo-cd/v2/util/io" + argokube "github.com/argoproj/argo-cd/v2/util/kube" + "github.com/argoproj/argo-cd/v2/util/templates" + "github.com/argoproj/argo-cd/v2/util/text/label" ) var ( diff --git a/cmd/argocd/commands/app_actions.go b/cmd/argocd/commands/app_actions.go index f9c629313891c..af0f36f898848 100644 --- a/cmd/argocd/commands/app_actions.go +++ b/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" - applicationpkg "github.com/argoproj/argo-cd/pkg/apiclient/application" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/io" + argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient" + applicationpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/application" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/io" ) type DisplayedAction struct { diff --git a/cmd/argocd/commands/cert.go b/cmd/argocd/commands/cert.go index e62a9f0d0a08e..3ab8f8ba57efd 100644 --- a/cmd/argocd/commands/cert.go +++ b/cmd/argocd/commands/cert.go @@ -11,12 +11,12 @@ import ( "github.com/spf13/cobra" - argocdclient "github.com/argoproj/argo-cd/pkg/apiclient" - certificatepkg "github.com/argoproj/argo-cd/pkg/apiclient/certificate" - appsv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - certutil "github.com/argoproj/argo-cd/util/cert" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/io" + argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient" + certificatepkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/certificate" + appsv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + certutil "github.com/argoproj/argo-cd/v2/util/cert" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/io" ) // NewCertCommand returns a new instance of an `argocd repo` command diff --git a/cmd/argocd/commands/cluster.go b/cmd/argocd/commands/cluster.go index bc20799637f25..9539ebbafb715 100644 --- a/cmd/argocd/commands/cluster.go +++ b/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" - "github.com/argoproj/argo-cd/common" - argocdclient "github.com/argoproj/argo-cd/pkg/apiclient" - clusterpkg "github.com/argoproj/argo-cd/pkg/apiclient/cluster" - argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/clusterauth" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/io" + cmdutil "github.com/argoproj/argo-cd/v2/cmd/util" + "github.com/argoproj/argo-cd/v2/common" + argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient" + clusterpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/cluster" + argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/clusterauth" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/io" ) // NewClusterCommand returns a new instance of an `argocd cluster` command diff --git a/cmd/argocd/commands/cluster_test.go b/cmd/argocd/commands/cluster_test.go index e0533d717ab2c..ebed69059a8e6 100644 --- a/cmd/argocd/commands/cluster_test.go +++ b/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) { diff --git a/cmd/argocd/commands/context.go b/cmd/argocd/commands/context.go index 9cad666ab5c61..e4fcabef4cad3 100644 --- a/cmd/argocd/commands/context.go +++ b/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" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/localconfig" + argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/localconfig" ) // NewContextCommand returns a new instance of an `argocd ctx` command diff --git a/cmd/argocd/commands/context_test.go b/cmd/argocd/commands/context_test.go index 414134ae887ab..70241d14554a4 100644 --- a/cmd/argocd/commands/context_test.go +++ b/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: diff --git a/cmd/argocd/commands/gpg.go b/cmd/argocd/commands/gpg.go index 438a342cbea5e..feb7502f9ed5c 100644 --- a/cmd/argocd/commands/gpg.go +++ b/cmd/argocd/commands/gpg.go @@ -10,11 +10,11 @@ import ( "github.com/spf13/cobra" - argocdclient "github.com/argoproj/argo-cd/pkg/apiclient" - gpgkeypkg "github.com/argoproj/argo-cd/pkg/apiclient/gpgkey" - appsv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/errors" - argoio "github.com/argoproj/argo-cd/util/io" + argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient" + gpgkeypkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/gpgkey" + appsv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/errors" + argoio "github.com/argoproj/argo-cd/v2/util/io" ) // NewGPGCommand returns a new instance of an `argocd repo` command diff --git a/cmd/argocd/commands/login.go b/cmd/argocd/commands/login.go index fdcf262a1c5d0..8aa5e314be6af 100644 --- a/cmd/argocd/commands/login.go +++ b/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" - sessionpkg "github.com/argoproj/argo-cd/pkg/apiclient/session" - settingspkg "github.com/argoproj/argo-cd/pkg/apiclient/settings" - "github.com/argoproj/argo-cd/util/cli" - "github.com/argoproj/argo-cd/util/errors" - grpc_util "github.com/argoproj/argo-cd/util/grpc" - "github.com/argoproj/argo-cd/util/io" - jwtutil "github.com/argoproj/argo-cd/util/jwt" - "github.com/argoproj/argo-cd/util/localconfig" - oidcutil "github.com/argoproj/argo-cd/util/oidc" - "github.com/argoproj/argo-cd/util/rand" + argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient" + sessionpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/session" + settingspkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/settings" + "github.com/argoproj/argo-cd/v2/util/cli" + "github.com/argoproj/argo-cd/v2/util/errors" + grpc_util "github.com/argoproj/argo-cd/v2/util/grpc" + "github.com/argoproj/argo-cd/v2/util/io" + jwtutil "github.com/argoproj/argo-cd/v2/util/jwt" + "github.com/argoproj/argo-cd/v2/util/localconfig" + oidcutil "github.com/argoproj/argo-cd/v2/util/oidc" + "github.com/argoproj/argo-cd/v2/util/rand" ) // NewLoginCommand returns a new instance of `argocd login` command diff --git a/cmd/argocd/commands/logout.go b/cmd/argocd/commands/logout.go index 832efdcfbaf82..e15450299347f 100644 --- a/cmd/argocd/commands/logout.go +++ b/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" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/localconfig" + argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/localconfig" ) // NewLogoutCommand returns a new instance of `argocd logout` command diff --git a/cmd/argocd/commands/logout_test.go b/cmd/argocd/commands/logout_test.go index caed324140986..6fa17aacebebd 100644 --- a/cmd/argocd/commands/logout_test.go +++ b/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) { diff --git a/cmd/argocd/commands/project.go b/cmd/argocd/commands/project.go index d35a847eed07f..3adddda5cc221 100644 --- a/cmd/argocd/commands/project.go +++ b/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" - argocdclient "github.com/argoproj/argo-cd/pkg/apiclient" - projectpkg "github.com/argoproj/argo-cd/pkg/apiclient/project" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/cli" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/git" - "github.com/argoproj/argo-cd/util/gpg" - argoio "github.com/argoproj/argo-cd/util/io" + cmdutil "github.com/argoproj/argo-cd/v2/cmd/util" + argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient" + projectpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/project" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/cli" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/git" + "github.com/argoproj/argo-cd/v2/util/gpg" + argoio "github.com/argoproj/argo-cd/v2/util/io" ) type policyOpts struct { diff --git a/cmd/argocd/commands/project_role.go b/cmd/argocd/commands/project_role.go index 74a69318d4504..5442c0d8833d8 100644 --- a/cmd/argocd/commands/project_role.go +++ b/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" - projectpkg "github.com/argoproj/argo-cd/pkg/apiclient/project" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/io" - "github.com/argoproj/argo-cd/util/jwt" + argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient" + projectpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/project" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/io" + "github.com/argoproj/argo-cd/v2/util/jwt" ) const ( diff --git a/cmd/argocd/commands/projectwindows.go b/cmd/argocd/commands/projectwindows.go index e32952480b562..939263acc2e63 100644 --- a/cmd/argocd/commands/projectwindows.go +++ b/cmd/argocd/commands/projectwindows.go @@ -10,11 +10,11 @@ import ( "github.com/spf13/cobra" - argocdclient "github.com/argoproj/argo-cd/pkg/apiclient" - projectpkg "github.com/argoproj/argo-cd/pkg/apiclient/project" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/io" + argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient" + projectpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/project" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/io" ) // NewProjectWindowsCommand returns a new instance of the `argocd proj windows` command diff --git a/cmd/argocd/commands/relogin.go b/cmd/argocd/commands/relogin.go index 8ee97a22f9b2c..59b10fd9bf26b 100644 --- a/cmd/argocd/commands/relogin.go +++ b/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" - settingspkg "github.com/argoproj/argo-cd/pkg/apiclient/settings" - "github.com/argoproj/argo-cd/util/errors" - argoio "github.com/argoproj/argo-cd/util/io" - "github.com/argoproj/argo-cd/util/localconfig" - "github.com/argoproj/argo-cd/util/session" + argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient" + settingspkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/settings" + "github.com/argoproj/argo-cd/v2/util/errors" + argoio "github.com/argoproj/argo-cd/v2/util/io" + "github.com/argoproj/argo-cd/v2/util/localconfig" + "github.com/argoproj/argo-cd/v2/util/session" ) // NewReloginCommand returns a new instance of `argocd relogin` command diff --git a/cmd/argocd/commands/repo.go b/cmd/argocd/commands/repo.go index cdbc47113cf65..a36e3500d2104 100644 --- a/cmd/argocd/commands/repo.go +++ b/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" - argocdclient "github.com/argoproj/argo-cd/pkg/apiclient" - repositorypkg "github.com/argoproj/argo-cd/pkg/apiclient/repository" - appsv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/cli" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/git" - "github.com/argoproj/argo-cd/util/io" + cmdutil "github.com/argoproj/argo-cd/v2/cmd/util" + argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient" + repositorypkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/repository" + appsv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/cli" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/git" + "github.com/argoproj/argo-cd/v2/util/io" ) // NewRepoCommand returns a new instance of an `argocd repo` command diff --git a/cmd/argocd/commands/repocreds.go b/cmd/argocd/commands/repocreds.go index 2a3519a47c211..e007bcac05689 100644 --- a/cmd/argocd/commands/repocreds.go +++ b/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" - repocredspkg "github.com/argoproj/argo-cd/pkg/apiclient/repocreds" - appsv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/cli" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/git" - "github.com/argoproj/argo-cd/util/io" + argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient" + repocredspkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/repocreds" + appsv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/cli" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/git" + "github.com/argoproj/argo-cd/v2/util/io" ) // NewRepoCredsCommand returns a new instance of an `argocd repocreds` command diff --git a/cmd/argocd/commands/root.go b/cmd/argocd/commands/root.go index a6a2306f243b7..42c274090bbd1 100644 --- a/cmd/argocd/commands/root.go +++ b/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" - argocdclient "github.com/argoproj/argo-cd/pkg/apiclient" - "github.com/argoproj/argo-cd/util/cli" - "github.com/argoproj/argo-cd/util/config" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/localconfig" + cmdutil "github.com/argoproj/argo-cd/v2/cmd/util" + argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient" + "github.com/argoproj/argo-cd/v2/util/cli" + "github.com/argoproj/argo-cd/v2/util/config" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/localconfig" ) func init() { diff --git a/cmd/argocd/commands/version.go b/cmd/argocd/commands/version.go index 842d4109ca6f7..7efbd20e3916f 100644 --- a/cmd/argocd/commands/version.go +++ b/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" - argocdclient "github.com/argoproj/argo-cd/pkg/apiclient" - "github.com/argoproj/argo-cd/pkg/apiclient/version" - "github.com/argoproj/argo-cd/util/errors" - argoio "github.com/argoproj/argo-cd/util/io" + "github.com/argoproj/argo-cd/v2/common" + argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient" + "github.com/argoproj/argo-cd/v2/pkg/apiclient/version" + "github.com/argoproj/argo-cd/v2/util/errors" + argoio "github.com/argoproj/argo-cd/v2/util/io" ) // NewVersionCmd returns a new `version` command to be used as a sub-command to root diff --git a/cmd/main.go b/cmd/main.go index ac6bcfa5e1af3..842715c6c8a80 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -7,12 +7,12 @@ import ( "github.com/spf13/cobra" - appcontroller "github.com/argoproj/argo-cd/cmd/argocd-application-controller/commands" - dex "github.com/argoproj/argo-cd/cmd/argocd-dex/commands" - reposerver "github.com/argoproj/argo-cd/cmd/argocd-repo-server/commands" - apiserver "github.com/argoproj/argo-cd/cmd/argocd-server/commands" - util "github.com/argoproj/argo-cd/cmd/argocd-util/commands" - cli "github.com/argoproj/argo-cd/cmd/argocd/commands" + appcontroller "github.com/argoproj/argo-cd/v2/cmd/argocd-application-controller/commands" + dex "github.com/argoproj/argo-cd/v2/cmd/argocd-dex/commands" + reposerver "github.com/argoproj/argo-cd/v2/cmd/argocd-repo-server/commands" + apiserver "github.com/argoproj/argo-cd/v2/cmd/argocd-server/commands" + util "github.com/argoproj/argo-cd/v2/cmd/argocd-util/commands" + cli "github.com/argoproj/argo-cd/v2/cmd/argocd/commands" ) const ( diff --git a/cmd/util/app.go b/cmd/util/app.go index 84dbc914a447b..5513845f457da 100644 --- a/cmd/util/app.go +++ b/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/pkg/apis/application" - argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/config" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/text/label" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apis/application" + argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/config" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/text/label" ) type AppOptions struct { diff --git a/cmd/util/app_test.go b/cmd/util/app_test.go index eadc85f5c343b..211e836d2c3e5 100644 --- a/cmd/util/app_test.go +++ b/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) { diff --git a/cmd/util/cluster.go b/cmd/util/cluster.go index be9980cf06b8d..4b2687cf4f4bd 100644 --- a/cmd/util/cluster.go +++ b/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" - "github.com/argoproj/argo-cd/util/errors" + argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/errors" ) func PrintKubeContexts(ca clientcmd.ConfigAccess) { diff --git a/cmd/util/cluster_test.go b/cmd/util/cluster_test.go index b7f543ea4cd5a..80cbbe60c2948 100644 --- a/cmd/util/cluster_test.go +++ b/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) { diff --git a/cmd/util/project.go b/cmd/util/project.go index f52899a09fe39..09e90caf5b5b8 100644 --- a/cmd/util/project.go +++ b/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/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/config" - "github.com/argoproj/argo-cd/util/gpg" + "github.com/argoproj/argo-cd/v2/pkg/apis/application" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/config" + "github.com/argoproj/argo-cd/v2/util/gpg" ) type ProjectOpts struct { diff --git a/cmd/util/repo.go b/cmd/util/repo.go index 6d9703a69204e..69d89ad93db45 100644 --- a/cmd/util/repo.go +++ b/cmd/util/repo.go @@ -3,8 +3,8 @@ package util import ( "github.com/spf13/cobra" - "github.com/argoproj/argo-cd/common" - appsv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/common" + appsv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" ) type RepoOptions struct { diff --git a/controller/appcontroller.go b/controller/appcontroller.go index 5782e1824e141..91823a78dde55 100644 --- a/controller/appcontroller.go +++ b/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" - statecache "github.com/argoproj/argo-cd/controller/cache" - "github.com/argoproj/argo-cd/controller/metrics" - "github.com/argoproj/argo-cd/pkg/apis/application" - appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned" - "github.com/argoproj/argo-cd/pkg/client/informers/externalversions/application/v1alpha1" - applisters "github.com/argoproj/argo-cd/pkg/client/listers/application/v1alpha1" - "github.com/argoproj/argo-cd/reposerver/apiclient" - "github.com/argoproj/argo-cd/util/argo" - appstatecache "github.com/argoproj/argo-cd/util/cache/appstate" - "github.com/argoproj/argo-cd/util/db" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/glob" - logutils "github.com/argoproj/argo-cd/util/log" - settings_util "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + statecache "github.com/argoproj/argo-cd/v2/controller/cache" + "github.com/argoproj/argo-cd/v2/controller/metrics" + "github.com/argoproj/argo-cd/v2/pkg/apis/application" + appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned" + "github.com/argoproj/argo-cd/v2/pkg/client/informers/externalversions/application/v1alpha1" + applisters "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + "github.com/argoproj/argo-cd/v2/util/argo" + appstatecache "github.com/argoproj/argo-cd/v2/util/cache/appstate" + "github.com/argoproj/argo-cd/v2/util/db" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/glob" + logutils "github.com/argoproj/argo-cd/v2/util/log" + settings_util "github.com/argoproj/argo-cd/v2/util/settings" ) const ( diff --git a/controller/appcontroller_test.go b/controller/appcontroller_test.go index 55ba68be9a7ca..d7787879201a3 100644 --- a/controller/appcontroller_test.go +++ b/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" - mockstatecache "github.com/argoproj/argo-cd/controller/cache/mocks" - argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/fake" - "github.com/argoproj/argo-cd/reposerver/apiclient" - mockrepoclient "github.com/argoproj/argo-cd/reposerver/apiclient/mocks" - "github.com/argoproj/argo-cd/test" - cacheutil "github.com/argoproj/argo-cd/util/cache" - appstatecache "github.com/argoproj/argo-cd/util/cache/appstate" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + mockstatecache "github.com/argoproj/argo-cd/v2/controller/cache/mocks" + argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/fake" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + mockrepoclient "github.com/argoproj/argo-cd/v2/reposerver/apiclient/mocks" + "github.com/argoproj/argo-cd/v2/test" + cacheutil "github.com/argoproj/argo-cd/v2/util/cache" + appstatecache "github.com/argoproj/argo-cd/v2/util/cache/appstate" + "github.com/argoproj/argo-cd/v2/util/settings" ) type namespacedResource struct { diff --git a/controller/cache/cache.go b/controller/cache/cache.go index 7e5b9f614084a..ef90974387d37 100644 --- a/controller/cache/cache.go +++ b/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/controller/metrics" - appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/argo" - "github.com/argoproj/argo-cd/util/db" - logutils "github.com/argoproj/argo-cd/util/log" - "github.com/argoproj/argo-cd/util/lua" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/controller/metrics" + appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/argo" + "github.com/argoproj/argo-cd/v2/util/db" + logutils "github.com/argoproj/argo-cd/v2/util/log" + "github.com/argoproj/argo-cd/v2/util/lua" + "github.com/argoproj/argo-cd/v2/util/settings" ) type LiveStateCache interface { diff --git a/controller/cache/cache_test.go b/controller/cache/cache_test.go index 9e2f444cdfd04..94fc7154bf160 100644 --- a/controller/cache/cache_test.go +++ b/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) { diff --git a/controller/cache/info.go b/controller/cache/info.go index 1a232782afb6a..d015170e7b91b 100644 --- a/controller/cache/info.go +++ b/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/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/resource" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/resource" ) func populateNodeInfo(un *unstructured.Unstructured, res *ResourceInfo) { diff --git a/controller/cache/info_test.go b/controller/cache/info_test.go index 2cf4f703503d8..9dcb2b08f04e6 100644 --- a/controller/cache/info_test.go +++ b/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 { diff --git a/controller/cache/mocks/LiveStateCache.go b/controller/cache/mocks/LiveStateCache.go index 2cafd20955857..9e4f9fd33b6c7 100644 --- a/controller/cache/mocks/LiveStateCache.go +++ b/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 diff --git a/controller/clusterinfoupdater.go b/controller/clusterinfoupdater.go index 0fa0c277f02fe..7582807891233 100644 --- a/controller/clusterinfoupdater.go +++ b/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" - appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/pkg/client/listers/application/v1alpha1" - "github.com/argoproj/argo-cd/util/argo" - appstatecache "github.com/argoproj/argo-cd/util/cache/appstate" - "github.com/argoproj/argo-cd/util/db" + "github.com/argoproj/argo-cd/v2/controller/metrics" + appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/argo" + appstatecache "github.com/argoproj/argo-cd/v2/util/cache/appstate" + "github.com/argoproj/argo-cd/v2/util/db" ) const ( diff --git a/controller/clusterinfoupdater_test.go b/controller/clusterinfoupdater_test.go index c22da7be07972..993e63b8d6e2a 100644 --- a/controller/clusterinfoupdater_test.go +++ b/controller/clusterinfoupdater_test.go @@ -6,14 +6,14 @@ import ( "testing" "time" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - appsfake "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/fake" - appinformers "github.com/argoproj/argo-cd/pkg/client/informers/externalversions/application/v1alpha1" - applisters "github.com/argoproj/argo-cd/pkg/client/listers/application/v1alpha1" - cacheutil "github.com/argoproj/argo-cd/util/cache" - "github.com/argoproj/argo-cd/util/cache/appstate" - "github.com/argoproj/argo-cd/util/db" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + appsfake "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/fake" + appinformers "github.com/argoproj/argo-cd/v2/pkg/client/informers/externalversions/application/v1alpha1" + applisters "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1" + cacheutil "github.com/argoproj/argo-cd/v2/util/cache" + "github.com/argoproj/argo-cd/v2/util/cache/appstate" + "github.com/argoproj/argo-cd/v2/util/db" + "github.com/argoproj/argo-cd/v2/util/settings" clustercache "github.com/argoproj/gitops-engine/pkg/cache" "github.com/stretchr/testify/assert" diff --git a/controller/metrics/metrics.go b/controller/metrics/metrics.go index 77a2c9443355d..d6d95de5bed0d 100644 --- a/controller/metrics/metrics.go +++ b/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" - applister "github.com/argoproj/argo-cd/pkg/client/listers/application/v1alpha1" - "github.com/argoproj/argo-cd/util/git" - "github.com/argoproj/argo-cd/util/healthz" + argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + applister "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/git" + "github.com/argoproj/argo-cd/v2/util/healthz" ) type MetricsServer struct { diff --git a/controller/metrics/metrics_test.go b/controller/metrics/metrics_test.go index 3fcf13c604898..f526f8098fa2f 100644 --- a/controller/metrics/metrics_test.go +++ b/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" - appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/fake" - appinformer "github.com/argoproj/argo-cd/pkg/client/informers/externalversions" - applister "github.com/argoproj/argo-cd/pkg/client/listers/application/v1alpha1" + argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/fake" + appinformer "github.com/argoproj/argo-cd/v2/pkg/client/informers/externalversions" + applister "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1" ) const fakeApp = ` diff --git a/controller/metrics/transportwrapper.go b/controller/metrics/transportwrapper.go index 2499625a7cbc0..637619bcd2881 100644 --- a/controller/metrics/transportwrapper.go +++ b/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 diff --git a/controller/sharding/sharding.go b/controller/sharding/sharding.go index f79c314f26bb7..1c0615196bd06 100644 --- a/controller/sharding/sharding.go +++ b/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) { diff --git a/controller/sharding/sharding_test.go b/controller/sharding/sharding_test.go index 459ebc0320df7..dc27726f8a6fa 100644 --- a/controller/sharding/sharding_test.go +++ b/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" ) diff --git a/controller/state.go b/controller/state.go index 1041a20362104..73d8123572319 100644 --- a/controller/state.go +++ b/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" - statecache "github.com/argoproj/argo-cd/controller/cache" - "github.com/argoproj/argo-cd/controller/metrics" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned" - "github.com/argoproj/argo-cd/reposerver/apiclient" - "github.com/argoproj/argo-cd/util/argo" - appstatecache "github.com/argoproj/argo-cd/util/cache/appstate" - "github.com/argoproj/argo-cd/util/db" - "github.com/argoproj/argo-cd/util/gpg" - argohealth "github.com/argoproj/argo-cd/util/health" - "github.com/argoproj/argo-cd/util/io" - "github.com/argoproj/argo-cd/util/settings" - "github.com/argoproj/argo-cd/util/stats" + "github.com/argoproj/argo-cd/v2/common" + statecache "github.com/argoproj/argo-cd/v2/controller/cache" + "github.com/argoproj/argo-cd/v2/controller/metrics" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + "github.com/argoproj/argo-cd/v2/util/argo" + appstatecache "github.com/argoproj/argo-cd/v2/util/cache/appstate" + "github.com/argoproj/argo-cd/v2/util/db" + "github.com/argoproj/argo-cd/v2/util/gpg" + argohealth "github.com/argoproj/argo-cd/v2/util/health" + "github.com/argoproj/argo-cd/v2/util/io" + "github.com/argoproj/argo-cd/v2/util/settings" + "github.com/argoproj/argo-cd/v2/util/stats" ) type resourceInfoProviderStub struct { diff --git a/controller/state_test.go b/controller/state_test.go index 5288973b5101a..a7df7f162b950 100644 --- a/controller/state_test.go +++ b/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" - argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/reposerver/apiclient" - "github.com/argoproj/argo-cd/test" + "github.com/argoproj/argo-cd/v2/common" + argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + "github.com/argoproj/argo-cd/v2/test" ) // TestCompareAppStateEmpty tests comparison when both git and live have no objects diff --git a/controller/sync.go b/controller/sync.go index d1d85d85a3690..ea1f49e0fbe36 100644 --- a/controller/sync.go +++ b/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" - "github.com/argoproj/argo-cd/controller/metrics" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - listersv1alpha1 "github.com/argoproj/argo-cd/pkg/client/listers/application/v1alpha1" - "github.com/argoproj/argo-cd/util/argo" - logutils "github.com/argoproj/argo-cd/util/log" - "github.com/argoproj/argo-cd/util/lua" - "github.com/argoproj/argo-cd/util/rand" + cdcommon "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/controller/metrics" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + listersv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/argo" + logutils "github.com/argoproj/argo-cd/v2/util/log" + "github.com/argoproj/argo-cd/v2/util/lua" + "github.com/argoproj/argo-cd/v2/util/rand" ) var syncIdPrefix uint64 = 0 diff --git a/controller/sync_test.go b/controller/sync_test.go index 1c6b2fc543dbd..e42468d6a6dbf 100644 --- a/controller/sync_test.go +++ b/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/reposerver/apiclient" - "github.com/argoproj/argo-cd/test" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + "github.com/argoproj/argo-cd/v2/test" ) func TestPersistRevisionHistory(t *testing.T) { diff --git a/docs/developer-guide/ci.md b/docs/developer-guide/ci.md index 79e9309fe1aec..4d830332a911d 100644 --- a/docs/developer-guide/ci.md +++ b/docs/developer-guide/ci.md @@ -63,12 +63,12 @@ make builder-image IMAGE_NAMESPACE=argoproj IMAGE_TAG=v1.0.0 ## Public CD -Every commit to master is built and published to `docker.pkg.github.com/argoproj/argo-cd/argocd:-`. The list of images is available at +Every commit to master is built and published to `ghcr.io/argoproj/argocd:-`. The list of images is available at https://github.com/argoproj/argo-cd/packages. !!! note Github docker registry [requires](https://github.community/t5/GitHub-Actions/docker-pull-from-public-GitHub-Package-Registry-fail-with-quot/m-p/32888#M1294) authentication to read even publicly available packages. Follow the steps from Kubernetes [documentation](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry) - to configure image pull secret if you want to use `docker.pkg.github.com/argoproj/argo-cd/argocd` image. + to configure image pull secret if you want to use `ghcr.io/argoproj/argocd` image. The image is automatically deployed to the dev Argo CD instance: [https://cd.apps.argoproj.io/](https://cd.apps.argoproj.io/) diff --git a/docs/developer-guide/contributing.md b/docs/developer-guide/contributing.md index dffa562549620..a608260b71a48 100644 --- a/docs/developer-guide/contributing.md +++ b/docs/developer-guide/contributing.md @@ -319,3 +319,9 @@ The final step is running the End-to-End testsuite, which makes sure that your K * When all components have started, run `make test-e2e-local` to run the end-to-end tests against your local services. For more information about End-to-End tests, refer to the [End-to-End test documentation](test-e2e.md). + + +## Enhancement proposals + +If you are proposing a major feature, change in design or process refactor, please help define how it would look like with a new enhancement proposal as described in the enhancement proposal [template](/docs/proposals/001-proposal-template.md). + diff --git a/docs/developer-guide/use-gitpod.md b/docs/developer-guide/use-gitpod.md new file mode 100644 index 0000000000000..a670baf9039c1 --- /dev/null +++ b/docs/developer-guide/use-gitpod.md @@ -0,0 +1,43 @@ +# Use Gitpod + +[Gitpod](https://www.gitpod.io/) is an open-source platform for automated and ready-to-code development environments. +GitPod is probably the easiest way to get ready to use development environment with the most tools that are required +for Argo CD development. + +## How To Use It + +1. Fork [https://github.com/argoproj/argo-cd](https://github.com/argoproj/argo-cd) repository +1. Create Gitpod workspace by opening the following url in the browser: + https://gitpod.io/#https://github.com//argo-cd + `The is your Github username` + +1. Once workspace is created you should see VSCode editor in the browser as well as workspace initialization + logs in the VSCode terminal. The initialization process downloads all backend and UI dependencies as well + as starts K8S control plane powered by Kubebuilder [envtest](https://book.kubebuilder.io/reference/envtest.html). + Please wait until you see `Kubeconfig is available at /tmp/kubeconfig` message: + + ![image](https://user-images.githubusercontent.com/426437/113638085-e46be080-962a-11eb-943b-24c29171fb2b.png) + +1. You are ready to go! + +Once your workspace is ready you can use VS Code to make code changes. Run `goreman start` to start Argo CD components +and test your changes. Use the Gitpod user interface or [CLI](https://www.gitpod.io/docs/command-line-interface/) to +access Argo CD API/UI from your laptop. + +## Why/When To Use It? + +Gitpod is a perfect tool in following cases: + +* you are a first-time contributor and eager to start coding; +* you are traveling and don't want to setup development tools on your laptop; +* you want to review pull request and need to quickly run code from the PR without changing your local setup; + +## Limitations + +There are some known limitations: + +* You can only use VS Code +* Free plan provides 50 hours per month +* [Envtest](https://book.kubebuilder.io/reference/envtest.html) based Kubernetes is only control plane. + So you won't be able to deploy Argo CD applications that runs actual pods. +* Codegen tools are not available. E.g. you won't be able to use `make codegen-local`. \ No newline at end of file diff --git a/docs/operator-manual/argocd-cm.yaml b/docs/operator-manual/argocd-cm.yaml index ca5f945040da3..5b949aee62b27 100644 --- a/docs/operator-manual/argocd-cm.yaml +++ b/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 diff --git a/docs/operator-manual/high_availability.md b/docs/operator-manual/high_availability.md index 15df5535ed2fd..c0e8e58eff9fa 100644 --- a/docs/operator-manual/high_availability.md +++ b/docs/operator-manual/high_availability.md @@ -2,7 +2,7 @@ Argo CD is largely stateless, all data is persisted as Kubernetes objects, which in turn is stored in Kubernetes' etcd. Redis is only used as a throw-away cache and can be lost. When lost, it will be rebuilt without loss of service. -A set HA of manifests are provided for users who wish to run Argo CD in a highly available manner. This runs more containers, and run Redis in HA mode. +A set of HA manifests are provided for users who wish to run Argo CD in a highly available manner. This runs more containers, and runs Redis in HA mode. [Manifests ⧉](https://github.com/argoproj/argo-cd/tree/master/manifests) diff --git a/docs/operator-manual/ingress.md b/docs/operator-manual/ingress.md index 782250e08fd57..a41f929f6c5d3 100644 --- a/docs/operator-manual/ingress.md +++ b/docs/operator-manual/ingress.md @@ -380,7 +380,7 @@ spec: Once we create this service, we can configure the Ingress to conditionally route all `application/grpc` traffic to the new HTTP2 backend, using the `alb.ingress.kubernetes.io/conditions` annotation, as seen below. Note: The value after the . in the condition annotation _must_ be the same name as the service that you want traffic to route to - and will be applied on any path with a matching serviceName. ```yaml - apiVersion: networking.k8s.io/v1 # Use extensions/v1beta1 for Kubernetes 1.14 and older + apiVersion: networking.k8s.io/v1 # Use extensions/v1beta1 for Kubernetes 1.18 and older kind: Ingress metadata: annotations: diff --git a/docs/operator-manual/user-management/google.md b/docs/operator-manual/user-management/google.md index c432771584881..354f93d4fac64 100644 --- a/docs/operator-manual/user-management/google.md +++ b/docs/operator-manual/user-management/google.md @@ -34,6 +34,7 @@ data: - Base64 encode the contents of the certificate file, for example: - `$ cat ArgoCD.cer | base64` - *Keep a copy of the encoded output to be used in the next section.* + - *Ensure that the certificate is in PEM format before base64 encoding* ![Google Admin IdP Metadata](../../assets/google-admin-idp-metadata.png "A screenshot of the Google IdP metadata") diff --git a/docs/proposals/001-proposal-template.md b/docs/proposals/001-proposal-template.md new file mode 100644 index 0000000000000..5d0d25f935db1 --- /dev/null +++ b/docs/proposals/001-proposal-template.md @@ -0,0 +1,111 @@ +--- +title: Neat-enhancement-idea +authors: + - "@sbose78" # Authors' github accounts here. +sponsors: + - TBD # List all intereste parties here. +reviewers: + - "@alexmt" + - TBD +approvers: + - "@alexmt" + - TBD + +creation-date: yyyy-mm-dd +last-updated: yyyy-mm-dd +--- + +# Neat Enhancement Idea + +This is the title of the enhancement. Keep it simple and descriptive. A good title can help +communicate what the enhancement is and should be considered as part of any review. + + +## Open Questions [optional] + +This is where to call out areas of the design that require closure before deciding to implement the +design. + + +## Summary + +The `Summary` is required for producing accurate user-focused documentation +such as release notes or a development roadmap. It should be possible to collect this information +before implementation begins in order to avoid requiring implementors to split their attention +between writing release notes and implementing the feature itself. Before you get started with this document, +please feel free to have a conversation on this with the maintainers/community on Github that would help +drive a more organized thought process for the formal proposal here. + +## Motivation + +This section is for explicitly listing the motivation, goals and non-goals of this proposal. +Describe why the change is important and the benefits to users. + +### Goals + +List the specific goals of the proposal and their measurable results. How will we know that this has succeeded? + +### Non-Goals + +What is out of scope for this proposal? Listing non-goals helps to focus discussion and make +progress. + +## Proposal + +This is where we get down to details of what the proposal is about. + +### Use cases + +Add a list of detailed use cases this enhancement intends to take care of. + +## Use case 1: +As a user, I would like to understand the drift. (This is an example) + +## Use case 2: +As a user, I would like to take an action on the deviation/drift. (This is an example) + +### Implementation Details/Notes/Constraints [optional] + +What are the caveats to the implementation? What are some important details that didn't come across +above. Go in to as much detail as necessary here. This might be a good place to talk about core +concepts and how they relate. + +You may have a work-in-progress Pull Request to demonstrate the functioning of the enhancement you are proposing. + +### Detailed examples + +### Security Considerations + +* How does this proposal impact the security aspects of Argo CD workloads ? +* Are there any unresolved follow-ups that need to be done to make the enhancement more robust ? + +### Risks and Mitigations + +What are the risks of this proposal and how do we mitigate. Think broadly. + +For example, consider +both security and how this will impact the larger Kubernetes ecosystem. + +Consider including folks that also work outside your immediate sub-project. + + +### Upgrade / Downgrade Strategy + +If applicable, how will the component be upgraded and downgraded? Make sure this is in the test +plan. + +Consider the following in developing an upgrade/downgrade strategy for this enhancement: + +- What changes (in invocations, configurations, API use, etc.) is an existing cluster required to + make on upgrade in order to keep previous behavior? +- What changes (in invocations, configurations, API use, etc.) is an existing cluster required to + make on upgrade in order to make use of the enhancement? + +## Drawbacks + +The idea is to find the best form of an argument why this enhancement should _not_ be implemented. + +## Alternatives + +Similar to the `Drawbacks` section the `Alternatives` section is used to highlight and record other +possible approaches to delivering the value proposed by an enhancement. \ No newline at end of file diff --git a/docs/user-guide/kustomize.md b/docs/user-guide/kustomize.md index 6e027468453f2..77cc64358cd2a 100644 --- a/docs/user-guide/kustomize.md +++ b/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.` 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.` fields of `argocd-cm` ConfigMap to register bundled additional versions. +use `kustomize.path.` 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.version.v3.5.4: /custom-tools/kustomize_3_5_4 + kustomize.path.v3.5.1: /custom-tools/kustomize_3_5_1 + 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: diff --git a/go.mod b/go.mod index 92ed17ab657fa..0d267d9b30345 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/argoproj/argo-cd +module github.com/argoproj/argo-cd/v2 go 1.16 @@ -7,7 +7,7 @@ require ( 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.1-0.20210325215106-1ce2acc845d2 + github.com/argoproj/gitops-engine v0.3.1-0.20210405221516-2a9c1448b292 github.com/argoproj/pkg v0.2.0 github.com/bombsimon/logrusr v1.0.0 github.com/bradleyfalzon/ghinstallation v1.1.1 @@ -20,6 +20,7 @@ require ( github.com/evanphx/json-patch v4.9.0+incompatible github.com/fsnotify/fsnotify v1.4.9 github.com/ghodss/yaml v1.0.0 + github.com/go-git/go-git/v5 v5.2.0 github.com/go-logr/logr v0.4.0 github.com/go-openapi/loads v0.19.4 github.com/go-openapi/runtime v0.19.4 @@ -70,7 +71,6 @@ require ( google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a google.golang.org/grpc v1.33.1 gopkg.in/go-playground/webhooks.v5 v5.11.0 - gopkg.in/src-d/go-git.v4 v4.13.1 gopkg.in/yaml.v2 v2.3.0 k8s.io/api v0.20.4 k8s.io/apiextensions-apiserver v0.20.4 @@ -81,8 +81,9 @@ require ( k8s.io/klog/v2 v2.5.0 k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd k8s.io/kubectl v0.20.4 - k8s.io/utils v0.0.0-20201110183641-67b214c5f920 + k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 layeh.com/gopher-json v0.0.0-20190114024228-97fed8db8427 + sigs.k8s.io/controller-runtime v0.8.3 sigs.k8s.io/yaml v1.2.0 ) diff --git a/go.sum b/go.sum index f96371ff88395..21af029896855 100644 --- a/go.sum +++ b/go.sum @@ -110,8 +110,8 @@ github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/argoproj/gitops-engine v0.3.1-0.20210325215106-1ce2acc845d2 h1:SAzMwXM3dXNRam/iuNrvQ56KFA71b3Kcpuc2hzbxJVU= -github.com/argoproj/gitops-engine v0.3.1-0.20210325215106-1ce2acc845d2/go.mod h1:IBHhAkqlC+3r/wBWUitWSidQhPzlLoSTWp2htq3dyQk= +github.com/argoproj/gitops-engine v0.3.1-0.20210405221516-2a9c1448b292 h1:ks7zpvEfF7cWwZtq9oJEJ/msBNQP70Kt7ii6Nc0cNgo= +github.com/argoproj/gitops-engine v0.3.1-0.20210405221516-2a9c1448b292/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 h1:QEF07wC0T1rKkctt1RINW/+RMTVmiwxETico2l3gxJA= @@ -234,6 +234,7 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:ma github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg= @@ -280,6 +281,7 @@ github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= github.com/euank/go-kmsg-parser v2.0.0+incompatible h1:cHD53+PLQuuQyLZeriD1V/esuG4MuU0Pjs5y6iknohY= github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod h1:MhmAMZ8V4CYH4ybgdRwPr2TU5ThnS43puaKEMpja1uw= +github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.9.0+incompatible h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM= @@ -291,6 +293,7 @@ github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= 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 h1:WXb3TSNmHp2vHoCroCIB1foO/yQ36swABL8aOVeDpgg= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= @@ -313,6 +316,14 @@ github.com/go-acme/lego v2.5.0+incompatible h1:5fNN9yRQfv8ymH3DSsxla+4aYeQt2IgfZ github.com/go-acme/lego v2.5.0+incompatible/go.mod h1:yzMNe9CasVUhkquNvti5nAtPmG94USbYxYrZfTkIn0M= github.com/go-bindata/go-bindata v3.1.1+incompatible h1:tR4f0e4VTO7LK6B2YWyAoVEzG9ByG1wrXB4TL9+jiYg= github.com/go-bindata/go-bindata v3.1.1+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo= +github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= +github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= +github.com/go-git/go-billy/v5 v5.0.0 h1:7NQHvd9FVid8VL4qVUMm8XifBK+2xCoZ2lSk0agRrHM= +github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= +github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12 h1:PbKy9zOy4aAKrJ5pibIRpVO2BXnK1Tlcg+caKI7Ox5M= +github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw= +github.com/go-git/go-git/v5 v5.2.0 h1:YPBLG/3UK1we1ohRkncLjaXWLW+HKp5QNM/jTli2JgI= +github.com/go-git/go-git/v5 v5.2.0/go.mod h1:kh02eMX+wdqqxgNMEyq8YgwlIOsDOa9homkUq1PoTMs= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 h1:QbL/5oDUmRBzO9/Z7Seo6zf912W/a6Sr4Eu0G/3Jho0= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -326,10 +337,11 @@ github.com/go-logfmt/logfmt v0.4.0 h1:MP4Eh7ZCb31lleYCFuwm0oe4/YGak+5l1vA2NOE80n github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v0.3.0 h1:q4c+kbcR0d5rSurhBR8dIgieOaYpXtsdTYfx22Cu6rs= github.com/go-logr/logr v0.3.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v0.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/zapr v0.2.0 h1:v6Ji8yBW77pva6NkJKQdHLAJKrIJKRHz0RXwPqCHSR4= +github.com/go-logr/zapr v0.2.0/go.mod h1:qhKdvif7YF5GI9NWEpyxTSSBdGmzkNguibrdCNVPunU= github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= @@ -433,8 +445,6 @@ github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/cadvisor v0.38.6 h1:5vu8NaOqsBKF6wOxBLeDPD7hcmxfg/4I5NZGYXK7gIo= -github.com/google/cadvisor v0.38.6/go.mod h1:1OFB9sOOMkBdUBGCO/1SArawTnDscgMzTodacVDe8mA= github.com/google/cadvisor v0.38.7 h1:ZWyUz+23k1PRmEA+yrnDGtEC6IuU4Vc6439x2NQLHnA= github.com/google/cadvisor v0.38.7/go.mod h1:1OFB9sOOMkBdUBGCO/1SArawTnDscgMzTodacVDe8mA= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -472,8 +482,9 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gnostic v0.4.1 h1:DLJCy1n/vrD4HPjOvYcT8aYQXpPIzoRZONaYwyycI+I= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= +github.com/googleapis/gnostic v0.5.1 h1:A8Yhf6EtqTv9RMsU6MQTyrtV1TjWlR6xU9BsZIwuTCM= +github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= github.com/gophercloud/gophercloud v0.1.0 h1:P/nh25+rzXouhytV2pUHBb65fnds26Ghl8/391+sT5o= github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= @@ -523,8 +534,9 @@ github.com/hashicorp/go.net v0.0.1 h1:sNCoNyDEvN1xa+X0baata4RdcpKwcMS6DH+xwfqPgj github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= +github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y= @@ -543,8 +555,10 @@ github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6 h1:UDMh68UUwekSh5iP2OMhRRZJiiBccgV7axzUG8vi56c= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.10 h1:6q5mVkdH/vYmqngx7kZQTjJ5HRsx+ImorDIEQ+beJgc= +github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/improbable-eng/grpc-web v0.0.0-20181111100011-16092bd1d58a h1:RweVA0vnEyStwtAelyGmnU8ENDnwd1Q7pQr7U3J/rXo= github.com/improbable-eng/grpc-web v0.0.0-20181111100011-16092bd1d58a/go.mod h1:6hRR09jOEG81ADP5wCQju1z71g6OL4eEvELdran/3cs= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= @@ -603,11 +617,11 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.5 h1:hyz3dwM5QLc1Rfoz4FuWJQG5BN7tc6K1MndAUnGpQr4= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= -github.com/kr/pty v1.1.8 h1:AkaSdXYQOWeaO3neb8EM634ahkXXe3jYbVh/F9lq+GI= -github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4= github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/libopenstorage/openstorage v1.0.0 h1:GLPam7/0mpdP8ZZtKjbfcXJBTIA/T1O6CBErVEFEyIM= @@ -717,6 +731,8 @@ github.com/naoina/go-stringutil v0.1.0 h1:rCUeRUHjBjGTSHl0VC00jUPLz8/F9dDzYI70Hz github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= github.com/naoina/toml v0.1.1 h1:PT/lllxVVN0gzzSqSlHEmP8MJB4MY2U7STGxiouV4X8= github.com/naoina/toml v0.1.1/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= @@ -730,6 +746,7 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.14.2 h1:8mVmC9kjFFmA8H4pKMUhcblgifdkOIXPvbhN1T36q1M= github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= @@ -737,6 +754,7 @@ github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3 h1:gph6h/qe9GSUw1NhH1gp+qb+h8rXD8Cy60Z32Qw3ELA= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -758,8 +776,6 @@ github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaR github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= -github.com/pelletier/go-buffruneio v0.2.0 h1:U4t4R6YkofJ5xHm3dJzuRpPZ0mr5MMCoAWooScCR7aA= -github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= @@ -868,8 +884,8 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.7.0 h1:xVKxvI7ouOI5I+U9s2eeiUfMaWBVoXA3AWskkrqK0VM= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4= -github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= +github.com/stoewer/go-strcase v1.2.0 h1:Z2iHWqGXH00XYgqDmNgQbIBxf3wrNq0F3feEy0ainaU= +github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/storageos/go-api v2.2.0+incompatible h1:U0SablXoZIg06gvSlg8BCdzq1C/SkHVygOVX95Z2MU0= github.com/storageos/go-api v2.2.0+incompatible/go.mod h1:ZrLn+e0ZuF3Y65PNF6dIwbJPZqfmtCXxFm9ckv0agOY= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -953,12 +969,20 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opentelemetry.io/otel v0.13.0 h1:2isEnyzjjJZq6r2EKMsFj4TxiQiexsM04AVhwbR/oBA= go.opentelemetry.io/otel v0.13.0/go.mod h1:dlSNewoRYikTkotEnxdmuBHgzT+k/idJSfDv/FxEnOY= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI= +go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= +go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0= +go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM= +go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= +go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/zap v1.8.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.15.0 h1:ZZCA22JRF2gQE5FoNmhmrf7jeJJ2uhqDUNRYKm8dvmM= +go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -972,8 +996,8 @@ golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -1161,10 +1185,12 @@ golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1189,6 +1215,8 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gomodules.xyz/jsonpatch/v2 v2.1.0 h1:Phva6wqu+xR//Njw6iorylFFgn/z547tw5Ne3HZPQ+k= +gomodules.xyz/jsonpatch/v2 v2.1.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= gonum.org/v1/gonum v0.6.2 h1:4r+yNT0+8SWcOkXP+63H2zQbN+USnC73cjGUxnDF94Q= @@ -1215,6 +1243,7 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -1251,8 +1280,9 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQ gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.25 h1:Ev7yu1/f6+d+b3pi5vPdRPc6nNtP1umSfcWiEfRqv6I= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8= @@ -1274,12 +1304,6 @@ gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXL gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/square/go-jose.v2 v2.2.2 h1:orlkJ3myw8CN1nVQHBFfloD+L3egixIa4FvUP6RosSA= gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg= -gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= -gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 h1:ivZFOIltbce2Mo8IjzUHAFoq/IylO9WHhNOAJK+LsJg= -gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= -gopkg.in/src-d/go-git.v4 v4.13.1 h1:SRtFyV8Kxc0UP7aCHcijOMQGPxHSmMOPrzulQWolkYE= -gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.1/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= @@ -1293,8 +1317,9 @@ gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2 h1:kG1BFyqVHuQoVQiR1bWGnfz/fmHvvuiSPIV7rvl360E= @@ -1307,60 +1332,32 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.20.1 h1:ud1c3W3YNzGd6ABJlbFfKXBKXO+1KdGfcgGGNgFR03E= -k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= k8s.io/api v0.20.4 h1:xZjKidCirayzX6tHONRQyTNDVIR55TYVqgATqo6ZULY= k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= -k8s.io/apiextensions-apiserver v0.20.1 h1:ZrXQeslal+6zKM/HjDXLzThlz/vPSxrfK3OqL8txgVQ= -k8s.io/apiextensions-apiserver v0.20.1/go.mod h1:ntnrZV+6a3dB504qwC5PN/Yg9PBiDNt1EVqbW2kORVk= k8s.io/apiextensions-apiserver v0.20.4 h1:VO/Y5PwBdznMIctX/vvgSNhxffikEmcLC/V1bpbhHhU= k8s.io/apiextensions-apiserver v0.20.4/go.mod h1:Hzebis/9c6Io5yzHp24Vg4XOkTp1ViMwKP/6gmpsfA4= -k8s.io/apimachinery v0.20.1 h1:LAhz8pKbgR8tUwn7boK+b2HZdt7MiTu2mkYtFMUjTRQ= -k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4 h1:vhxQ0PPUUU2Ns1b9r4/UFp13UPs8cw2iOoTjnY9faa0= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= -k8s.io/apiserver v0.20.1 h1:yEqdkxlnQbxi/3e74cp0X16h140fpvPrNnNRAJBDuBk= -k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4 h1:zMMKIgIUDIFiwK3LyY7qOV4Z4wKsHVYExL6vXY9fPX4= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= -k8s.io/cli-runtime v0.20.1 h1:fJhRQ9EfTpJpCqSFOAqnYLuu5aAM7yyORWZ26qW1jJc= -k8s.io/cli-runtime v0.20.1/go.mod h1:6wkMM16ZXTi7Ow3JLYPe10bS+XBnIkL6V9dmEz0mbuY= k8s.io/cli-runtime v0.20.4 h1:jVU13lBeebHLtarHeHkoIi3uRONFzccmP7hHLzEoQ4w= k8s.io/cli-runtime v0.20.4/go.mod h1:dz38e1CM4uuIhy8PMFUZv7qsvIdoE3ByZYlmbHNCkt4= -k8s.io/client-go v0.20.1 h1:Qquik0xNFbK9aUG92pxHYsyfea5/RPO9o9bSywNor+M= -k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/client-go v0.20.4 h1:85crgh1IotNkLpKYKZHVNI1JT86nr/iDCvq2iWKsql4= k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= -k8s.io/cloud-provider v0.20.1 h1:YV8bd58oeJZWd6gDzmsFc3IJSiS8mkpjcSgvWmnEXfE= -k8s.io/cloud-provider v0.20.1/go.mod h1:x2E8iyhfwoxQbk361wNBdTCFTQNKx8m/ZcxQPxpmFfE= k8s.io/cloud-provider v0.20.4 h1:wy5PE9CM3V7tTJ1rqAP8c3BIy/uZZoMdGijCOxvPOeo= k8s.io/cloud-provider v0.20.4/go.mod h1:wbU+iVZIWA3+iDEK5q8Ki9de1cgIHixr2B7LzO2nAjg= -k8s.io/cluster-bootstrap v0.20.1 h1:e1RTKolC9GA6MfYtCbxWsorCkcnx+3dWqYeLSGt7aDM= -k8s.io/cluster-bootstrap v0.20.1/go.mod h1:Xnom8jy4bkF9pz1w7XQAZYQWMYF4m3CSCTqYiehDdXI= k8s.io/cluster-bootstrap v0.20.4 h1:F9NSfGzWyl8Nhh8xU6p5No2S0RThysxYsFr2EuJZBxo= k8s.io/cluster-bootstrap v0.20.4/go.mod h1:WemJ9DOVs8DOvG+XjpQv29otMJHRazmR8gDnJPs4qA4= -k8s.io/code-generator v0.20.1 h1:kre3GNich5gbO3d1FyTT8fHI4ZJezZV217yFdWlQaRQ= -k8s.io/code-generator v0.20.1/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg= k8s.io/code-generator v0.20.4 h1:FhilVnvwMFVs65SxIQjXSOznGmzJIZEk3CCk/SULBfk= k8s.io/code-generator v0.20.4/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg= -k8s.io/component-base v0.20.1 h1:6OQaHr205NSl24t5wOF2IhdrlxZTWEZwuGlLvBgaeIg= -k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= k8s.io/component-base v0.20.4 h1:gdvPs4G11e99meQnW4zN+oYOjH8qkLz1sURrAzvKWqc= k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= -k8s.io/component-helpers v0.20.1 h1:Sw6bB6AHPPaI+Q3s3WNPjP2iHbuME252in03HvXXTEM= -k8s.io/component-helpers v0.20.1/go.mod h1:Q8trCj1zyLNdeur6pD2QvsF8d/nWVfK71YjN5+qVXy4= k8s.io/component-helpers v0.20.4 h1:3XJi6w+AcLd5f3ZwSRfgWuHFnUCmMAaRsUt2+NGDyQ0= k8s.io/component-helpers v0.20.4/go.mod h1:S7jGg8zQp3kwvSzfuGtNaQAMVmvzomXDioTm5vABn9g= -k8s.io/controller-manager v0.20.1 h1:B9O25PcmZaStjlI5Y9ubNZlSfNxwTPeurUngCeV+f/M= -k8s.io/controller-manager v0.20.1/go.mod h1:Wfwz1Sn3ITXiMKO+Z2qhc9b34YgzOL7puRi9jb4wIUo= k8s.io/controller-manager v0.20.4 h1:MwaI7deb9NhqyxaWTcOeocDGWXy0U65hZH+qGA8esSA= k8s.io/controller-manager v0.20.4/go.mod h1:WEvFUeeywQl0dIUvorC8Zx/vSqgB8sGKrzNncUEcjlE= -k8s.io/cri-api v0.20.1 h1:b4l7SZ9+VPfIrrJnMXzm0HR9wAsHwHh9+QcmK31nQMI= -k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= k8s.io/cri-api v0.20.4 h1:AwwzhJMfaxiw8NnEJAUQI+FWlX1mAp9tHODTVxnkEQg= k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= -k8s.io/csi-translation-lib v0.20.1 h1:2voWQcGKSzKgr+snfE7u1CqBaV6GBmRt13+Z5fMOqTI= -k8s.io/csi-translation-lib v0.20.1/go.mod h1:Jk3Ta91UveSd54W44P8qCXB57BQy7uqUrLaBqhT/4z4= k8s.io/csi-translation-lib v0.20.4 h1:I5qDIDPlVxcxfoQuZ1EoRkR0YtOTwtmLVtDFuafW1Go= k8s.io/csi-translation-lib v0.20.4/go.mod h1:WisLItCdoDKB4lr6nkhzQsfgBNBJDI/TD9m4Crw92JM= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= @@ -1368,66 +1365,40 @@ k8s.io/gengo v0.0.0-20201113003025-83324d819ded h1:JApXBKYyB7l9xx+DK7/+mFjC7A9Bt k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/heapster v1.2.0-beta.1 h1:lUsE/AHOMHpi3MLlBEkaU8Esxm5QhdyCrv1o7ot0s84= k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM= -k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= -k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.5.0 h1:8mOnjf1RmUPW6KRqQCfYSZq/K20Unmp3IhuZUhxl8KI= k8s.io/klog/v2 v2.5.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/kube-aggregator v0.20.1 h1:IPiL4l4ODmpzfte6LSYXbXuDyuYmTDZ4vQIcLS9NIZ0= -k8s.io/kube-aggregator v0.20.1/go.mod h1:1ZeyRfSg5HcRI8dihvWAc7VpXSMAw9UmZoWXBUOPyew= k8s.io/kube-aggregator v0.20.4 h1:j/SUwPy1eO+ud3XOUGmH18gISPyerqhXOoNRZDbv3fs= k8s.io/kube-aggregator v0.20.4/go.mod h1:0ixQ9De7KXyHteXizS6nVtrnKqGa4kiuxl9rEBsNccw= -k8s.io/kube-controller-manager v0.20.1 h1:C8HkbnirGRVyvW0pP/vCYsJDWu5T6iFox9QUMJmKrrg= -k8s.io/kube-controller-manager v0.20.1/go.mod h1:9iwMjyiO1pzgO9b2WvWmGoTilkal4ke7ceCcNWW6NAI= k8s.io/kube-controller-manager v0.20.4 h1:vyZOuF0zU9NRku3snWleE3KzL5Hzy2kD7zJ2tyC8IWo= k8s.io/kube-controller-manager v0.20.4/go.mod h1:HCVTzFZhw/dtTgfeF2mEUSZZM++poC6qUhNmZ5yRELk= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd h1:sOHNzJIkytDF6qadMNKhhDRpc6ODik8lVC6nOur7B2c= -k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd h1:sOHNzJIkytDF6qadMNKhhDRpc6ODik8lVC6nOur7B2c= -k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= -k8s.io/kube-proxy v0.20.1 h1:XKrkJ2UEgZkooHQxTSzGA+nmhlgGnp+nP9k93ljO4dM= -k8s.io/kube-proxy v0.20.1/go.mod h1:/PlQONAFpILYSKgmAg4sNsmlrXqPgwMSce/pWBtbbzk= k8s.io/kube-proxy v0.20.4 h1:bKRlKwhOQlMtGCnBJhgWLdNPGvYW6+1yBmG/sj6OkgI= k8s.io/kube-proxy v0.20.4/go.mod h1:FU0h3UFlM/n/NorYVzchOCYZa/eGyo/VdWpvrhtkPsY= -k8s.io/kube-scheduler v0.20.1 h1:GdSS7ejpeg3MmnDCBilQ8dzRg7fHO0XsYP+47ua1C1Y= -k8s.io/kube-scheduler v0.20.1/go.mod h1:3LrKGlT1iM1rsc4S8wSkTUaVrFsptQixESqBrtM0e6o= k8s.io/kube-scheduler v0.20.4 h1:aU/B/mP7cN75dOFUrvZSEnDa3Rp0wvNd8Fy+WlEihlk= k8s.io/kube-scheduler v0.20.4/go.mod h1:w1/IOIJ6q9K1TQ/9sQBvNDSvi9ylZgJaedkwWU5l9bA= -k8s.io/kubectl v0.20.1 h1:7h1vSrL/B3hLrhlCJhbTADElPKDbx+oVUt3+QDSXxBo= -k8s.io/kubectl v0.20.1/go.mod h1:2bE0JLYTRDVKDiTREFsjLAx4R2GvUtL/mGYFXfFFMzY= k8s.io/kubectl v0.20.4 h1:Y1gUiigiZM+ulcrnWeqSHlTd0/7xWcQIXjuMnjtHyoo= k8s.io/kubectl v0.20.4/go.mod h1:yCC5lUQyXRmmtwyxfaakryh9ezzp/bT0O14LeoFLbGo= -k8s.io/kubelet v0.20.1 h1:HfTFK95qWKMyY/UzT4C19/ke5pOlTp65z6mHiPIQ1Fc= -k8s.io/kubelet v0.20.1/go.mod h1:5zyqbuxkRJYcxNrh33VwHxd6T7HdqpuzpFldjgX8JMg= k8s.io/kubelet v0.20.4 h1:yTD3mHQsoqOKWUAEYna6egOF8qzvdCeBcpTSS4lL6rw= k8s.io/kubelet v0.20.4/go.mod h1:Jtubfqr/TlXcOMaUYWoGVkuY/iM5xmZiEukcJSJs0ns= -k8s.io/kubernetes v1.20.1 h1:SHJ+Ua3v2nzKB6JEGJilKv/JIiVJFo+dCs707Z3H0nk= -k8s.io/kubernetes v1.20.1/go.mod h1:v2E/T5A+ikBt81n9HZ8VVns5IXSsMHP1ITIFuHY3d5s= k8s.io/kubernetes v1.20.4 h1:gPeOspTx01shAQuFhae+O7ZfU0WKlD7RE5L0pooU0g8= k8s.io/kubernetes v1.20.4/go.mod h1:5oh+vhVyWep2o+IH61i3aU4e/Q77Yt96tcKwYOpVbvk= -k8s.io/legacy-cloud-providers v0.20.1 h1:CVwM/EzlFeW1O7AR/UFt1fBEa6d0PX/zr7AyKcJWaKQ= -k8s.io/legacy-cloud-providers v0.20.1/go.mod h1:r2Qf8WVnfQndTp6dSPPfGRtjO1CoWVbW098M4SI7njY= k8s.io/legacy-cloud-providers v0.20.4 h1:E2Twm/y3dYXlUqTFad38IJGpoimH4fExSQtoaLmC5Dw= k8s.io/legacy-cloud-providers v0.20.4/go.mod h1:whukzxTjXr2SclI8TObPeCFqIyWJ0IfqTb9enRi8Bs8= -k8s.io/metrics v0.20.1 h1:c03Mn9FpIOV3r5WSkF4VelFdlIGH9UYR4onIxrMBnHI= -k8s.io/metrics v0.20.1/go.mod h1:JhpBE/fad3yRGsgEpiZz5FQQM5wJ18OTLkD7Tv40c0s= k8s.io/metrics v0.20.4 h1:SxpF5zcFbUCvF3qzY6WPicp4VVFn9VCMHxnEvrwWJoQ= k8s.io/metrics v0.20.4/go.mod h1:DDXS+Ls+2NAxRcVhXKghRPa3csljyJRjDRjPe6EOg/g= -k8s.io/mount-utils v0.20.1 h1:PI8Qo/3+8Z/1hIEqe3u8PomanMo+6O0ZrO4/+wj7Fbs= -k8s.io/mount-utils v0.20.1/go.mod h1:Jv9NRZ5L2LF87A17GaGlArD+r3JAJdZFvo4XD1cG4Kc= k8s.io/mount-utils v0.20.4 h1:jfrZDJ9u5Jq7n3lJ9UKpp/RsV6M4sCLi0rmM6jiKoQQ= k8s.io/mount-utils v0.20.4/go.mod h1:Jv9NRZ5L2LF87A17GaGlArD+r3JAJdZFvo4XD1cG4Kc= -k8s.io/sample-apiserver v0.20.1 h1:LeArCEfqpr12WvXs6CwZnPQxE3cdimzr1Sp8D/2GZ5g= -k8s.io/sample-apiserver v0.20.1/go.mod h1:Ti0ug/r3ascaPpc7z22LC3jg3+wv7oCpcNPs0YdREes= k8s.io/sample-apiserver v0.20.4 h1:rAfusAeMxAoDwkvCob7b95inhRSUoHOkXz+56H8Nhzs= k8s.io/sample-apiserver v0.20.4/go.mod h1:QoqZx37RKI+i+yQ7mUL5rEaY59OciDCmMRmoIAiKPKs= k8s.io/system-validators v1.2.0 h1:D8clGm3PIsgX0bHoQWQXC8W/rTi6jRKejQGk7z/yuDY= k8s.io/system-validators v1.2.0/go.mod h1:bPldcLgkIUK22ALflnsXk8pvkTEndYdNuaHH6gRrl0Q= -k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 h1:0T5IaWHO3sJTEmCP6mUlBvMukxPKUQWqiI/YuiBNMiQ= +k8s.io/utils v0.0.0-20210111153108-fddb29f9d009/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= layeh.com/gopher-json v0.0.0-20190114024228-97fed8db8427 h1:RZkKxMR3jbQxdCEcglq3j7wY3PRJIopAwBlx1RE71X0= layeh.com/gopher-json v0.0.0-20190114024228-97fed8db8427/go.mod h1:ivKkcY8Zxw5ba0jldhZCYYQfGdb2K6u9tbYK1AwMIBc= modernc.org/cc v1.0.0 h1:nPibNuDEx6tvYrUAtvDTTw98rx5juGsa5zuDnKwEEQQ= @@ -1450,6 +1421,8 @@ rsc.io/sampler v1.3.0 h1:7uVkIFmeBqHfdjD+gZwtXXI+RODJ2Wc4O7MPEh/QiW4= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14 h1:TihvEz9MPj2u0KWds6E2OBUXfwaL4qRJ33c7HGiJpqk= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= +sigs.k8s.io/controller-runtime v0.8.3 h1:GMHvzjTmaWHQB8HadW+dIvBoJuLvZObYJ5YoZruPRao= +sigs.k8s.io/controller-runtime v0.8.3/go.mod h1:U/l+DUopBc1ecfRZ5aviA9JDmGFQKvLf5YkZNx2e0sU= sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0= sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= sigs.k8s.io/structured-merge-diff/v4 v4.0.2 h1:YHQV7Dajm86OuqnIR6zAelnDWBRjo+YhYV9PmGrh1s8= diff --git a/hack/dev-mounter/main.go b/hack/dev-mounter/main.go index 71466680a7020..59212f20579ce 100644 --- a/hack/dev-mounter/main.go +++ b/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" diff --git a/hack/gen-crd-spec/main.go b/hack/gen-crd-spec/main.go index 2cbed900cd4fa..eaa76aa13d73f 100644 --- a/hack/gen-crd-spec/main.go +++ b/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" diff --git a/hack/generate-proto.sh b/hack/generate-proto.sh index f6a2e858176e4..85f8346106724 100755 --- a/hack/generate-proto.sh +++ b/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() { diff --git a/hack/k8s/main.go b/hack/k8s/main.go new file mode 100644 index 0000000000000..99a9ca2deb84c --- /dev/null +++ b/hack/k8s/main.go @@ -0,0 +1,52 @@ +package main + +import ( + "context" + "fmt" + "os" + "os/exec" + "path/filepath" + "time" + + "k8s.io/client-go/kubernetes" + + "github.com/argoproj/argo-cd/v2/util/errors" + + "github.com/argoproj/gitops-engine/pkg/utils/kube" + "sigs.k8s.io/controller-runtime/pkg/envtest" +) + +func main() { + testEnv := envtest.Environment{ + CRDDirectoryPaths: []string{filepath.Join("manifests", "crds")}, + } + println("Starting K8S...") + cfg, err := testEnv.Start() + + errors.CheckError(err) + kubeConfigPath := "/tmp/kubeconfig" + if len(os.Args) > 2 { + kubeConfigPath = os.Args[1] + } + + println(fmt.Sprintf("Kubeconfig is available at %s", kubeConfigPath)) + errors.CheckError(kube.WriteKubeConfig(cfg, "default", kubeConfigPath)) + client, err := kubernetes.NewForConfig(cfg) + errors.CheckError(err) + + attempts := 5 + interval := time.Second + for i := 0; i < attempts; i++ { + _, err = client.ServerVersion() + if err == nil { + break + } + time.Sleep(interval) + } + errors.CheckError(err) + + cmd := exec.Command("kubectl", "apply", "-k", "manifests/base/config") + cmd.Env = []string{fmt.Sprintf("KUBECONFIG=%s", kubeConfigPath)} + errors.CheckError(cmd.Run()) + <-context.Background().Done() +} diff --git a/hack/test.sh b/hack/test.sh index ced037936b13b..23dcf7179908a 100755 --- a/hack/test.sh +++ b/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 diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh index f0d9b0e94f12c..1c44b8b830b6c 100755 --- a/hack/update-codegen.sh +++ b/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 \ No newline at end of file diff --git a/hack/update-openapi.sh b/hack/update-openapi.sh index 389ad136f8dbd..b22531c48c954 100755 --- a/hack/update-openapi.sh +++ b/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} \ - --output-package 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/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 diff --git a/manifests/base/dex/argocd-dex-server-deployment.yaml b/manifests/base/dex/argocd-dex-server-deployment.yaml index 23f049cb8d754..0ecb3d9e781fd 100644 --- a/manifests/base/dex/argocd-dex-server-deployment.yaml +++ b/manifests/base/dex/argocd-dex-server-deployment.yaml @@ -24,11 +24,17 @@ spec: volumeMounts: - mountPath: /shared name: static-files + - mountPath: /tmp + name: dexconfig containers: - name: dex image: ghcr.io/dexidp/dex:v2.27.0 imagePullPolicy: Always command: [/shared/argocd-dex, rundex] + securityContext: + allowPrivilegeEscalation: false + readOnlyRootFilesystem: true + runAsNonRoot: true ports: - containerPort: 5556 - containerPort: 5557 @@ -36,9 +42,13 @@ spec: volumeMounts: - mountPath: /shared name: static-files + - mountPath: /tmp + name: dexconfig volumes: - emptyDir: {} name: static-files + - emptyDir: {} + name: dexconfig affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: diff --git a/manifests/base/redis/argocd-redis-deployment.yaml b/manifests/base/redis/argocd-redis-deployment.yaml index 319c26f4cd687..9203f5d603b19 100644 --- a/manifests/base/redis/argocd-redis-deployment.yaml +++ b/manifests/base/redis/argocd-redis-deployment.yaml @@ -16,9 +16,6 @@ spec: app.kubernetes.io/name: argocd-redis spec: securityContext: - runAsUser: 1000 - runAsGroup: 1000 - fsGroup: 1000 runAsNonRoot: true serviceAccountName: argocd-redis containers: diff --git a/manifests/base/redis/argocd-redis-role.yaml b/manifests/base/redis/argocd-redis-role.yaml deleted file mode 100644 index 37b58fa946eb6..0000000000000 --- a/manifests/base/redis/argocd-redis-role.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - labels: - app.kubernetes.io/component: redis - app.kubernetes.io/name: argocd-redis - app.kubernetes.io/part-of: argocd - name: argocd-redis -rules: -- apiGroups: - - security.openshift.io - resourceNames: - - nonroot - resources: - - securitycontextconstraints - verbs: - - use diff --git a/manifests/base/redis/kustomization.yaml b/manifests/base/redis/kustomization.yaml index afebd7ba28223..f2311df1fefa3 100644 --- a/manifests/base/redis/kustomization.yaml +++ b/manifests/base/redis/kustomization.yaml @@ -3,7 +3,6 @@ kind: Kustomization resources: - argocd-redis-deployment.yaml -- argocd-redis-role.yaml - argocd-redis-rolebinding.yaml - argocd-redis-sa.yaml - argocd-redis-service.yaml diff --git a/manifests/ha/base/redis-ha/kustomization.yaml b/manifests/ha/base/redis-ha/kustomization.yaml index 15c410bd68b38..5b8c95ffd4fe4 100644 --- a/manifests/ha/base/redis-ha/kustomization.yaml +++ b/manifests/ha/base/redis-ha/kustomization.yaml @@ -11,21 +11,7 @@ patchesJson6902: kind: ConfigMap name: argocd-redis-ha-configmap namespace: argocd - path: overlays/remove-namespace.yaml -- target: - group: rbac.authorization.k8s.io - version: v1 - kind: Role - name: argocd-redis-ha - namespace: argocd - path: overlays/add-openshift-nonroot-scc.yaml -- target: - group: rbac.authorization.k8s.io - version: v1 - kind: Role - name: argocd-redis-ha-haproxy - namespace: argocd - path: overlays/add-openshift-nonroot-scc.yaml + path: overlays/remove-namespace.yaml - target: version: v1 group: "" diff --git a/manifests/ha/base/redis-ha/overlays/add-openshift-nonroot-scc.yaml b/manifests/ha/base/redis-ha/overlays/add-openshift-nonroot-scc.yaml deleted file mode 100644 index a669ed824d9c8..0000000000000 --- a/manifests/ha/base/redis-ha/overlays/add-openshift-nonroot-scc.yaml +++ /dev/null @@ -1,11 +0,0 @@ -- op: add - path: /rules/- - value: - apiGroups: - - security.openshift.io - resourceNames: - - nonroot - resources: - - securitycontextconstraints - verbs: - - use \ No newline at end of file diff --git a/manifests/ha/base/redis-ha/overlays/redis-ha-haproxy.yaml b/manifests/ha/base/redis-ha/overlays/redis-ha-haproxy.yaml deleted file mode 100644 index 4f4d6442b024a..0000000000000 --- a/manifests/ha/base/redis-ha/overlays/redis-ha-haproxy.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - labels: - app.kubernetes.io/component: redis - app.kubernetes.io/name: argocd-redis-ha-haproxy - app.kubernetes.io/part-of: argocd - name: argocd-redis-ha-haproxy - namespace: argocd -rules: [] ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - labels: - app.kubernetes.io/component: redis - app.kubernetes.io/name: argocd-redis-ha-haproxy - app.kubernetes.io/part-of: argocd - name: argocd-redis-ha-haproxy - namespace: argocd -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: argocd-redis-ha-haproxy -subjects: -- kind: ServiceAccount - name: argocd-redis-ha-haproxy - - diff --git a/manifests/ha/install.yaml b/manifests/ha/install.yaml index 5e9992ddd2c5d..e9a2c94fee524 100644 --- a/manifests/ha/install.yaml +++ b/manifests/ha/install.yaml @@ -2136,14 +2136,6 @@ rules: - endpoints verbs: - get -- apiGroups: - - security.openshift.io - resourceNames: - - nonroot - resources: - - securitycontextconstraints - verbs: - - use --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role @@ -2162,14 +2154,6 @@ rules: - endpoints verbs: - get -- apiGroups: - - security.openshift.io - resourceNames: - - nonroot - resources: - - securitycontextconstraints - verbs: - - use --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role @@ -3167,9 +3151,15 @@ spec: - containerPort: 5556 - containerPort: 5557 - containerPort: 5558 + securityContext: + allowPrivilegeEscalation: false + readOnlyRootFilesystem: true + runAsNonRoot: true volumeMounts: - mountPath: /shared name: static-files + - mountPath: /tmp + name: dexconfig initContainers: - command: - cp @@ -3182,10 +3172,14 @@ spec: volumeMounts: - mountPath: /shared name: static-files + - mountPath: /tmp + name: dexconfig serviceAccountName: argocd-dex-server volumes: - emptyDir: {} name: static-files + - emptyDir: {} + name: dexconfig --- apiVersion: apps/v1 kind: Deployment diff --git a/manifests/ha/namespace-install.yaml b/manifests/ha/namespace-install.yaml index 8f2745c847261..d32e803a44908 100644 --- a/manifests/ha/namespace-install.yaml +++ b/manifests/ha/namespace-install.yaml @@ -2136,14 +2136,6 @@ rules: - endpoints verbs: - get -- apiGroups: - - security.openshift.io - resourceNames: - - nonroot - resources: - - securitycontextconstraints - verbs: - - use --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role @@ -2162,14 +2154,6 @@ rules: - endpoints verbs: - get -- apiGroups: - - security.openshift.io - resourceNames: - - nonroot - resources: - - securitycontextconstraints - verbs: - - use --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role @@ -3082,9 +3066,15 @@ spec: - containerPort: 5556 - containerPort: 5557 - containerPort: 5558 + securityContext: + allowPrivilegeEscalation: false + readOnlyRootFilesystem: true + runAsNonRoot: true volumeMounts: - mountPath: /shared name: static-files + - mountPath: /tmp + name: dexconfig initContainers: - command: - cp @@ -3097,10 +3087,14 @@ spec: volumeMounts: - mountPath: /shared name: static-files + - mountPath: /tmp + name: dexconfig serviceAccountName: argocd-dex-server volumes: - emptyDir: {} name: static-files + - emptyDir: {} + name: dexconfig --- apiVersion: apps/v1 kind: Deployment diff --git a/manifests/install.yaml b/manifests/install.yaml index e2de0ed1a44cd..69f2f2d8746b9 100644 --- a/manifests/install.yaml +++ b/manifests/install.yaml @@ -2114,24 +2114,6 @@ rules: --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role -metadata: - labels: - app.kubernetes.io/component: redis - app.kubernetes.io/name: argocd-redis - app.kubernetes.io/part-of: argocd - name: argocd-redis -rules: -- apiGroups: - - security.openshift.io - resourceNames: - - nonroot - resources: - - securitycontextconstraints - verbs: - - use ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role metadata: labels: app.kubernetes.io/component: server @@ -2535,9 +2517,15 @@ spec: - containerPort: 5556 - containerPort: 5557 - containerPort: 5558 + securityContext: + allowPrivilegeEscalation: false + readOnlyRootFilesystem: true + runAsNonRoot: true volumeMounts: - mountPath: /shared name: static-files + - mountPath: /tmp + name: dexconfig initContainers: - command: - cp @@ -2550,10 +2538,14 @@ spec: volumeMounts: - mountPath: /shared name: static-files + - mountPath: /tmp + name: dexconfig serviceAccountName: argocd-dex-server volumes: - emptyDir: {} name: static-files + - emptyDir: {} + name: dexconfig --- apiVersion: apps/v1 kind: Deployment @@ -2599,10 +2591,7 @@ spec: ports: - containerPort: 6379 securityContext: - fsGroup: 1000 - runAsGroup: 1000 runAsNonRoot: true - runAsUser: 1000 serviceAccountName: argocd-redis --- apiVersion: apps/v1 diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml index db12d3f83ae58..224d80b058e45 100644 --- a/manifests/namespace-install.yaml +++ b/manifests/namespace-install.yaml @@ -2114,24 +2114,6 @@ rules: --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role -metadata: - labels: - app.kubernetes.io/component: redis - app.kubernetes.io/name: argocd-redis - app.kubernetes.io/part-of: argocd - name: argocd-redis -rules: -- apiGroups: - - security.openshift.io - resourceNames: - - nonroot - resources: - - securitycontextconstraints - verbs: - - use ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role metadata: labels: app.kubernetes.io/component: server @@ -2450,9 +2432,15 @@ spec: - containerPort: 5556 - containerPort: 5557 - containerPort: 5558 + securityContext: + allowPrivilegeEscalation: false + readOnlyRootFilesystem: true + runAsNonRoot: true volumeMounts: - mountPath: /shared name: static-files + - mountPath: /tmp + name: dexconfig initContainers: - command: - cp @@ -2465,10 +2453,14 @@ spec: volumeMounts: - mountPath: /shared name: static-files + - mountPath: /tmp + name: dexconfig serviceAccountName: argocd-dex-server volumes: - emptyDir: {} name: static-files + - emptyDir: {} + name: dexconfig --- apiVersion: apps/v1 kind: Deployment @@ -2514,10 +2506,7 @@ spec: ports: - containerPort: 6379 securityContext: - fsGroup: 1000 - runAsGroup: 1000 runAsNonRoot: true - runAsUser: 1000 serviceAccountName: argocd-redis --- apiVersion: apps/v1 diff --git a/mkdocs.yml b/mkdocs.yml index d8d7c38e01032..47e077d505171 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -108,6 +108,7 @@ nav: - developer-guide/contributing.md - developer-guide/running-locally.md - developer-guide/debugging-remote-environment.md + - developer-guide/use-gitpod.md - developer-guide/api-docs.md - developer-guide/test-e2e.md - developer-guide/dependencies.md diff --git a/pkg/apiclient/account/account.pb.go b/pkg/apiclient/account/account.pb.go index 3701f99fd3479..cf0df3475b596 100644 --- a/pkg/apiclient/account/account.pb.go +++ b/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 - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0xdd, 0x6e, 0xd3, 0x4a, - 0x10, 0x96, 0x93, 0xa6, 0x3f, 0x93, 0x9c, 0xf4, 0x74, 0x4f, 0x9a, 0x63, 0xf9, 0xe4, 0x84, 0x74, - 0x5b, 0xb5, 0xa1, 0xa8, 0xb5, 0x5a, 0x24, 0xfe, 0x6e, 0xaa, 0x52, 0x10, 0xaa, 0xc4, 0x05, 0x84, - 0x9f, 0x8b, 0x72, 0xb5, 0x71, 0x46, 0x61, 0x69, 0x62, 0xbb, 0xde, 0x75, 0x0a, 0x8a, 0x72, 0x03, - 0x8f, 0xc0, 0x15, 0x6f, 0xc4, 0x25, 0x12, 0x2f, 0x80, 0x2a, 0x1e, 0x04, 0x79, 0xbd, 0x76, 0x9c, - 0x9f, 0x22, 0xae, 0xbc, 0x33, 0xb3, 0x3b, 0xdf, 0x37, 0xb3, 0xdf, 0x78, 0xa1, 0x26, 0x30, 0x18, - 0x60, 0x60, 0x33, 0xc7, 0xf1, 0x42, 0x57, 0x26, 0xdf, 0x7d, 0x3f, 0xf0, 0xa4, 0x47, 0x96, 0xb4, - 0x69, 0x55, 0xba, 0x5e, 0xd7, 0x53, 0x3e, 0x3b, 0x5a, 0xc5, 0x61, 0xab, 0xd6, 0xf5, 0xbc, 0x6e, - 0x0f, 0x6d, 0xe6, 0x73, 0x9b, 0xb9, 0xae, 0x27, 0x99, 0xe4, 0x9e, 0x2b, 0xe2, 0x28, 0xbd, 0x84, - 0xf5, 0x57, 0x7e, 0x87, 0x49, 0x7c, 0xc6, 0x84, 0xb8, 0xf4, 0x82, 0x4e, 0x0b, 0x2f, 0x42, 0x14, - 0x92, 0x34, 0xa0, 0xe8, 0xe2, 0x65, 0xe2, 0x35, 0x8d, 0x86, 0xd1, 0x5c, 0x69, 0x65, 0x5d, 0xa4, - 0x09, 0xab, 0x4e, 0x18, 0x04, 0xe8, 0xca, 0x74, 0x57, 0x4e, 0xed, 0x9a, 0x76, 0x13, 0x02, 0x0b, - 0x2e, 0xeb, 0xa3, 0x99, 0x57, 0x61, 0xb5, 0xa6, 0x26, 0x54, 0xa7, 0x81, 0x85, 0xef, 0xb9, 0x02, - 0xa9, 0x03, 0xc5, 0x13, 0xe6, 0x9e, 0x26, 0x44, 0x2c, 0x58, 0x0e, 0x50, 0x78, 0x61, 0xe0, 0xa0, - 0x66, 0x91, 0xda, 0xa4, 0x0a, 0x8b, 0xcc, 0x89, 0xca, 0xd1, 0xc8, 0xda, 0x8a, 0xc8, 0x8b, 0xb0, - 0x9d, 0x1e, 0x8b, 0x71, 0xb3, 0x2e, 0xba, 0x05, 0xa5, 0x18, 0x24, 0x06, 0x25, 0x15, 0x28, 0x0c, - 0x58, 0x2f, 0x4c, 0x20, 0x62, 0x83, 0xee, 0xc0, 0xda, 0x13, 0x94, 0xc7, 0x71, 0x7f, 0x13, 0x42, - 0x49, 0x35, 0x46, 0xa6, 0x9a, 0x4f, 0x06, 0x2c, 0xe9, 0x6d, 0xf3, 0xe2, 0xc4, 0x84, 0x25, 0x74, - 0x59, 0xbb, 0x87, 0x71, 0x8f, 0x96, 0x5b, 0x89, 0x49, 0x28, 0x94, 0x1c, 0xe6, 0xb3, 0x36, 0xef, - 0x71, 0xc9, 0x51, 0x98, 0xf9, 0x46, 0xbe, 0xb9, 0xd2, 0x9a, 0xf0, 0x91, 0x6d, 0x58, 0x94, 0xde, - 0x39, 0xba, 0xc2, 0x5c, 0x68, 0xe4, 0x9b, 0xc5, 0xc3, 0xf2, 0x7e, 0xa2, 0x80, 0x97, 0x91, 0xbb, - 0xa5, 0xa3, 0xf4, 0x0e, 0x94, 0x34, 0x09, 0xf1, 0x94, 0x0b, 0x49, 0xb6, 0xa1, 0xc0, 0x25, 0xf6, - 0x85, 0x69, 0xa8, 0x63, 0x7f, 0xa7, 0xc7, 0x92, 0x8a, 0xe2, 0x30, 0x7d, 0x0e, 0x05, 0x95, 0x88, - 0x94, 0x21, 0xc7, 0x93, 0xbb, 0xce, 0xf1, 0x4e, 0xd4, 0x7b, 0x2e, 0x44, 0x88, 0x9d, 0x63, 0xa9, - 0x78, 0xe7, 0x5b, 0xa9, 0x4d, 0x6a, 0xb0, 0x82, 0xef, 0x7d, 0x1e, 0xa0, 0x38, 0x96, 0xaa, 0xc3, - 0xf9, 0xd6, 0xd8, 0x41, 0x0f, 0x01, 0x54, 0xca, 0x98, 0xc8, 0xd6, 0x24, 0x91, 0x69, 0xfe, 0x9a, - 0xc6, 0x6b, 0x20, 0x27, 0x01, 0x32, 0x89, 0xb1, 0xf7, 0xfa, 0x76, 0x67, 0xb0, 0x4f, 0x5d, 0x4d, - 0x6c, 0xec, 0xd0, 0x55, 0xe4, 0x93, 0x2a, 0xe8, 0x2d, 0xf8, 0x67, 0x22, 0xef, 0xf8, 0xca, 0x55, - 0xdf, 0x92, 0x2b, 0x57, 0x06, 0xbd, 0x07, 0xe4, 0x11, 0xf6, 0xf0, 0x0f, 0x48, 0xc4, 0x30, 0xb9, - 0x14, 0xa6, 0x02, 0x24, 0x2a, 0x76, 0x52, 0x2d, 0x74, 0x15, 0xfe, 0x7a, 0xdc, 0xf7, 0xe5, 0x87, - 0x04, 0xf6, 0xf0, 0x4b, 0x01, 0xca, 0x7a, 0xcf, 0x0b, 0x0c, 0x06, 0xdc, 0x41, 0x22, 0x61, 0x21, - 0x12, 0x23, 0xa9, 0xa4, 0x7d, 0xc9, 0x0c, 0x80, 0xb5, 0x3e, 0xe5, 0xd5, 0x63, 0x72, 0xf4, 0xf1, - 0xfb, 0xcf, 0xcf, 0xb9, 0xfb, 0xe4, 0xae, 0x9a, 0xec, 0xc1, 0x41, 0xfa, 0x77, 0x70, 0x98, 0xbb, - 0xc7, 0xed, 0x61, 0x22, 0xf5, 0x91, 0x3d, 0x8c, 0xa7, 0x62, 0x64, 0x0f, 0x33, 0x13, 0x30, 0x22, - 0x03, 0x28, 0x4f, 0x4e, 0x20, 0xa9, 0xa7, 0x48, 0x73, 0xff, 0x09, 0xd6, 0x8d, 0x6b, 0xe3, 0x9a, - 0xd3, 0xa6, 0xe2, 0xf4, 0xbf, 0x65, 0x4e, 0x73, 0xf2, 0xf5, 0xce, 0x07, 0xc6, 0x2e, 0x79, 0x03, - 0xa5, 0x4c, 0x9f, 0x04, 0xf9, 0x2f, 0xcd, 0x3a, 0xdb, 0xbe, 0x4c, 0xf1, 0x59, 0x65, 0xd3, 0x7f, - 0x15, 0xd0, 0x1a, 0x59, 0x9d, 0x02, 0x22, 0x67, 0x00, 0xe3, 0x89, 0x25, 0x56, 0x7a, 0x7a, 0x66, - 0x8c, 0xad, 0x99, 0x69, 0xa0, 0x75, 0x95, 0xd4, 0x24, 0xd5, 0x69, 0xf6, 0xc3, 0xe8, 0xbe, 0x47, - 0xe4, 0x02, 0x8a, 0x19, 0x1d, 0x65, 0x78, 0xcf, 0xaa, 0xd6, 0xaa, 0xcd, 0x0f, 0xea, 0x3e, 0xed, - 0x28, 0xa4, 0x0d, 0x5a, 0x9b, 0x8f, 0x64, 0x2b, 0x29, 0x46, 0xbd, 0xea, 0x43, 0x31, 0xa3, 0xc6, - 0x0c, 0xe4, 0xac, 0x46, 0xad, 0x6a, 0x1a, 0x9c, 0x10, 0x1c, 0xbd, 0xa9, 0xc0, 0x36, 0x77, 0x37, - 0x7e, 0x07, 0x66, 0x0f, 0x79, 0x67, 0xf4, 0xf0, 0xe8, 0xeb, 0x55, 0xdd, 0xf8, 0x76, 0x55, 0x37, - 0x7e, 0x5c, 0xd5, 0x8d, 0xb3, 0x83, 0x2e, 0x97, 0x6f, 0xc3, 0xf6, 0xbe, 0xe3, 0xf5, 0x6d, 0x16, - 0xa8, 0xa7, 0xe5, 0x9d, 0x5a, 0xec, 0x39, 0x1d, 0xdb, 0x3f, 0xef, 0x46, 0xf9, 0x9c, 0x1e, 0xc7, - 0xf1, 0x8b, 0xd4, 0x5e, 0x54, 0xaf, 0xca, 0xed, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xcc, 0xa8, - 0x25, 0x6b, 0xb2, 0x06, 0x00, 0x00, + // 743 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x4d, 0x6f, 0xd3, 0x4c, + 0x10, 0x96, 0x93, 0xa6, 0x1f, 0x93, 0xbc, 0xe9, 0xdb, 0x25, 0x0d, 0x96, 0x09, 0x21, 0xdd, 0x56, + 0x6d, 0x28, 0x6a, 0x2d, 0x02, 0xe2, 0xeb, 0x82, 0xda, 0x82, 0x50, 0x25, 0x0e, 0x10, 0x3e, 0x0e, + 0xe5, 0xb4, 0x71, 0x56, 0x61, 0x69, 0x62, 0xbb, 0xde, 0x75, 0x0a, 0x8a, 0x72, 0x81, 0x9f, 0xc0, + 0x89, 0x7f, 0xc4, 0x11, 0x89, 0x3f, 0x80, 0x2a, 0x7e, 0x08, 0xf2, 0x7a, 0xd7, 0x71, 0x9c, 0x14, + 0x71, 0xf2, 0xce, 0xcc, 0xee, 0x3c, 0xcf, 0xcc, 0x3e, 0xe3, 0x85, 0x1a, 0xa7, 0xc1, 0x90, 0x06, + 0x36, 0x71, 0x1c, 0x2f, 0x74, 0x85, 0xfe, 0xee, 0xfb, 0x81, 0x27, 0x3c, 0xb4, 0xa4, 0x4c, 0xab, + 0xd2, 0xf3, 0x7a, 0x9e, 0xf4, 0xd9, 0xd1, 0x2a, 0x0e, 0x5b, 0xb5, 0x9e, 0xe7, 0xf5, 0xfa, 0xd4, + 0x26, 0x3e, 0xb3, 0x89, 0xeb, 0x7a, 0x82, 0x08, 0xe6, 0xb9, 0x3c, 0x8e, 0xe2, 0x73, 0x58, 0x7f, + 0xe3, 0x77, 0x89, 0xa0, 0x2f, 0x08, 0xe7, 0xe7, 0x5e, 0xd0, 0x6d, 0xd3, 0xb3, 0x90, 0x72, 0x81, + 0x1a, 0x50, 0x74, 0xe9, 0xb9, 0xf6, 0x9a, 0x46, 0xc3, 0x68, 0xae, 0xb4, 0xd3, 0x2e, 0xd4, 0x84, + 0x55, 0x27, 0x0c, 0x02, 0xea, 0x8a, 0x64, 0x57, 0x4e, 0xee, 0xca, 0xba, 0x11, 0x82, 0x05, 0x97, + 0x0c, 0xa8, 0x99, 0x97, 0x61, 0xb9, 0xc6, 0x26, 0x54, 0xb3, 0xc0, 0xdc, 0xf7, 0x5c, 0x4e, 0xb1, + 0x03, 0xc5, 0x23, 0xe2, 0x1e, 0x6b, 0x22, 0x16, 0x2c, 0x07, 0x94, 0x7b, 0x61, 0xe0, 0x50, 0xc5, + 0x22, 0xb1, 0x51, 0x15, 0x16, 0x89, 0x13, 0x95, 0xa3, 0x90, 0x95, 0x15, 0x91, 0xe7, 0x61, 0x27, + 0x39, 0x16, 0xe3, 0xa6, 0x5d, 0x78, 0x0b, 0x4a, 0x31, 0x48, 0x0c, 0x8a, 0x2a, 0x50, 0x18, 0x92, + 0x7e, 0xa8, 0x21, 0x62, 0x03, 0xef, 0xc0, 0xda, 0x33, 0x2a, 0x0e, 0xe2, 0xfe, 0x6a, 0x42, 0xba, + 0x1a, 0x23, 0x55, 0xcd, 0x17, 0x03, 0x96, 0xd4, 0xb6, 0x79, 0x71, 0x64, 0xc2, 0x12, 0x75, 0x49, + 0xa7, 0x4f, 0xe3, 0x1e, 0x2d, 0xb7, 0xb5, 0x89, 0x30, 0x94, 0x1c, 0xe2, 0x93, 0x0e, 0xeb, 0x33, + 0xc1, 0x28, 0x37, 0xf3, 0x8d, 0x7c, 0x73, 0xa5, 0x3d, 0xe5, 0x43, 0xdb, 0xb0, 0x28, 0xbc, 0x53, + 0xea, 0x72, 0x73, 0xa1, 0x91, 0x6f, 0x16, 0x5b, 0xe5, 0x7d, 0xad, 0x80, 0xd7, 0x91, 0xbb, 0xad, + 0xa2, 0xf8, 0x1e, 0x94, 0x14, 0x09, 0xfe, 0x9c, 0x71, 0x81, 0xb6, 0xa1, 0xc0, 0x04, 0x1d, 0x70, + 0xd3, 0x90, 0xc7, 0xfe, 0x4f, 0x8e, 0xe9, 0x8a, 0xe2, 0x30, 0x7e, 0x09, 0x05, 0x99, 0x08, 0x95, + 0x21, 0xc7, 0xf4, 0x5d, 0xe7, 0x58, 0x37, 0xea, 0x3d, 0xe3, 0x3c, 0xa4, 0xdd, 0x03, 0x21, 0x79, + 0xe7, 0xdb, 0x89, 0x8d, 0x6a, 0xb0, 0x42, 0x3f, 0xfa, 0x2c, 0xa0, 0xfc, 0x40, 0xc8, 0x0e, 0xe7, + 0xdb, 0x13, 0x07, 0x6e, 0x01, 0xc8, 0x94, 0x31, 0x91, 0xad, 0x69, 0x22, 0x59, 0xfe, 0x8a, 0xc6, + 0x5b, 0x40, 0x47, 0x01, 0x25, 0x82, 0xc6, 0xde, 0xcb, 0xdb, 0x9d, 0xc2, 0x3e, 0x76, 0x15, 0xb1, + 0x89, 0x43, 0x55, 0x91, 0xd7, 0x55, 0xe0, 0x5b, 0x70, 0x65, 0x2a, 0xef, 0xe4, 0xca, 0x65, 0xdf, + 0xf4, 0x95, 0x4b, 0x03, 0x3f, 0x00, 0xf4, 0x84, 0xf6, 0xe9, 0x3f, 0x90, 0x88, 0x61, 0x72, 0x09, + 0x4c, 0x05, 0x50, 0x54, 0xec, 0xb4, 0x5a, 0xf0, 0x2a, 0xfc, 0xf7, 0x74, 0xe0, 0x8b, 0x4f, 0x1a, + 0xb6, 0xf5, 0xad, 0x00, 0x65, 0xb5, 0xe7, 0x15, 0x0d, 0x86, 0xcc, 0xa1, 0x48, 0xc0, 0x42, 0x24, + 0x46, 0x54, 0x49, 0xfa, 0x92, 0x1a, 0x00, 0x6b, 0x3d, 0xe3, 0x55, 0x63, 0xf2, 0xf8, 0xf3, 0xcf, + 0xdf, 0x5f, 0x73, 0x0f, 0xd1, 0x7d, 0x39, 0xd9, 0xc3, 0xdb, 0xc9, 0xdf, 0xc1, 0x21, 0xee, 0x1e, + 0xb3, 0x47, 0x5a, 0xea, 0x63, 0x7b, 0x14, 0x4f, 0xc5, 0xd8, 0x1e, 0xa5, 0x26, 0x60, 0x8c, 0x86, + 0x50, 0x9e, 0x9e, 0x40, 0x54, 0x4f, 0x90, 0xe6, 0xfe, 0x13, 0xac, 0x1b, 0x97, 0xc6, 0x15, 0xa7, + 0x4d, 0xc9, 0xe9, 0xba, 0x65, 0x66, 0x39, 0xf9, 0x6a, 0xe7, 0x23, 0x63, 0x17, 0xbd, 0x83, 0x52, + 0xaa, 0x4f, 0x1c, 0x5d, 0x4b, 0xb2, 0xce, 0xb6, 0x2f, 0x55, 0x7c, 0x5a, 0xd9, 0xf8, 0xaa, 0x04, + 0x5a, 0x43, 0xab, 0x19, 0x20, 0x74, 0x02, 0x30, 0x99, 0x58, 0x64, 0x25, 0xa7, 0x67, 0xc6, 0xd8, + 0x9a, 0x99, 0x06, 0x5c, 0x97, 0x49, 0x4d, 0x54, 0xcd, 0xb2, 0x1f, 0x45, 0xf7, 0x3d, 0x46, 0x67, + 0x50, 0x4c, 0xe9, 0x28, 0xc5, 0x7b, 0x56, 0xb5, 0x56, 0x6d, 0x7e, 0x50, 0xf5, 0x69, 0x47, 0x22, + 0x6d, 0xe0, 0xda, 0x7c, 0x24, 0x5b, 0x4a, 0x31, 0xea, 0xd5, 0x00, 0x8a, 0x29, 0x35, 0xa6, 0x20, + 0x67, 0x35, 0x6a, 0x55, 0x93, 0xe0, 0x94, 0xe0, 0xf0, 0x4d, 0x09, 0xb6, 0xb9, 0xbb, 0xf1, 0x37, + 0x30, 0x7b, 0xc4, 0xba, 0xe3, 0xc3, 0xc3, 0xef, 0x17, 0x75, 0xe3, 0xc7, 0x45, 0xdd, 0xf8, 0x75, + 0x51, 0x37, 0x4e, 0xee, 0xf6, 0x98, 0x78, 0x1f, 0x76, 0xf6, 0x1d, 0x6f, 0x60, 0x93, 0x40, 0x3e, + 0x2d, 0x1f, 0xe4, 0x62, 0xcf, 0xe9, 0xda, 0xc3, 0x96, 0xed, 0x9f, 0xf6, 0xa2, 0x94, 0x4e, 0x9f, + 0xd1, 0xc9, 0xa3, 0xd4, 0x59, 0x94, 0x0f, 0xcb, 0x9d, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa7, + 0xbc, 0x40, 0x6e, 0xb5, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/pkg/apiclient/apiclient.go b/pkg/apiclient/apiclient.go index b2b03f9c7c1b8..656c322745a79 100644 --- a/pkg/apiclient/apiclient.go +++ b/pkg/apiclient/apiclient.go @@ -26,28 +26,29 @@ import ( "google.golang.org/grpc/credentials" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - - "github.com/argoproj/argo-cd/common" - accountpkg "github.com/argoproj/argo-cd/pkg/apiclient/account" - applicationpkg "github.com/argoproj/argo-cd/pkg/apiclient/application" - certificatepkg "github.com/argoproj/argo-cd/pkg/apiclient/certificate" - clusterpkg "github.com/argoproj/argo-cd/pkg/apiclient/cluster" - gpgkeypkg "github.com/argoproj/argo-cd/pkg/apiclient/gpgkey" - projectpkg "github.com/argoproj/argo-cd/pkg/apiclient/project" - repocredspkg "github.com/argoproj/argo-cd/pkg/apiclient/repocreds" - repositorypkg "github.com/argoproj/argo-cd/pkg/apiclient/repository" - sessionpkg "github.com/argoproj/argo-cd/pkg/apiclient/session" - settingspkg "github.com/argoproj/argo-cd/pkg/apiclient/settings" - versionpkg "github.com/argoproj/argo-cd/pkg/apiclient/version" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/env" - grpc_util "github.com/argoproj/argo-cd/util/grpc" - argoio "github.com/argoproj/argo-cd/util/io" - "github.com/argoproj/argo-cd/util/kube" - "github.com/argoproj/argo-cd/util/localconfig" - oidcutil "github.com/argoproj/argo-cd/util/oidc" - tls_util "github.com/argoproj/argo-cd/util/tls" + "k8s.io/client-go/tools/clientcmd" + + "github.com/argoproj/argo-cd/v2/common" + accountpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/account" + applicationpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/application" + certificatepkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/certificate" + clusterpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/cluster" + gpgkeypkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/gpgkey" + projectpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/project" + repocredspkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/repocreds" + repositorypkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/repository" + sessionpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/session" + settingspkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/settings" + versionpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/version" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/env" + grpc_util "github.com/argoproj/argo-cd/v2/util/grpc" + argoio "github.com/argoproj/argo-cd/v2/util/io" + "github.com/argoproj/argo-cd/v2/util/kube" + "github.com/argoproj/argo-cd/v2/util/localconfig" + oidcutil "github.com/argoproj/argo-cd/v2/util/oidc" + tls_util "github.com/argoproj/argo-cd/v2/util/tls" ) const ( @@ -112,6 +113,7 @@ type ClientOptions struct { PortForward bool PortForwardNamespace string Headers []string + KubeOverrides *clientcmd.ConfigOverrides } type client struct { @@ -191,7 +193,10 @@ func NewClient(opts *ClientOptions) (Client, error) { c.ServerAddr = serverFromEnv } if opts.PortForward || opts.PortForwardNamespace != "" { - port, err := kube.PortForward("app.kubernetes.io/name=argocd-server", 8080, opts.PortForwardNamespace) + if opts.KubeOverrides == nil { + opts.KubeOverrides = &clientcmd.ConfigOverrides{} + } + port, err := kube.PortForward("app.kubernetes.io/name=argocd-server", 8080, opts.PortForwardNamespace, opts.KubeOverrides) if err != nil { return nil, err } diff --git a/pkg/apiclient/application/application.pb.go b/pkg/apiclient/application/application.pb.go index b8babdadb2e75..5845a91a80b04 100644 --- a/pkg/apiclient/application/application.pb.go +++ b/pkg/apiclient/application/application.pb.go @@ -10,8 +10,8 @@ package application import ( context "context" fmt "fmt" - v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - apiclient "github.com/argoproj/argo-cd/reposerver/apiclient" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + apiclient "github.com/argoproj/argo-cd/v2/reposerver/apiclient" _ "github.com/gogo/protobuf/gogoproto" github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto" proto "github.com/gogo/protobuf/proto" @@ -2094,153 +2094,153 @@ func init() { } var fileDescriptor_df6e82b174b5eaec = []byte{ - // 2326 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0xcd, 0x6f, 0x1c, 0x49, - 0x15, 0xa7, 0xc6, 0x1f, 0x33, 0xf3, 0x26, 0xd9, 0x24, 0xb5, 0x49, 0xe8, 0xed, 0x38, 0xce, 0xa8, - 0xf2, 0xe5, 0x38, 0x71, 0x4f, 0x6c, 0x02, 0x5a, 0xbc, 0xa0, 0x10, 0x27, 0xc1, 0x31, 0x38, 0x59, - 0xd3, 0x4e, 0x88, 0xb4, 0x08, 0xa1, 0xde, 0xee, 0xf2, 0xb8, 0xf1, 0x4c, 0x77, 0xd3, 0xdd, 0x33, - 0xd1, 0x28, 0xca, 0x65, 0x41, 0x88, 0x03, 0x02, 0x21, 0xf6, 0x00, 0x88, 0x8f, 0x15, 0x88, 0x1b, - 0x37, 0xe0, 0x82, 0xc4, 0x5e, 0x90, 0xd0, 0x72, 0x43, 0xb0, 0xe7, 0x68, 0x65, 0xf1, 0x07, 0xf0, - 0x27, 0xa0, 0xaa, 0xae, 0xea, 0xae, 0x1e, 0xcf, 0xf4, 0x4c, 0xd6, 0x83, 0x56, 0xb9, 0x4d, 0xbd, - 0xaa, 0x7e, 0xef, 0xf7, 0xbe, 0xab, 0x9e, 0x0d, 0x17, 0x22, 0x1a, 0x76, 0x69, 0xd8, 0xb0, 0x82, - 0xa0, 0xe5, 0xda, 0x56, 0xec, 0xfa, 0x9e, 0xfa, 0xdb, 0x08, 0x42, 0x3f, 0xf6, 0x71, 0x4d, 0x21, - 0xe9, 0x27, 0x9b, 0x7e, 0xd3, 0xe7, 0xf4, 0x06, 0xfb, 0x95, 0x1c, 0xd1, 0xe7, 0x9a, 0xbe, 0xdf, - 0x6c, 0xd1, 0x86, 0x15, 0xb8, 0x0d, 0xcb, 0xf3, 0xfc, 0x98, 0x1f, 0x8e, 0xc4, 0x2e, 0xd9, 0x7b, - 0x3d, 0x32, 0x5c, 0x9f, 0xef, 0xda, 0x7e, 0x48, 0x1b, 0xdd, 0xe5, 0x46, 0x93, 0x7a, 0x34, 0xb4, - 0x62, 0xea, 0x88, 0x33, 0x37, 0xb2, 0x33, 0x6d, 0xcb, 0xde, 0x75, 0x3d, 0x1a, 0xf6, 0x1a, 0xc1, - 0x5e, 0x93, 0x11, 0xa2, 0x46, 0x9b, 0xc6, 0xd6, 0xa0, 0xaf, 0x36, 0x9a, 0x6e, 0xbc, 0xdb, 0x79, - 0xdb, 0xb0, 0xfd, 0x76, 0xc3, 0x0a, 0x39, 0xb0, 0x6f, 0xf3, 0x1f, 0x4b, 0xb6, 0x93, 0x7d, 0xad, - 0xaa, 0xd7, 0x5d, 0xb6, 0x5a, 0xc1, 0xae, 0x75, 0x90, 0xd5, 0x5a, 0x11, 0xab, 0x90, 0x06, 0xbe, - 0xb0, 0x15, 0xff, 0xe9, 0xc6, 0x7e, 0xd8, 0x53, 0x7e, 0x26, 0x3c, 0xc8, 0x87, 0x08, 0x8e, 0xdf, - 0xca, 0x84, 0x7d, 0xad, 0x43, 0xc3, 0x1e, 0xc6, 0x30, 0xed, 0x59, 0x6d, 0xaa, 0xa1, 0x3a, 0x5a, - 0xa8, 0x9a, 0xfc, 0x37, 0xd6, 0xa0, 0x1c, 0xd2, 0x9d, 0x90, 0x46, 0xbb, 0x5a, 0x89, 0x93, 0xe5, - 0x12, 0x5f, 0x82, 0x32, 0x93, 0x4c, 0xed, 0x58, 0x9b, 0xaa, 0x4f, 0x2d, 0x54, 0xd7, 0x8e, 0xec, - 0x3f, 0x3f, 0x57, 0xd9, 0x4a, 0x48, 0x91, 0x29, 0x37, 0xb1, 0x01, 0xc7, 0x42, 0x1a, 0xf9, 0x9d, - 0xd0, 0xa6, 0x5f, 0xa7, 0x61, 0xe4, 0xfa, 0x9e, 0x36, 0xcd, 0x38, 0xad, 0x4d, 0x7f, 0xf0, 0xfc, - 0xdc, 0xa7, 0xcc, 0xfe, 0x4d, 0x5c, 0x87, 0x4a, 0x44, 0x5b, 0xd4, 0x8e, 0xfd, 0x50, 0x9b, 0x51, - 0x0e, 0xa6, 0x54, 0xac, 0xc1, 0x34, 0x53, 0x48, 0x9b, 0x55, 0x76, 0x39, 0x85, 0x9c, 0x83, 0xea, - 0x03, 0xdf, 0xa1, 0x43, 0xd5, 0x21, 0xeb, 0x70, 0xca, 0xa4, 0x5d, 0x97, 0x09, 0xba, 0x4f, 0x63, - 0xcb, 0xb1, 0x62, 0xab, 0xff, 0x70, 0x29, 0xd5, 0x5d, 0x87, 0x4a, 0x28, 0x0e, 0x6b, 0x25, 0x4e, - 0x4f, 0xd7, 0xe4, 0x2f, 0x08, 0xe6, 0x15, 0x03, 0x9a, 0x42, 0x89, 0xbb, 0x5d, 0xea, 0xc5, 0xd1, - 0x70, 0x96, 0x2b, 0x70, 0x42, 0xea, 0xfb, 0xc0, 0x6a, 0xd3, 0x28, 0xb0, 0x6c, 0x9a, 0xf0, 0x16, - 0x7a, 0x1c, 0xdc, 0xc6, 0x0b, 0x70, 0x44, 0x25, 0x6a, 0x53, 0xca, 0xf1, 0xdc, 0x0e, 0xbe, 0x04, - 0x35, 0xb9, 0x7e, 0xb4, 0x71, 0x47, 0x9b, 0x56, 0x0e, 0xaa, 0x1b, 0x64, 0x0b, 0x34, 0x05, 0xfb, - 0x7d, 0xcb, 0x73, 0x77, 0x68, 0x14, 0x0f, 0x47, 0x5d, 0xcf, 0x19, 0x42, 0x71, 0x49, 0x6a, 0x8e, - 0x53, 0xf0, 0x6a, 0xde, 0x1a, 0x81, 0xef, 0x45, 0x94, 0xbc, 0x8f, 0x72, 0x92, 0x6e, 0x87, 0xd4, - 0x8a, 0xa9, 0x49, 0xbf, 0xd3, 0xa1, 0x51, 0x8c, 0x3d, 0x50, 0xf3, 0x95, 0x0b, 0xac, 0xad, 0x7c, - 0xd9, 0xc8, 0xa2, 0xdb, 0x90, 0xd1, 0xcd, 0x7f, 0x7c, 0xcb, 0x76, 0x8c, 0x60, 0xaf, 0x69, 0xb0, - 0x44, 0x31, 0xd4, 0xdc, 0x97, 0x89, 0x62, 0x28, 0x92, 0xa4, 0xd6, 0xca, 0x39, 0x7c, 0x1a, 0x66, - 0x3b, 0x41, 0x44, 0xc3, 0x98, 0xeb, 0x50, 0x31, 0xc5, 0x8a, 0xb9, 0xb9, 0x6b, 0xb5, 0x5c, 0xc7, - 0x8a, 0x99, 0x6d, 0xd9, 0x4e, 0xba, 0x26, 0xef, 0xe5, 0x15, 0x78, 0x14, 0x38, 0x8a, 0x02, 0xbb, - 0xff, 0x47, 0x05, 0xf2, 0xd0, 0x55, 0x88, 0xa5, 0x3e, 0x88, 0xdd, 0x1c, 0xc2, 0x3b, 0xb4, 0x45, - 0x33, 0x84, 0x83, 0x9c, 0xa9, 0x41, 0xd9, 0xb6, 0x22, 0xdb, 0x72, 0x24, 0x2b, 0xb9, 0xc4, 0xd7, - 0xe0, 0x44, 0x10, 0xfa, 0x81, 0xd5, 0xe4, 0x9c, 0xb6, 0xfc, 0x96, 0x6b, 0xf7, 0xb8, 0x45, 0xaa, - 0xe6, 0xc1, 0x0d, 0x72, 0x1e, 0x6a, 0xdb, 0x3d, 0xcf, 0x7e, 0x33, 0xe0, 0x05, 0x14, 0x9f, 0x84, - 0x19, 0x37, 0xa6, 0xed, 0x48, 0x43, 0xac, 0x18, 0x98, 0xc9, 0x82, 0x7c, 0x6f, 0x06, 0x4e, 0x2b, - 0xe8, 0xd8, 0x07, 0x45, 0xd8, 0x46, 0x06, 0x1a, 0x9e, 0x83, 0x59, 0x27, 0xec, 0x99, 0x1d, 0x2f, - 0x71, 0x95, 0xd8, 0x17, 0x34, 0xac, 0xc3, 0x4c, 0x10, 0x76, 0x3c, 0xca, 0x2b, 0x8c, 0xdc, 0x4c, - 0x48, 0xd8, 0x86, 0x4a, 0x14, 0xb3, 0x3a, 0xda, 0xec, 0xf1, 0xba, 0x52, 0x5b, 0x59, 0x3f, 0x84, - 0xab, 0x98, 0x26, 0xdb, 0x82, 0x9d, 0x99, 0x32, 0xc6, 0x31, 0x54, 0x65, 0xa2, 0x45, 0x5a, 0xb9, - 0x3e, 0xb5, 0x50, 0x5b, 0xd9, 0x3a, 0xa4, 0x94, 0x37, 0x03, 0x56, 0xfd, 0x95, 0x1a, 0x23, 0xd4, - 0xca, 0x04, 0xe1, 0x39, 0xa8, 0xb6, 0x45, 0x12, 0x47, 0x5a, 0x85, 0xdb, 0x3f, 0x23, 0xe0, 0x47, - 0x30, 0xe3, 0x7a, 0x3b, 0x7e, 0xa4, 0x55, 0x39, 0x9e, 0x9b, 0x87, 0xc0, 0xb3, 0xe1, 0xed, 0xf8, - 0x66, 0xc2, 0x0d, 0x7b, 0x70, 0x34, 0xa4, 0x71, 0xd8, 0x93, 0x56, 0xd0, 0x80, 0x1b, 0xf5, 0xde, - 0x21, 0xd8, 0x9b, 0x2a, 0x3f, 0x33, 0xcf, 0x1e, 0xaf, 0x42, 0x2d, 0xca, 0xe2, 0x4d, 0xab, 0x71, - 0x69, 0x5a, 0x8e, 0x91, 0x12, 0x8f, 0xa6, 0x7a, 0x98, 0xfc, 0x09, 0xc1, 0xdc, 0x81, 0x34, 0xde, - 0x0e, 0x68, 0x61, 0x30, 0x3a, 0x30, 0x1d, 0x05, 0xd4, 0xe6, 0xe5, 0xb9, 0xb6, 0xf2, 0x95, 0xc9, - 0xe4, 0x35, 0x13, 0x2a, 0x5b, 0x16, 0xe3, 0x5e, 0x58, 0x7d, 0xda, 0xf0, 0x69, 0xe5, 0xd3, 0x2d, - 0x2b, 0xb6, 0x77, 0x8b, 0x00, 0xb3, 0xe8, 0x67, 0x67, 0x72, 0x0d, 0x25, 0x21, 0x61, 0x02, 0x55, - 0xfe, 0xe3, 0x61, 0x2f, 0xc8, 0x77, 0x90, 0x8c, 0x4c, 0xbe, 0x8f, 0x40, 0x57, 0x4b, 0x90, 0xdf, - 0x6a, 0xbd, 0x6d, 0xd9, 0x7b, 0xc5, 0x22, 0x4b, 0xae, 0xc3, 0xe5, 0x4d, 0xad, 0x01, 0xe3, 0xb7, - 0xff, 0xfc, 0x5c, 0x69, 0xe3, 0x8e, 0x59, 0x72, 0x9d, 0x8f, 0x9f, 0xaa, 0xec, 0x76, 0xa2, 0x0f, - 0x68, 0xae, 0x45, 0x40, 0x08, 0x54, 0xbd, 0x81, 0x0d, 0x35, 0x23, 0xbf, 0x40, 0x23, 0x9d, 0x87, - 0x72, 0x37, 0xbd, 0xab, 0x64, 0x87, 0x24, 0x91, 0x81, 0x6f, 0x86, 0x7e, 0x27, 0xd0, 0x66, 0x54, - 0x4b, 0x73, 0x12, 0xbb, 0x9d, 0xec, 0xb9, 0x9e, 0xa3, 0xcd, 0x2a, 0x5b, 0x9c, 0x42, 0x7e, 0x5e, - 0x82, 0x73, 0x03, 0xd4, 0x1a, 0xe9, 0xd7, 0x97, 0x40, 0xb7, 0x2c, 0xf6, 0xca, 0x23, 0x62, 0xaf, - 0x32, 0x38, 0xf6, 0xde, 0x2d, 0x41, 0x7d, 0x80, 0x6d, 0x46, 0xb7, 0xb3, 0x97, 0xc4, 0x38, 0x3b, - 0x7e, 0x68, 0x53, 0xad, 0x9c, 0xc6, 0x3a, 0x32, 0x13, 0x12, 0xcb, 0x12, 0x3f, 0x0c, 0x76, 0x2d, - 0x4f, 0xab, 0x28, 0x9b, 0x82, 0x46, 0xfe, 0x8b, 0x40, 0x93, 0xb6, 0xb8, 0x65, 0x73, 0xcb, 0x74, - 0xbc, 0x97, 0xdd, 0x1c, 0x73, 0x30, 0x6b, 0x71, 0x5d, 0x72, 0xc1, 0x22, 0x68, 0xe4, 0x07, 0x08, - 0xce, 0xe4, 0x55, 0x8e, 0x36, 0xdd, 0x28, 0x96, 0x77, 0x4a, 0xec, 0x42, 0x39, 0x39, 0x99, 0x5c, - 0x35, 0x6a, 0x2b, 0x1b, 0x87, 0xea, 0x38, 0xaa, 0x20, 0xa9, 0x9e, 0xe0, 0x4f, 0x6e, 0xc2, 0x99, - 0x81, 0x65, 0x48, 0x20, 0xa9, 0x43, 0x45, 0x76, 0xd9, 0xc4, 0x07, 0xf2, 0xb6, 0x22, 0xa9, 0xe4, - 0x1f, 0x53, 0xf9, 0x0a, 0xee, 0x3b, 0x9b, 0x7e, 0xb3, 0xe0, 0x79, 0x30, 0x8e, 0xf7, 0x34, 0x28, - 0x07, 0xbe, 0x23, 0x1c, 0xc7, 0x5f, 0x64, 0x62, 0xc9, 0xbe, 0xb6, 0x7d, 0x2f, 0xb6, 0xd8, 0x93, - 0x34, 0xe7, 0xaf, 0x8c, 0xcc, 0x7c, 0x1f, 0xb9, 0x9e, 0x4d, 0xb7, 0xa9, 0xed, 0x7b, 0x4e, 0xc4, - 0x1d, 0x37, 0x25, 0x7d, 0xaf, 0xee, 0xe0, 0x7b, 0x50, 0xe5, 0xeb, 0x87, 0x6e, 0x9b, 0xf2, 0xa7, - 0x56, 0x6d, 0x65, 0xd1, 0x48, 0xde, 0xbe, 0x86, 0xfa, 0xf6, 0xcd, 0x2c, 0xcc, 0xde, 0xbe, 0x46, - 0x77, 0xd9, 0x60, 0x5f, 0x98, 0xd9, 0xc7, 0x0c, 0x57, 0x6c, 0xb9, 0xad, 0x4d, 0xd7, 0xe3, 0x97, - 0xa2, 0x4c, 0x60, 0x46, 0x66, 0x31, 0xb1, 0xe3, 0xb7, 0x5a, 0xfe, 0x13, 0x5e, 0x20, 0xd2, 0x66, - 0x91, 0xd0, 0xd8, 0x05, 0xa7, 0xe3, 0xc5, 0x6e, 0x8b, 0x63, 0xa9, 0x72, 0xad, 0x33, 0x02, 0xbb, - 0xd8, 0xef, 0xb8, 0xad, 0x98, 0x86, 0xfc, 0x0a, 0x52, 0x35, 0xc5, 0x8a, 0x59, 0x98, 0x47, 0x60, - 0x2d, 0x79, 0x00, 0xf2, 0xd8, 0x3b, 0x29, 0x23, 0xf6, 0x08, 0x27, 0x8a, 0x58, 0x25, 0x7d, 0x19, - 0x71, 0x94, 0x6f, 0xe6, 0x68, 0xe4, 0x23, 0x04, 0x95, 0x4d, 0xbf, 0x79, 0xd7, 0x8b, 0xc3, 0x1e, - 0x4b, 0x0c, 0x66, 0x53, 0xea, 0xe5, 0x3d, 0x2f, 0x89, 0x78, 0x0b, 0xaa, 0xb1, 0xdb, 0xa6, 0xdb, - 0xb1, 0xd5, 0x0e, 0xc4, 0x05, 0xe2, 0x05, 0x8c, 0xb7, 0x36, 0xcb, 0xb8, 0x69, 0xc8, 0xcc, 0x98, - 0xb0, 0x74, 0x6a, 0x59, 0x51, 0xcc, 0x93, 0x55, 0x9a, 0x87, 0x53, 0x98, 0x4b, 0xd3, 0x63, 0xdb, - 0x71, 0xde, 0xf3, 0xb9, 0x1d, 0x86, 0x5a, 0x86, 0x8e, 0x9a, 0xb0, 0x92, 0x48, 0x1a, 0xf0, 0x5a, - 0x7a, 0xdb, 0x7c, 0x48, 0xc3, 0xb6, 0xeb, 0x59, 0x85, 0xc5, 0x97, 0x2c, 0xe7, 0x12, 0x84, 0x5d, - 0xbf, 0x1e, 0xbb, 0x9e, 0xe3, 0x3f, 0x19, 0x1e, 0xe2, 0xe4, 0x5f, 0xf9, 0x87, 0xb3, 0xf2, 0x4d, - 0x9a, 0x57, 0xf7, 0xe0, 0x28, 0xcb, 0xc0, 0x2e, 0x15, 0x1b, 0x22, 0xcf, 0x49, 0x2e, 0x85, 0x07, - 0xf2, 0x30, 0xf3, 0x1f, 0xe2, 0x4d, 0x38, 0x66, 0x45, 0x91, 0xdb, 0xf4, 0xa8, 0x23, 0x79, 0x95, - 0xc6, 0xe6, 0xd5, 0xff, 0x69, 0xf2, 0x72, 0xe2, 0x27, 0x12, 0x2f, 0x98, 0x72, 0x49, 0xbe, 0x8b, - 0xe0, 0xd4, 0x40, 0x26, 0x69, 0x0c, 0x0a, 0x13, 0x88, 0x76, 0x50, 0x89, 0xec, 0x5d, 0xea, 0x74, - 0x5a, 0x54, 0xce, 0x15, 0xe4, 0x9a, 0xed, 0x39, 0x9d, 0xc4, 0x03, 0x49, 0x5d, 0x36, 0xd3, 0x35, - 0x9e, 0x07, 0x68, 0x5b, 0x5e, 0xc7, 0x6a, 0x71, 0x08, 0xd3, 0x1c, 0x82, 0x42, 0x21, 0x73, 0xa0, - 0x0f, 0x72, 0x9f, 0x78, 0x8b, 0x7f, 0x88, 0xe0, 0x15, 0x59, 0xc2, 0x84, 0x7f, 0x0c, 0x38, 0xa6, - 0x98, 0xe1, 0x41, 0xea, 0x2a, 0xd1, 0x84, 0xfa, 0x37, 0xfb, 0xcb, 0x13, 0x1a, 0x5c, 0x9e, 0x12, - 0x9f, 0x4f, 0xa9, 0xc3, 0x19, 0xef, 0x40, 0x33, 0x41, 0x85, 0xcd, 0x04, 0x0d, 0x6f, 0x26, 0xa8, - 0xef, 0x52, 0xd5, 0x03, 0xed, 0xbe, 0xe5, 0x59, 0x4d, 0xea, 0xa4, 0xca, 0xa5, 0x81, 0xf4, 0x4d, - 0xf5, 0x4d, 0x7a, 0xb8, 0xf7, 0x5e, 0x7a, 0x21, 0x71, 0x77, 0x76, 0xc4, 0xe3, 0x76, 0xe5, 0xaf, - 0xf3, 0x80, 0x55, 0xaf, 0xd3, 0xb0, 0xeb, 0xda, 0x14, 0xff, 0x18, 0xc1, 0x34, 0xeb, 0x58, 0xf8, - 0xec, 0xb0, 0x20, 0xe3, 0xd6, 0xd7, 0x27, 0xf4, 0xa2, 0x60, 0xa2, 0xc8, 0xdc, 0x3b, 0xff, 0xfe, - 0xcf, 0x4f, 0x4b, 0xa7, 0xf1, 0x49, 0x3e, 0xba, 0xec, 0x2e, 0xab, 0x93, 0xc4, 0x08, 0xff, 0x10, - 0x01, 0x16, 0x3d, 0x54, 0x99, 0x52, 0xe1, 0xab, 0xc3, 0xf0, 0x0d, 0x98, 0x66, 0xe9, 0x67, 0x95, - 0xf2, 0x65, 0xd8, 0x7e, 0x48, 0x59, 0xb1, 0xe2, 0x07, 0x38, 0x80, 0x45, 0x0e, 0xe0, 0x02, 0x26, - 0x83, 0x00, 0x34, 0x9e, 0xb2, 0x00, 0x78, 0xd6, 0xa0, 0x89, 0xdc, 0xdf, 0x20, 0x98, 0x79, 0xcc, - 0x6f, 0x86, 0x23, 0x2c, 0xb4, 0x35, 0x19, 0x0b, 0x71, 0x59, 0x1c, 0x2a, 0x39, 0xcf, 0x61, 0x9e, - 0xc5, 0x67, 0x24, 0xcc, 0x28, 0x0e, 0xa9, 0xd5, 0xce, 0xa1, 0xbd, 0x8e, 0xf0, 0x6f, 0x11, 0xcc, - 0x26, 0xc3, 0x2a, 0x7c, 0x71, 0x18, 0xc4, 0xdc, 0x30, 0x4b, 0x9f, 0xd0, 0xd8, 0x87, 0x5c, 0xe1, - 0x00, 0xcf, 0x93, 0x81, 0x8e, 0x5c, 0xcd, 0x0d, 0x85, 0x7e, 0x82, 0x60, 0x6a, 0x9d, 0x8e, 0x0c, - 0xb3, 0x49, 0x21, 0x3b, 0x60, 0xba, 0x01, 0x1e, 0xc6, 0xbf, 0x43, 0xf0, 0xda, 0x3a, 0x8d, 0x07, - 0x17, 0x78, 0xbc, 0x30, 0xba, 0xea, 0x8a, 0x68, 0xbb, 0x3a, 0xc6, 0xc9, 0xb4, 0xb2, 0x35, 0x38, - 0xb2, 0x2b, 0xf8, 0x72, 0x51, 0xec, 0x45, 0x3d, 0xcf, 0x7e, 0x22, 0x70, 0xfc, 0x1d, 0xc1, 0xf1, - 0xfe, 0x31, 0x30, 0xce, 0xb7, 0x84, 0x81, 0x53, 0x62, 0xfd, 0xab, 0x87, 0xaa, 0x20, 0x79, 0x8e, - 0xe4, 0x16, 0x87, 0xfd, 0x06, 0xfe, 0x7c, 0x11, 0x6c, 0x39, 0xf8, 0x8a, 0x1a, 0x4f, 0xe5, 0xcf, - 0x67, 0xfc, 0x8f, 0x0c, 0x1c, 0xf3, 0x3b, 0x08, 0x8e, 0xac, 0xd3, 0xf8, 0x7e, 0x3a, 0xeb, 0x19, - 0x1a, 0xad, 0xb9, 0x21, 0xaf, 0x3e, 0x67, 0x28, 0x7f, 0x11, 0x90, 0x5b, 0xa9, 0x3d, 0x97, 0x38, - 0xb0, 0xcb, 0xf8, 0x62, 0x11, 0xb0, 0x6c, 0xbe, 0xf4, 0x3e, 0x82, 0xd9, 0x64, 0xa2, 0x32, 0x5c, - 0x7c, 0x6e, 0x70, 0x3a, 0xb1, 0x90, 0xbc, 0xcb, 0x81, 0xde, 0xd4, 0xaf, 0x0f, 0x06, 0xaa, 0x7e, - 0x2f, 0x4d, 0x66, 0x70, 0xf4, 0xf9, 0x44, 0xfa, 0x23, 0x02, 0xc8, 0x46, 0x42, 0xf8, 0x4a, 0xb1, - 0x12, 0xca, 0xd8, 0x48, 0x9f, 0xe0, 0x50, 0x88, 0x18, 0x5c, 0x99, 0x05, 0xbd, 0x5e, 0x18, 0xc5, - 0x01, 0xb5, 0x57, 0x93, 0xc1, 0xd1, 0xaf, 0x10, 0xcc, 0xf0, 0xd1, 0x01, 0xbe, 0x30, 0x0c, 0xb0, - 0x3a, 0x59, 0x98, 0x98, 0xd1, 0x2f, 0x71, 0x9c, 0xf5, 0x95, 0xa2, 0x3a, 0xb0, 0x8a, 0x16, 0x71, - 0x17, 0x66, 0x93, 0xd7, 0xfb, 0xf0, 0xa8, 0xc8, 0xbd, 0xee, 0xf5, 0x7a, 0x41, 0x3b, 0x4a, 0x02, - 0x53, 0x94, 0xa0, 0xc5, 0xc2, 0x12, 0xf4, 0x1e, 0x82, 0x69, 0x56, 0x25, 0xf0, 0xf9, 0xa2, 0x1a, - 0x32, 0x69, 0xab, 0x5c, 0xe5, 0xd0, 0x2e, 0x92, 0xfa, 0xa8, 0x1a, 0xc4, 0x4c, 0xf3, 0x33, 0x04, - 0xc7, 0xfb, 0x2f, 0x2d, 0xf8, 0x4c, 0x5f, 0xfd, 0x51, 0x6f, 0x6a, 0x7a, 0xde, 0x84, 0xc3, 0x2e, - 0x3c, 0xe4, 0x4b, 0x1c, 0xc5, 0x2a, 0x7e, 0x7d, 0x64, 0x42, 0x3c, 0x90, 0x49, 0xcc, 0x18, 0x2d, - 0x65, 0xa3, 0xe4, 0x3f, 0x23, 0x38, 0x22, 0xf9, 0x3e, 0x0c, 0x29, 0x2d, 0x86, 0x35, 0xa1, 0xf8, - 0x67, 0x82, 0xc8, 0x17, 0x38, 0xf6, 0xcf, 0xe1, 0x1b, 0x63, 0x62, 0x97, 0x98, 0x97, 0x62, 0x06, - 0xf3, 0x6f, 0x08, 0x4e, 0x3c, 0x4e, 0xc2, 0xfd, 0x93, 0x00, 0x7f, 0x9b, 0x83, 0xff, 0x22, 0x7e, - 0xa3, 0xe0, 0x5e, 0x31, 0x4a, 0x87, 0xeb, 0x08, 0xff, 0x01, 0x41, 0x45, 0x8e, 0x5d, 0xf1, 0xe5, - 0xa1, 0xf9, 0x90, 0x1f, 0xcc, 0x4e, 0x2c, 0x86, 0x45, 0x1f, 0x25, 0x17, 0x0a, 0x1b, 0x92, 0x10, - 0xce, 0xe2, 0xf8, 0x5d, 0x04, 0x38, 0x7d, 0x68, 0xa4, 0x4f, 0x0f, 0x7c, 0x29, 0x27, 0x6a, 0xe8, - 0x8b, 0x52, 0xbf, 0x3c, 0xf2, 0x5c, 0xbe, 0x21, 0x2d, 0x16, 0x36, 0x24, 0x3f, 0x95, 0xff, 0x23, - 0x04, 0xb5, 0x75, 0x9a, 0xde, 0x76, 0x0b, 0x0c, 0x99, 0x1f, 0x2c, 0xeb, 0x0b, 0xa3, 0x0f, 0x0a, - 0x44, 0xd7, 0x38, 0xa2, 0x4b, 0xb8, 0xd8, 0x54, 0x12, 0xc0, 0x2f, 0x11, 0x1c, 0xdd, 0x52, 0x83, - 0x13, 0x5f, 0x1b, 0x25, 0x29, 0x57, 0xba, 0xc7, 0xc7, 0xf5, 0x19, 0x8e, 0x6b, 0x89, 0x8c, 0x85, - 0x6b, 0x55, 0xcc, 0x67, 0x7f, 0x8d, 0xe0, 0x55, 0xf5, 0x79, 0x20, 0xa6, 0x6e, 0x1f, 0xd7, 0x6e, - 0x05, 0xc3, 0x3b, 0x72, 0x83, 0xe3, 0x33, 0xf0, 0xb5, 0x71, 0xf0, 0x35, 0xc4, 0x1c, 0x0e, 0xff, - 0x02, 0xc1, 0x09, 0x3e, 0xf7, 0x54, 0x19, 0xf7, 0xb5, 0x95, 0x61, 0x53, 0xd2, 0x31, 0xda, 0x8a, - 0xa8, 0x3c, 0xe4, 0x85, 0x40, 0xad, 0x8a, 0x79, 0x25, 0x7b, 0xee, 0xbd, 0x22, 0x1b, 0x99, 0xf0, - 0xee, 0xd2, 0x28, 0xc3, 0xbd, 0x68, 0xe3, 0x13, 0xe1, 0xb6, 0x38, 0x5e, 0xb8, 0xfd, 0x1e, 0x41, - 0x59, 0x8c, 0x1a, 0x0b, 0xee, 0x06, 0xca, 0x2c, 0x52, 0x3f, 0x95, 0x3b, 0x25, 0xa7, 0x5c, 0xe4, - 0x1b, 0x5c, 0xec, 0x23, 0xdc, 0x28, 0x12, 0x1b, 0xf8, 0x4e, 0xd4, 0x78, 0x2a, 0x46, 0x48, 0xcf, - 0x1a, 0x2d, 0xbf, 0x19, 0xbd, 0x45, 0x70, 0x61, 0x1f, 0x64, 0x67, 0xae, 0xa3, 0xb5, 0xdb, 0x1f, - 0xec, 0xcf, 0xa3, 0x7f, 0xee, 0xcf, 0xa3, 0x8f, 0xf6, 0xe7, 0xd1, 0x5b, 0x9f, 0x1d, 0xe3, 0x3f, - 0x64, 0xec, 0x96, 0x4b, 0xbd, 0x58, 0xe5, 0xf9, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x60, 0x3f, - 0x3b, 0xd3, 0x1a, 0x24, 0x00, 0x00, + // 2330 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0xcf, 0x8f, 0xdc, 0x48, + 0xf5, 0xff, 0x56, 0xcf, 0xaf, 0xee, 0xd7, 0xc9, 0x26, 0xa9, 0x4d, 0xf2, 0xf5, 0x3a, 0x93, 0x49, + 0xab, 0xf2, 0x6b, 0x32, 0xc9, 0xb8, 0x93, 0x26, 0x42, 0x61, 0x16, 0xb4, 0x64, 0x36, 0x21, 0x1b, + 0x98, 0x64, 0x07, 0x4f, 0x42, 0xd0, 0x72, 0x00, 0xaf, 0x5d, 0xd3, 0x63, 0xc6, 0x6d, 0x3b, 0xb6, + 0xbb, 0xa3, 0x56, 0xc8, 0x65, 0x91, 0xb8, 0x80, 0x00, 0x41, 0x0e, 0x80, 0x10, 0x42, 0xac, 0xf6, + 0xcc, 0x0d, 0x10, 0xb7, 0xbd, 0xa0, 0xdd, 0x1b, 0x82, 0x3d, 0x47, 0x4b, 0xc4, 0x1f, 0xc0, 0x9f, + 0x80, 0xaa, 0x5c, 0x65, 0x97, 0x7b, 0xba, 0xdd, 0x9d, 0x9d, 0x5e, 0xa1, 0xdc, 0xba, 0x5e, 0x95, + 0xdf, 0xfb, 0xbc, 0xdf, 0x55, 0x6f, 0x06, 0xce, 0xc4, 0x34, 0xea, 0xd1, 0xa8, 0x69, 0x85, 0xa1, + 0xe7, 0xda, 0x56, 0xe2, 0x06, 0xbe, 0xfa, 0xdb, 0x08, 0xa3, 0x20, 0x09, 0x70, 0x5d, 0x21, 0xe9, + 0x47, 0xdb, 0x41, 0x3b, 0xe0, 0xf4, 0x26, 0xfb, 0x95, 0x1e, 0xd1, 0x17, 0xdb, 0x41, 0xd0, 0xf6, + 0x68, 0xd3, 0x0a, 0xdd, 0xa6, 0xe5, 0xfb, 0x41, 0xc2, 0x0f, 0xc7, 0x62, 0x97, 0xec, 0x5e, 0x8b, + 0x0d, 0x37, 0xe0, 0xbb, 0x76, 0x10, 0xd1, 0x66, 0xef, 0x4a, 0xb3, 0x4d, 0x7d, 0x1a, 0x59, 0x09, + 0x75, 0xc4, 0x99, 0xab, 0xf9, 0x99, 0x8e, 0x65, 0xef, 0xb8, 0x3e, 0x8d, 0xfa, 0xcd, 0x70, 0xb7, + 0xcd, 0x08, 0x71, 0xb3, 0x43, 0x13, 0x6b, 0xd8, 0x57, 0x1b, 0x6d, 0x37, 0xd9, 0xe9, 0xbe, 0x6b, + 0xd8, 0x41, 0xa7, 0x69, 0x45, 0x1c, 0xd8, 0xf7, 0xf9, 0x8f, 0x55, 0xdb, 0x69, 0xf6, 0x5a, 0x39, + 0x03, 0x55, 0xc3, 0xde, 0x15, 0xcb, 0x0b, 0x77, 0xac, 0xbd, 0xdc, 0x6e, 0x8e, 0xe1, 0x16, 0xd1, + 0x30, 0x10, 0x16, 0xe3, 0x3f, 0xdd, 0x24, 0x88, 0xfa, 0xca, 0xcf, 0x94, 0x0d, 0xf9, 0x04, 0xc1, + 0xe1, 0xeb, 0xb9, 0xbc, 0x6f, 0x76, 0x69, 0xd4, 0xc7, 0x18, 0x66, 0x7d, 0xab, 0x43, 0x35, 0xd4, + 0x40, 0xcb, 0x35, 0x93, 0xff, 0xc6, 0x1a, 0x2c, 0x44, 0x74, 0x3b, 0xa2, 0xf1, 0x8e, 0x56, 0xe1, + 0x64, 0xb9, 0xc4, 0xe7, 0x60, 0x81, 0x09, 0xa7, 0x76, 0xa2, 0xcd, 0x34, 0x66, 0x96, 0x6b, 0xeb, + 0x07, 0x9e, 0x3f, 0x3b, 0x55, 0xdd, 0x4c, 0x49, 0xb1, 0x29, 0x37, 0xb1, 0x01, 0x87, 0x22, 0x1a, + 0x07, 0xdd, 0xc8, 0xa6, 0xdf, 0xa2, 0x51, 0xec, 0x06, 0xbe, 0x36, 0xcb, 0x38, 0xad, 0xcf, 0x7e, + 0xf4, 0xec, 0xd4, 0xff, 0x99, 0x83, 0x9b, 0xb8, 0x01, 0xd5, 0x98, 0x7a, 0xd4, 0x4e, 0x82, 0x48, + 0x9b, 0x53, 0x0e, 0x66, 0x54, 0xac, 0xc1, 0x2c, 0x53, 0x48, 0x9b, 0x57, 0x76, 0x39, 0x85, 0x9c, + 0x82, 0xda, 0xdd, 0xc0, 0xa1, 0x23, 0xd5, 0x21, 0xb7, 0xe0, 0x98, 0x49, 0x7b, 0x2e, 0x13, 0x74, + 0x87, 0x26, 0x96, 0x63, 0x25, 0xd6, 0xe0, 0xe1, 0x4a, 0xa6, 0xbb, 0x0e, 0xd5, 0x48, 0x1c, 0xd6, + 0x2a, 0x9c, 0x9e, 0xad, 0xc9, 0x5f, 0x11, 0x2c, 0x29, 0x06, 0x34, 0x85, 0x12, 0x37, 0x7b, 0xd4, + 0x4f, 0xe2, 0xd1, 0x2c, 0x5b, 0x70, 0x44, 0xea, 0x7b, 0xd7, 0xea, 0xd0, 0x38, 0xb4, 0x6c, 0x9a, + 0xf2, 0x16, 0x7a, 0xec, 0xdd, 0xc6, 0xcb, 0x70, 0x40, 0x25, 0x6a, 0x33, 0xca, 0xf1, 0xc2, 0x0e, + 0x3e, 0x07, 0x75, 0xb9, 0xbe, 0x7f, 0xfb, 0x86, 0x36, 0xab, 0x1c, 0x54, 0x37, 0xc8, 0x26, 0x68, + 0x0a, 0xf6, 0x3b, 0x96, 0xef, 0x6e, 0xd3, 0x38, 0x19, 0x8d, 0xba, 0x51, 0x30, 0x84, 0xe2, 0x92, + 0xcc, 0x1c, 0xc7, 0xe0, 0xd5, 0xa2, 0x35, 0xc2, 0xc0, 0x8f, 0x29, 0xf9, 0x10, 0x15, 0x24, 0xbd, + 0x19, 0x51, 0x2b, 0xa1, 0x26, 0x7d, 0xd8, 0xa5, 0x71, 0x82, 0x1f, 0x82, 0x9a, 0xb5, 0x5c, 0x60, + 0xbd, 0x75, 0xdb, 0xc8, 0x03, 0xdc, 0x90, 0x01, 0xce, 0x7f, 0x7c, 0xd7, 0x76, 0x8c, 0x5e, 0xcb, + 0x08, 0x77, 0xdb, 0x06, 0x4b, 0x17, 0x43, 0x2d, 0x02, 0x32, 0x5d, 0x0c, 0x45, 0x98, 0x54, 0x5c, + 0x39, 0x87, 0x8f, 0xc3, 0x7c, 0x37, 0x8c, 0x69, 0x94, 0x70, 0x35, 0xaa, 0xa6, 0x58, 0x31, 0x4f, + 0xf7, 0x2c, 0xcf, 0x75, 0xac, 0x84, 0x99, 0x97, 0xed, 0x64, 0x6b, 0xf2, 0x7e, 0x51, 0x87, 0xfb, + 0xa1, 0xa3, 0xe8, 0xb0, 0xfb, 0xf9, 0xea, 0x50, 0x44, 0xaf, 0xa2, 0xac, 0x0c, 0xa0, 0xec, 0x15, + 0x40, 0xde, 0xa0, 0x1e, 0xcd, 0x41, 0x0e, 0x73, 0xa9, 0x06, 0x0b, 0xb6, 0x15, 0xdb, 0x96, 0x23, + 0x59, 0xc9, 0x25, 0xbe, 0x04, 0x47, 0xc2, 0x28, 0x08, 0xad, 0x36, 0xe7, 0xb4, 0x19, 0x78, 0xae, + 0xdd, 0xe7, 0x46, 0xa9, 0x99, 0x7b, 0x37, 0xc8, 0x69, 0xa8, 0x6f, 0xf5, 0x7d, 0xfb, 0xed, 0x90, + 0x17, 0x53, 0x7c, 0x14, 0xe6, 0xdc, 0x84, 0x76, 0x62, 0x0d, 0xb1, 0x92, 0x60, 0xa6, 0x0b, 0xf2, + 0xf3, 0x39, 0x38, 0xae, 0xa0, 0x63, 0x1f, 0x94, 0x61, 0x1b, 0x1b, 0x6e, 0x78, 0x11, 0xe6, 0x9d, + 0xa8, 0x6f, 0x76, 0xfd, 0xd4, 0x5b, 0x62, 0x5f, 0xd0, 0xb0, 0x0e, 0x73, 0x61, 0xd4, 0xf5, 0x29, + 0xaf, 0x33, 0x72, 0x33, 0x25, 0xe1, 0x6d, 0xa8, 0xc6, 0x09, 0x2b, 0xa8, 0xed, 0x3e, 0xaf, 0x2e, + 0xf5, 0xd6, 0xd7, 0xf7, 0xe7, 0x2d, 0xa6, 0xcc, 0x96, 0xe0, 0x68, 0x66, 0xbc, 0xf1, 0x23, 0xa8, + 0xc9, 0x8c, 0x8b, 0xb5, 0x85, 0xc6, 0xcc, 0x72, 0xbd, 0xb5, 0xb5, 0x7f, 0x41, 0x6f, 0x87, 0xac, + 0x19, 0x28, 0xf5, 0x46, 0x28, 0x97, 0xcb, 0xc2, 0x8b, 0x50, 0xeb, 0x88, 0x84, 0x8e, 0xb5, 0x2a, + 0xf7, 0x42, 0x4e, 0xc0, 0xdf, 0x86, 0x39, 0xd7, 0xdf, 0x0e, 0x62, 0xad, 0xc6, 0x21, 0xad, 0xef, + 0x0f, 0xd2, 0x6d, 0x7f, 0x3b, 0x30, 0x53, 0x86, 0xf8, 0x21, 0x1c, 0x8c, 0x68, 0x12, 0xf5, 0xa5, + 0x2d, 0x34, 0xe0, 0xd6, 0xfd, 0xc6, 0xfe, 0x24, 0x98, 0x2a, 0x4b, 0xb3, 0x28, 0x01, 0xaf, 0x41, + 0x3d, 0xce, 0x63, 0x4f, 0xab, 0x73, 0x81, 0x5a, 0x81, 0x91, 0x12, 0x9b, 0xa6, 0x7a, 0x98, 0xfc, + 0x19, 0xc1, 0xe2, 0x9e, 0xac, 0xde, 0x0a, 0x69, 0x69, 0x60, 0xb6, 0x61, 0x36, 0x0e, 0xa9, 0xcd, + 0x0b, 0x76, 0xbd, 0x75, 0x67, 0x6a, 0x69, 0xce, 0xe4, 0xca, 0x3e, 0xc6, 0x04, 0x94, 0xd6, 0xa3, + 0x0e, 0xfc, 0xbf, 0xf2, 0xe9, 0xa6, 0x95, 0xd8, 0x3b, 0x65, 0x98, 0x59, 0x32, 0xb0, 0x33, 0x85, + 0x2e, 0x93, 0x92, 0x30, 0x81, 0x1a, 0xff, 0x71, 0xaf, 0x1f, 0x16, 0xdb, 0x4a, 0x4e, 0x26, 0x3f, + 0x42, 0xa0, 0xab, 0x15, 0x29, 0xf0, 0xbc, 0x77, 0x2d, 0x7b, 0xb7, 0x5c, 0x64, 0xc5, 0x75, 0xb8, + 0xbc, 0x99, 0x75, 0x60, 0xfc, 0x9e, 0x3f, 0x3b, 0x55, 0xb9, 0x7d, 0xc3, 0xac, 0xb8, 0xce, 0x67, + 0xcf, 0x5c, 0x76, 0x65, 0xd1, 0x87, 0x74, 0xdc, 0x32, 0x20, 0x04, 0x6a, 0xfe, 0xd0, 0x2e, 0x9b, + 0x93, 0x5f, 0xa0, 0xbb, 0x2e, 0xc1, 0x42, 0x2f, 0xbb, 0xc0, 0xe4, 0x87, 0x24, 0x91, 0x81, 0x6f, + 0x47, 0x41, 0x37, 0xd4, 0xe6, 0x54, 0x4b, 0x73, 0x12, 0xbb, 0xb2, 0xec, 0xba, 0xbe, 0xa3, 0xcd, + 0x2b, 0x5b, 0x9c, 0x42, 0x7e, 0x5d, 0x81, 0x53, 0x43, 0xd4, 0x1a, 0xeb, 0xd7, 0x97, 0x40, 0xb7, + 0x3c, 0xf6, 0x16, 0xc6, 0xc4, 0x5e, 0x75, 0x78, 0xec, 0x3d, 0xad, 0x40, 0x63, 0x88, 0x6d, 0xc6, + 0x77, 0xb7, 0x97, 0xc4, 0x38, 0xdb, 0x41, 0x64, 0x53, 0x6d, 0x21, 0x8b, 0x75, 0x64, 0xa6, 0x24, + 0x96, 0x25, 0x41, 0x14, 0xee, 0x58, 0xbe, 0x56, 0x55, 0x36, 0x05, 0x8d, 0xfc, 0x07, 0x81, 0x26, + 0x6d, 0x71, 0xdd, 0xe6, 0x96, 0xe9, 0xfa, 0x2f, 0xbb, 0x39, 0x16, 0x61, 0xde, 0xe2, 0xba, 0x14, + 0x82, 0x45, 0xd0, 0xc8, 0x8f, 0x11, 0x9c, 0x28, 0xaa, 0x1c, 0x6f, 0xb8, 0x71, 0x22, 0x2f, 0x9a, + 0xd8, 0x83, 0x85, 0xf4, 0x64, 0x7a, 0xf3, 0xa8, 0xb7, 0x36, 0xf6, 0xdb, 0x77, 0x54, 0x59, 0x52, + 0x43, 0x21, 0x82, 0xbc, 0x01, 0x27, 0x86, 0x56, 0x22, 0x01, 0xa6, 0x01, 0x55, 0xd9, 0x71, 0x53, + 0x37, 0xc8, 0xfb, 0x8b, 0xa4, 0x92, 0x8f, 0x67, 0x8a, 0x45, 0x3c, 0x70, 0x36, 0x82, 0x76, 0xc9, + 0xb3, 0x61, 0x12, 0x07, 0x6a, 0xb0, 0x10, 0x06, 0x8e, 0xf0, 0x1d, 0x7f, 0xa9, 0x89, 0x25, 0xfb, + 0xda, 0x0e, 0xfc, 0xc4, 0x62, 0x0f, 0xd6, 0x82, 0xcb, 0x72, 0x32, 0x73, 0x7f, 0xec, 0xfa, 0x36, + 0xdd, 0xa2, 0x76, 0xe0, 0x3b, 0x31, 0xf7, 0xdd, 0x8c, 0x74, 0xbf, 0xba, 0x83, 0xdf, 0x82, 0x1a, + 0x5f, 0xdf, 0x73, 0x3b, 0x94, 0x3f, 0xc1, 0xea, 0xad, 0x15, 0x23, 0x7d, 0x19, 0x1b, 0xea, 0xcb, + 0x38, 0xb7, 0x30, 0x7b, 0x19, 0x1b, 0xbd, 0x2b, 0x06, 0xfb, 0xc2, 0xcc, 0x3f, 0x66, 0xb8, 0x12, + 0xcb, 0xf5, 0x36, 0x5c, 0x9f, 0xdf, 0x91, 0x72, 0x81, 0x39, 0x99, 0x85, 0xc5, 0x76, 0xe0, 0x79, + 0xc1, 0x23, 0x5e, 0x23, 0xb2, 0x7e, 0x91, 0xd2, 0xd8, 0x65, 0xa7, 0xeb, 0x27, 0xae, 0xc7, 0xb1, + 0xd4, 0xb8, 0xd6, 0x39, 0x81, 0xdd, 0xf6, 0xb7, 0x5d, 0x2f, 0xa1, 0x11, 0xbf, 0x8b, 0xd4, 0x4c, + 0xb1, 0x62, 0x16, 0xe6, 0x41, 0x58, 0x4f, 0x1f, 0x86, 0x3c, 0xfc, 0x8e, 0xca, 0xa0, 0x3d, 0xc0, + 0x89, 0x22, 0x5c, 0xc9, 0x40, 0x52, 0x1c, 0xe4, 0x9b, 0x05, 0x1a, 0xf9, 0x14, 0x41, 0x75, 0x23, + 0x68, 0xdf, 0xf4, 0x93, 0xa8, 0xcf, 0x72, 0x83, 0xd9, 0x94, 0xfa, 0x45, 0xcf, 0x4b, 0x22, 0xde, + 0x84, 0x5a, 0xe2, 0x76, 0xe8, 0x56, 0x62, 0x75, 0x42, 0x71, 0x8d, 0x78, 0x01, 0xe3, 0xad, 0xcf, + 0x33, 0x6e, 0x1a, 0x32, 0x73, 0x26, 0x2c, 0xa3, 0x3c, 0x2b, 0x4e, 0x78, 0xbe, 0x4a, 0xf3, 0x70, + 0x0a, 0x73, 0x69, 0x76, 0x6c, 0x2b, 0x29, 0x7a, 0xbe, 0xb0, 0xc3, 0x50, 0xcb, 0xd0, 0x51, 0x73, + 0x56, 0x12, 0x49, 0x13, 0x5e, 0xcb, 0x6e, 0x9e, 0xf7, 0x68, 0xd4, 0x71, 0x7d, 0xab, 0xb4, 0xfe, + 0x92, 0x2b, 0x85, 0x04, 0x61, 0x97, 0xb0, 0x07, 0xae, 0xef, 0x04, 0x8f, 0x46, 0x87, 0x38, 0xf9, + 0x47, 0xf1, 0x41, 0xad, 0x7c, 0x93, 0xe5, 0xd5, 0x5b, 0x70, 0x90, 0x65, 0x60, 0x8f, 0x8a, 0x0d, + 0x91, 0xea, 0xa4, 0x90, 0xc2, 0x43, 0x79, 0x98, 0xc5, 0x0f, 0xf1, 0x06, 0x1c, 0xb2, 0xe2, 0xd8, + 0x6d, 0xfb, 0xd4, 0x91, 0xbc, 0x2a, 0x13, 0xf3, 0x1a, 0xfc, 0x34, 0x7d, 0x4b, 0xf1, 0x13, 0xa9, + 0x17, 0x4c, 0xb9, 0x24, 0x3f, 0x44, 0x70, 0x6c, 0x28, 0x93, 0x2c, 0x06, 0x85, 0x09, 0x44, 0x47, + 0xa8, 0xc6, 0xf6, 0x0e, 0x75, 0xba, 0x1e, 0x95, 0xf3, 0x06, 0xb9, 0x66, 0x7b, 0x4e, 0x37, 0xf5, + 0x40, 0x5a, 0x9a, 0xcd, 0x6c, 0x8d, 0x97, 0x00, 0x3a, 0x96, 0xdf, 0xb5, 0x3c, 0x0e, 0x61, 0x96, + 0x43, 0x50, 0x28, 0x64, 0x11, 0xf4, 0x61, 0xee, 0x13, 0x6f, 0xf4, 0x4f, 0x10, 0xbc, 0x22, 0x4b, + 0x98, 0xf0, 0x8f, 0x01, 0x87, 0x14, 0x33, 0xdc, 0xcd, 0x5c, 0x25, 0xfa, 0xd0, 0xe0, 0xe6, 0x60, + 0x79, 0x42, 0xc3, 0xcb, 0x53, 0xea, 0xf3, 0x19, 0x75, 0x68, 0xe3, 0xef, 0xe9, 0x27, 0xa8, 0xb4, + 0x9f, 0xa0, 0xd1, 0xfd, 0x04, 0x0d, 0xdc, 0xab, 0x7e, 0x00, 0xda, 0x1d, 0xcb, 0xb7, 0xda, 0xd4, + 0xc9, 0x94, 0xcb, 0x02, 0xe9, 0x7b, 0xea, 0x2b, 0x75, 0xdf, 0x2f, 0xc0, 0xec, 0x5a, 0xe2, 0x6e, + 0x6f, 0x8b, 0x17, 0x6f, 0xeb, 0x5f, 0x4b, 0x80, 0x55, 0xc7, 0xd3, 0xa8, 0xe7, 0xda, 0x14, 0xff, + 0x02, 0xc1, 0x2c, 0xeb, 0x5b, 0xf8, 0xe4, 0xa8, 0x38, 0xe3, 0x0e, 0xd0, 0xa7, 0xf7, 0xb4, 0x60, + 0xd2, 0xc8, 0xe2, 0x7b, 0xff, 0xfc, 0xf7, 0x2f, 0x2b, 0xc7, 0xf1, 0x51, 0x3e, 0xde, 0xec, 0x5d, + 0x51, 0x47, 0x8d, 0x31, 0xfe, 0x09, 0x02, 0x2c, 0x9a, 0xa9, 0x32, 0xc3, 0xc2, 0x17, 0x47, 0x41, + 0x1c, 0x32, 0xeb, 0xd2, 0x4f, 0x2a, 0x45, 0xcc, 0xb0, 0x83, 0x88, 0xb2, 0x92, 0xc5, 0x0f, 0x70, + 0x00, 0x2b, 0x1c, 0xc0, 0x19, 0x4c, 0x86, 0x01, 0x68, 0x3e, 0x66, 0x61, 0xf0, 0xa4, 0x49, 0x53, + 0xb9, 0x7f, 0x40, 0x30, 0xf7, 0x80, 0x5f, 0x11, 0xc7, 0x18, 0x69, 0x6b, 0x6a, 0x46, 0xe2, 0xe2, + 0x38, 0x5a, 0x72, 0x9a, 0x23, 0x3d, 0x89, 0x4f, 0x48, 0xa4, 0x71, 0x12, 0x51, 0xab, 0x53, 0x00, + 0x7c, 0x19, 0xe1, 0x0f, 0x10, 0xcc, 0xa7, 0xd3, 0x2c, 0x7c, 0x76, 0x14, 0xca, 0xc2, 0xb4, 0x4b, + 0x9f, 0xde, 0x50, 0x88, 0x5c, 0xe0, 0x18, 0x4f, 0x93, 0xa1, 0xee, 0x5c, 0x2b, 0x8c, 0x8c, 0x9e, + 0x22, 0x98, 0xb9, 0x45, 0xc7, 0xc6, 0xdb, 0x14, 0xc1, 0xed, 0x31, 0xe0, 0x10, 0x57, 0xe3, 0xf7, + 0x11, 0xbc, 0x76, 0x8b, 0x26, 0xc3, 0xeb, 0x3d, 0x5e, 0x1e, 0x5f, 0x84, 0x45, 0xd8, 0x5d, 0x9c, + 0xe0, 0x64, 0x56, 0xe8, 0x9a, 0x1c, 0xd9, 0x05, 0x7c, 0xbe, 0x2c, 0x08, 0xe3, 0xbe, 0x6f, 0x3f, + 0x12, 0x38, 0x3e, 0x46, 0x70, 0x78, 0x70, 0x5a, 0x8c, 0x8b, 0x1d, 0x62, 0xe8, 0x30, 0x59, 0xbf, + 0xbb, 0xdf, 0x82, 0x52, 0x64, 0x4a, 0xae, 0x73, 0xe4, 0xaf, 0xe3, 0x2f, 0x95, 0x21, 0x97, 0xc3, + 0xb1, 0xb8, 0xf9, 0x58, 0xfe, 0x7c, 0xc2, 0xff, 0x28, 0xc1, 0x61, 0xbf, 0x87, 0xe0, 0xc0, 0x2d, + 0x9a, 0xdc, 0xc9, 0x26, 0x41, 0x23, 0xc3, 0xb6, 0x30, 0x0e, 0xd6, 0x17, 0x0d, 0xe5, 0x6f, 0x07, + 0x72, 0x2b, 0x33, 0xe9, 0x2a, 0x07, 0x76, 0x1e, 0x9f, 0x2d, 0x03, 0x96, 0x4f, 0x9f, 0x3e, 0x44, + 0x30, 0x9f, 0x4e, 0x5a, 0x46, 0x8b, 0x2f, 0xcc, 0x57, 0xa7, 0x19, 0x98, 0x37, 0x39, 0xd6, 0x37, + 0xf4, 0xcb, 0xc3, 0xb1, 0xaa, 0xdf, 0x4b, 0xab, 0x19, 0x5c, 0x81, 0x62, 0x46, 0xfd, 0x09, 0x01, + 0xe4, 0xd3, 0x22, 0x7c, 0xa1, 0x5c, 0x0f, 0x65, 0xa2, 0xa4, 0x4f, 0x77, 0x5e, 0x44, 0x0c, 0xae, + 0xcf, 0xb2, 0xde, 0x28, 0x0d, 0xe7, 0x90, 0xda, 0x6b, 0xe9, 0x4c, 0xe9, 0xf7, 0x08, 0xe6, 0xf8, + 0x54, 0x01, 0x9f, 0x19, 0x85, 0x59, 0x1d, 0x3a, 0x4c, 0xd3, 0xf4, 0xe7, 0x38, 0xd4, 0x46, 0xab, + 0xac, 0x26, 0xac, 0xa1, 0x15, 0xdc, 0x83, 0xf9, 0xf4, 0x6d, 0x3f, 0x3a, 0x3c, 0x0a, 0x6f, 0x7f, + 0xbd, 0x51, 0xd2, 0xa3, 0xd2, 0x08, 0x15, 0xe5, 0x68, 0x65, 0x5c, 0x39, 0x9a, 0x65, 0x15, 0x03, + 0x9f, 0x2e, 0xab, 0x27, 0x9f, 0x83, 0x61, 0x2e, 0x72, 0x74, 0x67, 0x49, 0x63, 0x5c, 0x49, 0x62, + 0xd6, 0xf9, 0x15, 0x82, 0xc3, 0x83, 0x57, 0x1a, 0x7c, 0x62, 0xa0, 0x1c, 0xa9, 0xf7, 0x38, 0xbd, + 0x68, 0xc5, 0x51, 0xd7, 0x21, 0xf2, 0x55, 0x8e, 0x62, 0x0d, 0x5f, 0x1b, 0x9b, 0x19, 0x77, 0x65, + 0x42, 0x33, 0x46, 0xab, 0xf9, 0xd0, 0xf9, 0x2f, 0x08, 0x0e, 0x48, 0xbe, 0xf7, 0x22, 0x4a, 0xcb, + 0x61, 0x4d, 0x2f, 0x11, 0x98, 0x2c, 0xf2, 0x65, 0x0e, 0xff, 0x8b, 0xf8, 0xea, 0x84, 0xf0, 0x25, + 0xec, 0xd5, 0x84, 0x21, 0xfd, 0x1b, 0x82, 0x23, 0x0f, 0xd2, 0xb8, 0xff, 0x1f, 0xe1, 0x7f, 0x93, + 0xe3, 0xff, 0x0a, 0x7e, 0xbd, 0xe4, 0xca, 0x31, 0x4e, 0x8d, 0xcb, 0x08, 0xff, 0x11, 0x41, 0x55, + 0x4e, 0x67, 0xf1, 0xf9, 0x91, 0x89, 0x51, 0x9c, 0xdf, 0x4e, 0x33, 0x98, 0x45, 0x7f, 0x25, 0x67, + 0x4a, 0xbb, 0x94, 0x90, 0xcf, 0x02, 0xfa, 0x29, 0x02, 0x9c, 0xbd, 0x47, 0xb2, 0x17, 0x0a, 0x3e, + 0x57, 0x10, 0x35, 0xf2, 0xe1, 0xa9, 0x9f, 0x1f, 0x7b, 0xae, 0xd8, 0xa5, 0x56, 0x4a, 0xbb, 0x54, + 0x90, 0xc9, 0xff, 0x29, 0x82, 0xfa, 0x2d, 0x9a, 0x5d, 0x87, 0x4b, 0x6c, 0x59, 0x1c, 0x41, 0xeb, + 0xcb, 0xe3, 0x0f, 0x0a, 0x44, 0x97, 0x38, 0xa2, 0x73, 0xb8, 0xdc, 0x54, 0x12, 0xc0, 0x6f, 0x11, + 0x1c, 0xdc, 0x54, 0x43, 0x14, 0x5f, 0x1a, 0x27, 0xa9, 0x50, 0xc9, 0x27, 0xc7, 0xf5, 0x05, 0x8e, + 0x6b, 0x95, 0x4c, 0x84, 0x6b, 0x4d, 0x4c, 0x72, 0x7f, 0x87, 0xe0, 0x55, 0xf5, 0xfd, 0x20, 0xe6, + 0x73, 0x9f, 0xd5, 0x6e, 0x25, 0x63, 0x3e, 0x72, 0x95, 0xe3, 0x33, 0xf0, 0xa5, 0x49, 0xf0, 0x35, + 0xc5, 0xb8, 0x0e, 0xff, 0x06, 0xc1, 0x11, 0x3e, 0x21, 0x55, 0x19, 0x0f, 0xb4, 0x98, 0x51, 0xf3, + 0xd4, 0x09, 0x5a, 0x8c, 0xa8, 0x3f, 0xe4, 0x85, 0x40, 0xad, 0x89, 0xc9, 0x26, 0xfe, 0x19, 0x82, + 0x57, 0x64, 0x53, 0x13, 0xde, 0x5d, 0x1d, 0x67, 0xb8, 0x17, 0x6d, 0x82, 0x22, 0xdc, 0x56, 0x26, + 0x0b, 0xb7, 0x0f, 0x10, 0x2c, 0x88, 0x89, 0x64, 0xc9, 0x55, 0x41, 0x19, 0x59, 0xea, 0xc7, 0x0a, + 0xa7, 0xe4, 0x30, 0x8c, 0x7c, 0x87, 0x8b, 0xbd, 0x8f, 0x9b, 0x65, 0x62, 0xc3, 0xc0, 0x89, 0x9b, + 0x8f, 0xc5, 0xa4, 0xe9, 0x49, 0xd3, 0x0b, 0xda, 0xf1, 0x3b, 0x04, 0x97, 0x36, 0x44, 0x76, 0xe6, + 0x32, 0x5a, 0xff, 0xda, 0x47, 0xcf, 0x97, 0xd0, 0xdf, 0x9f, 0x2f, 0xa1, 0x4f, 0x9f, 0x2f, 0xa1, + 0x77, 0xae, 0x4d, 0xf6, 0x6f, 0x36, 0xb6, 0xe7, 0x52, 0x3f, 0x51, 0xd9, 0xfe, 0x37, 0x00, 0x00, + 0xff, 0xff, 0x06, 0x56, 0xdd, 0x2d, 0x62, 0x24, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/pkg/apiclient/application/forwarder_overwrite.go b/pkg/apiclient/application/forwarder_overwrite.go index bd28eddf25f27..8c67679846c2d 100644 --- a/pkg/apiclient/application/forwarder_overwrite.go +++ b/pkg/apiclient/application/forwarder_overwrite.go @@ -6,7 +6,7 @@ import ( "fmt" gohttp "net/http" - "github.com/argoproj/argo-cd/util/kube" + "github.com/argoproj/argo-cd/v2/util/kube" "github.com/argoproj/pkg/grpc/http" "github.com/grpc-ecosystem/grpc-gateway/runtime" @@ -14,7 +14,7 @@ import ( // nolint:staticcheck "github.com/golang/protobuf/proto" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" ) func init() { diff --git a/pkg/apiclient/certificate/certificate.pb.go b/pkg/apiclient/certificate/certificate.pb.go index e729f6094e02a..11247f6fff66e 100644 --- a/pkg/apiclient/certificate/certificate.pb.go +++ b/pkg/apiclient/certificate/certificate.pb.go @@ -11,7 +11,7 @@ package certificate import ( context "context" fmt "fmt" - v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -209,36 +209,36 @@ func init() { } var fileDescriptor_387c41efc0710f00 = []byte{ - // 451 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x53, 0x4f, 0x6b, 0x14, 0x31, + // 457 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x54, 0x4f, 0x6b, 0x14, 0x31, 0x14, 0x27, 0x55, 0x4a, 0x4d, 0x05, 0x6d, 0x28, 0xa5, 0x0c, 0x75, 0x2d, 0x43, 0xc1, 0x52, 0x30, - 0x61, 0x2b, 0x5e, 0x3c, 0xba, 0x5e, 0x04, 0x11, 0x9d, 0xf6, 0xe4, 0x45, 0xb2, 0xb3, 0xcf, 0x6c, - 0xec, 0x34, 0x89, 0xc9, 0x9b, 0xc1, 0xbd, 0x8a, 0xdf, 0xc0, 0x0f, 0xa2, 0x27, 0x3f, 0x80, 0x07, - 0xf1, 0x28, 0xf8, 0x05, 0x64, 0xf1, 0x83, 0xc8, 0x64, 0x5b, 0x9b, 0x91, 0x11, 0xbd, 0x2c, 0x78, - 0x7b, 0x79, 0x2f, 0xef, 0xfd, 0xfe, 0xbc, 0x84, 0xee, 0x05, 0xf0, 0x0d, 0x78, 0x51, 0x82, 0x47, - 0xfd, 0x42, 0x97, 0x12, 0x21, 0x8d, 0xb9, 0xf3, 0x16, 0x2d, 0x5b, 0x4f, 0x52, 0xd9, 0xa6, 0xb2, - 0xca, 0xc6, 0xbc, 0x68, 0xa3, 0xc5, 0x95, 0x6c, 0x47, 0x59, 0xab, 0x2a, 0x10, 0xd2, 0x69, 0x21, - 0x8d, 0xb1, 0x28, 0x51, 0x5b, 0x13, 0xce, 0xaa, 0x0f, 0x95, 0xc6, 0x69, 0x3d, 0xe6, 0xa5, 0x3d, - 0x15, 0xd2, 0xc7, 0xf6, 0x97, 0x31, 0xb8, 0x5d, 0x4e, 0x84, 0x3b, 0x51, 0x6d, 0x5b, 0x10, 0xd2, - 0xb9, 0xaa, 0xc5, 0xd0, 0xd6, 0x88, 0x66, 0x28, 0x2b, 0x37, 0x95, 0x43, 0xa1, 0xc0, 0x80, 0x97, - 0x08, 0x93, 0xc5, 0xa8, 0xfc, 0x2d, 0xa1, 0x59, 0x01, 0xce, 0x06, 0x8d, 0xd6, 0xcf, 0x46, 0x17, - 0xc4, 0x9e, 0xd6, 0xe0, 0x67, 0x6c, 0x9f, 0x5e, 0x9b, 0xda, 0x80, 0x8f, 0xe5, 0x29, 0x3c, 0x91, - 0x88, 0xe0, 0xcd, 0x36, 0xd9, 0x25, 0xfb, 0x57, 0x8a, 0xdf, 0xd3, 0x2c, 0xa3, 0x6b, 0xad, 0xac, - 0xe3, 0x99, 0x83, 0xed, 0x95, 0x78, 0xe5, 0xd7, 0x99, 0xed, 0xd2, 0x28, 0xf9, 0xa8, 0x1e, 0xc7, - 0xf2, 0xa5, 0x58, 0x4e, 0x53, 0xf9, 0x47, 0x42, 0xf3, 0x5e, 0x1a, 0x23, 0x0f, 0x12, 0xa1, 0x80, - 0x57, 0x35, 0x04, 0x64, 0xaf, 0xe9, 0xd5, 0xc4, 0xbb, 0x10, 0xb9, 0xac, 0x1f, 0x1e, 0xf3, 0x0b, - 0x3f, 0xf8, 0xb9, 0x1f, 0x31, 0x78, 0x5e, 0x4e, 0xb8, 0x3b, 0x51, 0xbc, 0xf5, 0x83, 0x27, 0x7e, - 0xf0, 0x73, 0x3f, 0x78, 0x2f, 0xe8, 0x23, 0x1d, 0xb0, 0xe8, 0x20, 0xb1, 0x2d, 0xba, 0x5a, 0xbb, - 0x00, 0x1e, 0xa3, 0xb8, 0xb5, 0xe2, 0xec, 0x94, 0xdf, 0xa4, 0x37, 0x7a, 0x47, 0x14, 0x10, 0x9c, - 0x35, 0x01, 0x0e, 0x3f, 0x5d, 0xa6, 0x2c, 0xc9, 0x1f, 0x81, 0x6f, 0x74, 0x09, 0xec, 0x3d, 0xa1, - 0xd7, 0x5b, 0x98, 0x51, 0x0a, 0x72, 0x8b, 0xa7, 0x8f, 0xe5, 0xcf, 0x6b, 0xc9, 0x96, 0xa2, 0x38, - 0xdf, 0x79, 0xf3, 0xed, 0xc7, 0xbb, 0x95, 0x2d, 0xb6, 0x19, 0x9f, 0x5d, 0x33, 0x14, 0x1d, 0x07, - 0x3e, 0x13, 0xba, 0xb1, 0xd8, 0x46, 0xd2, 0xc7, 0xc4, 0xdf, 0x29, 0x77, 0x56, 0xb8, 0x24, 0xea, - 0x07, 0x91, 0xfa, 0x5e, 0xde, 0x4b, 0xfd, 0x5e, 0x77, 0x95, 0x1f, 0x08, 0xdd, 0x78, 0x00, 0x15, - 0x74, 0x85, 0xfc, 0x1f, 0xde, 0x1f, 0xf4, 0x0a, 0xb8, 0x3f, 0xfa, 0x32, 0x1f, 0x90, 0xaf, 0xf3, - 0x01, 0xf9, 0x3e, 0x1f, 0x90, 0x67, 0x77, 0xff, 0xe1, 0xfb, 0x97, 0x95, 0x06, 0x83, 0xe9, 0x94, - 0xf1, 0x6a, 0xfc, 0xf1, 0x77, 0x7e, 0x06, 0x00, 0x00, 0xff, 0xff, 0x67, 0xe0, 0x7a, 0x1e, 0xa5, - 0x04, 0x00, 0x00, + 0x61, 0xc7, 0x8b, 0x78, 0x74, 0xc5, 0x53, 0x11, 0x9d, 0x0a, 0x82, 0x17, 0xc9, 0xce, 0x3e, 0x67, + 0x63, 0xa7, 0x49, 0x4c, 0xde, 0x0c, 0x2c, 0xde, 0xc4, 0x6f, 0xe0, 0x37, 0xd1, 0x93, 0xdf, 0x40, + 0xf1, 0x22, 0xf8, 0x05, 0x64, 0xf1, 0x83, 0xc8, 0x64, 0x5b, 0x9b, 0x91, 0x11, 0xbd, 0x2c, 0xf4, + 0xf6, 0xf2, 0x5e, 0xde, 0x7b, 0xbf, 0x3f, 0x21, 0x74, 0xcf, 0x83, 0x6b, 0xc0, 0x89, 0x02, 0x1c, + 0xaa, 0x97, 0xaa, 0x90, 0x08, 0x71, 0xcc, 0xad, 0x33, 0x68, 0xd8, 0x7a, 0x94, 0x4a, 0x36, 0x4b, + 0x53, 0x9a, 0x90, 0x17, 0x6d, 0xb4, 0xb8, 0x92, 0xec, 0x94, 0xc6, 0x94, 0x15, 0x08, 0x69, 0x95, + 0x90, 0x5a, 0x1b, 0x94, 0xa8, 0x8c, 0xf6, 0xa7, 0xd5, 0xc3, 0x52, 0xe1, 0xb4, 0x1e, 0xf3, 0xc2, + 0x9c, 0x08, 0xe9, 0x42, 0xfb, 0xab, 0x10, 0xdc, 0x2e, 0x26, 0xa2, 0xc9, 0x84, 0x3d, 0x2e, 0xdb, + 0x4e, 0x2f, 0xa4, 0xb5, 0x55, 0xbb, 0x46, 0x19, 0x2d, 0x9a, 0xa1, 0xac, 0xec, 0x54, 0x0e, 0x45, + 0x09, 0x1a, 0x9c, 0x44, 0x98, 0x2c, 0xa6, 0xa5, 0xef, 0x08, 0x4d, 0x72, 0xb0, 0xc6, 0x2b, 0x34, + 0x6e, 0x36, 0x3a, 0xc7, 0xf6, 0xa4, 0x06, 0x37, 0x63, 0xfb, 0xf4, 0xda, 0xd4, 0x78, 0x7c, 0x24, + 0x4f, 0xe0, 0xb1, 0x44, 0x04, 0xa7, 0xb7, 0xc9, 0x2e, 0xd9, 0xbf, 0x92, 0xff, 0x99, 0x66, 0x09, + 0x5d, 0x6b, 0x99, 0x3d, 0x9d, 0x59, 0xd8, 0x5e, 0x09, 0x57, 0x7e, 0x9f, 0xd9, 0x2e, 0x0d, 0xac, + 0x8f, 0xea, 0x71, 0x28, 0x5f, 0x0a, 0xe5, 0x38, 0x95, 0x7e, 0x22, 0x34, 0xed, 0x85, 0x31, 0x72, + 0x20, 0x11, 0x72, 0x78, 0x5d, 0x83, 0x47, 0xf6, 0x86, 0x5e, 0x8d, 0xe4, 0xf3, 0x01, 0xcb, 0x7a, + 0xf6, 0x8c, 0x9f, 0x4b, 0xc2, 0xcf, 0x24, 0x09, 0xc1, 0x8b, 0x62, 0xc2, 0x9b, 0x8c, 0xdb, 0xe3, + 0x92, 0xb7, 0x92, 0xf0, 0x48, 0x12, 0x7e, 0x26, 0x09, 0xef, 0xdd, 0x7b, 0xa8, 0x3c, 0xe6, 0x9d, + 0x65, 0x6c, 0x8b, 0xae, 0xd6, 0xd6, 0x83, 0xc3, 0xc0, 0x6f, 0x2d, 0x3f, 0x3d, 0xa5, 0x37, 0xe9, + 0x8d, 0xde, 0x11, 0x39, 0x78, 0x6b, 0xb4, 0x87, 0xec, 0xeb, 0x65, 0xca, 0xa2, 0xfc, 0x11, 0xb8, + 0x46, 0x15, 0xc0, 0x3e, 0x10, 0x7a, 0xbd, 0x5d, 0x33, 0x8a, 0x97, 0xdc, 0xe2, 0xf1, 0x93, 0xf9, + 0xbb, 0x33, 0xc9, 0xb2, 0x48, 0xa7, 0x3b, 0x6f, 0xbf, 0xff, 0x7c, 0xbf, 0xb2, 0xc5, 0x36, 0xc3, + 0xfb, 0x6b, 0x86, 0xa2, 0x23, 0xc2, 0x17, 0x42, 0x37, 0x16, 0x9e, 0x44, 0x7d, 0x4c, 0xfc, 0x1b, + 0x75, 0xc7, 0xc8, 0xe5, 0xa1, 0x3f, 0x08, 0xe8, 0xf7, 0xd2, 0x5e, 0xf4, 0xf7, 0xba, 0x86, 0x7e, + 0x24, 0x74, 0xe3, 0x01, 0x54, 0xd0, 0xe5, 0x72, 0x61, 0x1c, 0x38, 0xe8, 0xe5, 0x70, 0xff, 0xe1, + 0xe7, 0xf9, 0x80, 0x7c, 0x9b, 0x0f, 0xc8, 0x8f, 0xf9, 0x80, 0x3c, 0xbf, 0xfb, 0x7f, 0xbf, 0x41, + 0x51, 0x29, 0xd0, 0x18, 0x0f, 0x1a, 0xaf, 0x86, 0x0f, 0xe0, 0xce, 0xaf, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x35, 0xdf, 0x5b, 0xaf, 0xb7, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/pkg/apiclient/cluster/cluster.pb.go b/pkg/apiclient/cluster/cluster.pb.go index 7b0092d2b188b..1d1e09f5a1c07 100644 --- a/pkg/apiclient/cluster/cluster.pb.go +++ b/pkg/apiclient/cluster/cluster.pb.go @@ -10,7 +10,7 @@ package cluster import ( context "context" fmt "fmt" - v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -249,43 +249,43 @@ func init() { func init() { proto.RegisterFile("server/cluster/cluster.proto", fileDescriptor_a6b5ba0b5aa57b32) } var fileDescriptor_a6b5ba0b5aa57b32 = []byte{ - // 564 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0xc1, 0x6b, 0x13, 0x4f, - 0x14, 0xc7, 0xd9, 0xb4, 0xa4, 0xbf, 0xce, 0x4f, 0xad, 0x0e, 0x55, 0x62, 0xac, 0xa1, 0x5d, 0x14, - 0x4b, 0x31, 0x33, 0x24, 0x5e, 0xa4, 0x17, 0xb1, 0x91, 0x4a, 0xc1, 0x8b, 0x2b, 0x5e, 0xa4, 0x20, - 0xd3, 0xdd, 0xc7, 0x66, 0xcc, 0x76, 0x67, 0x9c, 0x99, 0x5d, 0x10, 0x11, 0x41, 0xaf, 0xe2, 0xc5, - 0x9b, 0x17, 0xfd, 0x37, 0xfc, 0x0f, 0x3c, 0x0a, 0xfe, 0x03, 0x12, 0xfc, 0x43, 0x64, 0x67, 0x67, - 0x93, 0x26, 0x21, 0xa2, 0x18, 0x3d, 0x65, 0xe6, 0x4d, 0xe6, 0xbd, 0xcf, 0xf7, 0xfb, 0xde, 0x0e, - 0xda, 0xd0, 0xa0, 0x72, 0x50, 0x34, 0x4c, 0x32, 0x6d, 0xc6, 0xbf, 0x44, 0x2a, 0x61, 0x04, 0x5e, - 0x71, 0xdb, 0xe6, 0x7a, 0x2c, 0x62, 0x61, 0x63, 0xb4, 0x58, 0x95, 0xc7, 0xcd, 0x8d, 0x58, 0x88, - 0x38, 0x01, 0xca, 0x24, 0xa7, 0x2c, 0x4d, 0x85, 0x61, 0x86, 0x8b, 0x54, 0xbb, 0x53, 0x7f, 0x70, - 0x53, 0x13, 0x2e, 0xec, 0x69, 0x28, 0x14, 0xd0, 0xbc, 0x43, 0x63, 0x48, 0x41, 0x31, 0x03, 0x91, - 0xfb, 0xcf, 0x41, 0xcc, 0x4d, 0x3f, 0x3b, 0x22, 0xa1, 0x38, 0xa6, 0x4c, 0xd9, 0x12, 0x4f, 0xec, - 0xa2, 0x1d, 0x46, 0x54, 0x0e, 0xe2, 0xe2, 0xb2, 0xa6, 0x4c, 0xca, 0x84, 0x87, 0x36, 0x39, 0xcd, - 0x3b, 0x2c, 0x91, 0x7d, 0x36, 0x93, 0xca, 0xdf, 0x45, 0xa7, 0x7a, 0x25, 0xed, 0xfd, 0x0c, 0xd4, - 0x33, 0x7c, 0x01, 0xd5, 0x4b, 0x6d, 0x0d, 0x6f, 0xd3, 0xdb, 0x5e, 0x0d, 0xdc, 0x0e, 0x63, 0xb4, - 0x9c, 0xb2, 0x63, 0x68, 0xd4, 0x6c, 0xd4, 0xae, 0xfd, 0x73, 0x68, 0xcd, 0xdd, 0x0d, 0x40, 0x4b, - 0x91, 0x6a, 0xf0, 0xdf, 0x78, 0x68, 0xdd, 0xc5, 0x7a, 0x0a, 0x98, 0x81, 0x00, 0x9e, 0x66, 0xa0, - 0x0d, 0x3e, 0x44, 0x95, 0x2b, 0x36, 0xf1, 0xff, 0xdd, 0x3d, 0x32, 0x16, 0x41, 0x2a, 0x11, 0x76, - 0xf1, 0x38, 0x8c, 0x88, 0x1c, 0xc4, 0xa4, 0x10, 0x41, 0x4e, 0x88, 0x20, 0x95, 0x08, 0x52, 0x55, - 0xad, 0x52, 0x16, 0xd4, 0x99, 0xd4, 0xa0, 0x8c, 0xe5, 0xfb, 0x2f, 0x70, 0x3b, 0xff, 0xfd, 0x18, - 0xe7, 0xa1, 0x8c, 0xfe, 0x19, 0xce, 0x15, 0x74, 0x3a, 0xb3, 0xe5, 0xa2, 0x7d, 0x0e, 0x49, 0xa4, - 0x1b, 0xb5, 0xcd, 0xa5, 0xed, 0xd5, 0x60, 0x32, 0xd8, 0xfd, 0xb4, 0x82, 0xce, 0xb8, 0xab, 0x0f, - 0x40, 0xe5, 0x3c, 0x04, 0xfc, 0x12, 0x2d, 0xdf, 0xe3, 0xda, 0xe0, 0xf3, 0xa4, 0x9a, 0xa8, 0x93, - 0xcd, 0x69, 0xee, 0xff, 0x39, 0x64, 0x91, 0xde, 0x6f, 0xbc, 0xfa, 0xfa, 0xfd, 0x5d, 0x0d, 0xe3, - 0xb3, 0x76, 0xca, 0xf2, 0x4e, 0x35, 0xbf, 0x1a, 0xbf, 0xf5, 0x50, 0xbd, 0x6c, 0x1c, 0xbe, 0x3c, - 0xcd, 0x30, 0xd1, 0xd0, 0xe6, 0x02, 0x0c, 0xf3, 0xb7, 0x2c, 0xc7, 0x25, 0x7f, 0x86, 0x63, 0x77, - 0x64, 0xe5, 0x6b, 0x0f, 0x2d, 0xdd, 0x85, 0xb9, 0x8e, 0x2c, 0x90, 0x02, 0x5f, 0x9c, 0xa6, 0xa0, - 0xcf, 0xcb, 0xe1, 0x7f, 0x81, 0x3f, 0x78, 0xa8, 0x5e, 0x0e, 0xd0, 0xac, 0x2d, 0x13, 0x83, 0xb5, - 0x10, 0xa0, 0xae, 0x05, 0xba, 0xde, 0xdc, 0x9a, 0x05, 0xaa, 0x6a, 0x3b, 0xb0, 0xb1, 0x4f, 0x87, - 0xa8, 0x7e, 0x07, 0x12, 0x30, 0x30, 0xcf, 0xa9, 0xc6, 0x74, 0x78, 0xf4, 0xcd, 0x3a, 0xfd, 0x3b, - 0x3f, 0xd1, 0x9f, 0x20, 0x14, 0x14, 0xef, 0x14, 0xdc, 0xce, 0x4c, 0xff, 0xf7, 0x2b, 0xb4, 0x6d, - 0x85, 0x6b, 0xfe, 0xd5, 0xb9, 0x15, 0xa8, 0xb2, 0xe9, 0xdb, 0xac, 0xc8, 0xff, 0xd1, 0x43, 0x6b, - 0x07, 0x69, 0xce, 0x12, 0x5e, 0x38, 0xdb, 0x63, 0x61, 0x1f, 0xfe, 0x66, 0xff, 0x9d, 0xdd, 0xfe, - 0xce, 0x7c, 0x3a, 0x3e, 0xa2, 0x69, 0x87, 0x05, 0xce, 0xde, 0xad, 0xcf, 0xc3, 0x96, 0xf7, 0x65, - 0xd8, 0xf2, 0xbe, 0x0d, 0x5b, 0xde, 0xa3, 0xce, 0x2f, 0xbc, 0xc7, 0x61, 0xc2, 0x21, 0x35, 0x55, - 0xee, 0xa3, 0xba, 0x7d, 0x7e, 0x6f, 0xfc, 0x08, 0x00, 0x00, 0xff, 0xff, 0x1a, 0x55, 0xe8, 0x91, - 0x4a, 0x06, 0x00, 0x00, + // 568 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x4f, 0x6b, 0x13, 0x4f, + 0x18, 0xc7, 0x99, 0xb4, 0xa4, 0xbf, 0xce, 0x4f, 0xad, 0x0e, 0x55, 0x62, 0xac, 0xa1, 0x5d, 0x14, + 0x4b, 0x31, 0x33, 0x24, 0x7a, 0x90, 0xde, 0x6c, 0xfc, 0x43, 0xa1, 0x17, 0x57, 0xbc, 0x88, 0x50, + 0xa6, 0xbb, 0x0f, 0x9b, 0x31, 0xdb, 0x9d, 0x75, 0x66, 0x76, 0x41, 0xc4, 0x4b, 0x0f, 0x5e, 0x45, + 0x3c, 0x7b, 0xd1, 0x37, 0xa3, 0x37, 0xc1, 0x37, 0x20, 0xc1, 0x17, 0x22, 0x3b, 0x3b, 0x9b, 0x34, + 0x09, 0x11, 0x85, 0xe8, 0x29, 0xcf, 0x3c, 0x93, 0x79, 0xbe, 0x9f, 0xe7, 0x3b, 0xcf, 0x0e, 0xde, + 0xd0, 0xa0, 0x72, 0x50, 0x2c, 0x88, 0x33, 0x6d, 0xc6, 0xbf, 0x34, 0x55, 0xd2, 0x48, 0xb2, 0xe2, + 0x96, 0xcd, 0xf5, 0x48, 0x46, 0xd2, 0xe6, 0x58, 0x11, 0x95, 0xdb, 0xcd, 0x8d, 0x48, 0xca, 0x28, + 0x06, 0xc6, 0x53, 0xc1, 0x78, 0x92, 0x48, 0xc3, 0x8d, 0x90, 0x89, 0x76, 0xbb, 0xde, 0xe0, 0x8e, + 0xa6, 0x42, 0xda, 0xdd, 0x40, 0x2a, 0x60, 0x79, 0x87, 0x45, 0x90, 0x80, 0xe2, 0x06, 0x42, 0xf7, + 0x9f, 0x83, 0x48, 0x98, 0x7e, 0x76, 0x44, 0x03, 0x79, 0xcc, 0xb8, 0xb2, 0x12, 0xcf, 0x6d, 0xd0, + 0x0e, 0x42, 0x96, 0x77, 0x59, 0x3a, 0x88, 0x8a, 0xf3, 0x9a, 0xf1, 0x34, 0x8d, 0x45, 0x60, 0xeb, + 0xb3, 0xbc, 0xc3, 0xe3, 0xb4, 0xcf, 0x67, 0xaa, 0x79, 0xbb, 0xf8, 0x4c, 0xaf, 0x04, 0x7e, 0x94, + 0x81, 0x7a, 0x49, 0x2e, 0xe1, 0x7a, 0xd9, 0x5e, 0x03, 0x6d, 0xa2, 0xed, 0x55, 0xdf, 0xad, 0x08, + 0xc1, 0xcb, 0x09, 0x3f, 0x86, 0x46, 0xcd, 0x66, 0x6d, 0xec, 0x5d, 0xc0, 0x6b, 0xee, 0xac, 0x0f, + 0x3a, 0x95, 0x89, 0x06, 0xef, 0x2d, 0xc2, 0xeb, 0x2e, 0xd7, 0x53, 0xc0, 0x0d, 0xf8, 0xf0, 0x22, + 0x03, 0x6d, 0xc8, 0x21, 0xae, 0x8c, 0xb1, 0x85, 0xff, 0xef, 0xde, 0xa7, 0xe3, 0x3e, 0x68, 0xd5, + 0x87, 0x0d, 0x0e, 0x83, 0x90, 0xe6, 0x5d, 0x9a, 0x0e, 0x22, 0x5a, 0xf4, 0x41, 0x4f, 0xf5, 0x41, + 0xab, 0x3e, 0x68, 0x25, 0x5c, 0x55, 0x2d, 0xc0, 0xb3, 0x54, 0x83, 0x32, 0x16, 0xf1, 0x3f, 0xdf, + 0xad, 0xbc, 0x0f, 0x63, 0xa2, 0x27, 0x69, 0xf8, 0x2f, 0x89, 0xae, 0xe1, 0xb3, 0x99, 0x55, 0x0c, + 0x1f, 0x08, 0x88, 0x43, 0xdd, 0xa8, 0x6d, 0x2e, 0x6d, 0xaf, 0xfa, 0x93, 0xc9, 0xee, 0x97, 0x15, + 0x7c, 0xce, 0x1d, 0x7d, 0x0c, 0x2a, 0x17, 0x01, 0x90, 0x13, 0x84, 0x97, 0x0f, 0x84, 0x36, 0xe4, + 0x22, 0xad, 0x66, 0xeb, 0xf4, 0x1d, 0x35, 0xf7, 0x17, 0x02, 0x5a, 0x28, 0x78, 0x8d, 0x93, 0x6f, + 0x3f, 0xde, 0xd7, 0x08, 0x39, 0x6f, 0x47, 0x2e, 0xef, 0x54, 0xc3, 0xac, 0xc9, 0x3b, 0x84, 0xeb, + 0xe5, 0x15, 0x92, 0xab, 0xd3, 0x18, 0x13, 0x57, 0xdb, 0x5c, 0x8c, 0x6f, 0xde, 0x96, 0x45, 0xb9, + 0xe2, 0xcd, 0xa0, 0xec, 0x8e, 0x1c, 0x7d, 0x83, 0xf0, 0xd2, 0x43, 0x98, 0xeb, 0xcb, 0x62, 0x41, + 0xc8, 0xe5, 0x69, 0x10, 0xf6, 0xaa, 0xfc, 0x18, 0x5e, 0x93, 0x8f, 0x08, 0xd7, 0xcb, 0x69, 0x9a, + 0x35, 0x67, 0x62, 0xca, 0x16, 0xc5, 0xd4, 0xb5, 0x4c, 0x37, 0x9b, 0x5b, 0xb3, 0x4c, 0x95, 0xbc, + 0x63, 0x1b, 0xbb, 0xf5, 0x0c, 0xd7, 0xef, 0x41, 0x0c, 0x06, 0xe6, 0xf9, 0xd5, 0x98, 0x4e, 0x8f, + 0x3e, 0x63, 0x67, 0xc1, 0xce, 0x2f, 0x2c, 0x88, 0x31, 0xf6, 0x8b, 0xd7, 0x0b, 0xee, 0x66, 0xa6, + 0xff, 0xe7, 0x0a, 0x6d, 0xab, 0x70, 0xc3, 0xbb, 0x3e, 0x57, 0x81, 0x29, 0x5b, 0xbe, 0xcd, 0x8b, + 0xfa, 0x9f, 0x10, 0x5e, 0xdb, 0x4f, 0x72, 0x1e, 0x8b, 0xc2, 0xdc, 0x1e, 0x0f, 0xfa, 0xf0, 0x97, + 0xa7, 0xc0, 0x39, 0xee, 0xed, 0xcc, 0x07, 0x14, 0x23, 0xa0, 0x76, 0x50, 0x10, 0xed, 0xed, 0x7d, + 0x1e, 0xb6, 0xd0, 0xd7, 0x61, 0x0b, 0x7d, 0x1f, 0xb6, 0xd0, 0xd3, 0xdb, 0xbf, 0xf7, 0x50, 0x07, + 0xb1, 0x80, 0xc4, 0x54, 0xe5, 0x8f, 0xea, 0xf6, 0x5d, 0xbe, 0xf5, 0x33, 0x00, 0x00, 0xff, 0xff, + 0x91, 0x1e, 0xb3, 0x71, 0x66, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/pkg/apiclient/cluster/mocks/ClusterServiceServer.go b/pkg/apiclient/cluster/mocks/ClusterServiceServer.go index 064a5e44d79c7..f6118b7a43f95 100644 --- a/pkg/apiclient/cluster/mocks/ClusterServiceServer.go +++ b/pkg/apiclient/cluster/mocks/ClusterServiceServer.go @@ -5,11 +5,11 @@ package mocks import ( context "context" - cluster "github.com/argoproj/argo-cd/pkg/apiclient/cluster" + cluster "github.com/argoproj/argo-cd/v2/pkg/apiclient/cluster" mock "github.com/stretchr/testify/mock" - v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" ) // ClusterServiceServer is an autogenerated mock type for the ClusterServiceServer type diff --git a/pkg/apiclient/gpgkey/gpgkey.pb.go b/pkg/apiclient/gpgkey/gpgkey.pb.go index af8630380e09f..7d79ec26b0055 100644 --- a/pkg/apiclient/gpgkey/gpgkey.pb.go +++ b/pkg/apiclient/gpgkey/gpgkey.pb.go @@ -10,7 +10,7 @@ package gpgkey import ( context "context" fmt "fmt" - v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -248,38 +248,38 @@ func init() { func init() { proto.RegisterFile("server/gpgkey/gpgkey.proto", fileDescriptor_8ba55a5eb76dc6fd) } var fileDescriptor_8ba55a5eb76dc6fd = []byte{ - // 491 bytes of a gzipped FileDescriptorProto + // 494 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0x41, 0x8b, 0xd3, 0x40, 0x14, 0xc7, 0x99, 0xee, 0x9a, 0xb5, 0x23, 0x22, 0x8e, 0xcb, 0x6e, 0xcc, 0x96, 0x5a, 0xa2, 0x87, - 0xa2, 0x38, 0x63, 0xd7, 0x9b, 0x07, 0x0f, 0xba, 0x10, 0xca, 0x2a, 0xd4, 0x78, 0xf3, 0xa0, 0xa4, - 0xc9, 0x63, 0x36, 0x26, 0x66, 0xc6, 0xcc, 0xa4, 0x12, 0xc4, 0x8b, 0x17, 0x0f, 0x82, 0x17, 0xef, - 0x82, 0xdf, 0xc6, 0xa3, 0xe0, 0x17, 0x90, 0xe2, 0x07, 0x91, 0x4e, 0xa6, 0xee, 0xb6, 0x94, 0xba, - 0x87, 0x9e, 0xf2, 0x5e, 0xde, 0xbc, 0xf7, 0x7e, 0x6f, 0xde, 0x7f, 0xb0, 0xa7, 0xa0, 0x9c, 0x40, - 0xc9, 0xb8, 0xe4, 0x19, 0xd4, 0xf6, 0x43, 0x65, 0x29, 0xb4, 0x20, 0x4e, 0xe3, 0x79, 0xbb, 0x5c, - 0x70, 0x61, 0x7e, 0xb1, 0x99, 0xd5, 0x44, 0xbd, 0x0e, 0x17, 0x82, 0xe7, 0xc0, 0x22, 0x99, 0xb2, - 0xa8, 0x28, 0x84, 0x8e, 0x74, 0x2a, 0x0a, 0x65, 0xa3, 0x43, 0x9e, 0xea, 0x93, 0x6a, 0x4c, 0x63, - 0xf1, 0x86, 0x45, 0xa5, 0x49, 0x7f, 0x6d, 0x8c, 0xbb, 0x71, 0xc2, 0x64, 0xc6, 0x67, 0x69, 0x8a, - 0x45, 0x52, 0xe6, 0x69, 0x6c, 0x12, 0xd9, 0x64, 0x10, 0xe5, 0xf2, 0x24, 0x1a, 0x30, 0x0e, 0x05, - 0x94, 0x91, 0x86, 0xa4, 0x29, 0xe5, 0xdf, 0xc1, 0xd7, 0x82, 0xa2, 0x1a, 0x05, 0xa3, 0x6a, 0x9c, - 0xa7, 0xf1, 0x31, 0xd4, 0xcf, 0x2a, 0x28, 0x6b, 0xb2, 0x8b, 0x2f, 0x64, 0x50, 0x0f, 0x8f, 0x5c, - 0xd4, 0x43, 0xfd, 0x76, 0xd8, 0x38, 0xfe, 0x37, 0x84, 0x0f, 0x16, 0x4f, 0x3f, 0x2e, 0x21, 0xd2, - 0x10, 0xc2, 0xdb, 0x0a, 0x94, 0x26, 0x1c, 0xb7, 0xa5, 0x89, 0x64, 0x50, 0x9b, 0xcc, 0x4b, 0x87, - 0x43, 0x7a, 0xca, 0x4a, 0xe7, 0xac, 0xc6, 0x78, 0x15, 0x27, 0x54, 0x66, 0x9c, 0xce, 0x58, 0xe9, - 0x19, 0x56, 0x3a, 0x67, 0xa5, 0x8b, 0xad, 0xc2, 0xd3, 0xda, 0x64, 0x0f, 0x3b, 0x95, 0x54, 0x50, - 0x6a, 0xb7, 0xd5, 0x43, 0xfd, 0x8b, 0xa1, 0xf5, 0xfc, 0xef, 0x08, 0x77, 0x56, 0x03, 0x2a, 0x29, - 0x0a, 0x05, 0x84, 0xe3, 0x9d, 0xd8, 0xfc, 0x49, 0x2c, 0xdf, 0xd3, 0x8d, 0xf1, 0x3d, 0x49, 0x95, - 0x0e, 0xe7, 0xd5, 0x89, 0x8b, 0x77, 0x54, 0x96, 0x4a, 0x09, 0x89, 0xdb, 0xea, 0x6d, 0xf5, 0xdb, - 0xe1, 0xdc, 0xf5, 0x5d, 0xbc, 0xb7, 0x34, 0x98, 0x85, 0x3b, 0xfc, 0xb4, 0x8d, 0x2f, 0x07, 0xa3, - 0xe0, 0x18, 0xea, 0xe7, 0x50, 0x4e, 0xd2, 0x18, 0xc8, 0x67, 0x84, 0xb7, 0x67, 0x75, 0xc9, 0x01, - 0xb5, 0xe2, 0x59, 0xb1, 0x2c, 0x6f, 0xb3, 0x33, 0xf8, 0xfb, 0x1f, 0x7f, 0xfd, 0xf9, 0xda, 0xba, - 0x4a, 0xae, 0x18, 0xf5, 0x4d, 0x06, 0x56, 0xb7, 0x8a, 0x7c, 0x41, 0x78, 0x2b, 0x80, 0xff, 0xc0, - 0x6c, 0x6e, 0xe1, 0xfe, 0x0d, 0x03, 0x72, 0x9d, 0xec, 0x2f, 0x81, 0xb0, 0xf7, 0x46, 0x8e, 0x1f, - 0xc8, 0x3b, 0xec, 0x34, 0xfb, 0x25, 0x37, 0x57, 0x23, 0x2d, 0xc8, 0xd3, 0xbb, 0xb5, 0xfe, 0x50, - 0xb3, 0x05, 0xdf, 0x37, 0x5d, 0x3b, 0xfe, 0xf2, 0xf8, 0x0f, 0xce, 0xe8, 0xef, 0x25, 0x76, 0x8e, - 0x20, 0x07, 0x0d, 0xeb, 0xef, 0xa2, 0xbb, 0x3a, 0xf8, 0xaf, 0x95, 0xbd, 0xe9, 0xdb, 0xcb, 0xad, - 0x1e, 0x3d, 0xfc, 0x31, 0xed, 0xa2, 0x9f, 0xd3, 0x2e, 0xfa, 0x3d, 0xed, 0xa2, 0x17, 0xf7, 0xce, - 0xf1, 0xdc, 0xe3, 0x3c, 0x85, 0x42, 0xdb, 0x02, 0x63, 0xc7, 0x3c, 0xee, 0xfb, 0x7f, 0x03, 0x00, - 0x00, 0xff, 0xff, 0x98, 0x67, 0x12, 0xff, 0x81, 0x04, 0x00, 0x00, + 0xa2, 0x38, 0x43, 0xbb, 0x37, 0x6f, 0xea, 0x42, 0x90, 0xed, 0xa1, 0xc6, 0x9b, 0x07, 0x25, 0x4d, + 0x1e, 0xb3, 0x69, 0x62, 0x66, 0xcc, 0x4c, 0x22, 0x41, 0xbc, 0x78, 0x57, 0x10, 0x3f, 0x81, 0xe0, + 0x87, 0xf1, 0x28, 0xf8, 0x05, 0xa4, 0xf8, 0x41, 0xa4, 0x93, 0xd4, 0xdd, 0x96, 0x52, 0xf7, 0xd0, + 0x53, 0xde, 0xcb, 0x9b, 0xf7, 0xde, 0x6f, 0xde, 0xfb, 0x0f, 0x76, 0x14, 0xe4, 0x25, 0xe4, 0x8c, + 0x4b, 0x9e, 0x40, 0xd5, 0x7c, 0xa8, 0xcc, 0x85, 0x16, 0xc4, 0xaa, 0x3d, 0x67, 0x9f, 0x0b, 0x2e, + 0xcc, 0x2f, 0x36, 0xb7, 0xea, 0xa8, 0xd3, 0xe1, 0x42, 0xf0, 0x14, 0x58, 0x20, 0x63, 0x16, 0x64, + 0x99, 0xd0, 0x81, 0x8e, 0x45, 0xa6, 0x9a, 0xe8, 0x88, 0xc7, 0xfa, 0xac, 0x98, 0xd0, 0x50, 0xbc, + 0x61, 0x41, 0x6e, 0xd2, 0xa7, 0xc6, 0x78, 0x18, 0x46, 0xac, 0x1c, 0x32, 0x99, 0xf0, 0x79, 0xa6, + 0x62, 0x81, 0x94, 0x69, 0x1c, 0x9a, 0x5c, 0x56, 0x0e, 0x82, 0x54, 0x9e, 0x05, 0x03, 0xc6, 0x21, + 0x83, 0x3c, 0xd0, 0x10, 0xd5, 0xd5, 0xdc, 0x07, 0xf8, 0x96, 0x97, 0x15, 0x63, 0x6f, 0x5c, 0x4c, + 0xd2, 0x38, 0x3c, 0x85, 0xea, 0x79, 0x01, 0x79, 0x45, 0xf6, 0xf1, 0x95, 0x04, 0xaa, 0x67, 0x27, + 0x36, 0xea, 0xa1, 0x7e, 0xdb, 0xaf, 0x1d, 0xf7, 0x1b, 0xc2, 0x47, 0xcb, 0xa7, 0x9f, 0xe6, 0x10, + 0x68, 0xf0, 0xe1, 0x6d, 0x01, 0x4a, 0x93, 0x29, 0x6e, 0x4b, 0x13, 0x49, 0xa0, 0x32, 0x99, 0xd7, + 0x86, 0x23, 0x7a, 0x8e, 0x4b, 0x17, 0xb8, 0xc6, 0x78, 0x1d, 0x46, 0xb4, 0x1c, 0x52, 0x99, 0x70, + 0x3a, 0xc7, 0xa5, 0x17, 0x70, 0xe9, 0x02, 0x97, 0x2e, 0x77, 0xf3, 0xcf, 0xcb, 0x93, 0x03, 0x6c, + 0x15, 0x52, 0x41, 0xae, 0xed, 0x56, 0x0f, 0xf5, 0xaf, 0xfa, 0x8d, 0xe7, 0x7e, 0x47, 0xb8, 0xb3, + 0x9e, 0x51, 0x49, 0x91, 0x29, 0x20, 0x53, 0xbc, 0x17, 0x9a, 0x3f, 0x51, 0x83, 0x38, 0xde, 0x26, + 0xe2, 0x28, 0x56, 0xda, 0x5f, 0x34, 0x20, 0x36, 0xde, 0x53, 0x49, 0x2c, 0x25, 0x44, 0x76, 0xab, + 0xb7, 0xd3, 0x6f, 0xfb, 0x0b, 0xd7, 0xb5, 0xf1, 0xc1, 0xca, 0xdd, 0x1a, 0xbe, 0xe1, 0xa7, 0x5d, + 0x7c, 0xdd, 0x1b, 0x7b, 0xa7, 0x50, 0xbd, 0x80, 0xbc, 0x8c, 0x43, 0x20, 0x9f, 0x11, 0xde, 0x9d, + 0xd7, 0x25, 0x47, 0xb4, 0x51, 0xd1, 0x9a, 0x95, 0x39, 0x5b, 0xbf, 0x86, 0x7b, 0xf8, 0xf1, 0xd7, + 0x9f, 0xaf, 0xad, 0x9b, 0xe4, 0x86, 0x51, 0x62, 0x39, 0x68, 0x34, 0xac, 0xc8, 0x17, 0x84, 0x77, + 0x3c, 0xf8, 0x0f, 0xcf, 0x56, 0x37, 0xef, 0xde, 0x31, 0x2c, 0xb7, 0xc9, 0xe1, 0x0a, 0x0b, 0x7b, + 0x6f, 0xa4, 0xf9, 0x81, 0xbc, 0xc3, 0x56, 0xbd, 0x68, 0x72, 0x77, 0x3d, 0xd5, 0x92, 0x54, 0x9d, + 0x7b, 0x9b, 0x0f, 0xd5, 0xbb, 0x70, 0x5d, 0xd3, 0xb5, 0xe3, 0xae, 0x4e, 0xe0, 0xd1, 0x05, 0x21, + 0xbe, 0xc2, 0xd6, 0x09, 0xa4, 0xa0, 0x61, 0xf3, 0x38, 0xba, 0xeb, 0x83, 0xff, 0x5a, 0x35, 0xc3, + 0xbe, 0xbf, 0xda, 0xea, 0xc9, 0xe3, 0x1f, 0xb3, 0x2e, 0xfa, 0x39, 0xeb, 0xa2, 0xdf, 0xb3, 0x2e, + 0x7a, 0x79, 0x7c, 0xb9, 0xd7, 0x1f, 0xa6, 0x31, 0x64, 0xba, 0xa9, 0x31, 0xb1, 0xcc, 0x5b, 0x3f, + 0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x22, 0x5b, 0x6e, 0xbf, 0x93, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/pkg/apiclient/grpcproxy.go b/pkg/apiclient/grpcproxy.go index 0c8e3ed656a77..13c0fcb5cbf5e 100644 --- a/pkg/apiclient/grpcproxy.go +++ b/pkg/apiclient/grpcproxy.go @@ -16,9 +16,9 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - argocderrors "github.com/argoproj/argo-cd/util/errors" - argoio "github.com/argoproj/argo-cd/util/io" - "github.com/argoproj/argo-cd/util/rand" + argocderrors "github.com/argoproj/argo-cd/v2/util/errors" + argoio "github.com/argoproj/argo-cd/v2/util/io" + "github.com/argoproj/argo-cd/v2/util/rand" ) const ( diff --git a/pkg/apiclient/project/project.pb.go b/pkg/apiclient/project/project.pb.go index 81b2733bf8516..30c670bb8f279 100644 --- a/pkg/apiclient/project/project.pb.go +++ b/pkg/apiclient/project/project.pb.go @@ -10,7 +10,7 @@ package project import ( context "context" fmt "fmt" - v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -583,62 +583,62 @@ func init() { func init() { proto.RegisterFile("server/project/project.proto", fileDescriptor_5f0a51496972c9e2) } var fileDescriptor_5f0a51496972c9e2 = []byte{ - // 867 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4f, 0x6f, 0x23, 0x35, - 0x14, 0x97, 0x9b, 0x36, 0x4b, 0x5d, 0x58, 0x8a, 0xb7, 0x5b, 0xd2, 0xd0, 0xed, 0x46, 0x46, 0x54, - 0x51, 0xa1, 0xb6, 0xd2, 0x82, 0xb4, 0x82, 0x03, 0xe2, 0x4f, 0x55, 0x55, 0xe2, 0x00, 0x29, 0x08, - 0x04, 0x87, 0xca, 0x9d, 0x79, 0x9a, 0xba, 0x49, 0xc6, 0x66, 0xc6, 0x49, 0x89, 0xa2, 0x5e, 0x56, - 0x88, 0x03, 0x1c, 0x38, 0x70, 0xe2, 0x8c, 0xc4, 0x67, 0xe1, 0x88, 0xc4, 0x17, 0x40, 0x15, 0x1f, - 0x04, 0xd9, 0xe3, 0x99, 0x64, 0x9a, 0x0e, 0x02, 0x11, 0xed, 0x29, 0x9e, 0xe7, 0xe7, 0xf7, 0xfb, - 0xbd, 0x9f, 0xdf, 0x7b, 0x31, 0xde, 0x4e, 0x21, 0x19, 0x41, 0xc2, 0x75, 0xa2, 0x2e, 0x21, 0x30, - 0xf9, 0x2f, 0xd3, 0x89, 0x32, 0x8a, 0xdc, 0xf3, 0x9f, 0xcd, 0x8d, 0x48, 0x45, 0xca, 0xd9, 0xb8, - 0x5d, 0x65, 0xdb, 0xcd, 0xed, 0x48, 0xa9, 0xa8, 0x0f, 0x5c, 0x68, 0xc9, 0x45, 0x1c, 0x2b, 0x23, - 0x8c, 0x54, 0x71, 0xea, 0x77, 0x69, 0xef, 0x49, 0xca, 0xa4, 0x72, 0xbb, 0x81, 0x4a, 0x80, 0x8f, - 0x3a, 0x3c, 0x82, 0x18, 0x12, 0x61, 0x20, 0xf4, 0x3e, 0x6f, 0x4e, 0x7d, 0x06, 0x22, 0xb8, 0x90, - 0x31, 0x24, 0x63, 0xae, 0x7b, 0x91, 0x35, 0xa4, 0x7c, 0x00, 0x46, 0xdc, 0x75, 0xea, 0x24, 0x92, - 0xe6, 0x62, 0x78, 0xce, 0x02, 0x35, 0xe0, 0x22, 0x71, 0xc4, 0x2e, 0xdd, 0x62, 0x3f, 0x08, 0xa7, - 0xa7, 0x85, 0xd6, 0x7d, 0x19, 0x38, 0x4a, 0x7c, 0xd4, 0x11, 0x7d, 0x7d, 0x21, 0xe6, 0x42, 0xd1, - 0x1f, 0x11, 0xde, 0xf8, 0x38, 0x4b, 0xf2, 0x83, 0x04, 0x84, 0x81, 0x2e, 0x7c, 0x3d, 0x84, 0xd4, - 0x90, 0x33, 0x9c, 0x27, 0xdf, 0x40, 0x2d, 0xd4, 0x5e, 0x3b, 0x38, 0x62, 0x53, 0x54, 0x96, 0xa3, - 0xba, 0xc5, 0x59, 0x10, 0x32, 0xdd, 0x8b, 0x98, 0x45, 0x65, 0x33, 0xa8, 0x2c, 0x47, 0x65, 0xef, - 0x69, 0xed, 0x41, 0xba, 0x79, 0x54, 0xb2, 0x89, 0xeb, 0x43, 0x9d, 0x42, 0x62, 0x1a, 0x4b, 0x2d, - 0xd4, 0x7e, 0xae, 0xeb, 0xbf, 0x68, 0x0f, 0x6f, 0x79, 0xdf, 0x4f, 0x55, 0x0f, 0xe2, 0x0f, 0xa1, - 0x0f, 0x53, 0x56, 0x8d, 0x32, 0xab, 0xd5, 0x69, 0x38, 0x82, 0x97, 0x13, 0xd5, 0x07, 0x17, 0x6c, - 0xb5, 0xeb, 0xd6, 0x64, 0x1d, 0xd7, 0xa4, 0x30, 0x8d, 0x5a, 0x0b, 0xb5, 0x6b, 0x5d, 0xbb, 0x24, - 0xf7, 0xf1, 0x92, 0x0c, 0x1b, 0xcb, 0xce, 0x67, 0x49, 0x86, 0xf4, 0x67, 0x54, 0x46, 0x2b, 0x6b, - 0x50, 0x8d, 0xd6, 0xc2, 0x6b, 0x21, 0xa4, 0x41, 0x22, 0xb5, 0x4d, 0xd4, 0x83, 0xce, 0x9a, 0x0a, - 0x3e, 0xb5, 0x19, 0x3e, 0xdb, 0x78, 0x15, 0xbe, 0xd1, 0x32, 0x81, 0xf4, 0x24, 0x76, 0x24, 0x6a, - 0xdd, 0xa9, 0xc1, 0x73, 0x5b, 0x29, 0xb8, 0xbd, 0x51, 0xdc, 0x8c, 0xa3, 0xd6, 0x85, 0x54, 0xab, - 0x38, 0x05, 0xb2, 0x81, 0x57, 0x8c, 0x35, 0x78, 0x4e, 0xd9, 0x07, 0xa5, 0xf8, 0x79, 0xef, 0xfd, - 0xc9, 0x10, 0x92, 0xb1, 0xc5, 0x8f, 0xc5, 0x00, 0xbc, 0x93, 0x5b, 0xd3, 0xab, 0x22, 0xe2, 0x67, - 0x3a, 0x7c, 0x86, 0x77, 0x4d, 0x5f, 0xc4, 0x2f, 0x1c, 0x0d, 0xb4, 0x19, 0xe7, 0x39, 0xd0, 0x5d, - 0xbc, 0x7e, 0x3a, 0x8e, 0x83, 0xcf, 0x65, 0x1c, 0xaa, 0xab, 0xb4, 0x9a, 0xf1, 0x08, 0x3f, 0x98, - 0xf1, 0x2b, 0x24, 0x38, 0xc3, 0xf7, 0xae, 0x32, 0x53, 0x03, 0xb5, 0x6a, 0xff, 0x93, 0xf0, 0x14, - 0xa0, 0x9b, 0x47, 0xa5, 0x43, 0xbc, 0x79, 0xdc, 0x57, 0xe7, 0xa2, 0xef, 0x53, 0x99, 0x42, 0x7f, - 0x85, 0x57, 0xa4, 0x81, 0xc1, 0x22, 0x80, 0x67, 0x94, 0xca, 0x62, 0x1e, 0xfc, 0x8a, 0xf1, 0x7d, - 0x6f, 0x3a, 0x85, 0x64, 0x24, 0x03, 0x20, 0xdf, 0x23, 0xbc, 0x96, 0x55, 0xa5, 0xab, 0x02, 0x42, - 0x59, 0x3e, 0xa2, 0x2a, 0xeb, 0xb6, 0xf9, 0xe8, 0x4e, 0x9f, 0x42, 0xfc, 0x27, 0x4f, 0xff, 0xf8, - 0xeb, 0xa7, 0xa5, 0x03, 0xba, 0xef, 0x46, 0xd3, 0xa8, 0x93, 0x0f, 0xbd, 0x94, 0x4f, 0xfc, 0xea, - 0x9a, 0xdb, 0x7a, 0x4d, 0xf9, 0xc4, 0xfe, 0x5c, 0x73, 0x57, 0x61, 0x6f, 0xa3, 0x3d, 0xf2, 0x1d, - 0xc2, 0x6b, 0x59, 0x43, 0xfe, 0x13, 0x99, 0x52, 0xcb, 0x36, 0x37, 0x0b, 0x9f, 0x72, 0x09, 0xbc, - 0xe3, 0x58, 0xbc, 0xb5, 0x77, 0xf8, 0x9f, 0x58, 0xf0, 0x89, 0x14, 0xe6, 0x9a, 0xfc, 0x80, 0x70, - 0x3d, 0xcb, 0x99, 0xcc, 0x25, 0x5b, 0xd6, 0x62, 0x31, 0x17, 0x44, 0x5f, 0x71, 0x6c, 0x1f, 0xd2, - 0xf5, 0xdb, 0x6c, 0xad, 0x2c, 0x4f, 0x11, 0x5e, 0xfe, 0x48, 0xa6, 0x86, 0x3c, 0xbc, 0xcd, 0xc5, - 0x55, 0x76, 0xf3, 0x64, 0x21, 0x1c, 0x2c, 0x02, 0x6d, 0x38, 0x1e, 0x84, 0xcc, 0xf1, 0x20, 0xdf, - 0x22, 0x5c, 0x3b, 0x86, 0x4a, 0x0e, 0x0b, 0xd2, 0xe1, 0xb1, 0xc3, 0xdf, 0x22, 0x2f, 0xcf, 0xdf, - 0x9a, 0x6d, 0xd8, 0x6b, 0x32, 0xc1, 0x2f, 0x1d, 0x83, 0x29, 0x37, 0x4f, 0x15, 0xa7, 0xc7, 0x85, - 0xf9, 0xee, 0x66, 0xa3, 0xcc, 0xa1, 0xb5, 0xc9, 0x6e, 0x05, 0x1a, 0x8f, 0xdc, 0xb9, 0x42, 0x83, - 0x5f, 0x10, 0xae, 0x67, 0xa3, 0x6d, 0xbe, 0x2c, 0x4a, 0x23, 0x6f, 0x51, 0x72, 0x1c, 0x3a, 0x82, - 0xfb, 0xcd, 0x76, 0x65, 0x11, 0x33, 0xfb, 0x27, 0x1e, 0x0a, 0x23, 0x98, 0x63, 0x6c, 0xcb, 0xe5, - 0x0b, 0x5c, 0xcf, 0x5a, 0xa4, 0x4a, 0x97, 0xaa, 0x96, 0xf1, 0xe2, 0xef, 0x55, 0x8a, 0x7f, 0x89, - 0xb1, 0xad, 0x92, 0xa3, 0x11, 0xc4, 0xd5, 0xaa, 0x3f, 0x62, 0xd9, 0xa3, 0xc3, 0x66, 0xc8, 0xec, - 0xc3, 0x84, 0x8d, 0x3a, 0xcc, 0x1d, 0x71, 0x15, 0xb6, 0xeb, 0x40, 0x5a, 0x64, 0xa7, 0x4a, 0x73, - 0xc8, 0xa2, 0x4f, 0xf0, 0x83, 0x63, 0x30, 0x33, 0xd3, 0xf9, 0xd4, 0x58, 0xdd, 0xb7, 0x0a, 0xd0, - 0xdb, 0x03, 0xbe, 0xb9, 0x7d, 0xd7, 0x56, 0x91, 0xdc, 0xeb, 0x0e, 0xf7, 0x35, 0xf2, 0x6a, 0x15, - 0x6e, 0x3a, 0x8e, 0x03, 0x3f, 0x9f, 0xdf, 0x7f, 0xf7, 0xb7, 0x9b, 0x1d, 0xf4, 0xfb, 0xcd, 0x0e, - 0xfa, 0xf3, 0x66, 0x07, 0x7d, 0xd9, 0xf9, 0x17, 0xef, 0xa1, 0xa0, 0x2f, 0x21, 0x2e, 0xde, 0x77, - 0xe7, 0x75, 0xf7, 0xfc, 0x39, 0xfc, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x3f, 0xc3, 0xbe, 0x9d, 0x00, - 0x0a, 0x00, 0x00, + // 874 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xc1, 0x6e, 0x23, 0x45, + 0x10, 0x55, 0xc7, 0x89, 0x97, 0x74, 0x60, 0x09, 0xbd, 0xd9, 0xe0, 0x98, 0x6c, 0xd6, 0x6a, 0x44, + 0x64, 0x05, 0xd2, 0xad, 0x38, 0x8b, 0xb4, 0x82, 0x13, 0x0b, 0xab, 0x80, 0x94, 0x03, 0x38, 0x20, + 0x10, 0x07, 0x50, 0x7b, 0xa6, 0x34, 0xe9, 0xd8, 0x9e, 0x6e, 0x66, 0x3a, 0xb3, 0x6b, 0xac, 0x5c, + 0x90, 0x00, 0x89, 0x03, 0x07, 0x38, 0xf1, 0x03, 0x7c, 0x00, 0x5f, 0xc1, 0x11, 0x89, 0x1f, 0x40, + 0x11, 0x1f, 0x82, 0xba, 0xa7, 0x67, 0x6c, 0xc7, 0x1e, 0x04, 0xc2, 0xe2, 0xe4, 0x9a, 0x9a, 0x9a, + 0x7a, 0xaf, 0x5e, 0x57, 0x95, 0x1b, 0xef, 0xa6, 0x90, 0x64, 0x90, 0x70, 0x9d, 0xa8, 0x0b, 0x08, + 0x4c, 0xf1, 0xcb, 0x74, 0xa2, 0x8c, 0x22, 0xb7, 0xfc, 0x63, 0x73, 0x2b, 0x52, 0x91, 0x72, 0x3e, + 0x6e, 0xad, 0xfc, 0x75, 0x73, 0x37, 0x52, 0x2a, 0x1a, 0x00, 0x17, 0x5a, 0x72, 0x11, 0xc7, 0xca, + 0x08, 0x23, 0x55, 0x9c, 0xfa, 0xb7, 0xb4, 0xff, 0x30, 0x65, 0x52, 0xb9, 0xb7, 0x81, 0x4a, 0x80, + 0x67, 0x47, 0x3c, 0x82, 0x18, 0x12, 0x61, 0x20, 0xf4, 0x31, 0x0f, 0x26, 0x31, 0x43, 0x11, 0x9c, + 0xcb, 0x18, 0x92, 0x11, 0xd7, 0xfd, 0xc8, 0x3a, 0x52, 0x3e, 0x04, 0x23, 0x16, 0x7d, 0x75, 0x1a, + 0x49, 0x73, 0x7e, 0xd9, 0x63, 0x81, 0x1a, 0x72, 0x91, 0x38, 0x62, 0x17, 0xce, 0x38, 0x0c, 0x42, + 0x9e, 0x75, 0x26, 0x09, 0x84, 0xd6, 0x03, 0x19, 0x38, 0x56, 0x3c, 0x3b, 0x12, 0x03, 0x7d, 0x2e, + 0xe6, 0xb2, 0xd1, 0x1f, 0x10, 0xde, 0x7a, 0x3f, 0xaf, 0xf3, 0xed, 0x04, 0x84, 0x81, 0x2e, 0x7c, + 0x71, 0x09, 0xa9, 0x21, 0x3d, 0x5c, 0xd4, 0xdf, 0x40, 0x2d, 0xd4, 0xde, 0xe8, 0xbc, 0xcb, 0x26, + 0xc0, 0xac, 0x00, 0x76, 0xc6, 0xe7, 0x41, 0xc8, 0xb2, 0x0e, 0xd3, 0xfd, 0x88, 0x59, 0x60, 0x36, + 0x05, 0xcc, 0x0a, 0x60, 0xf6, 0x96, 0xd6, 0x1e, 0xa7, 0x5b, 0x24, 0x26, 0xdb, 0xb8, 0x7e, 0xa9, + 0x53, 0x48, 0x4c, 0x63, 0xa5, 0x85, 0xda, 0xcf, 0x74, 0xfd, 0x13, 0xed, 0xe3, 0x1d, 0x1f, 0xfb, + 0xa1, 0xea, 0x43, 0xfc, 0x0e, 0x0c, 0x60, 0x42, 0xac, 0x31, 0x4b, 0x6c, 0x7d, 0x92, 0x8e, 0xe0, + 0xd5, 0x44, 0x0d, 0xc0, 0x25, 0x5b, 0xef, 0x3a, 0x9b, 0x6c, 0xe2, 0x9a, 0x14, 0xa6, 0x51, 0x6b, + 0xa1, 0x76, 0xad, 0x6b, 0x4d, 0x72, 0x1b, 0xaf, 0xc8, 0xb0, 0xb1, 0xea, 0x62, 0x56, 0x64, 0x48, + 0x7f, 0x42, 0xb3, 0x68, 0xb3, 0x32, 0x54, 0xa3, 0xb5, 0xf0, 0x46, 0x08, 0x69, 0x90, 0x48, 0x6d, + 0x0b, 0xf5, 0xa0, 0xd3, 0xae, 0x92, 0x4f, 0x6d, 0x8a, 0xcf, 0x2e, 0x5e, 0x87, 0xa7, 0x5a, 0x26, + 0x90, 0xbe, 0x17, 0x3b, 0x12, 0xb5, 0xee, 0xc4, 0xe1, 0xb9, 0xad, 0x95, 0xdc, 0x5e, 0x2b, 0x0f, + 0xc7, 0x51, 0xeb, 0x42, 0xaa, 0x55, 0x9c, 0x02, 0xd9, 0xc2, 0x6b, 0xc6, 0x3a, 0x3c, 0xa7, 0xfc, + 0x81, 0x52, 0xfc, 0xac, 0x8f, 0xfe, 0xe0, 0x12, 0x92, 0x91, 0xc5, 0x8f, 0xc5, 0x10, 0x7c, 0x90, + 0xb3, 0xe9, 0x97, 0x65, 0xc6, 0x8f, 0x74, 0xf8, 0xff, 0x1e, 0x37, 0x7d, 0x1e, 0x3f, 0xf7, 0x78, + 0xa8, 0xcd, 0xa8, 0x28, 0x83, 0xee, 0xe3, 0xcd, 0xb3, 0x51, 0x1c, 0x7c, 0x2c, 0xe3, 0x50, 0x3d, + 0x49, 0xab, 0x49, 0x8f, 0xf0, 0x9d, 0xa9, 0xb8, 0x52, 0x85, 0x1e, 0xbe, 0xf5, 0x24, 0x77, 0x35, + 0x50, 0xab, 0xf6, 0xdf, 0x39, 0x4f, 0x30, 0xba, 0x45, 0x62, 0xfa, 0x14, 0x6f, 0x9f, 0x0c, 0x54, + 0x4f, 0x0c, 0x7c, 0x35, 0x13, 0xf4, 0xcf, 0xf0, 0x9a, 0x34, 0x30, 0x5c, 0x12, 0xf6, 0x94, 0x5e, + 0x79, 0xda, 0xce, 0x2f, 0x18, 0xdf, 0xf6, 0xae, 0x33, 0x48, 0x32, 0x19, 0x00, 0xf9, 0x0e, 0xe1, + 0x8d, 0xbc, 0x3d, 0x5d, 0x3b, 0x10, 0xca, 0x8a, 0x8d, 0x55, 0xd9, 0xc0, 0xcd, 0x7b, 0x0b, 0x63, + 0xca, 0x23, 0x78, 0xf8, 0xd5, 0xef, 0x7f, 0xfe, 0xb8, 0xd2, 0xa1, 0x87, 0x6e, 0x53, 0x65, 0x47, + 0xc5, 0x0e, 0x4c, 0xf9, 0xd8, 0x5b, 0x57, 0xdc, 0x36, 0x6e, 0xca, 0xc7, 0xf6, 0xe7, 0x8a, 0xbb, + 0x56, 0x7b, 0x03, 0x1d, 0x90, 0x6f, 0x10, 0xde, 0xc8, 0x27, 0xf3, 0xef, 0xc8, 0xcc, 0xcc, 0x6e, + 0x73, 0xbb, 0x8c, 0x99, 0x6d, 0x84, 0x37, 0x1d, 0x8b, 0xd7, 0x0f, 0x8e, 0xff, 0x15, 0x0b, 0x3e, + 0x96, 0xc2, 0x5c, 0x91, 0xef, 0x11, 0xae, 0xe7, 0x35, 0x93, 0xb9, 0x62, 0x67, 0xb5, 0x58, 0xda, + 0x19, 0xd1, 0x97, 0x1c, 0xe1, 0xbb, 0x74, 0xf3, 0x26, 0x61, 0xab, 0xcc, 0xd7, 0x08, 0xaf, 0x9e, + 0xca, 0xd4, 0x90, 0xbb, 0x37, 0xe9, 0xb8, 0x16, 0x6f, 0x9e, 0x2e, 0x8b, 0x86, 0x05, 0xa1, 0x0d, + 0x47, 0x85, 0x90, 0x39, 0x2a, 0xe4, 0x5b, 0x84, 0x6b, 0x27, 0x50, 0x49, 0x63, 0x79, 0x6a, 0xdc, + 0x77, 0x14, 0x76, 0xc8, 0x8b, 0xf3, 0xc7, 0x67, 0xe7, 0xf7, 0x8a, 0x8c, 0xf1, 0x0b, 0x27, 0x60, + 0x66, 0x07, 0xa9, 0x8a, 0xd6, 0xfd, 0xd2, 0xbd, 0x78, 0xf0, 0x28, 0x73, 0x68, 0x6d, 0xb2, 0x5f, + 0x81, 0xc6, 0x23, 0xf7, 0x5d, 0x29, 0xc3, 0xcf, 0x08, 0xd7, 0xf3, 0x65, 0x37, 0xdf, 0x1f, 0x33, + 0x4b, 0x70, 0x89, 0x8a, 0x1c, 0x3b, 0x8e, 0x87, 0xcd, 0x76, 0x65, 0x43, 0x33, 0xfb, 0xff, 0x1e, + 0x0a, 0x23, 0x98, 0x23, 0x6d, 0xfb, 0xe6, 0x13, 0x5c, 0xcf, 0xc7, 0xa5, 0x4a, 0x9a, 0xaa, 0xf1, + 0xf1, 0xfa, 0x1f, 0x54, 0xea, 0x7f, 0x81, 0xb1, 0xed, 0x95, 0xc7, 0x19, 0xc4, 0xd5, 0xc2, 0xdf, + 0x63, 0xf9, 0x7d, 0xc4, 0x56, 0xc8, 0xec, 0x9d, 0x85, 0x65, 0x47, 0xcc, 0x7d, 0xe2, 0xfa, 0x6c, + 0xdf, 0x81, 0xb4, 0xc8, 0x5e, 0x95, 0xec, 0x90, 0x67, 0x1f, 0xe3, 0x3b, 0x27, 0x60, 0xa6, 0xf6, + 0xf5, 0x99, 0xb1, 0xd2, 0xef, 0x94, 0xa0, 0x37, 0x57, 0x7e, 0x73, 0x77, 0xd1, 0xab, 0xb2, 0xb8, + 0x57, 0x1d, 0xee, 0x2b, 0xe4, 0xe5, 0x2a, 0xdc, 0x74, 0x14, 0x07, 0x7e, 0x5d, 0x3f, 0x7a, 0xf4, + 0xeb, 0xf5, 0x1e, 0xfa, 0xed, 0x7a, 0x0f, 0xfd, 0x71, 0xbd, 0x87, 0x3e, 0x7d, 0xf0, 0xcf, 0xae, + 0x4a, 0xc1, 0x40, 0x42, 0x5c, 0xde, 0xfe, 0x7a, 0x75, 0x77, 0x33, 0x3a, 0xfe, 0x2b, 0x00, 0x00, + 0xff, 0xff, 0x22, 0xe7, 0xcb, 0x09, 0x1e, 0x0a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/pkg/apiclient/repocreds/repocreds.pb.go b/pkg/apiclient/repocreds/repocreds.pb.go index fca5694aed683..24d8cd7936dc3 100644 --- a/pkg/apiclient/repocreds/repocreds.pb.go +++ b/pkg/apiclient/repocreds/repocreds.pb.go @@ -10,7 +10,7 @@ package repocreds import ( context "context" fmt "fmt" - v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -287,39 +287,39 @@ func init() { func init() { proto.RegisterFile("server/repocreds/repocreds.proto", fileDescriptor_b0b5fce4710a8821) } var fileDescriptor_b0b5fce4710a8821 = []byte{ - // 497 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0x41, 0x6b, 0x14, 0x31, - 0x14, 0xc7, 0x49, 0xa5, 0xc5, 0x46, 0x90, 0x76, 0x2a, 0xb5, 0x3b, 0x5b, 0xd7, 0x35, 0x07, 0x29, - 0x45, 0x13, 0xb6, 0xbd, 0x88, 0x37, 0x6d, 0x0f, 0x0a, 0x5e, 0x1c, 0xf1, 0xd2, 0x8b, 0xa4, 0x33, - 0x8f, 0x69, 0xdc, 0x71, 0x12, 0x93, 0xcc, 0x40, 0x11, 0x11, 0x3c, 0x7b, 0xeb, 0xd1, 0x2f, 0xe0, - 0x07, 0xf0, 0x43, 0x78, 0x14, 0xfc, 0x02, 0xb2, 0xf8, 0x41, 0x24, 0xd9, 0x9d, 0x99, 0x1d, 0x76, - 0x0e, 0x7b, 0x58, 0x7a, 0x7b, 0x93, 0xbc, 0xf9, 0xbf, 0xdf, 0xcb, 0x3f, 0x2f, 0x78, 0x68, 0x40, - 0x97, 0xa0, 0x99, 0x06, 0x25, 0x63, 0x0d, 0x89, 0x69, 0x22, 0xaa, 0xb4, 0xb4, 0x32, 0xd8, 0xac, - 0x17, 0xc2, 0x3b, 0xa9, 0x4c, 0xa5, 0x5f, 0x65, 0x2e, 0x9a, 0x26, 0x84, 0xfb, 0xa9, 0x94, 0x69, - 0x06, 0x8c, 0x2b, 0xc1, 0x78, 0x9e, 0x4b, 0xcb, 0xad, 0x90, 0xf9, 0xec, 0xf7, 0x90, 0x8c, 0x9f, - 0x18, 0x2a, 0xa4, 0xdf, 0x8d, 0xa5, 0x06, 0x56, 0x8e, 0x58, 0x0a, 0x39, 0x68, 0x6e, 0x21, 0x99, - 0xe5, 0xbc, 0x4c, 0x85, 0xbd, 0x28, 0xce, 0x69, 0x2c, 0x3f, 0x30, 0xae, 0x7d, 0x89, 0xf7, 0x3e, - 0x78, 0x1c, 0x27, 0x4c, 0x8d, 0x53, 0xf7, 0xb3, 0x61, 0x5c, 0xa9, 0x4c, 0xc4, 0x5e, 0x9c, 0x95, - 0x23, 0x9e, 0xa9, 0x0b, 0xbe, 0x20, 0x45, 0x08, 0xbe, 0x1d, 0x81, 0x92, 0x27, 0x8e, 0xf7, 0x75, - 0x01, 0xfa, 0x32, 0xd8, 0xc2, 0x37, 0x0a, 0x9d, 0xed, 0xa1, 0x21, 0x3a, 0xd8, 0x8c, 0x5c, 0x48, - 0x0e, 0xf1, 0x6e, 0x9d, 0x73, 0x0a, 0x19, 0x58, 0x88, 0xe0, 0x63, 0x01, 0xc6, 0x76, 0xe4, 0xee, - 0xe0, 0xed, 0x3a, 0x37, 0x02, 0xa3, 0x64, 0x6e, 0x80, 0x7c, 0x43, 0x73, 0x0a, 0x27, 0x1a, 0x78, - 0xa3, 0x70, 0x86, 0xd7, 0xfd, 0x59, 0x79, 0x8d, 0x5b, 0x47, 0xa7, 0xb4, 0x69, 0x8d, 0x56, 0xad, - 0xf9, 0xe0, 0x5d, 0x9c, 0x50, 0x35, 0x4e, 0xa9, 0x6b, 0x8d, 0xce, 0xb5, 0x46, 0xab, 0xd6, 0x68, - 0x53, 0x77, 0x2a, 0x19, 0xec, 0xe2, 0x8d, 0x42, 0x19, 0xd0, 0x76, 0x6f, 0x6d, 0x88, 0x0e, 0x6e, - 0x46, 0xb3, 0x2f, 0x62, 0xe7, 0x68, 0xde, 0xaa, 0xe4, 0x7a, 0x68, 0x8e, 0xae, 0xd6, 0xf1, 0x56, - 0xbd, 0xf8, 0x06, 0x74, 0x29, 0x62, 0x08, 0xbe, 0x23, 0xdc, 0x7b, 0x25, 0x8c, 0x75, 0x1b, 0x46, - 0x58, 0xa9, 0x2f, 0xdd, 0x36, 0xe4, 0x56, 0xf0, 0xcc, 0x04, 0x3d, 0xda, 0x5c, 0xae, 0xb6, 0x4b, - 0xe1, 0x8b, 0x55, 0xa0, 0xb9, 0xca, 0xa4, 0xf7, 0xf5, 0xcf, 0xbf, 0xab, 0xb5, 0x9d, 0x60, 0xdb, - 0x5f, 0xb9, 0x72, 0xd4, 0x5c, 0xe8, 0xe0, 0x07, 0xc2, 0xfd, 0xca, 0xae, 0x2e, 0xbe, 0x07, 0x5d, - 0x7c, 0x2d, 0x7f, 0xc3, 0x95, 0x1c, 0x21, 0x19, 0x7a, 0xc6, 0x90, 0x2c, 0x32, 0x3e, 0x9d, 0x79, - 0xfd, 0x13, 0xe1, 0x7e, 0xe5, 0xe5, 0xd2, 0xa8, 0x2d, 0xf3, 0x57, 0x84, 0xfa, 0xc8, 0xa3, 0x3e, - 0x0c, 0xef, 0x2d, 0xa0, 0xb2, 0x4f, 0xd3, 0xf2, 0x85, 0xce, 0x3e, 0x57, 0xd8, 0x5f, 0x70, 0xbf, - 0x9a, 0xa8, 0xa5, 0xa9, 0x5b, 0x23, 0x18, 0xee, 0x77, 0xa5, 0xd4, 0x93, 0x77, 0xdf, 0xd3, 0xf4, - 0x0e, 0xef, 0x76, 0xd0, 0x38, 0x8e, 0xe7, 0xcf, 0x7e, 0x4d, 0x06, 0xe8, 0xf7, 0x64, 0x80, 0xfe, - 0x4e, 0x06, 0xe8, 0xec, 0x78, 0x89, 0x87, 0x25, 0xce, 0x04, 0xe4, 0xb6, 0x11, 0x3a, 0xdf, 0xf0, - 0x2f, 0xc9, 0xf1, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xae, 0xe4, 0x90, 0x83, 0x1b, 0x05, 0x00, - 0x00, + // 503 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0xc1, 0x6a, 0x14, 0x31, + 0x18, 0xc7, 0x49, 0xa5, 0xc5, 0x46, 0x90, 0x76, 0x2a, 0xb5, 0x3b, 0x5b, 0xd7, 0x35, 0x07, 0x29, + 0x45, 0x13, 0x76, 0x05, 0x11, 0x8f, 0xb6, 0xe0, 0xc1, 0x5e, 0x1c, 0xf1, 0x22, 0x88, 0xa4, 0x33, + 0x1f, 0xd3, 0xb8, 0xe3, 0x24, 0x26, 0x99, 0x91, 0x45, 0x44, 0xf0, 0x05, 0x3c, 0x78, 0x15, 0x5f, + 0xc0, 0x07, 0xf0, 0x15, 0x3c, 0x0a, 0xbe, 0x80, 0x2c, 0x3e, 0x88, 0x24, 0xbb, 0x33, 0xb3, 0xcb, + 0xce, 0x61, 0x0f, 0x8b, 0xb7, 0x6f, 0x92, 0xff, 0xfc, 0xf3, 0xfb, 0xf2, 0x7d, 0x5f, 0x70, 0xdf, + 0x80, 0x2e, 0x41, 0x33, 0x0d, 0x4a, 0xc6, 0x1a, 0x12, 0xd3, 0x44, 0x54, 0x69, 0x69, 0x65, 0xb0, + 0x5d, 0x2f, 0x84, 0xd7, 0x52, 0x99, 0x4a, 0xbf, 0xca, 0x5c, 0x34, 0x15, 0x84, 0x87, 0xa9, 0x94, + 0x69, 0x06, 0x8c, 0x2b, 0xc1, 0x78, 0x9e, 0x4b, 0xcb, 0xad, 0x90, 0xf9, 0xec, 0xf7, 0x90, 0x8c, + 0x1e, 0x18, 0x2a, 0xa4, 0xdf, 0x8d, 0xa5, 0x06, 0x56, 0x0e, 0x58, 0x0a, 0x39, 0x68, 0x6e, 0x21, + 0x99, 0x69, 0xce, 0x52, 0x61, 0x2f, 0x8a, 0x73, 0x1a, 0xcb, 0x37, 0x8c, 0x6b, 0x7f, 0xc4, 0x6b, + 0x1f, 0xdc, 0x8d, 0x13, 0x56, 0x0e, 0x99, 0x1a, 0xa5, 0xee, 0x7f, 0xc3, 0xb8, 0x52, 0x99, 0x88, + 0xbd, 0x3f, 0x2b, 0x07, 0x3c, 0x53, 0x17, 0x7c, 0xc9, 0x8d, 0x10, 0x7c, 0x35, 0x02, 0x25, 0x4f, + 0x1c, 0xf2, 0xd3, 0x02, 0xf4, 0x38, 0xd8, 0xc1, 0x97, 0x0a, 0x9d, 0x1d, 0xa0, 0x3e, 0x3a, 0xda, + 0x8e, 0x5c, 0x48, 0x8e, 0xf1, 0x7e, 0xad, 0x39, 0x85, 0x0c, 0x2c, 0x44, 0xf0, 0xb6, 0x00, 0x63, + 0x5b, 0xb4, 0x7b, 0x78, 0xb7, 0xd6, 0x46, 0x60, 0x94, 0xcc, 0x0d, 0x90, 0xcf, 0x68, 0xce, 0xe1, + 0x44, 0x03, 0x6f, 0x1c, 0x5e, 0xe2, 0x4d, 0x7f, 0x5d, 0xde, 0xe3, 0xca, 0xf0, 0x31, 0x6d, 0xb2, + 0xa3, 0x55, 0x76, 0x3e, 0x78, 0x15, 0x27, 0xb4, 0x1c, 0x52, 0x35, 0x4a, 0xa9, 0xcb, 0x8e, 0xce, + 0x65, 0x47, 0xab, 0xec, 0x68, 0x73, 0xf4, 0xd4, 0x35, 0xd8, 0xc7, 0x5b, 0x85, 0x32, 0xa0, 0xed, + 0xc1, 0x46, 0x1f, 0x1d, 0x5d, 0x8e, 0x66, 0x5f, 0xe4, 0xdd, 0x1c, 0xd0, 0x73, 0x95, 0xfc, 0x37, + 0xa0, 0xe1, 0xd7, 0x4d, 0xbc, 0x53, 0x2f, 0x3e, 0x03, 0x5d, 0x8a, 0x18, 0x82, 0x6f, 0x08, 0x77, + 0xce, 0x84, 0xb1, 0x6e, 0xc3, 0x08, 0x2b, 0xf5, 0xd8, 0x6d, 0x43, 0x6e, 0x05, 0xcf, 0x4c, 0xd0, + 0xa1, 0x4d, 0x97, 0x2d, 0xd6, 0x2a, 0x7c, 0xb2, 0x26, 0x3a, 0x77, 0x38, 0xe9, 0x7c, 0xfa, 0xfd, + 0xf7, 0xcb, 0xc6, 0x5e, 0xb0, 0xeb, 0xdb, 0xaf, 0x1c, 0x34, 0xcd, 0x1d, 0x7c, 0x47, 0xb8, 0x5b, + 0xd5, 0xad, 0x0d, 0xf1, 0x56, 0x1b, 0xe2, 0x42, 0xa1, 0xc3, 0x75, 0x5d, 0x24, 0xe9, 0x7b, 0xcc, + 0x90, 0x2c, 0x63, 0x3e, 0x9c, 0x15, 0xfd, 0x07, 0xc2, 0xdd, 0xaa, 0xa8, 0x2b, 0xd3, 0x2e, 0x74, + 0xc1, 0xfa, 0x68, 0xef, 0x78, 0xda, 0xdb, 0xe1, 0x8d, 0x25, 0x5a, 0xf6, 0x7e, 0x4a, 0x50, 0xe8, + 0xec, 0x43, 0x45, 0xfe, 0x11, 0x77, 0xab, 0x01, 0x5b, 0x19, 0x7c, 0x61, 0x22, 0xc3, 0xc3, 0x36, + 0x49, 0x3d, 0x88, 0x37, 0x3d, 0x4d, 0xe7, 0xf8, 0x7a, 0x0b, 0x8d, 0xe3, 0x78, 0x74, 0xfa, 0x73, + 0xd2, 0x43, 0xbf, 0x26, 0x3d, 0xf4, 0x67, 0xd2, 0x43, 0x2f, 0xee, 0xaf, 0xf6, 0xd4, 0xc4, 0x99, + 0x80, 0xdc, 0x36, 0x5e, 0xe7, 0x5b, 0xfe, 0x6d, 0xb9, 0xf7, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x83, + 0xa0, 0x52, 0xd7, 0x30, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/pkg/apiclient/repository/repository.pb.go b/pkg/apiclient/repository/repository.pb.go index e6cf5a180832a..5e5488352313c 100644 --- a/pkg/apiclient/repository/repository.pb.go +++ b/pkg/apiclient/repository/repository.pb.go @@ -10,8 +10,8 @@ package repository import ( context "context" fmt "fmt" - v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - apiclient "github.com/argoproj/argo-cd/reposerver/apiclient" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + apiclient "github.com/argoproj/argo-cd/v2/reposerver/apiclient" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -645,75 +645,75 @@ func init() { } var fileDescriptor_8d38260443475705 = []byte{ - // 1073 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcd, 0x6e, 0x1c, 0x45, - 0x10, 0xd6, 0xd8, 0xce, 0xda, 0x6e, 0xff, 0x64, 0xd3, 0x0e, 0x61, 0xd8, 0x38, 0x8e, 0xd5, 0x09, - 0x91, 0xb1, 0xc2, 0x4c, 0x6c, 0x40, 0x8a, 0x82, 0x00, 0xf9, 0x27, 0x0a, 0x16, 0x16, 0x81, 0x89, - 0x8c, 0x04, 0x12, 0x42, 0xed, 0xd9, 0xf2, 0xee, 0xe0, 0xd9, 0xe9, 0xa6, 0xbb, 0x77, 0x91, 0x15, - 0xe5, 0xc2, 0x29, 0x1c, 0x38, 0x00, 0xca, 0x8d, 0x0b, 0x12, 0x07, 0x1e, 0x85, 0x23, 0x12, 0x2f, - 0x80, 0x2c, 0x2e, 0xbc, 0x05, 0xea, 0xee, 0xf9, 0x5b, 0xef, 0xee, 0xc4, 0x11, 0x8e, 0x6f, 0xdd, - 0x5f, 0x55, 0x57, 0x7d, 0xf5, 0x4d, 0x75, 0xcd, 0x0c, 0x22, 0x12, 0x44, 0x0f, 0x84, 0x2f, 0x80, - 0x33, 0x19, 0x29, 0x26, 0x8e, 0x4a, 0x4b, 0x8f, 0x0b, 0xa6, 0x18, 0x46, 0x05, 0xd2, 0xb8, 0xdc, - 0x62, 0x2d, 0x66, 0x60, 0x5f, 0xaf, 0xac, 0x47, 0x63, 0xb1, 0xc5, 0x58, 0x2b, 0x06, 0x9f, 0xf2, - 0xc8, 0xa7, 0x49, 0xc2, 0x14, 0x55, 0x11, 0x4b, 0x64, 0x6a, 0x25, 0x87, 0x77, 0xa5, 0x17, 0x31, - 0x63, 0x0d, 0x99, 0x00, 0xbf, 0xb7, 0xe6, 0xb7, 0x20, 0x01, 0x41, 0x15, 0x34, 0x53, 0x9f, 0x9d, - 0x56, 0xa4, 0xda, 0xdd, 0x7d, 0x2f, 0x64, 0x1d, 0x9f, 0x0a, 0x93, 0xe2, 0x6b, 0xb3, 0x78, 0x33, - 0x6c, 0xfa, 0xfc, 0xb0, 0xa5, 0x0f, 0x4b, 0x9f, 0x72, 0x1e, 0x47, 0xa1, 0x09, 0xee, 0xf7, 0xd6, - 0x68, 0xcc, 0xdb, 0x74, 0x30, 0xd4, 0x66, 0x55, 0x28, 0x53, 0xca, 0x73, 0x4b, 0x26, 0x1f, 0xa0, - 0xb9, 0x00, 0x38, 0xdb, 0xe0, 0x5c, 0x7e, 0xda, 0x05, 0x71, 0x84, 0x31, 0x9a, 0xd0, 0x4e, 0xae, - 0xb3, 0xec, 0xac, 0x4c, 0x07, 0x66, 0x8d, 0x1b, 0x68, 0x4a, 0x40, 0x2f, 0x92, 0x11, 0x4b, 0xdc, - 0x31, 0x83, 0xe7, 0x7b, 0xb2, 0x86, 0x26, 0x37, 0x38, 0xdf, 0x49, 0x0e, 0x98, 0x3e, 0xaa, 0x8e, - 0x38, 0x64, 0x47, 0xf5, 0x5a, 0x63, 0x9c, 0xaa, 0x76, 0x7a, 0xcc, 0xac, 0xc9, 0x33, 0x07, 0x2d, - 0xa4, 0x49, 0xb7, 0x41, 0xd1, 0x28, 0x4e, 0x53, 0x37, 0x51, 0x4d, 0xb2, 0xae, 0x08, 0x6d, 0x84, - 0x99, 0xf5, 0x5d, 0xaf, 0x28, 0xd0, 0xcb, 0x0a, 0x34, 0x8b, 0xaf, 0xc2, 0xa6, 0xc7, 0x0f, 0x5b, - 0x9e, 0xd6, 0xca, 0x2b, 0x69, 0xe5, 0x65, 0x5a, 0x79, 0x1b, 0x05, 0xf8, 0xc8, 0xc4, 0x0c, 0xd2, - 0xd8, 0xd8, 0x45, 0x93, 0x94, 0xf3, 0x8f, 0x69, 0x07, 0x52, 0x52, 0xd9, 0x96, 0xbc, 0x87, 0xea, - 0x99, 0x16, 0x01, 0x48, 0xce, 0x12, 0x09, 0xf8, 0x0d, 0x74, 0x21, 0x52, 0xd0, 0x91, 0xae, 0xb3, - 0x3c, 0xbe, 0x32, 0xb3, 0xbe, 0xe0, 0x95, 0x14, 0x4c, 0xeb, 0x0e, 0xac, 0x07, 0xd9, 0x42, 0xd3, - 0xfa, 0xf8, 0x68, 0x19, 0x09, 0x9a, 0x3d, 0x60, 0x9a, 0x0a, 0x1c, 0x08, 0x90, 0x56, 0x93, 0xa9, - 0xa0, 0x0f, 0x23, 0x3f, 0x4c, 0xa0, 0x8b, 0x86, 0x44, 0x18, 0x82, 0xac, 0x7e, 0x24, 0x5d, 0x09, - 0x22, 0x29, 0xca, 0xc8, 0xf7, 0xda, 0xc6, 0xa9, 0x94, 0xdf, 0x32, 0xd1, 0x74, 0xc7, 0xad, 0x2d, - 0xdb, 0xe3, 0x9b, 0x68, 0x4e, 0xca, 0xf6, 0x27, 0x22, 0xea, 0x51, 0x05, 0x1f, 0xc1, 0x91, 0x3b, - 0x61, 0x1c, 0xfa, 0x41, 0x1d, 0x21, 0x4a, 0x24, 0x84, 0x5d, 0x01, 0xee, 0x05, 0xc3, 0x32, 0xdf, - 0xe3, 0xdb, 0xe8, 0x92, 0x8a, 0xe5, 0x56, 0x1c, 0x41, 0xa2, 0xb6, 0x40, 0xa8, 0x6d, 0xaa, 0xa8, - 0x5b, 0x33, 0x51, 0x06, 0x0d, 0x78, 0x15, 0xd5, 0xfb, 0x40, 0x9d, 0x72, 0xd2, 0x38, 0x0f, 0xe0, - 0x79, 0xff, 0x4c, 0xf7, 0xf7, 0x8f, 0xa9, 0x11, 0x59, 0xcc, 0xd4, 0xb7, 0x88, 0xa6, 0x21, 0xa1, - 0xfb, 0x31, 0x3c, 0x0c, 0x23, 0x77, 0xc6, 0xd0, 0x2b, 0x00, 0x7c, 0x07, 0x2d, 0xd8, 0xb6, 0xd9, - 0xe0, 0xbc, 0x54, 0xe7, 0xac, 0x09, 0x30, 0xcc, 0x84, 0x97, 0xd1, 0x4c, 0x0e, 0xef, 0x6c, 0xbb, - 0x73, 0xcb, 0xce, 0xca, 0x78, 0x50, 0x86, 0xf0, 0x5d, 0xf4, 0x6a, 0xb1, 0x4d, 0xa4, 0xa2, 0x71, - 0x6c, 0x5a, 0x6b, 0x67, 0xdb, 0x9d, 0x37, 0xde, 0xa3, 0xcc, 0xf8, 0x7d, 0xd4, 0xc8, 0x4d, 0xf7, - 0x13, 0x05, 0x82, 0x8b, 0x48, 0xc2, 0x26, 0x95, 0xb0, 0x27, 0x62, 0xf7, 0xa2, 0x21, 0x55, 0xe1, - 0x41, 0xe6, 0xd1, 0xac, 0x6e, 0x87, 0xac, 0x1f, 0xc9, 0x6f, 0x0e, 0xba, 0xa4, 0x81, 0x2d, 0x01, - 0x54, 0x41, 0x00, 0xdf, 0x74, 0x41, 0x2a, 0xfc, 0x79, 0xa9, 0x43, 0x66, 0xd6, 0xef, 0xff, 0x8f, - 0x7b, 0x13, 0xe4, 0xed, 0x9d, 0x36, 0xda, 0x15, 0x54, 0xeb, 0x72, 0x09, 0x42, 0xa5, 0xed, 0x9a, - 0xee, 0xf4, 0x43, 0x08, 0x05, 0x34, 0xe5, 0xc3, 0x24, 0x3e, 0x32, 0x5d, 0x36, 0x15, 0x14, 0x00, - 0x49, 0x2c, 0xcb, 0x3d, 0xde, 0x3c, 0x17, 0x96, 0xeb, 0xff, 0xce, 0xdb, 0x84, 0x16, 0x7c, 0x04, - 0xa2, 0x17, 0x85, 0x80, 0xbf, 0x77, 0xd0, 0xc4, 0x6e, 0x24, 0x15, 0x7e, 0xa5, 0x7c, 0x6d, 0xf3, - 0x4b, 0xda, 0xd8, 0x39, 0x13, 0x0a, 0x3a, 0x03, 0xb9, 0xfe, 0xdd, 0x5f, 0xff, 0xfc, 0x3c, 0x76, - 0x05, 0x5f, 0x36, 0xc3, 0xbf, 0xb7, 0x56, 0x4c, 0xda, 0x08, 0xe4, 0xd3, 0x31, 0x07, 0x3f, 0x75, - 0xd0, 0xf8, 0x03, 0x18, 0x49, 0xe5, 0x6c, 0xd4, 0x20, 0x37, 0x0c, 0x8d, 0x6b, 0xf8, 0xea, 0x30, - 0x1a, 0xfe, 0x63, 0xbd, 0x7b, 0x82, 0x7f, 0x72, 0x50, 0x5d, 0x93, 0x0e, 0x4a, 0xb6, 0x73, 0x90, - 0x68, 0xb1, 0x4a, 0x22, 0xfc, 0x25, 0x9a, 0xb2, 0x9c, 0x0e, 0x46, 0x72, 0xa9, 0xf7, 0xc3, 0x07, - 0x92, 0xac, 0x98, 0x90, 0x04, 0x2f, 0x57, 0x94, 0xeb, 0x0b, 0x1d, 0xb2, 0x63, 0xc3, 0xeb, 0xd9, - 0x8e, 0x5f, 0x3b, 0x19, 0x3e, 0x7f, 0xfb, 0x35, 0x16, 0x87, 0x99, 0xf2, 0xcb, 0x77, 0xaa, 0x74, - 0x54, 0xa7, 0xf8, 0xd1, 0x41, 0x73, 0x0f, 0x40, 0x15, 0x6f, 0x38, 0x7c, 0x7d, 0x48, 0xe4, 0xf2, - 0xdb, 0xaf, 0x41, 0x46, 0x3b, 0xe4, 0x04, 0xde, 0x35, 0x04, 0xde, 0x21, 0x77, 0x86, 0x13, 0xb0, - 0x6f, 0x38, 0x13, 0x67, 0x2f, 0xd8, 0x35, 0x54, 0x9a, 0x36, 0xc2, 0x3d, 0x67, 0x15, 0xf7, 0x0c, - 0xa5, 0x0f, 0x21, 0xee, 0x6c, 0xb5, 0xa9, 0x50, 0x23, 0x65, 0x5e, 0x2a, 0xc3, 0x85, 0x7b, 0x4e, - 0xc2, 0x33, 0x24, 0x56, 0xf0, 0xad, 0x2a, 0x15, 0xda, 0x10, 0x77, 0x42, 0x9b, 0xe6, 0x99, 0x83, - 0x6a, 0x76, 0x5c, 0xe1, 0x6b, 0x27, 0x33, 0xf6, 0x8d, 0xb1, 0xb3, 0xba, 0x04, 0xaf, 0x1b, 0x82, - 0x8b, 0x64, 0x68, 0xa3, 0xdd, 0x33, 0x03, 0x43, 0xdf, 0xc8, 0x5f, 0x1c, 0x54, 0xcf, 0xf2, 0x67, - 0x67, 0xcf, 0x89, 0x21, 0x79, 0x3e, 0x43, 0xfc, 0xab, 0x83, 0x6a, 0x76, 0x7e, 0x0e, 0x92, 0xea, - 0x9b, 0xab, 0x67, 0x45, 0x6a, 0xcd, 0x3e, 0xd7, 0x46, 0x45, 0x77, 0x1b, 0x1e, 0x4f, 0x0a, 0x09, - 0x7f, 0x77, 0x50, 0x3d, 0xe3, 0x32, 0x5a, 0xc2, 0x97, 0xc2, 0xd6, 0x7b, 0x31, 0xb6, 0x98, 0xa2, - 0xda, 0x36, 0xc4, 0xa0, 0x60, 0x54, 0xdb, 0xbb, 0x27, 0xe1, 0xbc, 0xe1, 0x6f, 0xd9, 0xa1, 0xba, - 0x5a, 0x35, 0x54, 0xb5, 0x1a, 0x6d, 0x54, 0xb7, 0x29, 0x4a, 0x62, 0xbc, 0x70, 0xb2, 0x1b, 0xa7, - 0x48, 0x86, 0x1f, 0xa3, 0xf9, 0xcf, 0x68, 0x1c, 0x69, 0x59, 0xed, 0x87, 0x22, 0xbe, 0x3a, 0x30, - 0x3d, 0x8a, 0x0f, 0xc8, 0x8a, 0x6c, 0xeb, 0x26, 0xdb, 0x6d, 0x72, 0xb3, 0xea, 0x2e, 0xf7, 0xd2, - 0x54, 0x56, 0xc9, 0xcd, 0xcd, 0x3f, 0x8e, 0x97, 0x9c, 0x3f, 0x8f, 0x97, 0x9c, 0xbf, 0x8f, 0x97, - 0x9c, 0x2f, 0xde, 0x3e, 0xc5, 0xff, 0x4c, 0x68, 0x3e, 0xf3, 0x4a, 0x3f, 0x1f, 0xfb, 0x35, 0xf3, - 0xf7, 0xf1, 0xd6, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x47, 0x07, 0x4d, 0x4e, 0x96, 0x0d, 0x00, - 0x00, + // 1082 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x5d, 0x6f, 0xdc, 0x44, + 0x17, 0x96, 0x93, 0x74, 0x93, 0x4c, 0x3e, 0xba, 0x9d, 0xf4, 0xed, 0x6b, 0xb6, 0x69, 0x1a, 0x4d, + 0x4b, 0x15, 0xa2, 0x62, 0x37, 0x8b, 0x10, 0x55, 0x11, 0xa0, 0x34, 0x89, 0xda, 0x88, 0x88, 0x80, + 0xab, 0x70, 0x81, 0x40, 0x68, 0xe2, 0x3d, 0xd9, 0x35, 0xf1, 0x7a, 0xa6, 0x33, 0xb3, 0x46, 0x51, + 0xd5, 0x1b, 0xae, 0x90, 0x80, 0x0b, 0x84, 0x90, 0x7a, 0xc7, 0x0d, 0x12, 0x17, 0xfc, 0x11, 0x2e, + 0x91, 0xf8, 0x03, 0x28, 0xe2, 0x77, 0x20, 0x34, 0x33, 0x5e, 0xdb, 0x9b, 0xfd, 0x48, 0x2a, 0x42, + 0xee, 0x66, 0x9e, 0x73, 0xe6, 0x9c, 0xe7, 0x3c, 0x3e, 0x73, 0x6c, 0x23, 0x22, 0x41, 0xa4, 0x20, + 0x7c, 0x01, 0x9c, 0xc9, 0x48, 0x31, 0x71, 0x54, 0x5a, 0x7a, 0x5c, 0x30, 0xc5, 0x30, 0x2a, 0x90, + 0xda, 0xd5, 0x26, 0x6b, 0x32, 0x03, 0xfb, 0x7a, 0x65, 0x3d, 0x6a, 0x8b, 0x4d, 0xc6, 0x9a, 0x31, + 0xf8, 0x94, 0x47, 0x3e, 0x4d, 0x12, 0xa6, 0xa8, 0x8a, 0x58, 0x22, 0x33, 0x2b, 0x39, 0xbc, 0x2f, + 0xbd, 0x88, 0x19, 0x6b, 0xc8, 0x04, 0xf8, 0xe9, 0x9a, 0xdf, 0x84, 0x04, 0x04, 0x55, 0xd0, 0xc8, + 0x7c, 0x76, 0x9a, 0x91, 0x6a, 0x75, 0xf6, 0xbd, 0x90, 0xb5, 0x7d, 0x2a, 0x4c, 0x8a, 0x2f, 0xcc, + 0xe2, 0xf5, 0xb0, 0xe1, 0xa7, 0x75, 0x9f, 0x1f, 0x36, 0xf5, 0x79, 0xe9, 0x53, 0xce, 0xe3, 0x28, + 0x34, 0xf1, 0xfd, 0x74, 0x8d, 0xc6, 0xbc, 0x45, 0xfb, 0xa3, 0x6d, 0x9d, 0x12, 0xcd, 0x14, 0x74, + 0x6a, 0xe1, 0xe4, 0x3d, 0x34, 0x17, 0x00, 0x67, 0xeb, 0x9c, 0xcb, 0x8f, 0x3a, 0x20, 0x8e, 0x30, + 0x46, 0x13, 0xda, 0xc9, 0x75, 0x96, 0x9d, 0x95, 0xe9, 0xc0, 0xac, 0x71, 0x0d, 0x4d, 0x09, 0x48, + 0x23, 0x19, 0xb1, 0xc4, 0x1d, 0x33, 0x78, 0xbe, 0x27, 0x6b, 0x68, 0x72, 0x9d, 0xf3, 0xed, 0xe4, + 0x80, 0xe9, 0xa3, 0xea, 0x88, 0x43, 0xf7, 0xa8, 0x5e, 0x6b, 0x8c, 0x53, 0xd5, 0xca, 0x8e, 0x99, + 0x35, 0x79, 0xe1, 0xa0, 0x85, 0x2c, 0xe9, 0x26, 0x28, 0x1a, 0xc5, 0x59, 0xea, 0x26, 0xaa, 0x48, + 0xd6, 0x11, 0xa1, 0x8d, 0x30, 0x53, 0xdf, 0xf5, 0x8a, 0x1a, 0xbd, 0x6e, 0x8d, 0x66, 0xf1, 0x79, + 0xd8, 0xf0, 0xd2, 0xba, 0xc7, 0x0f, 0x9b, 0x9e, 0x56, 0xcc, 0x2b, 0x29, 0xe6, 0x75, 0x15, 0xf3, + 0xd6, 0x0b, 0xf0, 0x89, 0x09, 0x1b, 0x64, 0xe1, 0xb1, 0x8b, 0x26, 0x29, 0xe7, 0x1f, 0xd0, 0x36, + 0x64, 0xbc, 0xba, 0x5b, 0xf2, 0x0e, 0xaa, 0x76, 0xe5, 0x08, 0x40, 0x72, 0x96, 0x48, 0xc0, 0xaf, + 0xa1, 0x4b, 0x91, 0x82, 0xb6, 0x74, 0x9d, 0xe5, 0xf1, 0x95, 0x99, 0xfa, 0x82, 0x57, 0x12, 0x31, + 0x2b, 0x3d, 0xb0, 0x1e, 0x64, 0x03, 0x4d, 0xeb, 0xe3, 0xc3, 0x95, 0x24, 0x68, 0xf6, 0x80, 0x69, + 0x2a, 0x70, 0x20, 0x40, 0x5a, 0x59, 0xa6, 0x82, 0x1e, 0x8c, 0x7c, 0x37, 0x81, 0x2e, 0x1b, 0x12, + 0x61, 0x08, 0x72, 0xf4, 0x53, 0xe9, 0x48, 0x10, 0x49, 0x51, 0x46, 0xbe, 0xd7, 0x36, 0x4e, 0xa5, + 0xfc, 0x92, 0x89, 0x86, 0x3b, 0x6e, 0x6d, 0xdd, 0x3d, 0xbe, 0x8d, 0xe6, 0xa4, 0x6c, 0x7d, 0x28, + 0xa2, 0x94, 0x2a, 0x78, 0x1f, 0x8e, 0xdc, 0x09, 0xe3, 0xd0, 0x0b, 0xea, 0x08, 0x51, 0x22, 0x21, + 0xec, 0x08, 0x70, 0x2f, 0x19, 0x96, 0xf9, 0x1e, 0xdf, 0x45, 0x57, 0x54, 0x2c, 0x37, 0xe2, 0x08, + 0x12, 0xb5, 0x01, 0x42, 0x6d, 0x52, 0x45, 0xdd, 0x8a, 0x89, 0xd2, 0x6f, 0xc0, 0xab, 0xa8, 0xda, + 0x03, 0xea, 0x94, 0x93, 0xc6, 0xb9, 0x0f, 0xcf, 0x5b, 0x68, 0xba, 0xb7, 0x85, 0x4c, 0x8d, 0xc8, + 0x62, 0xa6, 0xbe, 0x45, 0x34, 0x0d, 0x09, 0xdd, 0x8f, 0x61, 0x37, 0x8c, 0xdc, 0x19, 0x43, 0xaf, + 0x00, 0xf0, 0x3d, 0xb4, 0x60, 0x3b, 0x67, 0x9d, 0xf3, 0x52, 0x9d, 0xb3, 0x26, 0xc0, 0x20, 0x13, + 0x5e, 0x46, 0x33, 0x39, 0xbc, 0xbd, 0xe9, 0xce, 0x2d, 0x3b, 0x2b, 0xe3, 0x41, 0x19, 0xc2, 0xf7, + 0xd1, 0xff, 0x8b, 0x6d, 0x22, 0x15, 0x8d, 0x63, 0xd3, 0x5a, 0xdb, 0x9b, 0xee, 0xbc, 0xf1, 0x1e, + 0x66, 0xc6, 0xef, 0xa2, 0x5a, 0x6e, 0xda, 0x4a, 0x14, 0x08, 0x2e, 0x22, 0x09, 0x0f, 0xa9, 0x84, + 0x3d, 0x11, 0xbb, 0x97, 0x0d, 0xa9, 0x11, 0x1e, 0x64, 0x1e, 0xcd, 0xea, 0x76, 0xe8, 0xf6, 0x23, + 0xf9, 0xc5, 0x41, 0x57, 0x34, 0xb0, 0x21, 0x80, 0x2a, 0x08, 0xe0, 0x69, 0x07, 0xa4, 0xc2, 0x9f, + 0x96, 0x3a, 0x64, 0xa6, 0xfe, 0xf8, 0xdf, 0x5d, 0x9d, 0x20, 0xef, 0xf0, 0xac, 0xd7, 0xae, 0xa1, + 0x4a, 0x87, 0x4b, 0x10, 0x2a, 0xeb, 0xd8, 0x6c, 0xa7, 0x9f, 0x43, 0x28, 0xa0, 0x21, 0x77, 0x93, + 0xf8, 0xc8, 0x34, 0xda, 0x54, 0x50, 0x00, 0xe4, 0xa9, 0x25, 0xba, 0xc7, 0x1b, 0x17, 0x45, 0xb4, + 0xfe, 0xf7, 0xbc, 0xcd, 0x69, 0xc1, 0x27, 0x20, 0xd2, 0x28, 0x04, 0xfc, 0xad, 0x83, 0x26, 0x76, + 0x22, 0xa9, 0xf0, 0xff, 0xca, 0x97, 0x37, 0xbf, 0xaa, 0xb5, 0x9d, 0xf3, 0x62, 0xa1, 0x93, 0x90, + 0x9b, 0x5f, 0xfd, 0xf1, 0xd7, 0x0f, 0x63, 0xd7, 0xf0, 0x55, 0xf3, 0x3a, 0x48, 0xd7, 0x8a, 0xa9, + 0x1b, 0x81, 0xfc, 0x7a, 0xcc, 0xc1, 0xdf, 0x38, 0x68, 0xfc, 0x11, 0x0c, 0x65, 0x73, 0x6e, 0x9a, + 0x90, 0x5b, 0x86, 0xc9, 0x0d, 0x7c, 0x7d, 0x10, 0x13, 0xff, 0x99, 0xde, 0x3d, 0xc7, 0x3f, 0x3a, + 0xa8, 0xaa, 0x79, 0x07, 0x25, 0xdb, 0xc5, 0x08, 0xb5, 0x38, 0x4a, 0x28, 0xfc, 0x19, 0x9a, 0xb2, + 0xb4, 0x0e, 0x86, 0xd2, 0xa9, 0xf6, 0xc2, 0x07, 0x92, 0xac, 0x98, 0x90, 0x04, 0x2f, 0x8f, 0xa8, + 0xd8, 0x17, 0x3a, 0x64, 0xdb, 0x86, 0xd7, 0xa3, 0x1e, 0xbf, 0x72, 0x32, 0x7c, 0xfe, 0x3e, 0xac, + 0x2d, 0x0e, 0x32, 0xe5, 0x77, 0xf1, 0x4c, 0xe9, 0xa8, 0x4e, 0xf1, 0xbd, 0x83, 0xe6, 0x1e, 0x81, + 0x2a, 0xde, 0x79, 0xf8, 0xe6, 0x80, 0xc8, 0xe5, 0xf7, 0x61, 0x8d, 0x0c, 0x77, 0xc8, 0x09, 0xbc, + 0x6d, 0x08, 0xbc, 0x49, 0xee, 0x0d, 0x26, 0x60, 0x5f, 0x78, 0x26, 0xce, 0x5e, 0xb0, 0x63, 0xa8, + 0x34, 0x6c, 0x84, 0x07, 0xce, 0x2a, 0x4e, 0x0d, 0xa5, 0xc7, 0x10, 0xb7, 0x37, 0x5a, 0x54, 0xa8, + 0xa1, 0x32, 0x2f, 0x95, 0xe1, 0xc2, 0x3d, 0x27, 0xe1, 0x19, 0x12, 0x2b, 0xf8, 0xce, 0x28, 0x15, + 0x5a, 0x10, 0xb7, 0x43, 0x9b, 0xe6, 0x85, 0x83, 0x2a, 0x76, 0x7a, 0xe1, 0x1b, 0x27, 0x33, 0xf6, + 0x4c, 0xb5, 0x73, 0xbc, 0x0a, 0xaf, 0x1a, 0x8e, 0x8b, 0x64, 0x60, 0xaf, 0x3d, 0x30, 0xc3, 0x43, + 0x5f, 0xcd, 0x9f, 0x1c, 0x54, 0xed, 0x52, 0xe8, 0x9e, 0xbd, 0x38, 0x92, 0xe4, 0x74, 0x92, 0xf8, + 0x67, 0x07, 0x55, 0xec, 0x44, 0xed, 0xe7, 0xd5, 0x33, 0x69, 0xcf, 0x91, 0xd7, 0x9a, 0x7d, 0xc0, + 0xb5, 0x11, 0x6d, 0x6e, 0xa8, 0x3c, 0x2f, 0x84, 0xfc, 0xd5, 0x41, 0xd5, 0x2e, 0x9d, 0xe1, 0x42, + 0xfe, 0x57, 0x84, 0xbd, 0x97, 0x23, 0x8c, 0x29, 0xaa, 0x6c, 0x42, 0x0c, 0x0a, 0x86, 0x5d, 0x01, + 0xf7, 0x24, 0x9c, 0x37, 0xff, 0x1d, 0x3b, 0x63, 0x57, 0x47, 0xcd, 0x58, 0x2d, 0x48, 0x0b, 0x55, + 0x6d, 0x8a, 0x92, 0x1e, 0x2f, 0x9d, 0xec, 0xd6, 0x19, 0x92, 0xe1, 0x67, 0x68, 0xfe, 0x63, 0x1a, + 0x47, 0x5a, 0x59, 0xfb, 0x0d, 0x89, 0xaf, 0xf7, 0x4d, 0x92, 0xe2, 0xdb, 0x72, 0x44, 0xb6, 0xba, + 0xc9, 0x76, 0x97, 0xdc, 0x1e, 0x75, 0xaf, 0xd3, 0x2c, 0x95, 0x55, 0xf2, 0xe1, 0xd6, 0x6f, 0xc7, + 0x4b, 0xce, 0xef, 0xc7, 0x4b, 0xce, 0x9f, 0xc7, 0x4b, 0xce, 0x27, 0x6f, 0x9d, 0xed, 0x9f, 0x27, + 0x34, 0x1f, 0x81, 0xa5, 0xbf, 0x93, 0xfd, 0x8a, 0xf9, 0x3d, 0x79, 0xe3, 0x9f, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xcf, 0x15, 0x31, 0xd4, 0xbd, 0x0d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/pkg/apiclient/session/mocks/SessionServiceClient.go b/pkg/apiclient/session/mocks/SessionServiceClient.go index 42950067c4ce3..16a3692d86600 100644 --- a/pkg/apiclient/session/mocks/SessionServiceClient.go +++ b/pkg/apiclient/session/mocks/SessionServiceClient.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - session "github.com/argoproj/argo-cd/pkg/apiclient/session" + session "github.com/argoproj/argo-cd/v2/pkg/apiclient/session" ) // SessionServiceClient is an autogenerated mock type for the SessionServiceClient type diff --git a/pkg/apiclient/session/mocks/SessionServiceServer.go b/pkg/apiclient/session/mocks/SessionServiceServer.go index c23b901b294f3..f518fbc75a9f8 100644 --- a/pkg/apiclient/session/mocks/SessionServiceServer.go +++ b/pkg/apiclient/session/mocks/SessionServiceServer.go @@ -7,7 +7,7 @@ import ( mock "github.com/stretchr/testify/mock" - session "github.com/argoproj/argo-cd/pkg/apiclient/session" + session "github.com/argoproj/argo-cd/v2/pkg/apiclient/session" ) // SessionServiceServer is an autogenerated mock type for the SessionServiceServer type diff --git a/pkg/apiclient/session/session.pb.go b/pkg/apiclient/session/session.pb.go index aec6d6f69f104..fbf5c8a8cfa03 100644 --- a/pkg/apiclient/session/session.pb.go +++ b/pkg/apiclient/session/session.pb.go @@ -10,7 +10,6 @@ package session import ( context "context" fmt "fmt" - _ "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -18,7 +17,6 @@ import ( codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" io "io" - _ "k8s.io/api/core/v1" math "math" math_bits "math/bits" ) @@ -309,36 +307,33 @@ func init() { func init() { proto.RegisterFile("server/session/session.proto", fileDescriptor_87870a51a62685ed) } var fileDescriptor_87870a51a62685ed = []byte{ - // 453 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xcf, 0x8e, 0xd3, 0x30, - 0x10, 0xc6, 0x95, 0x16, 0x4a, 0xd7, 0x48, 0x2c, 0x98, 0x68, 0x89, 0x42, 0xa9, 0xaa, 0x5c, 0x58, - 0xad, 0x44, 0xad, 0xc2, 0x05, 0x71, 0x41, 0x02, 0x24, 0xd4, 0x6b, 0x56, 0x5c, 0x56, 0xe2, 0xe0, - 0x4d, 0x06, 0xaf, 0xb7, 0x59, 0x8f, 0xb1, 0xdd, 0xec, 0x9d, 0x57, 0xe0, 0x61, 0x78, 0x05, 0x8e, - 0x48, 0xbc, 0x00, 0xaa, 0x78, 0x10, 0x14, 0xe7, 0x0f, 0xdb, 0xb4, 0x42, 0x9c, 0xe2, 0x99, 0x2f, - 0xfe, 0x7d, 0x9f, 0x35, 0x43, 0x26, 0x16, 0x4c, 0x09, 0x86, 0x59, 0xb0, 0x56, 0xa2, 0x6a, 0xbf, - 0x73, 0x6d, 0xd0, 0x21, 0xbd, 0xd3, 0x94, 0x71, 0x28, 0x50, 0xa0, 0xef, 0xb1, 0xea, 0x54, 0xcb, - 0xf1, 0x44, 0x20, 0x8a, 0x02, 0x18, 0xd7, 0x92, 0x71, 0xa5, 0xd0, 0x71, 0x27, 0x51, 0xd9, 0x46, - 0x4d, 0x56, 0x2f, 0xed, 0x5c, 0xa2, 0x57, 0x33, 0x34, 0xc0, 0xca, 0x05, 0x13, 0xa0, 0xc0, 0x70, - 0x07, 0x79, 0xf3, 0xcf, 0x52, 0x48, 0x77, 0xb1, 0x3e, 0x9f, 0x67, 0x78, 0xc5, 0xb8, 0xf1, 0x16, - 0x97, 0xfe, 0xf0, 0x2c, 0xcb, 0x99, 0x5e, 0x89, 0xea, 0xb2, 0x65, 0x5c, 0xeb, 0x42, 0x66, 0x1e, - 0xce, 0xca, 0x05, 0x2f, 0xf4, 0x05, 0xdf, 0x41, 0x25, 0x39, 0x09, 0x4f, 0xeb, 0xb4, 0x6f, 0x0d, - 0x70, 0x07, 0x29, 0x7c, 0x5e, 0x83, 0x75, 0x34, 0x26, 0xe3, 0xb5, 0x05, 0xa3, 0xf8, 0x15, 0x44, - 0xc1, 0x2c, 0x38, 0x3e, 0x48, 0xbb, 0xba, 0xd2, 0x34, 0xb7, 0xf6, 0x1a, 0x4d, 0x1e, 0x0d, 0x6a, - 0xad, 0xad, 0x69, 0x48, 0x6e, 0x3b, 0x5c, 0x81, 0x8a, 0x86, 0x5e, 0xa8, 0x8b, 0xe4, 0xa8, 0x73, - 0x79, 0x07, 0x05, 0x74, 0x2e, 0xc9, 0x53, 0x72, 0xd8, 0xf4, 0x53, 0xb0, 0x1a, 0x95, 0x85, 0xbf, - 0x80, 0xe0, 0x26, 0x20, 0x24, 0xf4, 0x3d, 0xb8, 0x0f, 0x16, 0xcc, 0x52, 0x7d, 0xc2, 0xf6, 0xfa, - 0x35, 0x79, 0xb8, 0xd5, 0x6d, 0x10, 0x31, 0x19, 0x17, 0x28, 0x04, 0xe4, 0xcb, 0x9a, 0x32, 0x4e, - 0xbb, 0x7a, 0xeb, 0x5d, 0x83, 0xde, 0xbb, 0xee, 0x93, 0xa1, 0xb4, 0xb6, 0x49, 0x5e, 0x1d, 0xe9, - 0x11, 0x19, 0x09, 0x83, 0x6b, 0x6d, 0xa3, 0x5b, 0xb3, 0xe1, 0xf1, 0x41, 0xda, 0x54, 0xcf, 0xbf, - 0x0d, 0xc8, 0xbd, 0x26, 0xf8, 0x29, 0x98, 0x52, 0x66, 0x40, 0x2f, 0xc9, 0xdd, 0x1b, 0x59, 0xe8, - 0xe3, 0x79, 0xbb, 0x13, 0xbb, 0xb9, 0xe3, 0xc9, 0x7e, 0xb1, 0x8e, 0x9f, 0xcc, 0xbe, 0xfc, 0xfc, - 0xfd, 0x75, 0x10, 0xd3, 0xc8, 0xef, 0x40, 0xb9, 0xe8, 0xb6, 0xac, 0x0a, 0x2a, 0x2b, 0xf8, 0x47, - 0x32, 0xaa, 0xa7, 0x45, 0x9f, 0x74, 0xa4, 0x7d, 0x53, 0x8c, 0xa3, 0xbe, 0xdc, 0x99, 0xc4, 0xde, - 0x24, 0x4c, 0x0e, 0x7b, 0x26, 0xaf, 0x82, 0x13, 0x7a, 0x46, 0x46, 0xf5, 0x98, 0x76, 0xf1, 0x5b, - 0xe3, 0xfb, 0x07, 0xfe, 0x91, 0xc7, 0x3f, 0x38, 0xe9, 0xe3, 0xdf, 0xbc, 0xfe, 0xbe, 0x99, 0x06, - 0x3f, 0x36, 0xd3, 0xe0, 0xd7, 0x66, 0x1a, 0x9c, 0x2d, 0xfe, 0x63, 0x91, 0xb3, 0x42, 0x82, 0x72, - 0x2d, 0xe0, 0x7c, 0xe4, 0xf7, 0xf6, 0xc5, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8f, 0xb6, 0x16, - 0x68, 0x83, 0x03, 0x00, 0x00, + // 414 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x41, 0x6e, 0xd4, 0x30, + 0x14, 0x86, 0x95, 0x0c, 0x84, 0xa9, 0x91, 0x28, 0x98, 0xa8, 0x44, 0x66, 0x18, 0x8d, 0xb2, 0xa1, + 0xaa, 0xc4, 0x44, 0x14, 0x56, 0x2c, 0x0b, 0x12, 0xea, 0x36, 0x15, 0x9b, 0x4a, 0x2c, 0xd2, 0xe4, + 0x61, 0xdc, 0xa6, 0x7e, 0xc1, 0x76, 0x32, 0x7b, 0xae, 0xc0, 0x61, 0xb8, 0x02, 0x4b, 0x24, 0x2e, + 0x80, 0x46, 0x1c, 0x04, 0xc5, 0x4e, 0xc2, 0x4c, 0x66, 0xc4, 0x2a, 0xfe, 0xdf, 0xaf, 0x7c, 0xef, + 0xb7, 0x7e, 0x93, 0x99, 0x06, 0xd5, 0x80, 0x4a, 0x34, 0x68, 0x2d, 0x50, 0xf6, 0xdf, 0x65, 0xa5, + 0xd0, 0x20, 0xbd, 0xd7, 0x49, 0x16, 0x72, 0xe4, 0x68, 0x67, 0x49, 0x7b, 0x72, 0x36, 0x9b, 0x71, + 0x44, 0x5e, 0x42, 0x92, 0x55, 0x22, 0xc9, 0xa4, 0x44, 0x93, 0x19, 0x81, 0x52, 0x3b, 0x37, 0x2e, + 0x48, 0x78, 0xe1, 0x7e, 0x7f, 0xab, 0x20, 0x33, 0x90, 0xc2, 0x97, 0x1a, 0xb4, 0xa1, 0x8c, 0x4c, + 0x6b, 0x0d, 0x4a, 0x66, 0xb7, 0x10, 0x79, 0x0b, 0xef, 0xf8, 0x20, 0x1d, 0x74, 0xeb, 0x55, 0x99, + 0xd6, 0x2b, 0x54, 0x45, 0xe4, 0x3b, 0xaf, 0xd7, 0x34, 0x24, 0x77, 0x0d, 0xde, 0x80, 0x8c, 0x26, + 0xd6, 0x70, 0x22, 0x3e, 0x1a, 0xb6, 0xbc, 0x83, 0x12, 0x86, 0x2d, 0xf1, 0x73, 0x72, 0xd8, 0xcd, + 0x53, 0xd0, 0x15, 0x4a, 0x0d, 0xff, 0x00, 0xde, 0x26, 0x20, 0x24, 0xf4, 0x3d, 0x98, 0x0f, 0x1a, + 0xd4, 0xb9, 0xfc, 0x84, 0xfd, 0xef, 0x2b, 0xf2, 0x78, 0x6b, 0xda, 0x21, 0x18, 0x99, 0x96, 0xc8, + 0x39, 0x14, 0xe7, 0x8e, 0x32, 0x4d, 0x07, 0xbd, 0x75, 0x2f, 0x7f, 0x74, 0xaf, 0x87, 0x64, 0x22, + 0xb4, 0xee, 0x92, 0xb7, 0x47, 0x7a, 0x44, 0x02, 0xae, 0xb0, 0xae, 0x74, 0x74, 0x67, 0x31, 0x39, + 0x3e, 0x48, 0x3b, 0x75, 0xfa, 0xdd, 0x27, 0x0f, 0xba, 0xe0, 0x17, 0xa0, 0x1a, 0x91, 0x03, 0xbd, + 0x26, 0xf7, 0x37, 0xb2, 0xd0, 0xa7, 0xcb, 0xbe, 0xa4, 0xdd, 0xdc, 0x6c, 0xb6, 0xdf, 0x74, 0xf1, + 0xe3, 0xc5, 0xd7, 0x5f, 0x7f, 0xbe, 0xf9, 0x8c, 0x46, 0xb6, 0xb2, 0xe6, 0xe5, 0x50, 0x7b, 0x1b, + 0x54, 0xb4, 0xf0, 0x8f, 0x24, 0x70, 0x6d, 0xd1, 0x67, 0x03, 0x69, 0x5f, 0x8b, 0x2c, 0x1a, 0xdb, + 0xc3, 0x12, 0x66, 0x97, 0x84, 0xf1, 0xe1, 0x68, 0xc9, 0x1b, 0xef, 0x84, 0x5e, 0x92, 0xc0, 0xd5, + 0xb4, 0x8b, 0xdf, 0xaa, 0xef, 0x3f, 0xf8, 0x27, 0x16, 0xff, 0xe8, 0x64, 0x8c, 0x3f, 0x3b, 0xfb, + 0xb1, 0x9e, 0x7b, 0x3f, 0xd7, 0x73, 0xef, 0xf7, 0x7a, 0xee, 0x5d, 0xbe, 0xe6, 0xc2, 0x7c, 0xae, + 0xaf, 0x96, 0x39, 0xde, 0x26, 0x99, 0xb2, 0x8f, 0xf7, 0xda, 0x1e, 0x5e, 0xe4, 0x45, 0xd2, 0x9c, + 0x26, 0xd5, 0x0d, 0x6f, 0x01, 0x79, 0x29, 0x40, 0x9a, 0x9e, 0x71, 0x15, 0xd8, 0xa7, 0xfb, 0xea, + 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x67, 0x29, 0xb3, 0x73, 0x17, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/pkg/apiclient/settings/settings.pb.go b/pkg/apiclient/settings/settings.pb.go index fd07ace1b5467..fed4b8fb90a88 100644 --- a/pkg/apiclient/settings/settings.pb.go +++ b/pkg/apiclient/settings/settings.pb.go @@ -10,8 +10,8 @@ package settings import ( context "context" fmt "fmt" - v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - oidc "github.com/argoproj/argo-cd/server/settings/oidc" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + oidc "github.com/argoproj/argo-cd/v2/server/settings/oidc" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -609,68 +609,68 @@ func init() { func init() { proto.RegisterFile("server/settings/settings.proto", fileDescriptor_a480d494da040caa) } var fileDescriptor_a480d494da040caa = []byte{ - // 971 bytes of a gzipped FileDescriptorProto + // 976 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xcf, 0x6f, 0x1b, 0xc5, 0x17, 0xd7, 0xc6, 0x69, 0x62, 0x3f, 0x37, 0x71, 0x32, 0xdf, 0x2f, 0x61, 0xb1, 0x2a, 0xc7, 0xf8, - 0x50, 0x19, 0x09, 0xd6, 0x24, 0x3d, 0x80, 0x10, 0x08, 0xb0, 0x5d, 0xb5, 0x26, 0xa9, 0xd2, 0x4e, - 0x9b, 0x1e, 0x90, 0x50, 0x34, 0x59, 0x3f, 0x36, 0x83, 0x37, 0x33, 0xab, 0x99, 0x59, 0x53, 0x73, - 0xe4, 0x86, 0x38, 0x21, 0xfe, 0x20, 0xae, 0x1c, 0x91, 0xb8, 0x5b, 0xc8, 0xe2, 0x0f, 0x41, 0x3b, - 0xfb, 0x23, 0x1b, 0xdb, 0x54, 0x48, 0xbd, 0xbd, 0x79, 0x9f, 0xf7, 0x6b, 0xde, 0x7c, 0xf6, 0xbd, - 0x85, 0x96, 0x46, 0x35, 0x45, 0xd5, 0xd3, 0x68, 0x0c, 0x17, 0x81, 0x2e, 0x04, 0x2f, 0x52, 0xd2, - 0x48, 0xb2, 0xed, 0x87, 0xb1, 0x36, 0xa8, 0x9a, 0xff, 0x0f, 0x64, 0x20, 0xad, 0xae, 0x97, 0x48, - 0x29, 0xdc, 0xbc, 0x17, 0x48, 0x19, 0x84, 0xd8, 0x63, 0x11, 0xef, 0x31, 0x21, 0xa4, 0x61, 0x86, - 0x4b, 0x91, 0x39, 0x37, 0x47, 0x01, 0x37, 0x57, 0xf1, 0xa5, 0xe7, 0xcb, 0xeb, 0x1e, 0x53, 0xd6, - 0xfd, 0x3b, 0x2b, 0x7c, 0xe0, 0x8f, 0x7b, 0xd1, 0x24, 0x48, 0xdc, 0x74, 0x8f, 0x45, 0x51, 0xc8, - 0x7d, 0xeb, 0xd8, 0x9b, 0x1e, 0xb1, 0x30, 0xba, 0x62, 0x47, 0xbd, 0x00, 0x05, 0x2a, 0x66, 0x70, - 0x9c, 0x85, 0xfa, 0xec, 0x75, 0xa1, 0x96, 0xef, 0x20, 0xf9, 0xd8, 0xef, 0xf9, 0x21, 0xe3, 0xd7, - 0x59, 0x25, 0x9d, 0x06, 0xec, 0x3c, 0xcf, 0xd0, 0x67, 0x31, 0xaa, 0x59, 0xe7, 0xb7, 0x2a, 0x54, - 0x73, 0x0d, 0x79, 0x07, 0x2a, 0xb1, 0x0a, 0x5d, 0xa7, 0xed, 0x74, 0x6b, 0xfd, 0xed, 0xc5, 0xfc, - 0xb0, 0x72, 0x4e, 0x4f, 0x69, 0xa2, 0x23, 0x1f, 0x42, 0x6d, 0x8c, 0xaf, 0x06, 0x52, 0x7c, 0xcb, - 0x03, 0x77, 0xa3, 0xed, 0x74, 0xeb, 0xc7, 0xc4, 0xcb, 0x7a, 0xe2, 0x0d, 0x73, 0x84, 0xde, 0x18, - 0x91, 0x01, 0x40, 0x92, 0x3f, 0x73, 0xa9, 0x58, 0x97, 0xff, 0x15, 0x2e, 0x67, 0xa3, 0xe1, 0x20, - 0x85, 0xfa, 0xbb, 0x8b, 0xf9, 0x21, 0xdc, 0x9c, 0x69, 0xc9, 0x8d, 0xb4, 0xa1, 0xce, 0xa2, 0xe8, - 0x94, 0x5d, 0x62, 0x78, 0x82, 0x33, 0x77, 0x33, 0xa9, 0x8c, 0x96, 0x55, 0xe4, 0x25, 0xec, 0x2b, - 0xd4, 0x32, 0x56, 0x3e, 0x9e, 0x4d, 0x51, 0x29, 0x3e, 0x46, 0xed, 0xde, 0x69, 0x57, 0xba, 0xf5, - 0xe3, 0x6e, 0x91, 0x2d, 0xbf, 0xa1, 0x47, 0x97, 0x4d, 0x1f, 0x0a, 0xa3, 0x66, 0x74, 0x35, 0x04, - 0xf1, 0x80, 0x68, 0xc3, 0x4c, 0xac, 0xfb, 0x6c, 0x1c, 0xe0, 0x43, 0xc1, 0x2e, 0x43, 0x1c, 0xbb, - 0x5b, 0x6d, 0xa7, 0x5b, 0xa5, 0x6b, 0x10, 0xf2, 0x18, 0x1a, 0x29, 0x07, 0xbe, 0x14, 0x2c, 0x9c, - 0x19, 0xee, 0x6b, 0x77, 0xdb, 0xde, 0xb9, 0x55, 0x54, 0xf1, 0xe8, 0x36, 0x9e, 0x5d, 0x77, 0xd9, - 0x8d, 0x7c, 0x0f, 0x7b, 0x93, 0x58, 0x1b, 0x79, 0xcd, 0x7f, 0xc0, 0xb3, 0xc8, 0xf2, 0xc8, 0xad, - 0xda, 0x50, 0x27, 0xde, 0xcd, 0xeb, 0x7b, 0xf9, 0xeb, 0x5b, 0xe1, 0xc2, 0x1f, 0x7b, 0xd1, 0x24, - 0xf0, 0x12, 0x22, 0x79, 0x25, 0x22, 0x79, 0x39, 0x91, 0xbc, 0x93, 0xa5, 0x90, 0x74, 0x25, 0x09, - 0x79, 0x17, 0x36, 0xaf, 0x30, 0x8c, 0xdc, 0x9a, 0x4d, 0xb6, 0x53, 0xd4, 0xfd, 0x18, 0xc3, 0x88, - 0x5a, 0x88, 0xbc, 0x07, 0xdb, 0x51, 0x18, 0x07, 0x5c, 0x68, 0x17, 0x6c, 0x8f, 0x1b, 0x85, 0xd5, - 0x53, 0xab, 0xa7, 0x39, 0x9e, 0x34, 0x30, 0xd6, 0xa8, 0x4e, 0x65, 0x72, 0x1a, 0x72, 0x9d, 0x36, - 0xb0, 0x9e, 0x36, 0x70, 0x15, 0x21, 0x3f, 0x3b, 0xf0, 0xb6, 0x6f, 0x5b, 0xf2, 0x84, 0x09, 0x16, - 0xe0, 0x35, 0x0a, 0xf3, 0x34, 0xcb, 0x75, 0xd7, 0xe6, 0x7a, 0xf6, 0x06, 0xd7, 0x1f, 0xac, 0x8d, - 0x4c, 0xff, 0x2d, 0x23, 0x79, 0x1f, 0xf6, 0x8b, 0xfe, 0xbc, 0x44, 0xa5, 0xed, 0x2b, 0xec, 0xb4, - 0x2b, 0xdd, 0x1a, 0x5d, 0x05, 0x48, 0x13, 0xaa, 0x31, 0x1f, 0x68, 0x7d, 0x4e, 0x4f, 0xdd, 0x5d, - 0xcb, 0xd1, 0xe2, 0x4c, 0xba, 0xd0, 0x88, 0x79, 0x9f, 0x09, 0x81, 0x6a, 0x20, 0x85, 0x41, 0x61, - 0xdc, 0x86, 0x35, 0x59, 0x56, 0x27, 0x64, 0xcf, 0x55, 0x49, 0xa0, 0xbd, 0x94, 0xec, 0x25, 0x55, - 0xf3, 0x17, 0x07, 0x0e, 0xd6, 0x53, 0x98, 0xec, 0x41, 0x65, 0x82, 0xb3, 0xf4, 0xdb, 0xa5, 0x89, - 0x48, 0x18, 0xdc, 0x99, 0xb2, 0x30, 0xc6, 0xec, 0x73, 0x7d, 0x13, 0xf2, 0x2c, 0xe7, 0xa4, 0x69, - 0xe4, 0x4f, 0x36, 0x3e, 0x76, 0x3a, 0x17, 0xf0, 0xd6, 0x5a, 0x62, 0x93, 0x16, 0x80, 0x51, 0xcc, - 0x9f, 0x70, 0x11, 0x8c, 0x86, 0x59, 0x61, 0x25, 0x0d, 0xb9, 0x0f, 0xbb, 0x4c, 0x48, 0x31, 0x4b, - 0x3a, 0x79, 0xae, 0x51, 0x69, 0x5b, 0x68, 0x95, 0x2e, 0x69, 0x3b, 0x9f, 0xc2, 0x66, 0xc2, 0x40, - 0xe2, 0xc2, 0xb6, 0x7f, 0xc5, 0xcc, 0x79, 0x3e, 0xa1, 0x68, 0x7e, 0x4c, 0xda, 0x9f, 0x88, 0x2f, - 0xf0, 0x95, 0xb1, 0x31, 0x6a, 0xb4, 0x38, 0x77, 0xee, 0xc1, 0x56, 0xfa, 0xa6, 0x84, 0xc0, 0xa6, - 0x60, 0xd7, 0x98, 0x39, 0x5b, 0xb9, 0xf3, 0x39, 0xd4, 0x8a, 0xe1, 0x45, 0x8e, 0x01, 0x7c, 0x29, - 0x04, 0xfa, 0x46, 0x2a, 0xed, 0x3a, 0x96, 0x73, 0x37, 0x43, 0x6e, 0x90, 0x43, 0xb4, 0x64, 0xd5, - 0x79, 0x00, 0xb5, 0x02, 0x58, 0x97, 0x21, 0xd1, 0x99, 0x59, 0x84, 0x59, 0x5d, 0x56, 0xee, 0xfc, - 0x54, 0x81, 0xd2, 0xc0, 0x5b, 0xeb, 0x76, 0x00, 0x5b, 0x5c, 0xeb, 0x18, 0x55, 0xe6, 0x98, 0x9d, - 0x48, 0x17, 0xaa, 0x7e, 0xc8, 0x51, 0x98, 0xd1, 0xd0, 0xce, 0xd4, 0x5a, 0xff, 0xee, 0x62, 0x7e, - 0x58, 0x1d, 0x64, 0x3a, 0x5a, 0xa0, 0xe4, 0x08, 0xea, 0x7e, 0xc8, 0x73, 0x20, 0x1d, 0x9d, 0xfd, - 0xc6, 0x62, 0x7e, 0x58, 0x1f, 0x9c, 0x8e, 0x0a, 0xfb, 0xb2, 0x4d, 0x92, 0x54, 0xfb, 0x32, 0xca, - 0x06, 0x68, 0x8d, 0x66, 0x27, 0x72, 0x01, 0x3b, 0x7c, 0xfc, 0x42, 0x4e, 0x50, 0x0c, 0xec, 0x32, - 0x71, 0xb7, 0x6c, 0x6f, 0xee, 0xaf, 0x99, 0xe6, 0xde, 0xa8, 0x6c, 0x68, 0xa9, 0xd9, 0xdf, 0x5f, - 0xcc, 0x0f, 0x77, 0x46, 0xc3, 0x92, 0x9e, 0xde, 0x8e, 0xd7, 0x9c, 0x01, 0x59, 0xf5, 0x5b, 0x43, - 0xe9, 0x27, 0xb7, 0x29, 0xfd, 0xd1, 0x6b, 0x29, 0x9d, 0x6e, 0x43, 0xaf, 0x58, 0xe4, 0xc9, 0x5a, - 0xf1, 0x6c, 0xfc, 0x12, 0x7d, 0x8f, 0xbf, 0x81, 0x46, 0xbe, 0x1d, 0x9e, 0xa3, 0x9a, 0x72, 0x1f, - 0xc9, 0x57, 0x50, 0x79, 0x84, 0x86, 0x1c, 0xac, 0xac, 0x0f, 0xbb, 0x32, 0x9b, 0xfb, 0x2b, 0xfa, - 0x8e, 0xfb, 0xe3, 0x9f, 0x7f, 0xff, 0xba, 0x41, 0xc8, 0x9e, 0xfd, 0x01, 0x98, 0x1e, 0x15, 0x2b, - 0xb8, 0xff, 0xc5, 0xef, 0x8b, 0x96, 0xf3, 0xc7, 0xa2, 0xe5, 0xfc, 0xb5, 0x68, 0x39, 0x5f, 0x1f, - 0xff, 0x87, 0x1f, 0x81, 0xf4, 0x01, 0x8b, 0x08, 0x97, 0x5b, 0x76, 0x73, 0x3f, 0xf8, 0x27, 0x00, - 0x00, 0xff, 0xff, 0x43, 0x8a, 0x12, 0xdf, 0xa2, 0x08, 0x00, 0x00, + 0x50, 0x19, 0x09, 0x76, 0x89, 0x2b, 0x04, 0x42, 0x48, 0x80, 0xd7, 0x55, 0x6b, 0xea, 0x92, 0x32, + 0x4d, 0x7a, 0x40, 0x42, 0xd1, 0x64, 0x77, 0xd8, 0x0c, 0xde, 0xcc, 0xac, 0x66, 0x66, 0xad, 0xba, + 0x47, 0x6e, 0x5c, 0xb8, 0xc0, 0x1f, 0xd5, 0x23, 0x12, 0x77, 0x0b, 0x59, 0xfc, 0x21, 0x68, 0x67, + 0x7f, 0x64, 0x63, 0x9b, 0x1f, 0x52, 0x6f, 0x6f, 0xde, 0xe7, 0xfd, 0x9a, 0x37, 0x9f, 0x7d, 0x6f, + 0xa1, 0xa3, 0xa8, 0x9c, 0x51, 0xe9, 0x2a, 0xaa, 0x35, 0xe3, 0xa1, 0x2a, 0x05, 0x27, 0x96, 0x42, + 0x0b, 0xb4, 0xeb, 0x47, 0x89, 0xd2, 0x54, 0xb6, 0xff, 0x1f, 0x8a, 0x50, 0x18, 0x9d, 0x9b, 0x4a, + 0x19, 0xdc, 0xbe, 0x17, 0x0a, 0x11, 0x46, 0xd4, 0x25, 0x31, 0x73, 0x09, 0xe7, 0x42, 0x13, 0xcd, + 0x04, 0xcf, 0x9d, 0xdb, 0x93, 0x90, 0xe9, 0xab, 0xe4, 0xd2, 0xf1, 0xc5, 0xb5, 0x4b, 0xa4, 0x71, + 0xff, 0xc1, 0x08, 0x1f, 0xf8, 0x81, 0x3b, 0x1b, 0xb8, 0xf1, 0x34, 0x4c, 0x3d, 0x95, 0x4b, 0xe2, + 0x38, 0x62, 0xbe, 0xf1, 0x75, 0x67, 0x27, 0x24, 0x8a, 0xaf, 0xc8, 0x89, 0x1b, 0x52, 0x4e, 0x25, + 0xd1, 0x34, 0xc8, 0xa3, 0x7d, 0xf1, 0x2f, 0xd1, 0x56, 0x6f, 0x22, 0x58, 0xe0, 0xbb, 0x7e, 0x44, + 0xd8, 0x75, 0x5e, 0x4f, 0xaf, 0x05, 0x7b, 0xcf, 0x73, 0xf4, 0x9b, 0x84, 0xca, 0x79, 0xef, 0x75, + 0x1d, 0xea, 0x85, 0x06, 0xbd, 0x03, 0xb5, 0x44, 0x46, 0xb6, 0xd5, 0xb5, 0xfa, 0x8d, 0xe1, 0xee, + 0x72, 0x71, 0x5c, 0x3b, 0xc7, 0x13, 0x9c, 0xea, 0xd0, 0x87, 0xd0, 0x08, 0xe8, 0x4b, 0x4f, 0xf0, + 0xef, 0x59, 0x68, 0x6f, 0x75, 0xad, 0x7e, 0x73, 0x80, 0x9c, 0xbc, 0x33, 0xce, 0xa8, 0x40, 0xf0, + 0x8d, 0x11, 0xf2, 0x00, 0xd2, 0xfc, 0xb9, 0x4b, 0xcd, 0xb8, 0xfc, 0xaf, 0x74, 0x39, 0x1d, 0x8f, + 0xbc, 0x0c, 0x1a, 0xee, 0x2f, 0x17, 0xc7, 0x70, 0x73, 0xc6, 0x15, 0x37, 0xd4, 0x85, 0x26, 0x89, + 0xe3, 0x09, 0xb9, 0xa4, 0xd1, 0x13, 0x3a, 0xb7, 0xb7, 0xd3, 0xca, 0x70, 0x55, 0x85, 0x5e, 0xc0, + 0xa1, 0xa4, 0x4a, 0x24, 0xd2, 0xa7, 0xa7, 0x33, 0x2a, 0x25, 0x0b, 0xa8, 0xb2, 0xef, 0x74, 0x6b, + 0xfd, 0xe6, 0xa0, 0x5f, 0x66, 0x2b, 0x6e, 0xe8, 0xe0, 0x55, 0xd3, 0x87, 0x5c, 0xcb, 0x39, 0x5e, + 0x0f, 0x81, 0x1c, 0x40, 0x4a, 0x13, 0x9d, 0xa8, 0x21, 0x09, 0x42, 0xfa, 0x90, 0x93, 0xcb, 0x88, + 0x06, 0xf6, 0x4e, 0xd7, 0xea, 0xd7, 0xf1, 0x06, 0x04, 0x3d, 0x86, 0x56, 0xc6, 0x84, 0x2f, 0x39, + 0x89, 0xe6, 0x9a, 0xf9, 0xca, 0xde, 0x35, 0x77, 0xee, 0x94, 0x55, 0x3c, 0xba, 0x8d, 0xe7, 0xd7, + 0x5d, 0x75, 0x43, 0xaf, 0xe0, 0x60, 0x9a, 0x28, 0x2d, 0xae, 0xd9, 0x2b, 0x7a, 0x1a, 0x1b, 0x36, + 0xd9, 0x75, 0x13, 0xea, 0x6b, 0xe7, 0x86, 0x00, 0x4e, 0x41, 0x00, 0x23, 0x5c, 0xf8, 0x81, 0x33, + 0x1b, 0x38, 0xf1, 0x34, 0x74, 0x52, 0x3a, 0x39, 0x15, 0x3a, 0x39, 0x05, 0x9d, 0x9c, 0x27, 0x2b, + 0x51, 0xf1, 0x5a, 0x1e, 0xf4, 0x2e, 0x6c, 0x5f, 0xd1, 0x28, 0xb6, 0x1b, 0x26, 0xdf, 0x5e, 0x59, + 0xfa, 0x63, 0x1a, 0xc5, 0xd8, 0x40, 0xe8, 0x3d, 0xd8, 0x8d, 0xa3, 0x24, 0x64, 0x5c, 0xd9, 0x60, + 0xda, 0xdc, 0x2a, 0xad, 0x9e, 0x19, 0x3d, 0x2e, 0xf0, 0xb4, 0x87, 0x89, 0xa2, 0x72, 0x22, 0xd2, + 0xd3, 0x88, 0xa9, 0xac, 0x87, 0xcd, 0xac, 0x87, 0xeb, 0x08, 0xfa, 0xd9, 0x82, 0xb7, 0x7d, 0xd3, + 0x95, 0xa7, 0x84, 0x93, 0x90, 0x5e, 0x53, 0xae, 0x9f, 0xe5, 0xb9, 0xee, 0x9a, 0x5c, 0x67, 0x6f, + 0xd6, 0x01, 0x6f, 0x63, 0x70, 0xfc, 0x77, 0x49, 0xd1, 0xfb, 0x70, 0x58, 0xb6, 0xe8, 0x05, 0x95, + 0xca, 0xbc, 0xc5, 0x5e, 0xb7, 0xd6, 0x6f, 0xe0, 0x75, 0x00, 0xb5, 0xa1, 0x9e, 0x30, 0x4f, 0xa9, + 0x73, 0x3c, 0xb1, 0xf7, 0x0d, 0x53, 0xcb, 0x33, 0xea, 0x43, 0x2b, 0x61, 0x43, 0xc2, 0x39, 0x95, + 0x9e, 0xe0, 0x9a, 0x72, 0x6d, 0xb7, 0x8c, 0xc9, 0xaa, 0x3a, 0xa5, 0x7c, 0xa1, 0x4a, 0x03, 0x1d, + 0x64, 0x94, 0xaf, 0xa8, 0xda, 0xbf, 0x5a, 0x70, 0xb4, 0x99, 0xc8, 0xe8, 0x00, 0x6a, 0x53, 0x3a, + 0xcf, 0xbe, 0x60, 0x9c, 0x8a, 0x28, 0x80, 0x3b, 0x33, 0x12, 0x25, 0x34, 0xff, 0x68, 0xdf, 0x90, + 0x42, 0xab, 0x69, 0x71, 0x16, 0xfc, 0xd3, 0xad, 0x4f, 0xac, 0xde, 0x05, 0xbc, 0xb5, 0x91, 0xe1, + 0xa8, 0x03, 0xa0, 0x25, 0xf1, 0xa7, 0x8c, 0x87, 0xe3, 0x51, 0x5e, 0x5b, 0x45, 0x83, 0xee, 0xc3, + 0x3e, 0xe1, 0x82, 0xcf, 0xd3, 0x66, 0x9e, 0x2b, 0x2a, 0x95, 0xa9, 0xb5, 0x8e, 0x57, 0xb4, 0xbd, + 0xcf, 0x60, 0x3b, 0xe5, 0x21, 0xb2, 0x61, 0xd7, 0xbf, 0x22, 0xfa, 0xbc, 0x18, 0x55, 0xb8, 0x38, + 0xa6, 0x2f, 0x90, 0x8a, 0x67, 0xf4, 0xa5, 0x36, 0x31, 0x1a, 0xb8, 0x3c, 0xf7, 0xee, 0xc1, 0x4e, + 0xf6, 0xac, 0x08, 0xc1, 0x36, 0x27, 0xd7, 0x34, 0x77, 0x36, 0x72, 0xef, 0x73, 0x68, 0x94, 0x53, + 0x0c, 0x0d, 0x00, 0x7c, 0xc1, 0x39, 0xf5, 0xb5, 0x90, 0xca, 0xb6, 0x0c, 0xf3, 0x6e, 0xa6, 0x9d, + 0x57, 0x40, 0xb8, 0x62, 0xd5, 0x7b, 0x00, 0x8d, 0x12, 0xd8, 0x94, 0x21, 0xd5, 0xe9, 0x79, 0x4c, + 0xf3, 0xba, 0x8c, 0xdc, 0xfb, 0xa9, 0x06, 0x95, 0xc9, 0xb7, 0xd1, 0xed, 0x08, 0x76, 0x98, 0x52, + 0x09, 0x95, 0xb9, 0x63, 0x7e, 0x42, 0x7d, 0xa8, 0xfb, 0x11, 0xa3, 0x5c, 0x8f, 0x47, 0x66, 0xb8, + 0x36, 0x86, 0x77, 0x97, 0x8b, 0xe3, 0xba, 0x97, 0xeb, 0x70, 0x89, 0xa2, 0x13, 0x68, 0xfa, 0x11, + 0x2b, 0x80, 0x6c, 0x86, 0x0e, 0x5b, 0xcb, 0xc5, 0x71, 0xd3, 0x9b, 0x8c, 0x4b, 0xfb, 0xaa, 0x4d, + 0x9a, 0x54, 0xf9, 0x22, 0xce, 0x27, 0x69, 0x03, 0xe7, 0x27, 0x74, 0x01, 0x7b, 0x2c, 0x38, 0x13, + 0x53, 0xca, 0x3d, 0xb3, 0x55, 0xec, 0x1d, 0xd3, 0x9b, 0xfb, 0x1b, 0xc6, 0xba, 0x33, 0xae, 0x1a, + 0x1a, 0x76, 0x0e, 0x0f, 0x97, 0x8b, 0xe3, 0xbd, 0xf1, 0xa8, 0xa2, 0xc7, 0xb7, 0xe3, 0xb5, 0xe7, + 0x80, 0xd6, 0xfd, 0x36, 0xb0, 0xfa, 0xe9, 0x6d, 0x56, 0x7f, 0xfc, 0x8f, 0xac, 0xce, 0xd6, 0xa2, + 0x53, 0xee, 0xf5, 0x74, 0xbf, 0x38, 0x26, 0x7e, 0x85, 0xbe, 0x83, 0xef, 0xa0, 0x55, 0xac, 0x89, + 0xe7, 0x54, 0xce, 0x98, 0x4f, 0xd1, 0x57, 0x50, 0x7b, 0x44, 0x35, 0x3a, 0x5a, 0xdb, 0x23, 0x66, + 0x77, 0xb6, 0x0f, 0xd7, 0xf4, 0x3d, 0xfb, 0xc7, 0xdf, 0xff, 0xfc, 0x65, 0x0b, 0xa1, 0x03, 0xf3, + 0x3f, 0x30, 0x3b, 0x29, 0x77, 0xf1, 0xd0, 0x7b, 0xbd, 0xec, 0x58, 0xbf, 0x2d, 0x3b, 0xd6, 0x1f, + 0xcb, 0x8e, 0xf5, 0xed, 0x47, 0xff, 0xed, 0xbf, 0x20, 0x7b, 0xc3, 0x32, 0xc8, 0xe5, 0x8e, 0xd9, + 0xe2, 0x0f, 0xfe, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x71, 0x4d, 0xb0, 0xe8, 0xb4, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/pkg/apiclient/version/version.pb.go b/pkg/apiclient/version/version.pb.go index bfb16dce85bf4..fcfa285bf7fc1 100644 --- a/pkg/apiclient/version/version.pb.go +++ b/pkg/apiclient/version/version.pb.go @@ -183,33 +183,33 @@ func init() { func init() { proto.RegisterFile("server/version/version.proto", fileDescriptor_8be80977d07a4107) } var fileDescriptor_8be80977d07a4107 = []byte{ - // 407 bytes of a gzipped FileDescriptorProto + // 409 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x92, 0xcd, 0x6a, 0xdb, 0x40, 0x14, 0x85, 0x91, 0xdd, 0xfa, 0x67, 0xec, 0x9a, 0x32, 0x14, 0x57, 0xa8, 0xc6, 0x18, 0x2f, 0x4a, - 0x29, 0x54, 0xa2, 0xed, 0x03, 0x14, 0xec, 0x16, 0x97, 0x9a, 0x82, 0x89, 0x43, 0x16, 0xd9, 0x8d, - 0xe4, 0x6b, 0x65, 0x12, 0x8d, 0xae, 0x18, 0x8d, 0x0c, 0xc9, 0x32, 0xaf, 0x90, 0xf7, 0xc9, 0x3a, - 0xcb, 0x40, 0x5e, 0x20, 0x98, 0x3c, 0x48, 0xd0, 0x48, 0xa3, 0x44, 0xc9, 0x4a, 0x73, 0xcf, 0xf9, - 0x74, 0xee, 0xc0, 0x19, 0x32, 0x4a, 0x41, 0xee, 0x40, 0x7a, 0x3b, 0x90, 0x29, 0xc7, 0xd8, 0x7c, - 0xdd, 0x44, 0xa2, 0x42, 0xda, 0x2e, 0x47, 0x67, 0x14, 0x22, 0x86, 0x11, 0x78, 0x2c, 0xe1, 0x1e, - 0x8b, 0x63, 0x54, 0x4c, 0x71, 0x8c, 0xd3, 0x02, 0x73, 0x3e, 0x95, 0xae, 0x9e, 0xfc, 0x6c, 0xeb, - 0x81, 0x48, 0xd4, 0x79, 0x61, 0x4e, 0xaf, 0x9b, 0x64, 0x70, 0x54, 0xc4, 0xfc, 0x87, 0x34, 0x65, - 0x21, 0x50, 0x9b, 0xb4, 0x4b, 0xc5, 0xb6, 0x26, 0xd6, 0x97, 0xee, 0x81, 0x19, 0xe9, 0x88, 0x74, - 0x67, 0x19, 0x8f, 0x36, 0xbf, 0x99, 0x02, 0xbb, 0xa1, 0xbd, 0x27, 0x21, 0x77, 0x17, 0x5c, 0xcd, - 0x51, 0x08, 0xae, 0xec, 0x66, 0xe1, 0x56, 0x02, 0x1d, 0x92, 0xd6, 0x82, 0xab, 0x43, 0x16, 0xda, - 0x6f, 0xb4, 0x55, 0x4e, 0x74, 0x4a, 0xfa, 0xf9, 0x49, 0x02, 0xac, 0x55, 0x1e, 0xfb, 0x56, 0xbb, - 0x35, 0x4d, 0x27, 0xa3, 0xb9, 0x53, 0xab, 0x4c, 0x36, 0x02, 0x75, 0x48, 0x67, 0x8e, 0x22, 0xe1, - 0x11, 0x48, 0xbb, 0xad, 0xcd, 0x6a, 0xce, 0xbd, 0x55, 0xc4, 0xd4, 0x16, 0xa5, 0xb0, 0x3b, 0x85, - 0x67, 0x66, 0xfa, 0x99, 0x0c, 0x96, 0x29, 0xc6, 0x31, 0x28, 0x13, 0xdd, 0xd5, 0xc4, 0x0b, 0x95, - 0x7e, 0x25, 0xef, 0x97, 0x59, 0xaa, 0x50, 0xf0, 0x0b, 0x30, 0x24, 0xd1, 0xe4, 0x2b, 0x9d, 0x4e, - 0x48, 0xef, 0x2f, 0x44, 0xc2, 0x60, 0x3d, 0x8d, 0x3d, 0x97, 0xf4, 0xd6, 0xcc, 0x87, 0x40, 0x45, - 0x06, 0xea, 0x97, 0x5b, 0x6b, 0x6a, 0xce, 0xfd, 0xab, 0xdf, 0xee, 0x5d, 0xc1, 0xd5, 0xd5, 0x1f, - 0x7e, 0xd5, 0xdf, 0x1a, 0xe4, 0x8e, 0x07, 0x40, 0x57, 0x55, 0x7f, 0x74, 0xe8, 0x16, 0xdd, 0xbb, - 0xa6, 0x7b, 0xf7, 0x4f, 0xde, 0xbd, 0xf3, 0xd1, 0x35, 0x2f, 0xa9, 0xde, 0xfd, 0xf4, 0xc3, 0xe5, - 0xdd, 0xc3, 0x55, 0x63, 0x40, 0xfb, 0xfa, 0x2d, 0x95, 0xd0, 0xec, 0xd7, 0xcd, 0x7e, 0x6c, 0xdd, - 0xee, 0xc7, 0xd6, 0xfd, 0x7e, 0x6c, 0x1d, 0x7f, 0x0f, 0xb9, 0x3a, 0xc9, 0x7c, 0x37, 0x40, 0xe1, - 0x31, 0x19, 0x62, 0x22, 0xf1, 0x54, 0x1f, 0xbe, 0x05, 0x1b, 0x2f, 0x39, 0x0b, 0xf3, 0x5f, 0x83, - 0x88, 0x43, 0xac, 0x4c, 0x80, 0xdf, 0xd2, 0xfb, 0x7f, 0x3e, 0x06, 0x00, 0x00, 0xff, 0xff, 0x50, - 0x52, 0xad, 0xa0, 0xd0, 0x02, 0x00, 0x00, + 0x29, 0x54, 0x02, 0xb7, 0x4f, 0x60, 0xb7, 0xb8, 0xd4, 0x14, 0x4c, 0x5d, 0xba, 0xe8, 0x6e, 0x24, + 0x5f, 0xab, 0xd3, 0x68, 0x74, 0xc5, 0x68, 0x24, 0x48, 0x96, 0x79, 0x85, 0xbc, 0x4f, 0xd6, 0x59, + 0x06, 0xf2, 0x02, 0xc1, 0xe4, 0x41, 0x82, 0x46, 0x1a, 0x25, 0x4a, 0x56, 0x9a, 0x7b, 0xce, 0xa7, + 0x33, 0x17, 0xce, 0x90, 0x49, 0x0a, 0x32, 0x07, 0xe9, 0xe5, 0x20, 0x53, 0x8e, 0xb1, 0xf9, 0xba, + 0x89, 0x44, 0x85, 0xb4, 0x5b, 0x8d, 0xce, 0x24, 0x44, 0x0c, 0x23, 0xf0, 0x58, 0xc2, 0x3d, 0x16, + 0xc7, 0xa8, 0x98, 0xe2, 0x18, 0xa7, 0x25, 0xe6, 0xbc, 0xab, 0x5c, 0x3d, 0xf9, 0xd9, 0xc1, 0x03, + 0x91, 0xa8, 0xd3, 0xd2, 0x9c, 0x5f, 0xb6, 0xc9, 0xe8, 0x4f, 0x19, 0xf3, 0x13, 0xd2, 0x94, 0x85, + 0x40, 0x6d, 0xd2, 0xad, 0x14, 0xdb, 0x9a, 0x59, 0x1f, 0xfa, 0xbf, 0xcc, 0x48, 0x27, 0xa4, 0xbf, + 0xcc, 0x78, 0xb4, 0xff, 0xca, 0x14, 0xd8, 0x2d, 0xed, 0x3d, 0x08, 0x85, 0xbb, 0xe6, 0x6a, 0x85, + 0x42, 0x70, 0x65, 0xb7, 0x4b, 0xb7, 0x16, 0xe8, 0x98, 0x74, 0xd6, 0x5c, 0xfd, 0x66, 0xa1, 0xfd, + 0x42, 0x5b, 0xd5, 0x44, 0xe7, 0x64, 0x58, 0x9c, 0x24, 0xc0, 0x4e, 0x15, 0xb1, 0x2f, 0xb5, 0xdb, + 0xd0, 0x74, 0x32, 0x9a, 0x9d, 0x3a, 0x55, 0xb2, 0x11, 0xa8, 0x43, 0x7a, 0x2b, 0x14, 0x09, 0x8f, + 0x40, 0xda, 0x5d, 0x6d, 0xd6, 0x73, 0xe1, 0x6d, 0x23, 0xa6, 0x0e, 0x28, 0x85, 0xdd, 0x2b, 0x3d, + 0x33, 0xd3, 0xf7, 0x64, 0xb4, 0x49, 0x31, 0x8e, 0x41, 0x99, 0xe8, 0xbe, 0x26, 0x9e, 0xa8, 0xf4, + 0x23, 0x79, 0xbd, 0xc9, 0x52, 0x85, 0x82, 0x9f, 0x81, 0x21, 0x89, 0x26, 0x9f, 0xe9, 0x74, 0x46, + 0x06, 0xdf, 0x21, 0x12, 0x06, 0x1b, 0x68, 0xec, 0xb1, 0xa4, 0x6f, 0xcd, 0x7c, 0x08, 0x54, 0x64, + 0xa0, 0x61, 0x75, 0x6b, 0x43, 0x2d, 0xb8, 0x1f, 0xcd, 0xed, 0x5e, 0x95, 0x5c, 0x53, 0x5d, 0xf8, + 0x75, 0x7f, 0x3b, 0x90, 0x39, 0x0f, 0x80, 0x6e, 0xeb, 0xfe, 0xe8, 0xd8, 0x2d, 0xbb, 0x77, 0x4d, + 0xf7, 0xee, 0xb7, 0xa2, 0x7b, 0xe7, 0xad, 0x6b, 0x5e, 0x52, 0xb3, 0xfb, 0xf9, 0x9b, 0xf3, 0x9b, + 0xbb, 0x8b, 0xd6, 0x88, 0x0e, 0xf5, 0x5b, 0xaa, 0xa0, 0xe5, 0xf2, 0xea, 0x38, 0xb5, 0xae, 0x8f, + 0x53, 0xeb, 0xf6, 0x38, 0xb5, 0xfe, 0x7e, 0x09, 0xb9, 0xfa, 0x97, 0xf9, 0x6e, 0x80, 0xc2, 0x63, + 0x32, 0xc4, 0x44, 0xe2, 0x7f, 0x7d, 0xf8, 0x14, 0xec, 0xbd, 0x7c, 0xe1, 0x25, 0x27, 0x61, 0xf1, + 0x77, 0x10, 0x71, 0x88, 0x95, 0xc9, 0xf0, 0x3b, 0x7a, 0x85, 0xcf, 0xf7, 0x01, 0x00, 0x00, 0xff, + 0xff, 0x48, 0x07, 0x04, 0xf4, 0xd3, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/pkg/apis/api-rules/violation_exceptions.list b/pkg/apis/api-rules/violation_exceptions.list index 3592e35dcf9d1..adba152dbc69e 100644 --- a/pkg/apis/api-rules/violation_exceptions.list +++ b/pkg/apis/api-rules/violation_exceptions.list @@ -1,79 +1,79 @@ -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,AppProjectSpec,ClusterResourceBlacklist -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,AppProjectSpec,ClusterResourceWhitelist -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,AppProjectSpec,Destinations -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,AppProjectSpec,NamespaceResourceBlacklist -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,AppProjectSpec,NamespaceResourceWhitelist -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,AppProjectSpec,Roles -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,AppProjectSpec,SignatureKeys -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,AppProjectSpec,SourceRepos -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationSourceHelm,FileParameters -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationSourceHelm,Parameters -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationSourceHelm,ValueFiles -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationSourceJsonnet,ExtVars -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationSourceJsonnet,Libs -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationSourceJsonnet,TLAs -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationSourceKsonnet,Parameters -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationSpec,IgnoreDifferences -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationSpec,Info -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationStatus,Conditions -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationStatus,Resources -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationSummary,ExternalURLs -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationSummary,Images -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationTree,Hosts -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationTree,Nodes -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationTree,OrphanedNodes -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,Cluster,Namespaces -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,Command,Args -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,Command,Command -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ExecProviderConfig,Args -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,HostInfo,ResourcesInfo -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,JWTTokens,Items -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,Operation,Info -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,OrphanedResourcesMonitorSettings,Ignore -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,OverrideIgnoreDiff,JSONPointers -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ProjectRole,Groups -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ProjectRole,JWTTokens -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ProjectRole,Policies -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,RepositoryCertificate,CertData -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceAction,Params -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceActions,Definitions -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceIgnoreDifferences,JSONPointers -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceNetworkingInfo,ExternalURLs -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceNetworkingInfo,Ingress -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceNetworkingInfo,TargetRefs -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceNode,Images -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceNode,Info -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceNode,ParentRefs -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceOverride,KnownTypeFields -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,RevisionMetadata,Tags -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,SyncOperation,Manifests -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,SyncOperation,Resources -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,SyncWindow,Applications -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,SyncWindow,Clusters -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,SyncWindow,Namespaces -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,TLSClientConfig,CAData -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,TLSClientConfig,CertData -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,TLSClientConfig,KeyData -API rule violation: list_type_missing,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,rawResourceOverride,KnownTypeFields -API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ApplicationSourceJsonnet,TLAs -API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ClusterCacheInfo,APIsCount -API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ConnectionState,ModifiedAt -API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,JWTToken,ExpiresAt -API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,JWTToken,IssuedAt -API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,KustomizeOptions,BinaryPath -API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,KustomizeOptions,BuildOptions -API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,RepoCreds,GitHubAppEnterpriseBaseURL -API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,RepoCreds,GithubAppId -API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,RepoCreds,GithubAppInstallationId -API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,Repository,EnableLFS -API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,Repository,GitHubAppEnterpriseBaseURL -API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,Repository,GithubAppId -API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,Repository,GithubAppInstallationId -API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceActionDefinition,ActionLua -API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceActions,ActionDiscoveryLua -API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceOverride,Actions -API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceOverride,HealthLua -API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceOverride,IgnoreDifferences -API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,ResourceOverride,KnownTypeFields -API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,objectMeta,Name -API rule violation: names_match,github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1,rawResourceOverride,HealthLua +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,AppProjectSpec,ClusterResourceBlacklist +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,AppProjectSpec,ClusterResourceWhitelist +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,AppProjectSpec,Destinations +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,AppProjectSpec,NamespaceResourceBlacklist +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,AppProjectSpec,NamespaceResourceWhitelist +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,AppProjectSpec,Roles +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,AppProjectSpec,SignatureKeys +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,AppProjectSpec,SourceRepos +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationSourceHelm,FileParameters +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationSourceHelm,Parameters +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationSourceHelm,ValueFiles +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationSourceJsonnet,ExtVars +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationSourceJsonnet,Libs +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationSourceJsonnet,TLAs +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationSourceKsonnet,Parameters +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationSpec,IgnoreDifferences +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationSpec,Info +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationStatus,Conditions +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationStatus,Resources +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationSummary,ExternalURLs +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationSummary,Images +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationTree,Hosts +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationTree,Nodes +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationTree,OrphanedNodes +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,Cluster,Namespaces +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,Command,Args +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,Command,Command +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ExecProviderConfig,Args +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,HostInfo,ResourcesInfo +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,JWTTokens,Items +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,Operation,Info +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,OrphanedResourcesMonitorSettings,Ignore +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,OverrideIgnoreDiff,JSONPointers +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ProjectRole,Groups +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ProjectRole,JWTTokens +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ProjectRole,Policies +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,RepositoryCertificate,CertData +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ResourceAction,Params +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ResourceActions,Definitions +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ResourceIgnoreDifferences,JSONPointers +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ResourceNetworkingInfo,ExternalURLs +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ResourceNetworkingInfo,Ingress +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ResourceNetworkingInfo,TargetRefs +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ResourceNode,Images +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ResourceNode,Info +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ResourceNode,ParentRefs +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ResourceOverride,KnownTypeFields +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,RevisionMetadata,Tags +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,SyncOperation,Manifests +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,SyncOperation,Resources +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,SyncWindow,Applications +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,SyncWindow,Clusters +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,SyncWindow,Namespaces +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,TLSClientConfig,CAData +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,TLSClientConfig,CertData +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,TLSClientConfig,KeyData +API rule violation: list_type_missing,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,rawResourceOverride,KnownTypeFields +API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ApplicationSourceJsonnet,TLAs +API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ClusterCacheInfo,APIsCount +API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ConnectionState,ModifiedAt +API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,JWTToken,ExpiresAt +API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,JWTToken,IssuedAt +API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,KustomizeOptions,BinaryPath +API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,KustomizeOptions,BuildOptions +API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,RepoCreds,GitHubAppEnterpriseBaseURL +API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,RepoCreds,GithubAppId +API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,RepoCreds,GithubAppInstallationId +API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,Repository,EnableLFS +API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,Repository,GitHubAppEnterpriseBaseURL +API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,Repository,GithubAppId +API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,Repository,GithubAppInstallationId +API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ResourceActionDefinition,ActionLua +API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ResourceActions,ActionDiscoveryLua +API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ResourceOverride,Actions +API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ResourceOverride,HealthLua +API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ResourceOverride,IgnoreDifferences +API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,ResourceOverride,KnownTypeFields +API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,objectMeta,Name +API rule violation: names_match,github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1,rawResourceOverride,HealthLua diff --git a/pkg/apis/application/v1alpha1/generated.pb.go b/pkg/apis/application/v1alpha1/generated.pb.go index c4c558052b072..825e9ca76fa92 100644 --- a/pkg/apis/application/v1alpha1/generated.pb.go +++ b/pkg/apis/application/v1alpha1/generated.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1/generated.proto +// source: github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/generated.proto package v1alpha1 @@ -39,7 +39,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package func (m *AWSAuthConfig) Reset() { *m = AWSAuthConfig{} } func (*AWSAuthConfig) ProtoMessage() {} func (*AWSAuthConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{0} + return fileDescriptor_030104ce3b95bcac, []int{0} } func (m *AWSAuthConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -67,7 +67,7 @@ var xxx_messageInfo_AWSAuthConfig proto.InternalMessageInfo func (m *AppProject) Reset() { *m = AppProject{} } func (*AppProject) ProtoMessage() {} func (*AppProject) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{1} + return fileDescriptor_030104ce3b95bcac, []int{1} } func (m *AppProject) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -95,7 +95,7 @@ var xxx_messageInfo_AppProject proto.InternalMessageInfo func (m *AppProjectList) Reset() { *m = AppProjectList{} } func (*AppProjectList) ProtoMessage() {} func (*AppProjectList) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{2} + return fileDescriptor_030104ce3b95bcac, []int{2} } func (m *AppProjectList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -123,7 +123,7 @@ var xxx_messageInfo_AppProjectList proto.InternalMessageInfo func (m *AppProjectSpec) Reset() { *m = AppProjectSpec{} } func (*AppProjectSpec) ProtoMessage() {} func (*AppProjectSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{3} + return fileDescriptor_030104ce3b95bcac, []int{3} } func (m *AppProjectSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -151,7 +151,7 @@ var xxx_messageInfo_AppProjectSpec proto.InternalMessageInfo func (m *AppProjectStatus) Reset() { *m = AppProjectStatus{} } func (*AppProjectStatus) ProtoMessage() {} func (*AppProjectStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{4} + return fileDescriptor_030104ce3b95bcac, []int{4} } func (m *AppProjectStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -179,7 +179,7 @@ var xxx_messageInfo_AppProjectStatus proto.InternalMessageInfo func (m *Application) Reset() { *m = Application{} } func (*Application) ProtoMessage() {} func (*Application) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{5} + return fileDescriptor_030104ce3b95bcac, []int{5} } func (m *Application) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -207,7 +207,7 @@ var xxx_messageInfo_Application proto.InternalMessageInfo func (m *ApplicationCondition) Reset() { *m = ApplicationCondition{} } func (*ApplicationCondition) ProtoMessage() {} func (*ApplicationCondition) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{6} + return fileDescriptor_030104ce3b95bcac, []int{6} } func (m *ApplicationCondition) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -235,7 +235,7 @@ var xxx_messageInfo_ApplicationCondition proto.InternalMessageInfo func (m *ApplicationDestination) Reset() { *m = ApplicationDestination{} } func (*ApplicationDestination) ProtoMessage() {} func (*ApplicationDestination) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{7} + return fileDescriptor_030104ce3b95bcac, []int{7} } func (m *ApplicationDestination) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -263,7 +263,7 @@ var xxx_messageInfo_ApplicationDestination proto.InternalMessageInfo func (m *ApplicationList) Reset() { *m = ApplicationList{} } func (*ApplicationList) ProtoMessage() {} func (*ApplicationList) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{8} + return fileDescriptor_030104ce3b95bcac, []int{8} } func (m *ApplicationList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -291,7 +291,7 @@ var xxx_messageInfo_ApplicationList proto.InternalMessageInfo func (m *ApplicationSource) Reset() { *m = ApplicationSource{} } func (*ApplicationSource) ProtoMessage() {} func (*ApplicationSource) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{9} + return fileDescriptor_030104ce3b95bcac, []int{9} } func (m *ApplicationSource) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -319,7 +319,7 @@ var xxx_messageInfo_ApplicationSource proto.InternalMessageInfo func (m *ApplicationSourceDirectory) Reset() { *m = ApplicationSourceDirectory{} } func (*ApplicationSourceDirectory) ProtoMessage() {} func (*ApplicationSourceDirectory) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{10} + return fileDescriptor_030104ce3b95bcac, []int{10} } func (m *ApplicationSourceDirectory) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -347,7 +347,7 @@ var xxx_messageInfo_ApplicationSourceDirectory proto.InternalMessageInfo func (m *ApplicationSourceHelm) Reset() { *m = ApplicationSourceHelm{} } func (*ApplicationSourceHelm) ProtoMessage() {} func (*ApplicationSourceHelm) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{11} + return fileDescriptor_030104ce3b95bcac, []int{11} } func (m *ApplicationSourceHelm) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -375,7 +375,7 @@ var xxx_messageInfo_ApplicationSourceHelm proto.InternalMessageInfo func (m *ApplicationSourceJsonnet) Reset() { *m = ApplicationSourceJsonnet{} } func (*ApplicationSourceJsonnet) ProtoMessage() {} func (*ApplicationSourceJsonnet) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{12} + return fileDescriptor_030104ce3b95bcac, []int{12} } func (m *ApplicationSourceJsonnet) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -403,7 +403,7 @@ var xxx_messageInfo_ApplicationSourceJsonnet proto.InternalMessageInfo func (m *ApplicationSourceKsonnet) Reset() { *m = ApplicationSourceKsonnet{} } func (*ApplicationSourceKsonnet) ProtoMessage() {} func (*ApplicationSourceKsonnet) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{13} + return fileDescriptor_030104ce3b95bcac, []int{13} } func (m *ApplicationSourceKsonnet) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -431,7 +431,7 @@ var xxx_messageInfo_ApplicationSourceKsonnet proto.InternalMessageInfo func (m *ApplicationSourceKustomize) Reset() { *m = ApplicationSourceKustomize{} } func (*ApplicationSourceKustomize) ProtoMessage() {} func (*ApplicationSourceKustomize) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{14} + return fileDescriptor_030104ce3b95bcac, []int{14} } func (m *ApplicationSourceKustomize) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -459,7 +459,7 @@ var xxx_messageInfo_ApplicationSourceKustomize proto.InternalMessageInfo func (m *ApplicationSourcePlugin) Reset() { *m = ApplicationSourcePlugin{} } func (*ApplicationSourcePlugin) ProtoMessage() {} func (*ApplicationSourcePlugin) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{15} + return fileDescriptor_030104ce3b95bcac, []int{15} } func (m *ApplicationSourcePlugin) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -487,7 +487,7 @@ var xxx_messageInfo_ApplicationSourcePlugin proto.InternalMessageInfo func (m *ApplicationSpec) Reset() { *m = ApplicationSpec{} } func (*ApplicationSpec) ProtoMessage() {} func (*ApplicationSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{16} + return fileDescriptor_030104ce3b95bcac, []int{16} } func (m *ApplicationSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -515,7 +515,7 @@ var xxx_messageInfo_ApplicationSpec proto.InternalMessageInfo func (m *ApplicationStatus) Reset() { *m = ApplicationStatus{} } func (*ApplicationStatus) ProtoMessage() {} func (*ApplicationStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{17} + return fileDescriptor_030104ce3b95bcac, []int{17} } func (m *ApplicationStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -543,7 +543,7 @@ var xxx_messageInfo_ApplicationStatus proto.InternalMessageInfo func (m *ApplicationSummary) Reset() { *m = ApplicationSummary{} } func (*ApplicationSummary) ProtoMessage() {} func (*ApplicationSummary) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{18} + return fileDescriptor_030104ce3b95bcac, []int{18} } func (m *ApplicationSummary) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -571,7 +571,7 @@ var xxx_messageInfo_ApplicationSummary proto.InternalMessageInfo func (m *ApplicationTree) Reset() { *m = ApplicationTree{} } func (*ApplicationTree) ProtoMessage() {} func (*ApplicationTree) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{19} + return fileDescriptor_030104ce3b95bcac, []int{19} } func (m *ApplicationTree) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -599,7 +599,7 @@ var xxx_messageInfo_ApplicationTree proto.InternalMessageInfo func (m *ApplicationWatchEvent) Reset() { *m = ApplicationWatchEvent{} } func (*ApplicationWatchEvent) ProtoMessage() {} func (*ApplicationWatchEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{20} + return fileDescriptor_030104ce3b95bcac, []int{20} } func (m *ApplicationWatchEvent) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -627,7 +627,7 @@ var xxx_messageInfo_ApplicationWatchEvent proto.InternalMessageInfo func (m *Backoff) Reset() { *m = Backoff{} } func (*Backoff) ProtoMessage() {} func (*Backoff) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{21} + return fileDescriptor_030104ce3b95bcac, []int{21} } func (m *Backoff) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -655,7 +655,7 @@ var xxx_messageInfo_Backoff proto.InternalMessageInfo func (m *Cluster) Reset() { *m = Cluster{} } func (*Cluster) ProtoMessage() {} func (*Cluster) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{22} + return fileDescriptor_030104ce3b95bcac, []int{22} } func (m *Cluster) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -683,7 +683,7 @@ var xxx_messageInfo_Cluster proto.InternalMessageInfo func (m *ClusterCacheInfo) Reset() { *m = ClusterCacheInfo{} } func (*ClusterCacheInfo) ProtoMessage() {} func (*ClusterCacheInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{23} + return fileDescriptor_030104ce3b95bcac, []int{23} } func (m *ClusterCacheInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -711,7 +711,7 @@ var xxx_messageInfo_ClusterCacheInfo proto.InternalMessageInfo func (m *ClusterConfig) Reset() { *m = ClusterConfig{} } func (*ClusterConfig) ProtoMessage() {} func (*ClusterConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{24} + return fileDescriptor_030104ce3b95bcac, []int{24} } func (m *ClusterConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -739,7 +739,7 @@ var xxx_messageInfo_ClusterConfig proto.InternalMessageInfo func (m *ClusterInfo) Reset() { *m = ClusterInfo{} } func (*ClusterInfo) ProtoMessage() {} func (*ClusterInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{25} + return fileDescriptor_030104ce3b95bcac, []int{25} } func (m *ClusterInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -767,7 +767,7 @@ var xxx_messageInfo_ClusterInfo proto.InternalMessageInfo func (m *ClusterList) Reset() { *m = ClusterList{} } func (*ClusterList) ProtoMessage() {} func (*ClusterList) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{26} + return fileDescriptor_030104ce3b95bcac, []int{26} } func (m *ClusterList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -795,7 +795,7 @@ var xxx_messageInfo_ClusterList proto.InternalMessageInfo func (m *Command) Reset() { *m = Command{} } func (*Command) ProtoMessage() {} func (*Command) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{27} + return fileDescriptor_030104ce3b95bcac, []int{27} } func (m *Command) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -823,7 +823,7 @@ var xxx_messageInfo_Command proto.InternalMessageInfo func (m *ComparedTo) Reset() { *m = ComparedTo{} } func (*ComparedTo) ProtoMessage() {} func (*ComparedTo) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{28} + return fileDescriptor_030104ce3b95bcac, []int{28} } func (m *ComparedTo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -851,7 +851,7 @@ var xxx_messageInfo_ComparedTo proto.InternalMessageInfo func (m *ComponentParameter) Reset() { *m = ComponentParameter{} } func (*ComponentParameter) ProtoMessage() {} func (*ComponentParameter) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{29} + return fileDescriptor_030104ce3b95bcac, []int{29} } func (m *ComponentParameter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -879,7 +879,7 @@ var xxx_messageInfo_ComponentParameter proto.InternalMessageInfo func (m *ConfigManagementPlugin) Reset() { *m = ConfigManagementPlugin{} } func (*ConfigManagementPlugin) ProtoMessage() {} func (*ConfigManagementPlugin) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{30} + return fileDescriptor_030104ce3b95bcac, []int{30} } func (m *ConfigManagementPlugin) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -907,7 +907,7 @@ var xxx_messageInfo_ConfigManagementPlugin proto.InternalMessageInfo func (m *ConnectionState) Reset() { *m = ConnectionState{} } func (*ConnectionState) ProtoMessage() {} func (*ConnectionState) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{31} + return fileDescriptor_030104ce3b95bcac, []int{31} } func (m *ConnectionState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -935,7 +935,7 @@ var xxx_messageInfo_ConnectionState proto.InternalMessageInfo func (m *EnvEntry) Reset() { *m = EnvEntry{} } func (*EnvEntry) ProtoMessage() {} func (*EnvEntry) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{32} + return fileDescriptor_030104ce3b95bcac, []int{32} } func (m *EnvEntry) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -963,7 +963,7 @@ var xxx_messageInfo_EnvEntry proto.InternalMessageInfo func (m *ExecProviderConfig) Reset() { *m = ExecProviderConfig{} } func (*ExecProviderConfig) ProtoMessage() {} func (*ExecProviderConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{33} + return fileDescriptor_030104ce3b95bcac, []int{33} } func (m *ExecProviderConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -991,7 +991,7 @@ var xxx_messageInfo_ExecProviderConfig proto.InternalMessageInfo func (m *GnuPGPublicKey) Reset() { *m = GnuPGPublicKey{} } func (*GnuPGPublicKey) ProtoMessage() {} func (*GnuPGPublicKey) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{34} + return fileDescriptor_030104ce3b95bcac, []int{34} } func (m *GnuPGPublicKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1019,7 +1019,7 @@ var xxx_messageInfo_GnuPGPublicKey proto.InternalMessageInfo func (m *GnuPGPublicKeyList) Reset() { *m = GnuPGPublicKeyList{} } func (*GnuPGPublicKeyList) ProtoMessage() {} func (*GnuPGPublicKeyList) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{35} + return fileDescriptor_030104ce3b95bcac, []int{35} } func (m *GnuPGPublicKeyList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1047,7 +1047,7 @@ var xxx_messageInfo_GnuPGPublicKeyList proto.InternalMessageInfo func (m *HealthStatus) Reset() { *m = HealthStatus{} } func (*HealthStatus) ProtoMessage() {} func (*HealthStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{36} + return fileDescriptor_030104ce3b95bcac, []int{36} } func (m *HealthStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1075,7 +1075,7 @@ var xxx_messageInfo_HealthStatus proto.InternalMessageInfo func (m *HelmFileParameter) Reset() { *m = HelmFileParameter{} } func (*HelmFileParameter) ProtoMessage() {} func (*HelmFileParameter) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{37} + return fileDescriptor_030104ce3b95bcac, []int{37} } func (m *HelmFileParameter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1103,7 +1103,7 @@ var xxx_messageInfo_HelmFileParameter proto.InternalMessageInfo func (m *HelmParameter) Reset() { *m = HelmParameter{} } func (*HelmParameter) ProtoMessage() {} func (*HelmParameter) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{38} + return fileDescriptor_030104ce3b95bcac, []int{38} } func (m *HelmParameter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1131,7 +1131,7 @@ var xxx_messageInfo_HelmParameter proto.InternalMessageInfo func (m *HostInfo) Reset() { *m = HostInfo{} } func (*HostInfo) ProtoMessage() {} func (*HostInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{39} + return fileDescriptor_030104ce3b95bcac, []int{39} } func (m *HostInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1159,7 +1159,7 @@ var xxx_messageInfo_HostInfo proto.InternalMessageInfo func (m *HostResourceInfo) Reset() { *m = HostResourceInfo{} } func (*HostResourceInfo) ProtoMessage() {} func (*HostResourceInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{40} + return fileDescriptor_030104ce3b95bcac, []int{40} } func (m *HostResourceInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1187,7 +1187,7 @@ var xxx_messageInfo_HostResourceInfo proto.InternalMessageInfo func (m *Info) Reset() { *m = Info{} } func (*Info) ProtoMessage() {} func (*Info) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{41} + return fileDescriptor_030104ce3b95bcac, []int{41} } func (m *Info) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1215,7 +1215,7 @@ var xxx_messageInfo_Info proto.InternalMessageInfo func (m *InfoItem) Reset() { *m = InfoItem{} } func (*InfoItem) ProtoMessage() {} func (*InfoItem) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{42} + return fileDescriptor_030104ce3b95bcac, []int{42} } func (m *InfoItem) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1243,7 +1243,7 @@ var xxx_messageInfo_InfoItem proto.InternalMessageInfo func (m *JWTToken) Reset() { *m = JWTToken{} } func (*JWTToken) ProtoMessage() {} func (*JWTToken) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{43} + return fileDescriptor_030104ce3b95bcac, []int{43} } func (m *JWTToken) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1271,7 +1271,7 @@ var xxx_messageInfo_JWTToken proto.InternalMessageInfo func (m *JWTTokens) Reset() { *m = JWTTokens{} } func (*JWTTokens) ProtoMessage() {} func (*JWTTokens) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{44} + return fileDescriptor_030104ce3b95bcac, []int{44} } func (m *JWTTokens) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1299,7 +1299,7 @@ var xxx_messageInfo_JWTTokens proto.InternalMessageInfo func (m *JsonnetVar) Reset() { *m = JsonnetVar{} } func (*JsonnetVar) ProtoMessage() {} func (*JsonnetVar) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{45} + return fileDescriptor_030104ce3b95bcac, []int{45} } func (m *JsonnetVar) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1327,7 +1327,7 @@ var xxx_messageInfo_JsonnetVar proto.InternalMessageInfo func (m *KnownTypeField) Reset() { *m = KnownTypeField{} } func (*KnownTypeField) ProtoMessage() {} func (*KnownTypeField) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{46} + return fileDescriptor_030104ce3b95bcac, []int{46} } func (m *KnownTypeField) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1355,7 +1355,7 @@ var xxx_messageInfo_KnownTypeField proto.InternalMessageInfo func (m *KsonnetParameter) Reset() { *m = KsonnetParameter{} } func (*KsonnetParameter) ProtoMessage() {} func (*KsonnetParameter) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{47} + return fileDescriptor_030104ce3b95bcac, []int{47} } func (m *KsonnetParameter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1383,7 +1383,7 @@ var xxx_messageInfo_KsonnetParameter proto.InternalMessageInfo func (m *KustomizeOptions) Reset() { *m = KustomizeOptions{} } func (*KustomizeOptions) ProtoMessage() {} func (*KustomizeOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{48} + return fileDescriptor_030104ce3b95bcac, []int{48} } func (m *KustomizeOptions) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1411,7 +1411,7 @@ var xxx_messageInfo_KustomizeOptions proto.InternalMessageInfo func (m *Operation) Reset() { *m = Operation{} } func (*Operation) ProtoMessage() {} func (*Operation) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{49} + return fileDescriptor_030104ce3b95bcac, []int{49} } func (m *Operation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1439,7 +1439,7 @@ var xxx_messageInfo_Operation proto.InternalMessageInfo func (m *OperationInitiator) Reset() { *m = OperationInitiator{} } func (*OperationInitiator) ProtoMessage() {} func (*OperationInitiator) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{50} + return fileDescriptor_030104ce3b95bcac, []int{50} } func (m *OperationInitiator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1467,7 +1467,7 @@ var xxx_messageInfo_OperationInitiator proto.InternalMessageInfo func (m *OperationState) Reset() { *m = OperationState{} } func (*OperationState) ProtoMessage() {} func (*OperationState) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{51} + return fileDescriptor_030104ce3b95bcac, []int{51} } func (m *OperationState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1495,7 +1495,7 @@ var xxx_messageInfo_OperationState proto.InternalMessageInfo func (m *OrphanedResourceKey) Reset() { *m = OrphanedResourceKey{} } func (*OrphanedResourceKey) ProtoMessage() {} func (*OrphanedResourceKey) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{52} + return fileDescriptor_030104ce3b95bcac, []int{52} } func (m *OrphanedResourceKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1523,7 +1523,7 @@ var xxx_messageInfo_OrphanedResourceKey proto.InternalMessageInfo func (m *OrphanedResourcesMonitorSettings) Reset() { *m = OrphanedResourcesMonitorSettings{} } func (*OrphanedResourcesMonitorSettings) ProtoMessage() {} func (*OrphanedResourcesMonitorSettings) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{53} + return fileDescriptor_030104ce3b95bcac, []int{53} } func (m *OrphanedResourcesMonitorSettings) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1551,7 +1551,7 @@ var xxx_messageInfo_OrphanedResourcesMonitorSettings proto.InternalMessageInfo func (m *OverrideIgnoreDiff) Reset() { *m = OverrideIgnoreDiff{} } func (*OverrideIgnoreDiff) ProtoMessage() {} func (*OverrideIgnoreDiff) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{54} + return fileDescriptor_030104ce3b95bcac, []int{54} } func (m *OverrideIgnoreDiff) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1579,7 +1579,7 @@ var xxx_messageInfo_OverrideIgnoreDiff proto.InternalMessageInfo func (m *ProjectRole) Reset() { *m = ProjectRole{} } func (*ProjectRole) ProtoMessage() {} func (*ProjectRole) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{55} + return fileDescriptor_030104ce3b95bcac, []int{55} } func (m *ProjectRole) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1607,7 +1607,7 @@ var xxx_messageInfo_ProjectRole proto.InternalMessageInfo func (m *RepoCreds) Reset() { *m = RepoCreds{} } func (*RepoCreds) ProtoMessage() {} func (*RepoCreds) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{56} + return fileDescriptor_030104ce3b95bcac, []int{56} } func (m *RepoCreds) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1635,7 +1635,7 @@ var xxx_messageInfo_RepoCreds proto.InternalMessageInfo func (m *RepoCredsList) Reset() { *m = RepoCredsList{} } func (*RepoCredsList) ProtoMessage() {} func (*RepoCredsList) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{57} + return fileDescriptor_030104ce3b95bcac, []int{57} } func (m *RepoCredsList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1663,7 +1663,7 @@ var xxx_messageInfo_RepoCredsList proto.InternalMessageInfo func (m *Repository) Reset() { *m = Repository{} } func (*Repository) ProtoMessage() {} func (*Repository) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{58} + return fileDescriptor_030104ce3b95bcac, []int{58} } func (m *Repository) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1691,7 +1691,7 @@ var xxx_messageInfo_Repository proto.InternalMessageInfo func (m *RepositoryCertificate) Reset() { *m = RepositoryCertificate{} } func (*RepositoryCertificate) ProtoMessage() {} func (*RepositoryCertificate) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{59} + return fileDescriptor_030104ce3b95bcac, []int{59} } func (m *RepositoryCertificate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1719,7 +1719,7 @@ var xxx_messageInfo_RepositoryCertificate proto.InternalMessageInfo func (m *RepositoryCertificateList) Reset() { *m = RepositoryCertificateList{} } func (*RepositoryCertificateList) ProtoMessage() {} func (*RepositoryCertificateList) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{60} + return fileDescriptor_030104ce3b95bcac, []int{60} } func (m *RepositoryCertificateList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1747,7 +1747,7 @@ var xxx_messageInfo_RepositoryCertificateList proto.InternalMessageInfo func (m *RepositoryList) Reset() { *m = RepositoryList{} } func (*RepositoryList) ProtoMessage() {} func (*RepositoryList) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{61} + return fileDescriptor_030104ce3b95bcac, []int{61} } func (m *RepositoryList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1775,7 +1775,7 @@ var xxx_messageInfo_RepositoryList proto.InternalMessageInfo func (m *ResourceAction) Reset() { *m = ResourceAction{} } func (*ResourceAction) ProtoMessage() {} func (*ResourceAction) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{62} + return fileDescriptor_030104ce3b95bcac, []int{62} } func (m *ResourceAction) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1803,7 +1803,7 @@ var xxx_messageInfo_ResourceAction proto.InternalMessageInfo func (m *ResourceActionDefinition) Reset() { *m = ResourceActionDefinition{} } func (*ResourceActionDefinition) ProtoMessage() {} func (*ResourceActionDefinition) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{63} + return fileDescriptor_030104ce3b95bcac, []int{63} } func (m *ResourceActionDefinition) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1831,7 +1831,7 @@ var xxx_messageInfo_ResourceActionDefinition proto.InternalMessageInfo func (m *ResourceActionParam) Reset() { *m = ResourceActionParam{} } func (*ResourceActionParam) ProtoMessage() {} func (*ResourceActionParam) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{64} + return fileDescriptor_030104ce3b95bcac, []int{64} } func (m *ResourceActionParam) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1859,7 +1859,7 @@ var xxx_messageInfo_ResourceActionParam proto.InternalMessageInfo func (m *ResourceActions) Reset() { *m = ResourceActions{} } func (*ResourceActions) ProtoMessage() {} func (*ResourceActions) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{65} + return fileDescriptor_030104ce3b95bcac, []int{65} } func (m *ResourceActions) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1887,7 +1887,7 @@ var xxx_messageInfo_ResourceActions proto.InternalMessageInfo func (m *ResourceDiff) Reset() { *m = ResourceDiff{} } func (*ResourceDiff) ProtoMessage() {} func (*ResourceDiff) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{66} + return fileDescriptor_030104ce3b95bcac, []int{66} } func (m *ResourceDiff) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1915,7 +1915,7 @@ var xxx_messageInfo_ResourceDiff proto.InternalMessageInfo func (m *ResourceIgnoreDifferences) Reset() { *m = ResourceIgnoreDifferences{} } func (*ResourceIgnoreDifferences) ProtoMessage() {} func (*ResourceIgnoreDifferences) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{67} + return fileDescriptor_030104ce3b95bcac, []int{67} } func (m *ResourceIgnoreDifferences) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1943,7 +1943,7 @@ var xxx_messageInfo_ResourceIgnoreDifferences proto.InternalMessageInfo func (m *ResourceNetworkingInfo) Reset() { *m = ResourceNetworkingInfo{} } func (*ResourceNetworkingInfo) ProtoMessage() {} func (*ResourceNetworkingInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{68} + return fileDescriptor_030104ce3b95bcac, []int{68} } func (m *ResourceNetworkingInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1971,7 +1971,7 @@ var xxx_messageInfo_ResourceNetworkingInfo proto.InternalMessageInfo func (m *ResourceNode) Reset() { *m = ResourceNode{} } func (*ResourceNode) ProtoMessage() {} func (*ResourceNode) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{69} + return fileDescriptor_030104ce3b95bcac, []int{69} } func (m *ResourceNode) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1999,7 +1999,7 @@ var xxx_messageInfo_ResourceNode proto.InternalMessageInfo func (m *ResourceOverride) Reset() { *m = ResourceOverride{} } func (*ResourceOverride) ProtoMessage() {} func (*ResourceOverride) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{70} + return fileDescriptor_030104ce3b95bcac, []int{70} } func (m *ResourceOverride) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2027,7 +2027,7 @@ var xxx_messageInfo_ResourceOverride proto.InternalMessageInfo func (m *ResourceRef) Reset() { *m = ResourceRef{} } func (*ResourceRef) ProtoMessage() {} func (*ResourceRef) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{71} + return fileDescriptor_030104ce3b95bcac, []int{71} } func (m *ResourceRef) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2055,7 +2055,7 @@ var xxx_messageInfo_ResourceRef proto.InternalMessageInfo func (m *ResourceResult) Reset() { *m = ResourceResult{} } func (*ResourceResult) ProtoMessage() {} func (*ResourceResult) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{72} + return fileDescriptor_030104ce3b95bcac, []int{72} } func (m *ResourceResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2083,7 +2083,7 @@ var xxx_messageInfo_ResourceResult proto.InternalMessageInfo func (m *ResourceStatus) Reset() { *m = ResourceStatus{} } func (*ResourceStatus) ProtoMessage() {} func (*ResourceStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{73} + return fileDescriptor_030104ce3b95bcac, []int{73} } func (m *ResourceStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2111,7 +2111,7 @@ var xxx_messageInfo_ResourceStatus proto.InternalMessageInfo func (m *RetryStrategy) Reset() { *m = RetryStrategy{} } func (*RetryStrategy) ProtoMessage() {} func (*RetryStrategy) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{74} + return fileDescriptor_030104ce3b95bcac, []int{74} } func (m *RetryStrategy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2139,7 +2139,7 @@ var xxx_messageInfo_RetryStrategy proto.InternalMessageInfo func (m *RevisionHistory) Reset() { *m = RevisionHistory{} } func (*RevisionHistory) ProtoMessage() {} func (*RevisionHistory) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{75} + return fileDescriptor_030104ce3b95bcac, []int{75} } func (m *RevisionHistory) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2167,7 +2167,7 @@ var xxx_messageInfo_RevisionHistory proto.InternalMessageInfo func (m *RevisionMetadata) Reset() { *m = RevisionMetadata{} } func (*RevisionMetadata) ProtoMessage() {} func (*RevisionMetadata) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{76} + return fileDescriptor_030104ce3b95bcac, []int{76} } func (m *RevisionMetadata) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2195,7 +2195,7 @@ var xxx_messageInfo_RevisionMetadata proto.InternalMessageInfo func (m *SignatureKey) Reset() { *m = SignatureKey{} } func (*SignatureKey) ProtoMessage() {} func (*SignatureKey) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{77} + return fileDescriptor_030104ce3b95bcac, []int{77} } func (m *SignatureKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2223,7 +2223,7 @@ var xxx_messageInfo_SignatureKey proto.InternalMessageInfo func (m *SyncOperation) Reset() { *m = SyncOperation{} } func (*SyncOperation) ProtoMessage() {} func (*SyncOperation) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{78} + return fileDescriptor_030104ce3b95bcac, []int{78} } func (m *SyncOperation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2251,7 +2251,7 @@ var xxx_messageInfo_SyncOperation proto.InternalMessageInfo func (m *SyncOperationResource) Reset() { *m = SyncOperationResource{} } func (*SyncOperationResource) ProtoMessage() {} func (*SyncOperationResource) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{79} + return fileDescriptor_030104ce3b95bcac, []int{79} } func (m *SyncOperationResource) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2279,7 +2279,7 @@ var xxx_messageInfo_SyncOperationResource proto.InternalMessageInfo func (m *SyncOperationResult) Reset() { *m = SyncOperationResult{} } func (*SyncOperationResult) ProtoMessage() {} func (*SyncOperationResult) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{80} + return fileDescriptor_030104ce3b95bcac, []int{80} } func (m *SyncOperationResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2307,7 +2307,7 @@ var xxx_messageInfo_SyncOperationResult proto.InternalMessageInfo func (m *SyncPolicy) Reset() { *m = SyncPolicy{} } func (*SyncPolicy) ProtoMessage() {} func (*SyncPolicy) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{81} + return fileDescriptor_030104ce3b95bcac, []int{81} } func (m *SyncPolicy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2335,7 +2335,7 @@ var xxx_messageInfo_SyncPolicy proto.InternalMessageInfo func (m *SyncPolicyAutomated) Reset() { *m = SyncPolicyAutomated{} } func (*SyncPolicyAutomated) ProtoMessage() {} func (*SyncPolicyAutomated) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{82} + return fileDescriptor_030104ce3b95bcac, []int{82} } func (m *SyncPolicyAutomated) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2363,7 +2363,7 @@ var xxx_messageInfo_SyncPolicyAutomated proto.InternalMessageInfo func (m *SyncStatus) Reset() { *m = SyncStatus{} } func (*SyncStatus) ProtoMessage() {} func (*SyncStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{83} + return fileDescriptor_030104ce3b95bcac, []int{83} } func (m *SyncStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2391,7 +2391,7 @@ var xxx_messageInfo_SyncStatus proto.InternalMessageInfo func (m *SyncStrategy) Reset() { *m = SyncStrategy{} } func (*SyncStrategy) ProtoMessage() {} func (*SyncStrategy) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{84} + return fileDescriptor_030104ce3b95bcac, []int{84} } func (m *SyncStrategy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2419,7 +2419,7 @@ var xxx_messageInfo_SyncStrategy proto.InternalMessageInfo func (m *SyncStrategyApply) Reset() { *m = SyncStrategyApply{} } func (*SyncStrategyApply) ProtoMessage() {} func (*SyncStrategyApply) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{85} + return fileDescriptor_030104ce3b95bcac, []int{85} } func (m *SyncStrategyApply) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2447,7 +2447,7 @@ var xxx_messageInfo_SyncStrategyApply proto.InternalMessageInfo func (m *SyncStrategyHook) Reset() { *m = SyncStrategyHook{} } func (*SyncStrategyHook) ProtoMessage() {} func (*SyncStrategyHook) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{86} + return fileDescriptor_030104ce3b95bcac, []int{86} } func (m *SyncStrategyHook) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2475,7 +2475,7 @@ var xxx_messageInfo_SyncStrategyHook proto.InternalMessageInfo func (m *SyncWindow) Reset() { *m = SyncWindow{} } func (*SyncWindow) ProtoMessage() {} func (*SyncWindow) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{87} + return fileDescriptor_030104ce3b95bcac, []int{87} } func (m *SyncWindow) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2503,7 +2503,7 @@ var xxx_messageInfo_SyncWindow proto.InternalMessageInfo func (m *TLSClientConfig) Reset() { *m = TLSClientConfig{} } func (*TLSClientConfig) ProtoMessage() {} func (*TLSClientConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_e7dc23c2911a1a00, []int{88} + return fileDescriptor_030104ce3b95bcac, []int{88} } func (m *TLSClientConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2529,513 +2529,515 @@ func (m *TLSClientConfig) XXX_DiscardUnknown() { var xxx_messageInfo_TLSClientConfig proto.InternalMessageInfo func init() { - proto.RegisterType((*AWSAuthConfig)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.AWSAuthConfig") - proto.RegisterType((*AppProject)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.AppProject") - proto.RegisterType((*AppProjectList)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.AppProjectList") - proto.RegisterType((*AppProjectSpec)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.AppProjectSpec") - proto.RegisterType((*AppProjectStatus)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.AppProjectStatus") - proto.RegisterMapType((map[string]JWTTokens)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.AppProjectStatus.JwtTokensByRoleEntry") - proto.RegisterType((*Application)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Application") - proto.RegisterType((*ApplicationCondition)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationCondition") - proto.RegisterType((*ApplicationDestination)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationDestination") - proto.RegisterType((*ApplicationList)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationList") - proto.RegisterType((*ApplicationSource)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationSource") - proto.RegisterType((*ApplicationSourceDirectory)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationSourceDirectory") - proto.RegisterType((*ApplicationSourceHelm)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationSourceHelm") - proto.RegisterType((*ApplicationSourceJsonnet)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationSourceJsonnet") - proto.RegisterType((*ApplicationSourceKsonnet)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationSourceKsonnet") - proto.RegisterType((*ApplicationSourceKustomize)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationSourceKustomize") - proto.RegisterMapType((map[string]string)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationSourceKustomize.CommonAnnotationsEntry") - proto.RegisterMapType((map[string]string)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationSourceKustomize.CommonLabelsEntry") - proto.RegisterType((*ApplicationSourcePlugin)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationSourcePlugin") - proto.RegisterType((*ApplicationSpec)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationSpec") - proto.RegisterType((*ApplicationStatus)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationStatus") - proto.RegisterType((*ApplicationSummary)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationSummary") - proto.RegisterType((*ApplicationTree)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationTree") - proto.RegisterType((*ApplicationWatchEvent)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationWatchEvent") - proto.RegisterType((*Backoff)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Backoff") - proto.RegisterType((*Cluster)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Cluster") - proto.RegisterType((*ClusterCacheInfo)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ClusterCacheInfo") - proto.RegisterType((*ClusterConfig)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ClusterConfig") - proto.RegisterType((*ClusterInfo)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ClusterInfo") - proto.RegisterType((*ClusterList)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ClusterList") - proto.RegisterType((*Command)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Command") - proto.RegisterType((*ComparedTo)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ComparedTo") - proto.RegisterType((*ComponentParameter)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ComponentParameter") - proto.RegisterType((*ConfigManagementPlugin)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ConfigManagementPlugin") - proto.RegisterType((*ConnectionState)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ConnectionState") - proto.RegisterType((*EnvEntry)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.EnvEntry") - proto.RegisterType((*ExecProviderConfig)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ExecProviderConfig") - proto.RegisterMapType((map[string]string)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ExecProviderConfig.EnvEntry") - proto.RegisterType((*GnuPGPublicKey)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.GnuPGPublicKey") - proto.RegisterType((*GnuPGPublicKeyList)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.GnuPGPublicKeyList") - proto.RegisterType((*HealthStatus)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.HealthStatus") - proto.RegisterType((*HelmFileParameter)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.HelmFileParameter") - proto.RegisterType((*HelmParameter)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.HelmParameter") - proto.RegisterType((*HostInfo)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.HostInfo") - proto.RegisterType((*HostResourceInfo)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.HostResourceInfo") - proto.RegisterType((*Info)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Info") - proto.RegisterType((*InfoItem)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.InfoItem") - proto.RegisterType((*JWTToken)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.JWTToken") - proto.RegisterType((*JWTTokens)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.JWTTokens") - proto.RegisterType((*JsonnetVar)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.JsonnetVar") - proto.RegisterType((*KnownTypeField)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.KnownTypeField") - proto.RegisterType((*KsonnetParameter)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.KsonnetParameter") - proto.RegisterType((*KustomizeOptions)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.KustomizeOptions") - proto.RegisterType((*Operation)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Operation") - proto.RegisterType((*OperationInitiator)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.OperationInitiator") - proto.RegisterType((*OperationState)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.OperationState") - proto.RegisterType((*OrphanedResourceKey)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.OrphanedResourceKey") - proto.RegisterType((*OrphanedResourcesMonitorSettings)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.OrphanedResourcesMonitorSettings") - proto.RegisterType((*OverrideIgnoreDiff)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.OverrideIgnoreDiff") - proto.RegisterType((*ProjectRole)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ProjectRole") - proto.RegisterType((*RepoCreds)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.RepoCreds") - proto.RegisterType((*RepoCredsList)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.RepoCredsList") - proto.RegisterType((*Repository)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Repository") - proto.RegisterType((*RepositoryCertificate)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.RepositoryCertificate") - proto.RegisterType((*RepositoryCertificateList)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.RepositoryCertificateList") - proto.RegisterType((*RepositoryList)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.RepositoryList") - proto.RegisterType((*ResourceAction)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ResourceAction") - proto.RegisterType((*ResourceActionDefinition)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ResourceActionDefinition") - proto.RegisterType((*ResourceActionParam)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ResourceActionParam") - proto.RegisterType((*ResourceActions)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ResourceActions") - proto.RegisterType((*ResourceDiff)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ResourceDiff") - proto.RegisterType((*ResourceIgnoreDifferences)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ResourceIgnoreDifferences") - proto.RegisterType((*ResourceNetworkingInfo)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ResourceNetworkingInfo") - proto.RegisterMapType((map[string]string)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ResourceNetworkingInfo.LabelsEntry") - proto.RegisterMapType((map[string]string)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ResourceNetworkingInfo.TargetLabelsEntry") - proto.RegisterType((*ResourceNode)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ResourceNode") - proto.RegisterType((*ResourceOverride)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ResourceOverride") - proto.RegisterType((*ResourceRef)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ResourceRef") - proto.RegisterType((*ResourceResult)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ResourceResult") - proto.RegisterType((*ResourceStatus)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ResourceStatus") - proto.RegisterType((*RetryStrategy)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.RetryStrategy") - proto.RegisterType((*RevisionHistory)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.RevisionHistory") - proto.RegisterType((*RevisionMetadata)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.RevisionMetadata") - proto.RegisterType((*SignatureKey)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.SignatureKey") - proto.RegisterType((*SyncOperation)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.SyncOperation") - proto.RegisterType((*SyncOperationResource)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.SyncOperationResource") - proto.RegisterType((*SyncOperationResult)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.SyncOperationResult") - proto.RegisterType((*SyncPolicy)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.SyncPolicy") - proto.RegisterType((*SyncPolicyAutomated)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.SyncPolicyAutomated") - proto.RegisterType((*SyncStatus)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.SyncStatus") - proto.RegisterType((*SyncStrategy)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.SyncStrategy") - proto.RegisterType((*SyncStrategyApply)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.SyncStrategyApply") - proto.RegisterType((*SyncStrategyHook)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.SyncStrategyHook") - proto.RegisterType((*SyncWindow)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.SyncWindow") - proto.RegisterType((*TLSClientConfig)(nil), "github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.TLSClientConfig") + proto.RegisterType((*AWSAuthConfig)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.AWSAuthConfig") + proto.RegisterType((*AppProject)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.AppProject") + proto.RegisterType((*AppProjectList)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.AppProjectList") + proto.RegisterType((*AppProjectSpec)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.AppProjectSpec") + proto.RegisterType((*AppProjectStatus)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.AppProjectStatus") + proto.RegisterMapType((map[string]JWTTokens)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.AppProjectStatus.JwtTokensByRoleEntry") + proto.RegisterType((*Application)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Application") + proto.RegisterType((*ApplicationCondition)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationCondition") + proto.RegisterType((*ApplicationDestination)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationDestination") + proto.RegisterType((*ApplicationList)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationList") + proto.RegisterType((*ApplicationSource)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationSource") + proto.RegisterType((*ApplicationSourceDirectory)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationSourceDirectory") + proto.RegisterType((*ApplicationSourceHelm)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationSourceHelm") + proto.RegisterType((*ApplicationSourceJsonnet)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationSourceJsonnet") + proto.RegisterType((*ApplicationSourceKsonnet)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationSourceKsonnet") + proto.RegisterType((*ApplicationSourceKustomize)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationSourceKustomize") + proto.RegisterMapType((map[string]string)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationSourceKustomize.CommonAnnotationsEntry") + proto.RegisterMapType((map[string]string)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationSourceKustomize.CommonLabelsEntry") + proto.RegisterType((*ApplicationSourcePlugin)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationSourcePlugin") + proto.RegisterType((*ApplicationSpec)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationSpec") + proto.RegisterType((*ApplicationStatus)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationStatus") + proto.RegisterType((*ApplicationSummary)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationSummary") + proto.RegisterType((*ApplicationTree)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationTree") + proto.RegisterType((*ApplicationWatchEvent)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationWatchEvent") + proto.RegisterType((*Backoff)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Backoff") + proto.RegisterType((*Cluster)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Cluster") + proto.RegisterType((*ClusterCacheInfo)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ClusterCacheInfo") + proto.RegisterType((*ClusterConfig)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ClusterConfig") + proto.RegisterType((*ClusterInfo)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ClusterInfo") + proto.RegisterType((*ClusterList)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ClusterList") + proto.RegisterType((*Command)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Command") + proto.RegisterType((*ComparedTo)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ComparedTo") + proto.RegisterType((*ComponentParameter)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ComponentParameter") + proto.RegisterType((*ConfigManagementPlugin)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ConfigManagementPlugin") + proto.RegisterType((*ConnectionState)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ConnectionState") + proto.RegisterType((*EnvEntry)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.EnvEntry") + proto.RegisterType((*ExecProviderConfig)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ExecProviderConfig") + proto.RegisterMapType((map[string]string)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ExecProviderConfig.EnvEntry") + proto.RegisterType((*GnuPGPublicKey)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.GnuPGPublicKey") + proto.RegisterType((*GnuPGPublicKeyList)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.GnuPGPublicKeyList") + proto.RegisterType((*HealthStatus)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.HealthStatus") + proto.RegisterType((*HelmFileParameter)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.HelmFileParameter") + proto.RegisterType((*HelmParameter)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.HelmParameter") + proto.RegisterType((*HostInfo)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.HostInfo") + proto.RegisterType((*HostResourceInfo)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.HostResourceInfo") + proto.RegisterType((*Info)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Info") + proto.RegisterType((*InfoItem)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.InfoItem") + proto.RegisterType((*JWTToken)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.JWTToken") + proto.RegisterType((*JWTTokens)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.JWTTokens") + proto.RegisterType((*JsonnetVar)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.JsonnetVar") + proto.RegisterType((*KnownTypeField)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.KnownTypeField") + proto.RegisterType((*KsonnetParameter)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.KsonnetParameter") + proto.RegisterType((*KustomizeOptions)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.KustomizeOptions") + proto.RegisterType((*Operation)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Operation") + proto.RegisterType((*OperationInitiator)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.OperationInitiator") + proto.RegisterType((*OperationState)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.OperationState") + proto.RegisterType((*OrphanedResourceKey)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.OrphanedResourceKey") + proto.RegisterType((*OrphanedResourcesMonitorSettings)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.OrphanedResourcesMonitorSettings") + proto.RegisterType((*OverrideIgnoreDiff)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.OverrideIgnoreDiff") + proto.RegisterType((*ProjectRole)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ProjectRole") + proto.RegisterType((*RepoCreds)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RepoCreds") + proto.RegisterType((*RepoCredsList)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RepoCredsList") + proto.RegisterType((*Repository)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Repository") + proto.RegisterType((*RepositoryCertificate)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RepositoryCertificate") + proto.RegisterType((*RepositoryCertificateList)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RepositoryCertificateList") + proto.RegisterType((*RepositoryList)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RepositoryList") + proto.RegisterType((*ResourceAction)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ResourceAction") + proto.RegisterType((*ResourceActionDefinition)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ResourceActionDefinition") + proto.RegisterType((*ResourceActionParam)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ResourceActionParam") + proto.RegisterType((*ResourceActions)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ResourceActions") + proto.RegisterType((*ResourceDiff)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ResourceDiff") + proto.RegisterType((*ResourceIgnoreDifferences)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ResourceIgnoreDifferences") + proto.RegisterType((*ResourceNetworkingInfo)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ResourceNetworkingInfo") + proto.RegisterMapType((map[string]string)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ResourceNetworkingInfo.LabelsEntry") + proto.RegisterMapType((map[string]string)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ResourceNetworkingInfo.TargetLabelsEntry") + proto.RegisterType((*ResourceNode)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ResourceNode") + proto.RegisterType((*ResourceOverride)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ResourceOverride") + proto.RegisterType((*ResourceRef)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ResourceRef") + proto.RegisterType((*ResourceResult)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ResourceResult") + proto.RegisterType((*ResourceStatus)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ResourceStatus") + proto.RegisterType((*RetryStrategy)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RetryStrategy") + proto.RegisterType((*RevisionHistory)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RevisionHistory") + proto.RegisterType((*RevisionMetadata)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RevisionMetadata") + proto.RegisterType((*SignatureKey)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.SignatureKey") + proto.RegisterType((*SyncOperation)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.SyncOperation") + proto.RegisterType((*SyncOperationResource)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.SyncOperationResource") + proto.RegisterType((*SyncOperationResult)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.SyncOperationResult") + proto.RegisterType((*SyncPolicy)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.SyncPolicy") + proto.RegisterType((*SyncPolicyAutomated)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.SyncPolicyAutomated") + proto.RegisterType((*SyncStatus)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.SyncStatus") + proto.RegisterType((*SyncStrategy)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.SyncStrategy") + proto.RegisterType((*SyncStrategyApply)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.SyncStrategyApply") + proto.RegisterType((*SyncStrategyHook)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.SyncStrategyHook") + proto.RegisterType((*SyncWindow)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.SyncWindow") + proto.RegisterType((*TLSClientConfig)(nil), "github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.TLSClientConfig") } func init() { - proto.RegisterFile("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1/generated.proto", fileDescriptor_e7dc23c2911a1a00) -} - -var fileDescriptor_e7dc23c2911a1a00 = []byte{ - // 6463 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x7d, 0x5d, 0x6c, 0x24, 0xd9, - 0x55, 0xf0, 0x56, 0xb7, 0x7f, 0xba, 0x8f, 0x7f, 0x66, 0x7c, 0x77, 0x76, 0xd7, 0xf1, 0xb7, 0x19, - 0x8f, 0x6a, 0x95, 0x64, 0x3f, 0x92, 0xd8, 0xec, 0xb2, 0x84, 0x4d, 0x16, 0x12, 0xdc, 0xf6, 0xfc, - 0x78, 0xc6, 0xe3, 0xf1, 0x1e, 0x7b, 0x67, 0xc4, 0xe6, 0x87, 0x2d, 0x57, 0xdf, 0xee, 0xae, 0x71, - 0x77, 0x55, 0x6f, 0x55, 0xb5, 0x67, 0xbc, 0x24, 0x21, 0x81, 0x44, 0x5a, 0x85, 0xdd, 0x80, 0x08, - 0x09, 0x0f, 0x24, 0x12, 0x81, 0x07, 0x44, 0x24, 0x84, 0x22, 0x84, 0x04, 0x8f, 0x04, 0x09, 0xed, - 0x53, 0x14, 0x21, 0x04, 0x2b, 0x84, 0x4c, 0x76, 0x22, 0x24, 0x04, 0x0f, 0x04, 0x81, 0x84, 0x34, - 0x4f, 0xe8, 0xfe, 0xdf, 0xaa, 0xee, 0x1e, 0xdb, 0xd3, 0x35, 0x93, 0x28, 0xbc, 0xb9, 0xcf, 0x39, - 0x75, 0xce, 0xb9, 0x7f, 0xe7, 0x9e, 0x7b, 0xce, 0xb9, 0xd7, 0xb0, 0xde, 0x0c, 0xd2, 0x56, 0x6f, - 0x77, 0xc9, 0x8f, 0x3a, 0xcb, 0x5e, 0xdc, 0x8c, 0xba, 0x71, 0x74, 0x93, 0xff, 0xf1, 0x41, 0xbf, - 0xbe, 0xdc, 0xdd, 0x6b, 0x2e, 0x7b, 0xdd, 0x20, 0x59, 0xf6, 0xba, 0xdd, 0x76, 0xe0, 0x7b, 0x69, - 0x10, 0x85, 0xcb, 0xfb, 0xcf, 0x78, 0xed, 0x6e, 0xcb, 0x7b, 0x66, 0xb9, 0x49, 0x43, 0x1a, 0x7b, - 0x29, 0xad, 0x2f, 0x75, 0xe3, 0x28, 0x8d, 0xc8, 0x87, 0x0d, 0xab, 0x25, 0xc5, 0x8a, 0xff, 0xf1, - 0xcb, 0x7e, 0x7d, 0xa9, 0xbb, 0xd7, 0x5c, 0x62, 0xac, 0x96, 0x2c, 0x56, 0x4b, 0x8a, 0xd5, 0xc2, - 0x07, 0x2d, 0x2d, 0x9a, 0x51, 0x33, 0x5a, 0xe6, 0x1c, 0x77, 0x7b, 0x0d, 0xfe, 0x8b, 0xff, 0xe0, - 0x7f, 0x09, 0x49, 0x0b, 0xee, 0xde, 0xf3, 0xc9, 0x52, 0x10, 0x31, 0xdd, 0x96, 0xfd, 0x28, 0xa6, - 0xcb, 0xfb, 0x7d, 0xda, 0x2c, 0x3c, 0x67, 0x68, 0x3a, 0x9e, 0xdf, 0x0a, 0x42, 0x1a, 0x1f, 0x98, - 0x06, 0x75, 0x68, 0xea, 0x0d, 0xfa, 0x6a, 0x79, 0xd8, 0x57, 0x71, 0x2f, 0x4c, 0x83, 0x0e, 0xed, - 0xfb, 0xe0, 0x43, 0x47, 0x7d, 0x90, 0xf8, 0x2d, 0xda, 0xf1, 0xf2, 0xdf, 0xb9, 0xaf, 0xc2, 0xcc, - 0xca, 0x8d, 0xed, 0x95, 0x5e, 0xda, 0x5a, 0x8d, 0xc2, 0x46, 0xd0, 0x24, 0x3f, 0x0b, 0x53, 0x7e, - 0xbb, 0x97, 0xa4, 0x34, 0xde, 0xf4, 0x3a, 0x74, 0xde, 0x39, 0xe7, 0x3c, 0x5d, 0xad, 0x3d, 0xfa, - 0xd6, 0xe1, 0xe2, 0x23, 0x77, 0x0e, 0x17, 0xa7, 0x56, 0x0d, 0x0a, 0x6d, 0x3a, 0xf2, 0xff, 0x61, - 0x32, 0x8e, 0xda, 0x74, 0x05, 0x37, 0xe7, 0x4b, 0xfc, 0x93, 0x53, 0xf2, 0x93, 0x49, 0x14, 0x60, - 0x54, 0x78, 0xf7, 0x7b, 0x25, 0x80, 0x95, 0x6e, 0x77, 0x2b, 0x8e, 0x6e, 0x52, 0x3f, 0x25, 0xaf, - 0x40, 0x85, 0xf5, 0x42, 0xdd, 0x4b, 0x3d, 0x2e, 0x6d, 0xea, 0xd9, 0x9f, 0x5e, 0x12, 0x8d, 0x59, - 0xb2, 0x1b, 0x63, 0x46, 0x8e, 0x51, 0x2f, 0xed, 0x3f, 0xb3, 0x74, 0x6d, 0x97, 0x7d, 0x7f, 0x95, - 0xa6, 0x5e, 0x8d, 0x48, 0x61, 0x60, 0x60, 0xa8, 0xb9, 0x92, 0x3d, 0x18, 0x4b, 0xba, 0xd4, 0xe7, - 0x8a, 0x4d, 0x3d, 0xbb, 0xbe, 0x74, 0xdf, 0xf3, 0x63, 0xc9, 0xa8, 0xbd, 0xdd, 0xa5, 0x7e, 0x6d, - 0x5a, 0x8a, 0x1d, 0x63, 0xbf, 0x90, 0x0b, 0x21, 0x09, 0x4c, 0x24, 0xa9, 0x97, 0xf6, 0x92, 0xf9, - 0x32, 0x17, 0x77, 0xa5, 0x18, 0x71, 0x9c, 0x65, 0x6d, 0x56, 0x0a, 0x9c, 0x10, 0xbf, 0x51, 0x8a, - 0x72, 0xff, 0xd1, 0x81, 0x59, 0x43, 0xbc, 0x11, 0x24, 0x29, 0xf9, 0x44, 0x5f, 0xb7, 0x2e, 0x1d, - 0xaf, 0x5b, 0xd9, 0xd7, 0xbc, 0x53, 0x4f, 0x4b, 0x61, 0x15, 0x05, 0xb1, 0xba, 0xf4, 0x26, 0x8c, - 0x07, 0x29, 0xed, 0x24, 0xf3, 0xa5, 0x73, 0xe5, 0xa7, 0xa7, 0x9e, 0x3d, 0x5f, 0x48, 0x23, 0x6b, - 0x33, 0x52, 0xe2, 0xf8, 0x3a, 0xe3, 0x8d, 0x42, 0x84, 0xfb, 0x2f, 0x60, 0x37, 0x8e, 0x75, 0x35, - 0x79, 0x06, 0xa6, 0x92, 0xa8, 0x17, 0xfb, 0x14, 0x69, 0x37, 0x4a, 0xe6, 0x9d, 0x73, 0x65, 0x36, - 0xe3, 0xd8, 0x04, 0xdd, 0x36, 0x60, 0xb4, 0x69, 0xc8, 0x6f, 0x38, 0x30, 0x5d, 0xa7, 0x49, 0x1a, - 0x84, 0x5c, 0xbe, 0xd2, 0xfc, 0xc5, 0xd1, 0x34, 0x57, 0xc0, 0x35, 0xc3, 0xb9, 0x76, 0x46, 0xb6, - 0x62, 0xda, 0x02, 0x26, 0x98, 0x11, 0xce, 0x56, 0x59, 0x9d, 0x26, 0x7e, 0x1c, 0x74, 0xd9, 0x6f, - 0x3e, 0x55, 0xac, 0x55, 0xb6, 0x66, 0x50, 0x68, 0xd3, 0x91, 0x3d, 0x18, 0x67, 0xab, 0x28, 0x99, - 0x1f, 0xe3, 0xca, 0x5f, 0x18, 0x41, 0x79, 0xd9, 0x9d, 0x6c, 0x75, 0x9a, 0x7e, 0x67, 0xbf, 0x12, - 0x14, 0x32, 0xc8, 0x9b, 0x0e, 0xcc, 0xcb, 0x25, 0x8e, 0x54, 0x74, 0xe5, 0x8d, 0x56, 0x90, 0xd2, - 0x76, 0x90, 0xa4, 0xf3, 0xe3, 0x5c, 0x81, 0xe5, 0xe3, 0x4d, 0xa9, 0x8b, 0x71, 0xd4, 0xeb, 0x5e, - 0x09, 0xc2, 0x7a, 0xed, 0x9c, 0x94, 0x34, 0xbf, 0x3a, 0x84, 0x31, 0x0e, 0x15, 0x49, 0xbe, 0xe2, - 0xc0, 0x42, 0xe8, 0x75, 0x68, 0xd2, 0xf5, 0xd8, 0xa0, 0x0a, 0x74, 0xad, 0xed, 0xf9, 0x7b, 0x5c, - 0xa3, 0x89, 0xfb, 0xd3, 0xc8, 0x95, 0x1a, 0x2d, 0x6c, 0x0e, 0x65, 0x8d, 0xf7, 0x10, 0x4b, 0x7e, - 0xdf, 0x81, 0xb9, 0x28, 0xee, 0xb6, 0xbc, 0x90, 0xd6, 0x15, 0x36, 0x99, 0x9f, 0xe4, 0x2b, 0xee, - 0xe3, 0x23, 0x8c, 0xcf, 0xb5, 0x3c, 0xcf, 0xab, 0x51, 0x18, 0xa4, 0x51, 0xbc, 0x4d, 0xd3, 0x34, - 0x08, 0x9b, 0x49, 0xed, 0xb1, 0x3b, 0x87, 0x8b, 0x73, 0x7d, 0x54, 0xd8, 0xaf, 0x0c, 0xb9, 0x0d, - 0x53, 0xc9, 0x41, 0xe8, 0xdf, 0x08, 0xc2, 0x7a, 0x74, 0x2b, 0x99, 0xaf, 0x8c, 0xbc, 0x64, 0xb7, - 0x35, 0x37, 0xb9, 0xe8, 0x0c, 0x77, 0xb4, 0x45, 0x0d, 0x1e, 0x32, 0x33, 0x89, 0xaa, 0x45, 0x0f, - 0x99, 0x99, 0x46, 0xf7, 0x10, 0x4b, 0xbe, 0xe0, 0xc0, 0x4c, 0x12, 0x34, 0x43, 0x2f, 0xed, 0xc5, - 0xf4, 0x0a, 0x3d, 0x48, 0xe6, 0x81, 0x2b, 0x72, 0x71, 0x94, 0x2e, 0xb1, 0xf8, 0xd5, 0x1e, 0x93, - 0x0a, 0xce, 0xd8, 0xd0, 0x04, 0xb3, 0x42, 0x07, 0xad, 0x2f, 0x33, 0x9b, 0xa7, 0x8a, 0x5d, 0x5f, - 0x66, 0x2e, 0x0f, 0x15, 0xe9, 0xfe, 0x75, 0x09, 0x4e, 0xe7, 0x77, 0x1c, 0xf2, 0x87, 0x0e, 0x9c, - 0xba, 0x79, 0x2b, 0xdd, 0x89, 0xf6, 0x68, 0x98, 0xd4, 0x0e, 0x98, 0x81, 0xe0, 0xe6, 0x76, 0xea, - 0xd9, 0x57, 0x0a, 0xdc, 0xd8, 0x96, 0x2e, 0x67, 0x45, 0x9c, 0x0f, 0xd3, 0xf8, 0xa0, 0xf6, 0x84, - 0x6c, 0xcc, 0xa9, 0xcb, 0x37, 0x76, 0x6c, 0x2c, 0xe6, 0x35, 0x5a, 0x78, 0xdd, 0x81, 0x33, 0x83, - 0x58, 0x90, 0xd3, 0x50, 0xde, 0xa3, 0x07, 0xc2, 0x8b, 0x41, 0xf6, 0x27, 0x79, 0x19, 0xc6, 0xf7, - 0xbd, 0x76, 0x8f, 0x4a, 0x6f, 0x60, 0x6d, 0x84, 0x56, 0x68, 0xb5, 0x50, 0xb0, 0xfc, 0x48, 0xe9, - 0x79, 0xc7, 0xfd, 0x9b, 0x32, 0x4c, 0x59, 0x1b, 0xc3, 0x43, 0x70, 0x6f, 0xda, 0x19, 0xf7, 0xe6, - 0x72, 0x31, 0x1b, 0xda, 0x50, 0xff, 0x26, 0xcd, 0xf9, 0x37, 0x1b, 0x05, 0xc9, 0xbb, 0xa7, 0x83, - 0x43, 0x5e, 0x85, 0x6a, 0xd4, 0x65, 0x8e, 0x2b, 0xdb, 0x2d, 0xc7, 0x46, 0x1e, 0xb9, 0x6b, 0x8a, - 0x57, 0x6d, 0xe6, 0xce, 0xe1, 0x62, 0x55, 0xff, 0x44, 0x23, 0xc5, 0xfd, 0x07, 0x07, 0xce, 0x58, - 0x0a, 0xae, 0x46, 0x61, 0x3d, 0xe0, 0x23, 0x7a, 0x0e, 0xc6, 0xd2, 0x83, 0xae, 0x72, 0x8d, 0x75, - 0x1f, 0xed, 0x1c, 0x74, 0x29, 0x72, 0x0c, 0x73, 0x86, 0x3b, 0x34, 0x49, 0xbc, 0x26, 0xcd, 0x3b, - 0xc3, 0x57, 0x05, 0x18, 0x15, 0x9e, 0xc4, 0x40, 0xda, 0x5e, 0x92, 0xee, 0xc4, 0x5e, 0x98, 0x70, - 0xf6, 0x3b, 0x41, 0x87, 0xca, 0xae, 0xfd, 0xa9, 0xe3, 0x4d, 0x14, 0xf6, 0x45, 0xed, 0xf1, 0x3b, - 0x87, 0x8b, 0x64, 0xa3, 0x8f, 0x13, 0x0e, 0xe0, 0xee, 0x7e, 0xc5, 0x81, 0xc7, 0x07, 0xfb, 0x2e, - 0xe4, 0xbd, 0x30, 0x91, 0xd0, 0x78, 0x9f, 0xc6, 0xb2, 0x75, 0x66, 0x3c, 0x38, 0x14, 0x25, 0x96, - 0x2c, 0x43, 0x55, 0x1b, 0x58, 0xd9, 0xc6, 0x39, 0x49, 0x5a, 0x35, 0x56, 0xd9, 0xd0, 0xb0, 0x4e, - 0x63, 0x3f, 0xa4, 0xa7, 0xa3, 0x3b, 0x8d, 0x1f, 0x24, 0x38, 0xc6, 0xfd, 0x27, 0x07, 0x4e, 0x59, - 0x5a, 0x3d, 0x04, 0x27, 0x76, 0x2f, 0xeb, 0xc4, 0x5e, 0x28, 0x66, 0x26, 0x0f, 0xf1, 0x62, 0xff, - 0x6c, 0x02, 0xe6, 0xec, 0xf9, 0xce, 0x8d, 0x2f, 0x3f, 0x36, 0xd1, 0x6e, 0xf4, 0x12, 0x6e, 0xc8, - 0x0e, 0x37, 0xc7, 0x26, 0x01, 0x46, 0x85, 0x67, 0x3d, 0xd8, 0xf5, 0xd2, 0x96, 0xec, 0x6d, 0xdd, - 0x83, 0x5b, 0x5e, 0xda, 0x42, 0x8e, 0x21, 0x1f, 0x85, 0xd9, 0xd4, 0x8b, 0x9b, 0x34, 0x45, 0xba, - 0x1f, 0x24, 0x6a, 0xa5, 0x54, 0x6b, 0x8f, 0x4b, 0xda, 0xd9, 0x9d, 0x0c, 0x16, 0x73, 0xd4, 0x24, - 0x84, 0xb1, 0x16, 0x6d, 0x77, 0xa4, 0xf3, 0xb2, 0x55, 0xd0, 0xc2, 0xe6, 0x0d, 0xbd, 0x44, 0xdb, - 0x9d, 0x5a, 0x85, 0xe9, 0xcb, 0xfe, 0x42, 0x2e, 0x87, 0xfc, 0x9a, 0x03, 0xd5, 0xbd, 0x5e, 0x92, - 0x46, 0x9d, 0xe0, 0x35, 0x3a, 0x5f, 0xe1, 0x52, 0x5f, 0x2a, 0x52, 0xea, 0x15, 0xc5, 0x5c, 0x2c, - 0x73, 0xfd, 0x13, 0x8d, 0x58, 0xf2, 0x1a, 0x4c, 0xee, 0x25, 0x51, 0x18, 0x52, 0xe6, 0x8e, 0x30, - 0x0d, 0xb6, 0x0b, 0xd5, 0x40, 0xb0, 0xae, 0x4d, 0xb1, 0x21, 0x95, 0x3f, 0x50, 0x09, 0xe4, 0x1d, - 0x50, 0x0f, 0x62, 0xea, 0xa7, 0x51, 0x7c, 0x30, 0x0f, 0xc5, 0x77, 0xc0, 0x9a, 0x62, 0x2e, 0x3a, - 0x40, 0xff, 0x44, 0x23, 0x96, 0xec, 0xc3, 0x44, 0xb7, 0xdd, 0x6b, 0x06, 0xe1, 0xfc, 0x14, 0x57, - 0x00, 0x8b, 0x54, 0x60, 0x8b, 0x73, 0xae, 0x01, 0x33, 0x21, 0xe2, 0x6f, 0x94, 0xd2, 0xc8, 0x53, - 0x30, 0xee, 0xb7, 0xbc, 0x38, 0x9d, 0x9f, 0xe6, 0x93, 0x54, 0xaf, 0x9a, 0x55, 0x06, 0x44, 0x81, - 0x73, 0xbf, 0x51, 0x82, 0x85, 0xe1, 0xad, 0x12, 0xcb, 0xc7, 0xef, 0xc5, 0x89, 0xb0, 0xc6, 0x15, - 0x7b, 0xf9, 0x70, 0x30, 0x2a, 0x3c, 0xf9, 0x2c, 0x4c, 0xde, 0x94, 0xe3, 0x5c, 0x2a, 0x7e, 0x9c, - 0x2f, 0xcb, 0x71, 0xd6, 0xf2, 0x2f, 0xab, 0xb1, 0x96, 0x42, 0x99, 0xaa, 0xf4, 0xb6, 0xdf, 0xee, - 0xd5, 0x95, 0x0d, 0xd4, 0xa4, 0xe7, 0x05, 0x18, 0x15, 0x9e, 0x91, 0x06, 0xa1, 0x20, 0x1d, 0xcb, - 0x92, 0xae, 0x87, 0x92, 0x54, 0xe2, 0xdd, 0xc3, 0x32, 0x3c, 0x36, 0x70, 0xb1, 0x91, 0x25, 0x00, - 0xee, 0x94, 0x5c, 0x08, 0xd8, 0x79, 0x51, 0x9c, 0x90, 0x67, 0x99, 0x0f, 0x71, 0x5d, 0x43, 0xd1, - 0xa2, 0x20, 0x9f, 0x06, 0xe8, 0x7a, 0xb1, 0xd7, 0xa1, 0x29, 0x8d, 0x95, 0x45, 0xbc, 0x34, 0x42, - 0x17, 0x31, 0x25, 0xb6, 0x14, 0x43, 0xe3, 0xc1, 0x68, 0x50, 0x82, 0x96, 0x3c, 0x76, 0x1e, 0x8e, - 0x69, 0x9b, 0x7a, 0x09, 0xdd, 0x34, 0xbb, 0x84, 0x3e, 0x0f, 0xa3, 0x41, 0xa1, 0x4d, 0xc7, 0xb6, - 0x2b, 0xde, 0x84, 0x44, 0x76, 0x94, 0xde, 0xae, 0x78, 0x23, 0x13, 0x94, 0x58, 0xf2, 0x86, 0x03, - 0xb3, 0x8d, 0xa0, 0x4d, 0x8d, 0x74, 0x79, 0x80, 0xdd, 0x18, 0xb1, 0x85, 0x17, 0x6c, 0xa6, 0xc6, - 0xd0, 0x66, 0xc0, 0x09, 0xe6, 0x64, 0xb3, 0x01, 0xde, 0xa7, 0x31, 0xb7, 0xd0, 0x13, 0xd9, 0x01, - 0xbe, 0x2e, 0xc0, 0xa8, 0xf0, 0xee, 0x57, 0x4a, 0x30, 0x3f, 0x6c, 0xb6, 0x91, 0x2e, 0x9b, 0x53, - 0xe9, 0x75, 0x2f, 0x4e, 0xa4, 0x4f, 0x3e, 0xca, 0xa1, 0x4e, 0x32, 0xbd, 0xee, 0xc5, 0xf6, 0xd4, - 0xe4, 0xdc, 0x51, 0x89, 0x21, 0x4d, 0x18, 0x4b, 0xdb, 0x5e, 0x11, 0x61, 0x1f, 0x4b, 0x9c, 0x71, - 0xa1, 0x36, 0x56, 0x12, 0xe4, 0x02, 0xc8, 0x93, 0x30, 0xd6, 0x0e, 0x76, 0x99, 0x93, 0xc9, 0x26, - 0x2e, 0xdf, 0x39, 0x36, 0x82, 0xdd, 0x04, 0x39, 0xd4, 0xfd, 0x5b, 0x67, 0x40, 0xaf, 0x48, 0xf3, - 0xca, 0xe6, 0x12, 0x0d, 0xf7, 0x83, 0x38, 0x0a, 0x3b, 0x34, 0x4c, 0xf3, 0x11, 0xcc, 0xf3, 0x06, - 0x85, 0x36, 0x1d, 0xf9, 0xd5, 0x01, 0x0b, 0x60, 0x94, 0xe0, 0x9d, 0x54, 0xe7, 0xd8, 0x6b, 0xc0, - 0x7d, 0x6b, 0x7c, 0x80, 0xad, 0xd3, 0x7b, 0x16, 0x79, 0x16, 0x80, 0xf9, 0x49, 0x5b, 0x31, 0x6d, - 0x04, 0xb7, 0x65, 0xab, 0x34, 0xcb, 0x4d, 0x8d, 0x41, 0x8b, 0x4a, 0x7d, 0xb3, 0xdd, 0x6b, 0xb0, - 0x6f, 0x4a, 0xfd, 0xdf, 0x08, 0x0c, 0x5a, 0x54, 0xe4, 0x39, 0x98, 0x08, 0x3a, 0x5e, 0x93, 0xaa, - 0xbe, 0x7f, 0x92, 0xad, 0xa7, 0x75, 0x0e, 0xb9, 0x7b, 0xb8, 0x38, 0xab, 0x15, 0xe2, 0x20, 0x94, - 0xb4, 0xe4, 0x9b, 0x0e, 0x4c, 0xfb, 0x51, 0xa7, 0x13, 0x85, 0x1b, 0xde, 0x2e, 0x6d, 0xab, 0x08, - 0x55, 0xf3, 0x81, 0x6c, 0xe7, 0x4b, 0xab, 0x96, 0x24, 0x71, 0x56, 0xd4, 0x41, 0x37, 0x1b, 0x85, - 0x19, 0x95, 0xec, 0x65, 0x37, 0x7e, 0xef, 0x65, 0x47, 0xfe, 0xdc, 0x81, 0x39, 0xf1, 0xed, 0x4a, - 0x18, 0x46, 0xa9, 0x0c, 0x19, 0x8a, 0x10, 0x53, 0xfb, 0x41, 0xb6, 0xc9, 0x12, 0x27, 0x1a, 0xf6, - 0x2e, 0xa9, 0xe3, 0x5c, 0x1f, 0x1e, 0xfb, 0x35, 0x5c, 0xf8, 0x18, 0xcc, 0xf5, 0xf5, 0xcd, 0x80, - 0x43, 0xf0, 0x19, 0xfb, 0x10, 0x5c, 0xb5, 0x8e, 0xaf, 0x0b, 0x6b, 0xf0, 0xf8, 0x60, 0x45, 0x4e, - 0xc2, 0xc5, 0xfd, 0x3d, 0x07, 0x9e, 0x18, 0xe2, 0x0b, 0xe8, 0x93, 0x80, 0x33, 0xec, 0x24, 0x40, - 0x3e, 0x05, 0x65, 0x1a, 0xee, 0xcb, 0x25, 0xb8, 0x3a, 0x42, 0x6f, 0x9f, 0x0f, 0xf7, 0x45, 0x27, - 0x4e, 0xde, 0x39, 0x5c, 0x2c, 0x9f, 0x0f, 0xf7, 0x91, 0x31, 0x76, 0xbf, 0x38, 0x91, 0x39, 0x69, - 0x6c, 0xab, 0x63, 0x2d, 0xd7, 0x52, 0x9e, 0x33, 0x36, 0x8a, 0x1c, 0x64, 0xeb, 0x18, 0x25, 0x22, - 0xd2, 0x52, 0x16, 0x79, 0xdd, 0xe1, 0x71, 0x60, 0x75, 0xfc, 0x92, 0x9e, 0xc9, 0x03, 0x88, 0x49, - 0xdb, 0xa1, 0x65, 0x05, 0x44, 0x5b, 0x34, 0x5b, 0x1c, 0x5d, 0x11, 0x92, 0xc9, 0xfb, 0x27, 0x2a, - 0x52, 0xac, 0xf0, 0xa4, 0x07, 0x90, 0x1c, 0x84, 0xfe, 0x56, 0xd4, 0x0e, 0xfc, 0x03, 0x79, 0x1a, - 0x1f, 0x35, 0x9c, 0x28, 0x98, 0x09, 0x0f, 0xc5, 0xfc, 0x46, 0x4b, 0x10, 0xf9, 0x86, 0x03, 0x73, - 0x41, 0x33, 0x8c, 0x62, 0xba, 0x16, 0x34, 0x1a, 0x34, 0xa6, 0xa1, 0x4f, 0xd5, 0x3e, 0xbe, 0x33, - 0x82, 0x78, 0x15, 0x09, 0x5b, 0xcf, 0xf3, 0x36, 0x6b, 0xaf, 0x0f, 0x85, 0xfd, 0x9a, 0x10, 0x0f, - 0xc6, 0x82, 0xb0, 0x11, 0x49, 0x2b, 0xf1, 0xb1, 0x11, 0x34, 0x5a, 0x0f, 0x1b, 0x91, 0x59, 0x19, - 0xec, 0x17, 0x72, 0xd6, 0x64, 0x03, 0xce, 0xc4, 0xf2, 0xb4, 0x76, 0x29, 0x48, 0x98, 0x0b, 0xbc, - 0x11, 0x74, 0x82, 0x94, 0x9f, 0xd8, 0xca, 0xb5, 0xf9, 0x3b, 0x87, 0x8b, 0x67, 0x70, 0x00, 0x1e, - 0x07, 0x7e, 0xe5, 0xfe, 0x57, 0x25, 0x7b, 0x24, 0x15, 0xa1, 0x96, 0xd7, 0xa0, 0x1a, 0xeb, 0x38, - 0xb6, 0x70, 0x2b, 0xd6, 0x0b, 0xe8, 0x5d, 0x19, 0xe0, 0xd1, 0x51, 0x02, 0x13, 0xb1, 0x36, 0xe2, - 0x98, 0x7b, 0xc1, 0x06, 0x5c, 0xae, 0x83, 0x51, 0xe7, 0x94, 0x14, 0x69, 0xa2, 0x58, 0x07, 0xa1, - 0x8f, 0x5c, 0x00, 0x89, 0x60, 0xa2, 0x45, 0xbd, 0x76, 0xda, 0x92, 0xa1, 0x96, 0x8b, 0x23, 0xf9, - 0x81, 0x8c, 0x51, 0x3e, 0x80, 0x25, 0xa0, 0x28, 0xc5, 0x90, 0x1e, 0x4c, 0xb6, 0x44, 0xdf, 0xcb, - 0x9d, 0xf1, 0xf2, 0x48, 0x7d, 0x9a, 0x19, 0x4d, 0xb3, 0x54, 0x25, 0x00, 0x95, 0x2c, 0xf2, 0xeb, - 0x0e, 0x80, 0xaf, 0x22, 0x57, 0x6a, 0xb1, 0x5c, 0x2b, 0xc6, 0xbe, 0xe8, 0x88, 0x98, 0x71, 0x29, - 0x34, 0x28, 0x41, 0x4b, 0x2c, 0x79, 0x05, 0xa6, 0x63, 0xea, 0x47, 0xa1, 0x1f, 0xb4, 0x69, 0x7d, - 0x25, 0xe5, 0x4e, 0xef, 0xc9, 0xc2, 0x5b, 0xa7, 0xd9, 0xd6, 0x8e, 0x16, 0x0f, 0xcc, 0x70, 0x24, - 0x5f, 0x74, 0x60, 0x56, 0x87, 0xee, 0xd8, 0x50, 0x50, 0x19, 0xc5, 0x58, 0x2f, 0x22, 0x4a, 0xc8, - 0x19, 0xd6, 0x08, 0xf3, 0xec, 0xb3, 0x30, 0xcc, 0x09, 0x25, 0x2f, 0x03, 0x44, 0xbb, 0x3c, 0x46, - 0xc6, 0xda, 0x59, 0x39, 0x71, 0x3b, 0x67, 0x45, 0x94, 0x57, 0x71, 0x40, 0x8b, 0x1b, 0xb9, 0x02, - 0x20, 0xd6, 0xc9, 0xce, 0x41, 0x97, 0xf2, 0x60, 0x45, 0xb5, 0xf6, 0x7e, 0xd5, 0xf3, 0xdb, 0x1a, - 0x73, 0xf7, 0x70, 0xb1, 0xff, 0x48, 0xc8, 0x83, 0x93, 0xd6, 0xe7, 0xe4, 0x36, 0x4c, 0x26, 0xbd, - 0x4e, 0xc7, 0xd3, 0x71, 0x87, 0xab, 0x05, 0x6d, 0x78, 0x82, 0xa9, 0x99, 0x92, 0x12, 0x80, 0x4a, - 0x9c, 0x1b, 0x02, 0xe9, 0xa7, 0x27, 0xcf, 0xc1, 0x34, 0xbd, 0x9d, 0xd2, 0x38, 0xf4, 0xda, 0x2f, - 0xe1, 0x86, 0x3a, 0xb0, 0xf2, 0x61, 0x3f, 0x6f, 0xc1, 0x31, 0x43, 0x45, 0x5c, 0xed, 0xab, 0x96, - 0x38, 0x3d, 0x18, 0x5f, 0x55, 0x79, 0xa6, 0xee, 0x0f, 0x4b, 0x99, 0xdd, 0x7e, 0x27, 0xa6, 0x94, - 0xb4, 0x61, 0x3c, 0x8c, 0xea, 0xda, 0xbe, 0x5d, 0x2c, 0xc0, 0xbe, 0x6d, 0x46, 0x75, 0x2b, 0x91, - 0xca, 0x7e, 0x25, 0x28, 0x84, 0xf0, 0x7c, 0x93, 0xca, 0xca, 0x71, 0x84, 0x74, 0x6d, 0x0a, 0x13, - 0xab, 0xf3, 0x4d, 0xd7, 0x6c, 0x29, 0x98, 0x15, 0x4a, 0x5a, 0x30, 0xde, 0x8a, 0x92, 0x54, 0xf8, - 0xf5, 0xa3, 0x39, 0x56, 0x97, 0xa2, 0x24, 0xe5, 0x9b, 0x94, 0x6e, 0x30, 0x83, 0x24, 0x28, 0x04, - 0xb8, 0x3f, 0x70, 0x32, 0x51, 0x89, 0x1b, 0x5e, 0xea, 0xb7, 0xce, 0xef, 0xb3, 0x43, 0xd6, 0x95, - 0x4c, 0xec, 0xfc, 0xe7, 0xec, 0xd8, 0xf9, 0xdd, 0xc3, 0xc5, 0xf7, 0x0d, 0x2b, 0x62, 0xb9, 0xc5, - 0x38, 0x2c, 0x71, 0x16, 0x56, 0x98, 0xfd, 0x33, 0x30, 0x65, 0x69, 0x27, 0x37, 0x8d, 0xa2, 0xa2, - 0xb8, 0xda, 0x63, 0xb2, 0x80, 0x68, 0xcb, 0x73, 0x7f, 0xdb, 0x81, 0xc9, 0x9a, 0xe7, 0xef, 0x45, - 0x8d, 0x06, 0xf9, 0x00, 0x54, 0xea, 0x3d, 0x99, 0x9e, 0x10, 0x6d, 0xd3, 0x81, 0xe7, 0x35, 0x09, - 0x47, 0x4d, 0xc1, 0xa6, 0x6d, 0xc3, 0xf3, 0xd3, 0x28, 0xe6, 0x3a, 0x97, 0xc5, 0xb4, 0xbd, 0xc0, - 0x21, 0x28, 0x31, 0xec, 0x14, 0xdb, 0xf1, 0x6e, 0xab, 0x8f, 0xf3, 0x11, 0x91, 0xab, 0x06, 0x85, - 0x36, 0x9d, 0xfb, 0x57, 0xe3, 0x30, 0x29, 0x73, 0x7f, 0xc7, 0x0e, 0xe6, 0x2b, 0x8f, 0xbc, 0x34, - 0xd4, 0x23, 0xef, 0xc2, 0x84, 0xcf, 0xcb, 0x83, 0xe4, 0x76, 0x39, 0x4a, 0x60, 0x48, 0x6a, 0x27, - 0xca, 0x8d, 0x8c, 0x4e, 0xe2, 0x37, 0x4a, 0x39, 0xe4, 0x4d, 0x07, 0x4e, 0xf9, 0xec, 0x00, 0xed, - 0x1b, 0x8b, 0x3e, 0x36, 0x72, 0x82, 0x6b, 0x35, 0xcb, 0xd1, 0x64, 0x18, 0x73, 0x08, 0xcc, 0xcb, - 0x26, 0x2f, 0xc0, 0x8c, 0xe8, 0xad, 0xeb, 0x99, 0x13, 0xa4, 0xc9, 0xf4, 0xda, 0x48, 0xcc, 0xd2, - 0x92, 0x25, 0x71, 0x0c, 0xe7, 0x99, 0x10, 0x71, 0x8a, 0x94, 0xb1, 0x38, 0x9d, 0x2a, 0x49, 0xd0, - 0xa2, 0x20, 0x31, 0x90, 0x98, 0x36, 0x62, 0x9a, 0xb4, 0x90, 0xbe, 0xda, 0xa3, 0x49, 0xca, 0x77, - 0x93, 0xc9, 0xfb, 0x4b, 0x0a, 0x61, 0x1f, 0x27, 0x1c, 0xc0, 0x9d, 0xb4, 0xa4, 0xf7, 0x5a, 0x19, - 0x79, 0x15, 0xc9, 0x01, 0x1e, 0xea, 0xc4, 0x2e, 0xc2, 0x78, 0xd2, 0xf2, 0xe2, 0x3a, 0xdf, 0xc2, - 0xca, 0xb5, 0x2a, 0x33, 0x1f, 0xdb, 0x0c, 0x80, 0x02, 0xee, 0xfe, 0xb7, 0x03, 0xa7, 0xd5, 0x2c, - 0xf1, 0xfc, 0x16, 0x65, 0xdf, 0x92, 0x8f, 0xc2, 0xac, 0xf6, 0x13, 0x57, 0xa3, 0x9e, 0x0c, 0xec, - 0x94, 0x4d, 0xcc, 0x0d, 0x33, 0x58, 0xcc, 0x51, 0x93, 0x65, 0xa8, 0x32, 0x95, 0xc5, 0xa7, 0x62, - 0xd9, 0x69, 0x5f, 0x74, 0x65, 0x6b, 0x5d, 0x7e, 0x65, 0x68, 0x48, 0x04, 0x73, 0x6d, 0x2f, 0x49, - 0xb9, 0x06, 0xcc, 0x73, 0xbc, 0xcf, 0xc4, 0x1c, 0x2f, 0xd3, 0xd8, 0xc8, 0x33, 0xc2, 0x7e, 0xde, - 0xee, 0x77, 0xc7, 0x60, 0x26, 0xb3, 0x38, 0x98, 0x55, 0xe9, 0x25, 0x6c, 0xb7, 0xd3, 0xc7, 0x65, - 0x6d, 0x55, 0x5e, 0x92, 0x70, 0xd4, 0x14, 0x8c, 0xba, 0xeb, 0x25, 0xc9, 0xad, 0x28, 0xae, 0xcb, - 0xa5, 0xac, 0xa9, 0xb7, 0x24, 0x1c, 0x35, 0x05, 0xb3, 0x2f, 0xbb, 0xd4, 0x8b, 0x69, 0xcc, 0x53, - 0xd8, 0x79, 0xfb, 0x52, 0x33, 0x28, 0xb4, 0xe9, 0xf8, 0xba, 0x4c, 0xdb, 0xc9, 0x6a, 0x3b, 0xa0, - 0x61, 0x2a, 0xd4, 0x2c, 0x60, 0x5d, 0xee, 0x6c, 0x6c, 0xdb, 0x1c, 0xcd, 0xba, 0xcc, 0x21, 0x30, - 0x2f, 0x9b, 0x7c, 0xde, 0x81, 0x19, 0xef, 0x56, 0x62, 0x0a, 0x18, 0xf9, 0xc2, 0x1c, 0xcd, 0x42, - 0x65, 0x0a, 0x22, 0x6b, 0x73, 0x6c, 0x79, 0x67, 0x40, 0x98, 0x95, 0x48, 0xbe, 0xea, 0x00, 0xa1, - 0xb7, 0xa9, 0xbf, 0x15, 0x47, 0xfb, 0x41, 0x5d, 0x8d, 0x9e, 0xf4, 0x72, 0x47, 0xf1, 0xab, 0xce, - 0xf7, 0x31, 0x15, 0x4b, 0xba, 0x1f, 0x8e, 0x03, 0x14, 0x70, 0xbf, 0x59, 0x86, 0x29, 0x6b, 0x31, - 0x0e, 0xb4, 0xa9, 0xce, 0x8f, 0x93, 0x4d, 0x2d, 0x9d, 0xc0, 0xa6, 0x7e, 0x1a, 0xaa, 0xbe, 0x32, - 0x0e, 0x05, 0x94, 0x5a, 0xe6, 0xed, 0x8d, 0x31, 0x0e, 0x1a, 0x84, 0x46, 0x20, 0xb9, 0x08, 0x73, - 0x16, 0x1b, 0x69, 0x55, 0xc6, 0xb8, 0x55, 0xd1, 0x41, 0x83, 0x95, 0x3c, 0x01, 0xf6, 0x7f, 0xe3, - 0xfe, 0x9d, 0xa3, 0xc7, 0xe8, 0x21, 0x64, 0xbc, 0x9b, 0xd9, 0x8c, 0x77, 0x6d, 0xf4, 0x0e, 0x1b, - 0x92, 0xed, 0xde, 0x84, 0xc9, 0xd5, 0xa8, 0xd3, 0xf1, 0xc2, 0x3a, 0x79, 0x0f, 0x4c, 0xfa, 0xe2, - 0x4f, 0xe9, 0xd4, 0xf3, 0x5c, 0xa8, 0xc4, 0xa2, 0xc2, 0x91, 0x27, 0x61, 0xcc, 0x8b, 0x9b, 0xca, - 0x91, 0xe7, 0x01, 0xff, 0x95, 0xb8, 0x99, 0x20, 0x87, 0xba, 0x6f, 0x96, 0x00, 0x56, 0xa3, 0x4e, - 0xd7, 0x8b, 0x69, 0x7d, 0x27, 0xfa, 0x3f, 0x1f, 0xad, 0x73, 0xdf, 0x70, 0x80, 0xb0, 0xfe, 0x88, - 0x42, 0x1a, 0x9a, 0x14, 0x03, 0xdb, 0xe4, 0x7c, 0x05, 0x95, 0x3b, 0x86, 0x99, 0xc7, 0x0a, 0x81, - 0x86, 0xe6, 0x18, 0xae, 0xdf, 0x53, 0x2a, 0xc8, 0x5b, 0xce, 0xa6, 0x69, 0x79, 0x86, 0x4d, 0xc6, - 0x7c, 0xdd, 0x2f, 0x97, 0xe0, 0x71, 0x61, 0x74, 0xae, 0x7a, 0xa1, 0xd7, 0xa4, 0x1d, 0xa6, 0xd5, - 0x71, 0xc3, 0xbd, 0xaf, 0x30, 0xcf, 0x23, 0x50, 0x69, 0xd9, 0x91, 0xe6, 0xa4, 0x98, 0x4b, 0x62, - 0xf6, 0xac, 0x87, 0x41, 0x8a, 0x9c, 0x33, 0xe9, 0x42, 0x45, 0xd5, 0xbd, 0x4b, 0x53, 0x51, 0x84, - 0x14, 0xbd, 0xd0, 0x2e, 0x4a, 0xde, 0xa8, 0xa5, 0xb8, 0xdf, 0x71, 0x20, 0x6f, 0xff, 0xb8, 0x3b, - 0x2e, 0x2a, 0xa7, 0xf2, 0xee, 0x78, 0xb6, 0xd6, 0xe9, 0x04, 0xd5, 0x43, 0x9f, 0x80, 0x29, 0x2f, - 0x4d, 0x69, 0xa7, 0x2b, 0x3c, 0xc4, 0xf2, 0xfd, 0xc5, 0x1b, 0xae, 0x46, 0xf5, 0xa0, 0x11, 0x70, - 0xcf, 0xd0, 0x66, 0xe7, 0xbe, 0x08, 0x15, 0x15, 0x41, 0x3f, 0xc6, 0x30, 0x3e, 0x95, 0xc9, 0x06, - 0x0c, 0x99, 0x28, 0xff, 0x53, 0x82, 0x01, 0xbb, 0x17, 0x6b, 0xb2, 0xb1, 0x11, 0x99, 0x26, 0x9f, - 0xcc, 0x4e, 0x90, 0x9e, 0x48, 0x1d, 0x88, 0x13, 0xee, 0xf5, 0x42, 0xb7, 0x5e, 0x93, 0x4d, 0x98, - 0x92, 0xca, 0xe9, 0x8c, 0x02, 0x79, 0x16, 0xc0, 0xeb, 0x06, 0x6a, 0x1b, 0x1b, 0xcb, 0xe6, 0xd9, - 0x56, 0xb6, 0xd6, 0xd5, 0x1e, 0x66, 0x51, 0x31, 0x07, 0x2c, 0x08, 0x93, 0xd4, 0x6b, 0xb7, 0x2f, - 0x05, 0x61, 0x2a, 0xcf, 0x13, 0x7a, 0xe5, 0xaf, 0x1b, 0x14, 0xda, 0x74, 0x0b, 0x1f, 0xb2, 0x06, - 0xe5, 0x24, 0x29, 0x99, 0x37, 0x4a, 0x30, 0x7b, 0x31, 0xec, 0x6d, 0x5d, 0xdc, 0xea, 0xed, 0xb6, - 0x03, 0xff, 0x0a, 0x3d, 0x60, 0x23, 0xb6, 0x47, 0x0f, 0xd6, 0xd7, 0x64, 0x9f, 0xeb, 0x11, 0xbb, - 0xc2, 0x80, 0x28, 0x70, 0x4c, 0xcd, 0x46, 0x10, 0x36, 0x69, 0xdc, 0x8d, 0x03, 0xe9, 0x39, 0x5b, - 0x6a, 0x5e, 0x30, 0x28, 0xb4, 0xe9, 0x18, 0xef, 0xe8, 0x56, 0x48, 0xe3, 0xbc, 0xd9, 0xb8, 0xc6, - 0x80, 0x28, 0x70, 0x8c, 0x28, 0x8d, 0x7b, 0x49, 0x2a, 0x7b, 0x4c, 0x13, 0xed, 0x30, 0x20, 0x0a, - 0x1c, 0x9b, 0x1b, 0x49, 0x6f, 0x97, 0xc7, 0xbc, 0x72, 0x59, 0xbb, 0x6d, 0x01, 0x46, 0x85, 0x67, - 0xa4, 0x7b, 0xf4, 0x60, 0x8d, 0xed, 0x9d, 0xb9, 0xbc, 0xfa, 0x15, 0x01, 0x46, 0x85, 0x77, 0xef, - 0x38, 0x40, 0xb2, 0xdd, 0xf1, 0x10, 0xb6, 0xdf, 0x30, 0xbb, 0xfd, 0x8e, 0x12, 0x9b, 0xcc, 0xea, - 0x3e, 0x64, 0x17, 0xfe, 0x03, 0x07, 0xa6, 0xed, 0xe8, 0x34, 0x69, 0xe6, 0x4c, 0xd0, 0xb5, 0xac, - 0x09, 0xba, 0x7b, 0xb8, 0xf8, 0x0b, 0x83, 0xee, 0x61, 0x35, 0x83, 0x34, 0xea, 0x26, 0x1f, 0xa4, - 0x61, 0x33, 0x08, 0x29, 0x0f, 0xc8, 0x88, 0xa8, 0x76, 0x26, 0xf4, 0xbd, 0x1a, 0xd5, 0xe9, 0x7d, - 0xd8, 0x30, 0xf7, 0x06, 0xcc, 0xf5, 0x55, 0x52, 0x1c, 0xc3, 0xdc, 0x1c, 0x59, 0x0e, 0xe7, 0xbe, - 0xe9, 0xc0, 0x4c, 0xa6, 0x0a, 0xa5, 0x20, 0x23, 0xc6, 0x97, 0x44, 0xc4, 0x53, 0x1a, 0x71, 0x10, - 0x8a, 0x90, 0x48, 0xc5, 0x5a, 0x12, 0x06, 0x85, 0x36, 0x9d, 0xfb, 0x9b, 0x25, 0xa8, 0xa8, 0xc0, - 0xd9, 0x31, 0x54, 0x79, 0xdd, 0x81, 0x19, 0x7d, 0x86, 0xe5, 0x5e, 0xee, 0xe8, 0x35, 0x09, 0x4c, - 0xbc, 0x4e, 0x77, 0x31, 0x2f, 0x57, 0xfb, 0xda, 0x68, 0x4b, 0xc2, 0xac, 0x60, 0x72, 0x1d, 0x20, - 0x39, 0x48, 0x52, 0xda, 0xb1, 0x9c, 0x6d, 0xd7, 0x5a, 0x17, 0x4b, 0x7e, 0x14, 0x53, 0xb6, 0x0a, - 0x36, 0xa3, 0x3a, 0xdd, 0xd6, 0x94, 0xc6, 0x04, 0x1a, 0x18, 0x5a, 0x9c, 0xdc, 0x3f, 0x2d, 0xc1, - 0xe9, 0xbc, 0x4a, 0xe4, 0xe3, 0x30, 0xad, 0xa4, 0x5b, 0x37, 0xd0, 0x54, 0xa8, 0x70, 0x1a, 0x2d, - 0xdc, 0xdd, 0xc3, 0xc5, 0xc5, 0xfe, 0x2b, 0x78, 0x4b, 0x36, 0x09, 0x66, 0x98, 0x89, 0x28, 0x82, - 0x0c, 0x7a, 0xd4, 0x0e, 0x56, 0xba, 0x5d, 0x19, 0x0a, 0xb0, 0xa2, 0x08, 0x36, 0x16, 0x73, 0xd4, - 0x64, 0x0b, 0xce, 0x58, 0x90, 0x4d, 0x1a, 0x34, 0x5b, 0xbb, 0x51, 0x2c, 0x6a, 0xa1, 0xcb, 0xb5, - 0x27, 0x25, 0x97, 0x33, 0x38, 0x80, 0x06, 0x07, 0x7e, 0xc9, 0x4e, 0xed, 0xbe, 0xd7, 0xf5, 0xfc, - 0x20, 0x3d, 0x90, 0x07, 0x08, 0x6d, 0x41, 0x56, 0x25, 0x1c, 0x35, 0x85, 0x7b, 0x15, 0xc6, 0x8e, - 0x39, 0x7d, 0x8e, 0xb5, 0x1d, 0xbf, 0x08, 0x15, 0xc6, 0x8e, 0x19, 0x8d, 0xa2, 0x58, 0x46, 0x50, - 0x51, 0x75, 0xf1, 0xc4, 0x85, 0x72, 0xe0, 0xa9, 0x40, 0x8d, 0x6e, 0xd6, 0x7a, 0x92, 0xf4, 0xb8, - 0xb3, 0xc1, 0x90, 0xe4, 0x29, 0x28, 0xd3, 0xdb, 0xdd, 0x7c, 0x44, 0xe6, 0xfc, 0xed, 0x6e, 0x10, - 0xd3, 0x84, 0x11, 0xd1, 0xdb, 0x5d, 0xb2, 0x00, 0xa5, 0xa0, 0x2e, 0xb7, 0x12, 0x90, 0x34, 0xa5, - 0xf5, 0x35, 0x2c, 0x05, 0x75, 0xb7, 0x07, 0x55, 0x5d, 0x88, 0x4f, 0x5a, 0xca, 0xc2, 0x3a, 0x23, - 0xc7, 0xb8, 0x15, 0xd3, 0x21, 0xb6, 0xb5, 0x07, 0x60, 0x4a, 0x98, 0x8a, 0xb2, 0x2c, 0xe7, 0x60, - 0xcc, 0x8f, 0x64, 0x85, 0x60, 0xc5, 0xb0, 0xe1, 0xa6, 0x95, 0x63, 0xdc, 0x1b, 0x30, 0x7b, 0x25, - 0x8c, 0x6e, 0x85, 0x6c, 0xbf, 0xbb, 0x10, 0xd0, 0x76, 0x9d, 0x31, 0x6e, 0xb0, 0x3f, 0xf2, 0xbb, - 0x38, 0xc7, 0xa2, 0xc0, 0xe9, 0x9a, 0xf5, 0xd2, 0xb0, 0x9a, 0x75, 0xf7, 0x4b, 0x0e, 0x9c, 0xce, - 0x97, 0x2c, 0xfd, 0xc8, 0xce, 0x13, 0x9f, 0x63, 0xca, 0xa8, 0xca, 0x98, 0x6b, 0x5d, 0x91, 0x45, - 0x7c, 0x1e, 0xa6, 0x77, 0x7b, 0x41, 0xbb, 0x2e, 0x7f, 0x4b, 0x7d, 0x74, 0xe1, 0x4f, 0xcd, 0xc2, - 0x61, 0x86, 0x92, 0xb9, 0x67, 0xbb, 0x41, 0xe8, 0xc5, 0x07, 0x5b, 0x66, 0xc7, 0xd0, 0xb6, 0xa9, - 0xa6, 0x31, 0x68, 0x51, 0xb9, 0x6f, 0x95, 0xc1, 0xdc, 0x0b, 0x20, 0x0d, 0x99, 0x98, 0x76, 0x46, - 0x0e, 0x2e, 0x6d, 0x1f, 0x84, 0xbe, 0xb9, 0x7e, 0x50, 0xc9, 0xe5, 0xa5, 0xbf, 0xe0, 0x30, 0xaf, - 0x30, 0x48, 0x03, 0x8f, 0x9b, 0x09, 0x79, 0x26, 0xba, 0x5a, 0x44, 0x12, 0x73, 0x5d, 0xb0, 0x8d, - 0x62, 0xdb, 0xc9, 0xd4, 0x92, 0xd0, 0x16, 0x4b, 0x3e, 0x29, 0x83, 0xc1, 0xe5, 0x62, 0x4a, 0x19, - 0x2a, 0xb9, 0x08, 0x70, 0x07, 0xc6, 0x63, 0x9a, 0xc6, 0xaa, 0x76, 0xe4, 0xd2, 0x48, 0x79, 0xb0, - 0x34, 0x3e, 0xd8, 0x4e, 0xd9, 0xa1, 0xab, 0x69, 0xb9, 0x41, 0x1c, 0x8c, 0x42, 0x8a, 0x9b, 0x00, - 0xe9, 0xef, 0x85, 0x13, 0x06, 0x57, 0x97, 0xa1, 0xea, 0xf5, 0xd2, 0xa8, 0xc3, 0x3a, 0x88, 0x8f, - 0x4a, 0xc5, 0x0a, 0x1f, 0x2b, 0x04, 0x1a, 0x1a, 0xf7, 0xf5, 0x71, 0xc8, 0x25, 0x8b, 0x49, 0xcf, - 0xbe, 0xc4, 0xe2, 0x14, 0x78, 0x89, 0x45, 0x6b, 0x32, 0xe8, 0x22, 0x0b, 0x69, 0xc2, 0x78, 0xb7, - 0xe5, 0x25, 0x6a, 0x51, 0xbe, 0xa8, 0xfa, 0x68, 0x8b, 0x01, 0xef, 0x1e, 0x2e, 0xfe, 0xe2, 0xf1, - 0x5c, 0x3e, 0x36, 0x3f, 0x97, 0x45, 0xc5, 0x99, 0x11, 0xcd, 0x79, 0xa0, 0xe0, 0x6f, 0x3b, 0x7d, - 0xe5, 0x23, 0x0e, 0xae, 0x9f, 0x15, 0x25, 0x44, 0x48, 0x93, 0x5e, 0x3b, 0x95, 0xd3, 0x60, 0xb3, - 0xa8, 0x55, 0x25, 0xb8, 0x9a, 0x5a, 0x22, 0xf1, 0x1b, 0x2d, 0x89, 0xe4, 0xe3, 0x50, 0x4d, 0x52, - 0x2f, 0x4e, 0xef, 0xb3, 0x1c, 0x41, 0x77, 0xf8, 0xb6, 0x62, 0x82, 0x86, 0x1f, 0x79, 0x19, 0xa0, - 0x11, 0x84, 0x41, 0xd2, 0xba, 0xcf, 0xb4, 0x0d, 0x57, 0xfc, 0x82, 0xe6, 0x80, 0x16, 0x37, 0x66, - 0xca, 0xf8, 0xa4, 0x16, 0x11, 0xc7, 0x0a, 0xdf, 0x35, 0xb5, 0x29, 0x43, 0x8d, 0x41, 0x8b, 0xca, - 0xfd, 0x2c, 0x3c, 0x9a, 0xbf, 0x27, 0x2a, 0x8f, 0x7f, 0xcd, 0x38, 0xea, 0x75, 0xf3, 0x1b, 0x07, - 0xbf, 0x4d, 0x88, 0x02, 0xc7, 0x0c, 0xfa, 0x5e, 0x10, 0xd6, 0xf3, 0x06, 0xfd, 0x4a, 0x10, 0xd6, - 0x91, 0x63, 0x8e, 0x71, 0xb3, 0xe7, 0x2f, 0x1c, 0x38, 0x77, 0xd4, 0x75, 0x56, 0x76, 0xae, 0xbf, - 0xe5, 0xc5, 0xa1, 0xac, 0xe3, 0xe7, 0x16, 0xe3, 0x86, 0x17, 0x87, 0xc8, 0xa1, 0x64, 0x1f, 0x26, - 0x44, 0xc1, 0x95, 0x74, 0x82, 0x37, 0x0b, 0xbc, 0x59, 0xcb, 0xce, 0x4f, 0x3a, 0x16, 0x23, 0x2a, - 0xbd, 0x50, 0x4a, 0x73, 0x2f, 0x03, 0xb9, 0xb6, 0x4f, 0xe3, 0x38, 0xa8, 0x5b, 0xe5, 0x61, 0xe4, - 0x39, 0x98, 0xbe, 0xb9, 0x7d, 0x6d, 0x73, 0x2b, 0x0a, 0x42, 0x5e, 0x2c, 0x6c, 0x15, 0x2b, 0x5c, - 0xb6, 0xe0, 0x98, 0xa1, 0x72, 0xbf, 0x55, 0x82, 0x29, 0xeb, 0xd6, 0xf5, 0x31, 0x7c, 0x86, 0xdc, - 0x2d, 0xf1, 0xd2, 0x31, 0x6f, 0x89, 0x3f, 0x0d, 0x95, 0x6e, 0xd4, 0x0e, 0xfc, 0x40, 0xd7, 0xf0, - 0x4e, 0xf3, 0x24, 0x90, 0x84, 0xa1, 0xc6, 0x92, 0x14, 0xaa, 0xfa, 0x2a, 0xa5, 0xac, 0x4b, 0x2a, - 0xc4, 0x65, 0xd2, 0xeb, 0xc3, 0x5c, 0x91, 0x34, 0x82, 0x88, 0x0b, 0x13, 0x7c, 0x72, 0x89, 0x7a, - 0x24, 0x59, 0xb5, 0xc1, 0x67, 0x5d, 0x82, 0x12, 0xe3, 0xfe, 0xee, 0x38, 0x54, 0x91, 0x76, 0xa3, - 0xd5, 0x98, 0xd6, 0x13, 0xf2, 0x6e, 0x28, 0xf7, 0xe2, 0xb6, 0xec, 0x29, 0x1d, 0x7e, 0x79, 0x09, - 0x37, 0x90, 0xc1, 0x33, 0xa6, 0xbc, 0x74, 0xa2, 0x3c, 0x59, 0xf9, 0xc8, 0x3c, 0xd9, 0x0b, 0x30, - 0x93, 0x24, 0xad, 0xad, 0x38, 0xd8, 0xf7, 0x52, 0x36, 0x55, 0x64, 0xac, 0xc2, 0x24, 0x29, 0xb6, - 0x2f, 0x19, 0x24, 0x66, 0x69, 0xc9, 0x45, 0x98, 0x33, 0x09, 0x2b, 0x1a, 0xa7, 0x3c, 0x34, 0x21, - 0xa2, 0x18, 0x3a, 0x4d, 0x60, 0x52, 0x5c, 0x92, 0x00, 0xfb, 0xbf, 0x21, 0x6b, 0x70, 0x3a, 0x03, - 0x64, 0x8a, 0x88, 0x10, 0xc7, 0xbc, 0xe4, 0x73, 0x3a, 0xc3, 0x87, 0xe9, 0xd2, 0xf7, 0x05, 0xb9, - 0x0a, 0x8f, 0x8a, 0xc1, 0xe5, 0xf7, 0x6f, 0x75, 0x8b, 0x26, 0x39, 0xa3, 0xff, 0x27, 0x19, 0x3d, - 0x7a, 0xb1, 0x9f, 0x04, 0x07, 0x7d, 0xc7, 0xa6, 0xa7, 0x06, 0xaf, 0xaf, 0x49, 0x63, 0xa4, 0xa7, - 0xa7, 0x66, 0xb3, 0x5e, 0x47, 0x9b, 0x8e, 0xfc, 0x12, 0x3c, 0x61, 0x7e, 0x8a, 0xc8, 0x96, 0xd8, - 0x9a, 0xd7, 0x64, 0x46, 0x78, 0x51, 0xb2, 0x78, 0xe2, 0xe2, 0x40, 0xb2, 0x3a, 0x0e, 0xfb, 0x9e, - 0xec, 0xc2, 0x82, 0x46, 0x9d, 0x67, 0xab, 0xae, 0x1b, 0x07, 0x09, 0xad, 0x79, 0x09, 0x7d, 0x29, - 0x6e, 0xf3, 0x42, 0xa7, 0xaa, 0xb9, 0x3d, 0x7e, 0x31, 0x48, 0x2f, 0x0d, 0xa2, 0xc4, 0x0d, 0xbc, - 0x07, 0x17, 0xf7, 0x6d, 0x07, 0x66, 0xf4, 0xcc, 0x7c, 0x08, 0x41, 0xa3, 0x20, 0x1b, 0x34, 0x5a, - 0x1b, 0xc9, 0x59, 0x92, 0x6a, 0x0f, 0x39, 0xd3, 0xfc, 0x4e, 0x15, 0x80, 0xbf, 0x96, 0x11, 0xf0, - 0xe2, 0xc1, 0x73, 0x30, 0x16, 0xd3, 0x6e, 0x94, 0x37, 0x50, 0x8c, 0x02, 0x39, 0xe6, 0xc7, 0x77, - 0xe1, 0x0d, 0x4a, 0x75, 0x8e, 0xff, 0x08, 0x53, 0x9d, 0xdb, 0xf0, 0x58, 0x10, 0x26, 0xd4, 0xef, - 0xc5, 0x72, 0x1f, 0xb9, 0x14, 0x25, 0x7a, 0x11, 0x57, 0x6a, 0xef, 0x96, 0x8c, 0x1e, 0x5b, 0x1f, - 0x44, 0x84, 0x83, 0xbf, 0x65, 0xfd, 0xa9, 0x10, 0x7c, 0x0d, 0x57, 0xac, 0x33, 0xb6, 0x84, 0xa3, - 0xa6, 0x60, 0x1e, 0x2c, 0x0d, 0xbd, 0xdd, 0x36, 0xdd, 0x68, 0x24, 0x7c, 0xad, 0x5a, 0x1e, 0xec, - 0x79, 0x81, 0xb8, 0xb0, 0x8d, 0x86, 0x66, 0xb0, 0xf1, 0xaa, 0x16, 0x64, 0xbc, 0xe0, 0xc4, 0xc6, - 0x4b, 0x1d, 0x61, 0xa7, 0x86, 0x5e, 0xbb, 0x56, 0x1b, 0xea, 0xf4, 0xd0, 0x0d, 0xf5, 0xa3, 0x30, - 0x1b, 0x84, 0x2d, 0x1a, 0x07, 0x29, 0xad, 0xf3, 0x85, 0x30, 0x3f, 0xc3, 0x3b, 0x42, 0x87, 0x7f, - 0xd6, 0x33, 0x58, 0xcc, 0x51, 0x9b, 0x3e, 0xbc, 0xb6, 0xba, 0x3e, 0x3f, 0x3b, 0xa8, 0x0f, 0xaf, - 0xad, 0xae, 0xa3, 0xa1, 0x19, 0x66, 0x71, 0x4f, 0x15, 0x63, 0x71, 0x4f, 0x8f, 0x6e, 0x71, 0xe7, - 0x1e, 0xa8, 0xc5, 0x25, 0x85, 0x58, 0xdc, 0xd7, 0x4b, 0xf0, 0x98, 0x31, 0x4b, 0x6c, 0x3e, 0x04, - 0x0d, 0xb6, 0x36, 0xf9, 0x9d, 0x28, 0x51, 0x15, 0x60, 0x45, 0x0a, 0x4d, 0xd0, 0x51, 0x63, 0xd0, - 0xa2, 0xe2, 0x01, 0x37, 0x1a, 0xf3, 0x3a, 0xc2, 0xbc, 0xcd, 0x5a, 0x95, 0x70, 0xd4, 0x14, 0xfc, - 0x39, 0x2c, 0x1a, 0xa7, 0x32, 0xd5, 0x90, 0x2f, 0x93, 0x59, 0x35, 0x28, 0xb4, 0xe9, 0x98, 0x0b, - 0xe6, 0xab, 0x25, 0xc3, 0xec, 0xd6, 0xb4, 0x70, 0xc1, 0xf4, 0x2a, 0xd1, 0x58, 0xa5, 0x0e, 0x8f, - 0xac, 0x8e, 0xf7, 0xab, 0xc3, 0x4f, 0xcd, 0x9a, 0xc2, 0xfd, 0xa1, 0x03, 0xef, 0x1a, 0xd8, 0x15, - 0x0f, 0x61, 0x23, 0xea, 0x65, 0x37, 0xa2, 0xad, 0x11, 0x37, 0xa2, 0xbe, 0x26, 0x0c, 0xd9, 0x94, - 0xfe, 0xde, 0x81, 0x59, 0x43, 0xff, 0x10, 0xda, 0xd9, 0x28, 0xee, 0x6d, 0x2b, 0xa3, 0xb7, 0x28, - 0x73, 0xcb, 0x34, 0xec, 0x6d, 0xde, 0x30, 0x71, 0x06, 0x59, 0xf1, 0xd5, 0xd3, 0x12, 0x47, 0x1c, - 0x09, 0xf6, 0x61, 0x82, 0x5f, 0x19, 0x4c, 0x0a, 0x38, 0x08, 0x65, 0x85, 0xf3, 0xa8, 0x9f, 0x39, - 0x08, 0xf1, 0x9f, 0x09, 0x4a, 0x69, 0xbc, 0xc0, 0x35, 0x48, 0x98, 0x59, 0xab, 0xcb, 0xe8, 0xa4, - 0x29, 0x70, 0x95, 0x70, 0xd4, 0x14, 0x6e, 0x07, 0xe6, 0xb3, 0xcc, 0xd7, 0x68, 0x83, 0xc7, 0x97, - 0x8e, 0xd5, 0xc6, 0x65, 0xa8, 0x7a, 0xfc, 0xab, 0x8d, 0x9e, 0x97, 0x7f, 0x5c, 0x62, 0x45, 0x21, - 0xd0, 0xd0, 0xb8, 0x7f, 0xec, 0xc0, 0xa3, 0x03, 0x1a, 0x53, 0x60, 0x54, 0x36, 0x35, 0x8b, 0x7f, - 0xc8, 0x83, 0x1f, 0x75, 0xda, 0xf0, 0x54, 0x2c, 0xc3, 0x8a, 0x7c, 0xac, 0x09, 0x30, 0x2a, 0xbc, - 0xfb, 0x6f, 0x0e, 0x9c, 0xca, 0xea, 0x9a, 0x90, 0xcb, 0x40, 0x44, 0x63, 0xd6, 0x82, 0xc4, 0x8f, - 0xf6, 0x69, 0x7c, 0xc0, 0x5a, 0x2e, 0xb4, 0x5e, 0x90, 0x9c, 0xc8, 0x4a, 0x1f, 0x05, 0x0e, 0xf8, - 0x8a, 0x7c, 0x89, 0x17, 0xa9, 0xa8, 0xde, 0x56, 0xd3, 0x64, 0xbb, 0xb0, 0x69, 0x62, 0x46, 0xd2, - 0x3e, 0x89, 0x6a, 0x79, 0x68, 0x0b, 0x77, 0xbf, 0x3f, 0x06, 0x3a, 0x61, 0xc3, 0x4f, 0xce, 0x05, - 0xc5, 0x1c, 0x32, 0xcf, 0x8f, 0x94, 0x4f, 0xf0, 0xfc, 0xc8, 0xd8, 0xbd, 0xce, 0xda, 0xe2, 0x39, - 0x0c, 0xe3, 0x2c, 0x5a, 0x86, 0x7e, 0xc7, 0xa0, 0xd0, 0xa6, 0x63, 0x9a, 0xb4, 0x83, 0x7d, 0x2a, - 0x3e, 0x9a, 0xc8, 0x6a, 0xb2, 0xa1, 0x10, 0x68, 0x68, 0x98, 0x26, 0xf5, 0xa0, 0xd1, 0x90, 0x87, - 0x2e, 0xad, 0x09, 0xeb, 0x1d, 0xe4, 0x18, 0x46, 0xd1, 0x8a, 0xa2, 0x3d, 0xe9, 0xa3, 0x69, 0x8a, - 0x4b, 0x51, 0xb4, 0x87, 0x1c, 0xc3, 0xbc, 0x8a, 0x30, 0x8a, 0x3b, 0x5e, 0x3b, 0x78, 0x8d, 0xd6, - 0xb5, 0x14, 0xe9, 0x9b, 0x69, 0xaf, 0x62, 0xb3, 0x9f, 0x04, 0x07, 0x7d, 0xc7, 0xa6, 0x5f, 0x37, - 0xa6, 0xf5, 0xc0, 0x4f, 0x6d, 0x6e, 0x90, 0x9d, 0x7e, 0x5b, 0x7d, 0x14, 0x38, 0xe0, 0x2b, 0xb2, - 0x02, 0xa7, 0x54, 0xc2, 0x4d, 0x95, 0x43, 0x08, 0x87, 0x4d, 0xfb, 0xca, 0x98, 0x45, 0x63, 0x9e, - 0x9e, 0x99, 0x9a, 0x8e, 0xac, 0x48, 0xe1, 0xae, 0x9c, 0x65, 0x6a, 0x54, 0xa5, 0x0a, 0x6a, 0x0a, - 0xf7, 0xdf, 0xf9, 0x8e, 0x38, 0xe4, 0x06, 0xdf, 0x43, 0x8b, 0x71, 0x65, 0x67, 0xe4, 0xd8, 0x31, - 0x66, 0xe4, 0x73, 0x30, 0x7d, 0x33, 0x89, 0x42, 0x1d, 0x43, 0x1a, 0x1f, 0x1a, 0x43, 0xb2, 0xa8, - 0xdc, 0xef, 0x8c, 0xc3, 0xe3, 0x3a, 0xbd, 0x49, 0xd3, 0x5b, 0x51, 0xbc, 0x17, 0x84, 0x4d, 0x9e, - 0x12, 0xfc, 0x86, 0x03, 0xd3, 0x62, 0x66, 0xca, 0x1b, 0xd8, 0x22, 0x05, 0xe6, 0x17, 0x71, 0xc9, - 0x24, 0x23, 0x69, 0x69, 0xc7, 0x92, 0x92, 0xbb, 0x7d, 0x6d, 0xa3, 0x30, 0xa3, 0x0e, 0x79, 0x0d, - 0x40, 0xbd, 0x37, 0xd3, 0x28, 0xe2, 0xc9, 0x1d, 0xa5, 0x1c, 0xd2, 0x86, 0xf1, 0xf9, 0x76, 0xb4, - 0x04, 0xb4, 0xa4, 0x91, 0x2f, 0x3a, 0x30, 0xd1, 0x16, 0xbd, 0x22, 0x52, 0x1a, 0x9f, 0x2c, 0xbe, - 0x57, 0xec, 0xfe, 0xd0, 0xbb, 0xa8, 0xec, 0x09, 0x29, 0x9c, 0x20, 0x4c, 0x06, 0x61, 0x33, 0xa6, - 0x89, 0x8a, 0xb6, 0xbd, 0x6f, 0x50, 0x16, 0x7d, 0x23, 0xf2, 0xea, 0x35, 0xaf, 0xed, 0x85, 0x3e, - 0x8d, 0xd7, 0x05, 0xb9, 0xfd, 0x04, 0x08, 0x07, 0xa0, 0x62, 0xd4, 0x77, 0x73, 0x6a, 0xfc, 0x38, - 0x37, 0xa7, 0x16, 0x3e, 0x06, 0x73, 0x7d, 0xc3, 0x78, 0xa2, 0x8b, 0xe2, 0x1f, 0x86, 0xa9, 0xfb, - 0xfc, 0xd4, 0xfd, 0x93, 0x09, 0xb3, 0x2b, 0x6c, 0x46, 0x75, 0x7e, 0x91, 0x27, 0x36, 0xa3, 0x29, - 0x5d, 0xba, 0xa2, 0xe6, 0x86, 0xf5, 0x8a, 0x88, 0x06, 0xa2, 0x2d, 0x8f, 0xcd, 0xcc, 0xae, 0x17, - 0xd3, 0xf0, 0x81, 0xce, 0xcc, 0x2d, 0x2d, 0x01, 0x2d, 0x69, 0x84, 0x66, 0x32, 0x6d, 0xab, 0x23, - 0x66, 0xda, 0x98, 0x7f, 0x39, 0xf0, 0xce, 0xc5, 0x9b, 0x0e, 0xcc, 0x86, 0x99, 0xf9, 0x2a, 0x93, - 0x2e, 0x2f, 0x16, 0xbe, 0x10, 0xc4, 0x3d, 0xc9, 0x2c, 0x0c, 0x73, 0xc2, 0x07, 0x6d, 0x13, 0xe3, - 0x27, 0xdc, 0x26, 0xcc, 0xdd, 0xbf, 0x89, 0x61, 0x77, 0xff, 0xc8, 0x9e, 0xbe, 0xe6, 0x3b, 0x59, - 0xec, 0x35, 0x5f, 0x18, 0x70, 0xc5, 0xf7, 0x06, 0x54, 0xfd, 0x98, 0x7a, 0xe9, 0x7d, 0x5e, 0xfd, - 0xe4, 0x2f, 0x34, 0xad, 0x2a, 0x06, 0x68, 0x78, 0xb9, 0x5f, 0x2b, 0xc3, 0x69, 0xd5, 0x1d, 0x2a, - 0x1b, 0xc1, 0x36, 0x1c, 0x21, 0xd7, 0xb8, 0x8a, 0x7a, 0xc3, 0xb9, 0xa4, 0x10, 0x68, 0x68, 0x98, - 0x8f, 0x2a, 0xdc, 0xc5, 0x24, 0x9f, 0x9d, 0x93, 0x6e, 0x28, 0x2a, 0x3c, 0xf9, 0xda, 0xc0, 0x9b, - 0xf6, 0x05, 0xe4, 0xa2, 0xfb, 0x52, 0x29, 0x27, 0xbc, 0x62, 0xff, 0x86, 0x03, 0xa7, 0xf6, 0x32, - 0xe5, 0x0f, 0xca, 0x90, 0x8e, 0x52, 0x4b, 0x97, 0x2d, 0xa8, 0x30, 0x53, 0x30, 0x0b, 0x4f, 0x30, - 0x2f, 0xda, 0xfd, 0x4f, 0x07, 0x6c, 0xab, 0x72, 0x3c, 0x6f, 0xc3, 0x7a, 0x85, 0xa4, 0x74, 0xc4, - 0x2b, 0x24, 0xca, 0x31, 0x29, 0x1f, 0xcf, 0x11, 0x1e, 0x3b, 0x81, 0x23, 0x3c, 0x3e, 0xd4, 0x93, - 0x79, 0x37, 0x94, 0x7b, 0x41, 0x5d, 0xfa, 0xb2, 0x26, 0xd7, 0xb2, 0xbe, 0x86, 0x0c, 0xee, 0xfe, - 0xe5, 0xb8, 0x39, 0xb5, 0xca, 0x64, 0xea, 0x4f, 0x44, 0xb3, 0x1b, 0xba, 0x34, 0x52, 0xb4, 0x7c, - 0xb3, 0xaf, 0x34, 0xf2, 0xe7, 0x4f, 0x9e, 0x27, 0x17, 0x1d, 0x34, 0xac, 0x32, 0x72, 0xf2, 0x88, - 0x24, 0xf9, 0x4d, 0xa8, 0x30, 0x77, 0x9f, 0x07, 0x9e, 0x2a, 0x19, 0xa5, 0x2a, 0x97, 0x24, 0xfc, - 0xee, 0xe1, 0xe2, 0x47, 0x4e, 0xae, 0x96, 0xfa, 0x1a, 0x35, 0x7f, 0x92, 0x40, 0x95, 0xfd, 0xcd, - 0xf3, 0xf9, 0xf2, 0x20, 0xf1, 0x92, 0x36, 0x27, 0x0a, 0x51, 0x48, 0xb1, 0x80, 0x91, 0x43, 0x42, - 0xa8, 0xf2, 0xf7, 0x3d, 0xb8, 0x50, 0x71, 0xde, 0xd8, 0xd2, 0x99, 0x75, 0x85, 0xb8, 0x7b, 0xb8, - 0xf8, 0xc2, 0xc9, 0x85, 0xea, 0xcf, 0xd1, 0x88, 0x70, 0xdf, 0x29, 0x9b, 0xb9, 0x2b, 0x2b, 0x62, - 0x7f, 0x22, 0xe6, 0xee, 0xf3, 0xb9, 0xb9, 0x7b, 0xae, 0x6f, 0xee, 0xce, 0x9a, 0xf7, 0x30, 0x32, - 0xb3, 0xf1, 0xa1, 0x6e, 0x90, 0x47, 0x1f, 0x6c, 0xb9, 0x5b, 0xf0, 0x6a, 0x2f, 0x88, 0x69, 0xb2, - 0x15, 0xf7, 0xc2, 0x20, 0x6c, 0xf2, 0xb9, 0x58, 0xb1, 0xdd, 0x82, 0x0c, 0x1a, 0xf3, 0xf4, 0xee, - 0xb7, 0x78, 0x7a, 0xce, 0x2a, 0x0a, 0x62, 0x43, 0xdc, 0xe6, 0xaf, 0xa4, 0x88, 0x3a, 0x44, 0x3d, - 0xc4, 0xe2, 0x69, 0x14, 0x81, 0x23, 0x29, 0x4c, 0xee, 0x8a, 0xbb, 0xdc, 0x05, 0xdc, 0x43, 0x91, - 0xb7, 0xc2, 0xf9, 0x65, 0x3d, 0x75, 0x45, 0xfc, 0xae, 0xf9, 0x13, 0x95, 0x28, 0xf7, 0xeb, 0x65, - 0x38, 0x95, 0x7b, 0xcc, 0x83, 0x1d, 0x7f, 0xd5, 0x6b, 0x2d, 0xf9, 0xf8, 0xb4, 0x7e, 0xb9, 0x53, - 0x53, 0x90, 0x4f, 0x01, 0xd4, 0x69, 0xb7, 0x1d, 0x1d, 0x70, 0xaf, 0x63, 0xec, 0xc4, 0x5e, 0x87, - 0xf6, 0x4f, 0xd7, 0x34, 0x17, 0xb4, 0x38, 0xca, 0xca, 0xcb, 0x71, 0x71, 0x4d, 0x3d, 0x5b, 0x79, - 0x69, 0xdd, 0xc2, 0x9a, 0x78, 0x88, 0xb7, 0xb0, 0x02, 0x38, 0x25, 0xf4, 0xd3, 0xb5, 0x37, 0xf7, - 0x51, 0x62, 0xf3, 0x28, 0x9b, 0x4b, 0x6b, 0x59, 0x36, 0x98, 0xe7, 0xeb, 0x7e, 0xb9, 0xc4, 0x1c, - 0x2f, 0xd1, 0xd3, 0x57, 0x55, 0x78, 0xf8, 0xbd, 0x30, 0xe1, 0xf5, 0xd2, 0x56, 0xd4, 0x77, 0xab, - 0x7e, 0x85, 0x43, 0x51, 0x62, 0xc9, 0x06, 0x8c, 0xd5, 0xbd, 0x54, 0xbd, 0x33, 0x7d, 0x12, 0xe5, - 0x4c, 0x50, 0xc8, 0x4b, 0x29, 0x72, 0x2e, 0xe4, 0x49, 0x18, 0x4b, 0xbd, 0x66, 0xe6, 0x3d, 0xbc, - 0x1d, 0xaf, 0x99, 0x20, 0x87, 0xda, 0x9b, 0xca, 0xd8, 0x11, 0x9b, 0xca, 0x0b, 0xd6, 0xdb, 0xe7, - 0x56, 0xd2, 0xa1, 0xff, 0xc9, 0x72, 0x51, 0x08, 0x9e, 0xa1, 0x75, 0x7f, 0x06, 0xa6, 0xed, 0x27, - 0xcd, 0x8f, 0x75, 0x83, 0xc4, 0xfd, 0xe7, 0x31, 0x98, 0xc9, 0xd4, 0x67, 0x65, 0xa6, 0xb8, 0x73, - 0xe4, 0x14, 0x7f, 0x0a, 0xc6, 0xbb, 0x71, 0x2f, 0xa4, 0xb2, 0xec, 0x4e, 0x0b, 0x61, 0x2b, 0x9e, - 0xa2, 0xc0, 0xb1, 0x51, 0xa9, 0xc7, 0x07, 0xd8, 0x0b, 0x65, 0x74, 0x5a, 0x8f, 0xca, 0x1a, 0x87, - 0xa2, 0xc4, 0x92, 0xcf, 0xc0, 0x74, 0xc2, 0x4d, 0xa1, 0x30, 0x0e, 0x72, 0xc5, 0x5c, 0x1c, 0xf9, - 0xa5, 0x21, 0x59, 0x80, 0xc8, 0x8f, 0xdd, 0x36, 0x04, 0x33, 0xe2, 0xc8, 0xe7, 0x1d, 0xfb, 0x75, - 0xa5, 0x89, 0x91, 0x13, 0x29, 0xf9, 0xba, 0x37, 0xb1, 0x74, 0xee, 0xfd, 0xc8, 0x52, 0x57, 0x2f, - 0xdb, 0xc9, 0x07, 0xb0, 0x6c, 0x61, 0xc0, 0x92, 0x7d, 0x3f, 0x54, 0x3b, 0x5e, 0x18, 0x34, 0x68, - 0x92, 0x8a, 0x7f, 0x3f, 0x50, 0x15, 0xa7, 0x9d, 0xab, 0x0a, 0x88, 0x06, 0xcf, 0xff, 0xb7, 0x07, - 0x6f, 0x95, 0x38, 0xab, 0x54, 0xad, 0xff, 0xed, 0x61, 0xc0, 0x68, 0xd3, 0xb8, 0xdf, 0x76, 0xe0, - 0xb1, 0x81, 0x3d, 0xf1, 0xe3, 0x1b, 0xff, 0x73, 0xbf, 0x5d, 0x82, 0x47, 0x07, 0x54, 0x2d, 0x92, - 0xfd, 0x07, 0xf3, 0xfc, 0x96, 0xac, 0x89, 0x9c, 0x19, 0x3a, 0x2b, 0x4e, 0xb6, 0xed, 0x18, 0xd3, - 0x5f, 0x7e, 0x78, 0xa6, 0xdf, 0xfd, 0xa3, 0x12, 0x58, 0x8f, 0xc3, 0x91, 0x5f, 0xb1, 0x6b, 0x72, - 0x9d, 0x42, 0x6a, 0x48, 0x05, 0x67, 0x5d, 0xd0, 0x2b, 0xfa, 0x6b, 0x50, 0x7d, 0x6f, 0x7e, 0x9a, - 0x96, 0x8e, 0x9e, 0xa6, 0x24, 0x50, 0x65, 0xcf, 0xe5, 0x82, 0xcb, 0x9e, 0xab, 0x7d, 0x25, 0xcf, - 0x5f, 0x77, 0xc4, 0xec, 0xca, 0xb5, 0xc7, 0xd8, 0x52, 0xe7, 0x1e, 0xb6, 0xf4, 0x03, 0x50, 0x49, - 0x68, 0xbb, 0xc1, 0xbc, 0x37, 0x69, 0x73, 0xf5, 0x54, 0xd8, 0x96, 0x70, 0xd4, 0x14, 0xfc, 0xee, - 0x63, 0xbb, 0x1d, 0xdd, 0x3a, 0xdf, 0xe9, 0xa6, 0x07, 0xd2, 0xfa, 0x9a, 0xbb, 0x8f, 0x1a, 0x83, - 0x16, 0x95, 0xfb, 0x1f, 0x8e, 0x18, 0x48, 0xe9, 0x84, 0x3f, 0x9f, 0xbb, 0x96, 0x76, 0x7c, 0xff, - 0xf5, 0x00, 0xc0, 0xd7, 0xd7, 0xc2, 0x0b, 0x78, 0x36, 0xce, 0xdc, 0x31, 0xb7, 0x1f, 0x35, 0x53, - 0x30, 0xb4, 0x84, 0x65, 0x16, 0x4c, 0xf9, 0xa8, 0x05, 0xe3, 0xfe, 0xab, 0x03, 0x99, 0x7d, 0x81, - 0x74, 0x60, 0x9c, 0x69, 0x70, 0x50, 0xc0, 0x0d, 0x76, 0x9b, 0x2f, 0x5b, 0x4c, 0x72, 0x42, 0xf0, - 0x3f, 0x51, 0x48, 0x21, 0x81, 0xf4, 0xbd, 0x4b, 0x23, 0xbf, 0x94, 0x60, 0x4b, 0x63, 0xae, 0xbb, - 0x7c, 0xd6, 0x5d, 0x3b, 0xf1, 0xee, 0xf3, 0x30, 0xd7, 0xa7, 0x11, 0xbf, 0xa5, 0x12, 0xa9, 0x0b, - 0xfb, 0xd6, 0xc4, 0xe3, 0xb7, 0xe5, 0x50, 0xe0, 0x98, 0xef, 0x7e, 0x3a, 0xcf, 0x9e, 0x7c, 0xd5, - 0x81, 0xb9, 0x24, 0xcf, 0xef, 0x81, 0xf4, 0x9a, 0x8e, 0x45, 0xf5, 0xa1, 0xb0, 0x5f, 0x03, 0xf7, - 0xbb, 0xd2, 0x18, 0x89, 0xff, 0x75, 0xa3, 0x37, 0x11, 0x67, 0xe8, 0x26, 0xc2, 0x96, 0x95, 0xdf, - 0xa2, 0xf5, 0x5e, 0xbb, 0xaf, 0xf0, 0x64, 0x5b, 0xc2, 0x51, 0x53, 0x64, 0x5e, 0x94, 0x2a, 0x1f, - 0xf9, 0xa2, 0xd4, 0x73, 0x30, 0x6d, 0xbf, 0x2d, 0xc1, 0x83, 0x62, 0x32, 0x09, 0x60, 0x3f, 0x43, - 0x81, 0x19, 0xaa, 0xdc, 0xbb, 0x44, 0xe3, 0x47, 0xbe, 0x4b, 0xf4, 0x34, 0x54, 0xe4, 0x7f, 0x8f, - 0x51, 0x41, 0x57, 0x51, 0xd5, 0x22, 0x61, 0xa8, 0xb1, 0xcc, 0x28, 0x74, 0xbc, 0xb0, 0xe7, 0xb5, - 0x59, 0x0f, 0xc9, 0xe2, 0x34, 0xbd, 0xa0, 0xae, 0x6a, 0x0c, 0x5a, 0x54, 0x6c, 0x89, 0xe4, 0xdf, - 0x7b, 0xc9, 0x94, 0xb8, 0x39, 0x47, 0x96, 0xb8, 0x65, 0xcb, 0x81, 0x4a, 0xc7, 0x2a, 0x07, 0xb2, - 0x2b, 0x75, 0xca, 0xf7, 0xac, 0xd4, 0x79, 0x8f, 0xb9, 0x5d, 0x2c, 0x4a, 0x7a, 0xa6, 0x06, 0xdd, - 0x2c, 0x26, 0x2e, 0x4c, 0xf8, 0x9e, 0x2e, 0xf4, 0x9d, 0x16, 0x0e, 0xd1, 0xea, 0x0a, 0x27, 0x92, - 0x98, 0xda, 0xd2, 0x5b, 0xef, 0x9c, 0x7d, 0xe4, 0x7b, 0xef, 0x9c, 0x7d, 0xe4, 0xed, 0x77, 0xce, - 0x3e, 0xf2, 0xb9, 0x3b, 0x67, 0x9d, 0xb7, 0xee, 0x9c, 0x75, 0xbe, 0x77, 0xe7, 0xac, 0xf3, 0xf6, - 0x9d, 0xb3, 0xce, 0xf7, 0xef, 0x9c, 0x75, 0x7e, 0xeb, 0x07, 0x67, 0x1f, 0x79, 0xb9, 0xa2, 0xe6, - 0xea, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x24, 0xf5, 0x57, 0xb5, 0x1e, 0x71, 0x00, 0x00, + proto.RegisterFile("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/generated.proto", fileDescriptor_030104ce3b95bcac) +} + +var fileDescriptor_030104ce3b95bcac = []byte{ + // 6484 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x7d, 0x6b, 0x6c, 0x24, 0xd9, + 0x55, 0xf0, 0x56, 0xb7, 0x1f, 0xdd, 0xc7, 0x8f, 0x19, 0xdf, 0x9d, 0xdd, 0x75, 0xe6, 0xdb, 0x8c, + 0x47, 0xb5, 0x4a, 0xb2, 0xdf, 0x97, 0xc4, 0xfe, 0x76, 0x58, 0xc2, 0x92, 0x0d, 0x09, 0x6e, 0x7b, + 0x1e, 0x9e, 0xf1, 0xcc, 0x78, 0x8f, 0x3d, 0x33, 0xe4, 0x41, 0xd8, 0x72, 0xf5, 0xed, 0xee, 0x1a, + 0x77, 0x57, 0xf5, 0x56, 0x55, 0x7b, 0xdc, 0x09, 0x79, 0xa1, 0x40, 0x56, 0xe4, 0xa9, 0x24, 0x52, + 0x12, 0x29, 0x82, 0xf0, 0x10, 0x88, 0x1f, 0x11, 0xe2, 0x17, 0x20, 0xc4, 0x9f, 0xfc, 0x0a, 0x20, + 0x85, 0xfc, 0x40, 0x49, 0x50, 0x84, 0x49, 0x86, 0x20, 0x40, 0x08, 0x24, 0x20, 0x7f, 0x98, 0x5f, + 0xe8, 0xbe, 0x6f, 0x55, 0x77, 0x8f, 0xed, 0x71, 0xcd, 0x24, 0x8a, 0xf8, 0xe7, 0x3e, 0xe7, 0xd4, + 0x39, 0xe7, 0xbe, 0xce, 0x3d, 0xf7, 0x9c, 0x73, 0xaf, 0x61, 0xbd, 0x19, 0xa4, 0xad, 0xde, 0xf6, + 0xa2, 0x1f, 0x75, 0x96, 0xbc, 0xb8, 0x19, 0x75, 0xe3, 0xe8, 0x36, 0xff, 0xe3, 0xcd, 0x7e, 0x7d, + 0x69, 0xf7, 0xdc, 0x52, 0x77, 0xa7, 0xb9, 0xe4, 0x75, 0x83, 0x64, 0xc9, 0xeb, 0x76, 0xdb, 0x81, + 0xef, 0xa5, 0x41, 0x14, 0x2e, 0xed, 0x3e, 0xe7, 0xb5, 0xbb, 0x2d, 0xef, 0xb9, 0xa5, 0x26, 0x0d, + 0x69, 0xec, 0xa5, 0xb4, 0xbe, 0xd8, 0x8d, 0xa3, 0x34, 0x22, 0x6f, 0x33, 0xdc, 0x16, 0x15, 0x37, + 0xfe, 0xc7, 0x2f, 0xf9, 0xf5, 0xc5, 0xdd, 0x73, 0x8b, 0xdd, 0x9d, 0xe6, 0x22, 0xe3, 0xb6, 0x68, + 0x71, 0x5b, 0x54, 0xdc, 0x4e, 0xbf, 0xd9, 0xd2, 0xa5, 0x19, 0x35, 0xa3, 0x25, 0xce, 0x74, 0xbb, + 0xd7, 0xe0, 0xbf, 0xf8, 0x0f, 0xfe, 0x97, 0x10, 0x76, 0xda, 0xdd, 0x79, 0x21, 0x59, 0x0c, 0x22, + 0xa6, 0xde, 0x92, 0x1f, 0xc5, 0x74, 0x69, 0x77, 0x40, 0xa1, 0xd3, 0xcf, 0x1b, 0x9a, 0x8e, 0xe7, + 0xb7, 0x82, 0x90, 0xc6, 0x7d, 0xd3, 0xa6, 0x0e, 0x4d, 0xbd, 0x61, 0x5f, 0x2d, 0x8d, 0xfa, 0x2a, + 0xee, 0x85, 0x69, 0xd0, 0xa1, 0x03, 0x1f, 0xbc, 0xe5, 0xa0, 0x0f, 0x12, 0xbf, 0x45, 0x3b, 0x5e, + 0xfe, 0x3b, 0xf7, 0x15, 0x98, 0x59, 0xbe, 0xb5, 0xb9, 0xdc, 0x4b, 0x5b, 0x2b, 0x51, 0xd8, 0x08, + 0x9a, 0xe4, 0xa7, 0x61, 0xca, 0x6f, 0xf7, 0x92, 0x94, 0xc6, 0xd7, 0xbc, 0x0e, 0x9d, 0x77, 0xce, + 0x3a, 0xcf, 0x56, 0x6b, 0x8f, 0x7f, 0x7d, 0x7f, 0xe1, 0xb1, 0xbb, 0xfb, 0x0b, 0x53, 0x2b, 0x06, + 0x85, 0x36, 0x1d, 0xf9, 0xbf, 0x30, 0x19, 0x47, 0x6d, 0xba, 0x8c, 0xd7, 0xe6, 0x4b, 0xfc, 0x93, + 0x13, 0xf2, 0x93, 0x49, 0x14, 0x60, 0x54, 0x78, 0xf7, 0x5b, 0x25, 0x80, 0xe5, 0x6e, 0x77, 0x23, + 0x8e, 0x6e, 0x53, 0x3f, 0x25, 0x2f, 0x43, 0x85, 0xf5, 0x42, 0xdd, 0x4b, 0x3d, 0x2e, 0x6d, 0xea, + 0xdc, 0xff, 0x5f, 0x14, 0x8d, 0x59, 0xb4, 0x1b, 0x63, 0x46, 0x8e, 0x51, 0x2f, 0xee, 0x3e, 0xb7, + 0x78, 0x7d, 0x9b, 0x7d, 0x7f, 0x95, 0xa6, 0x5e, 0x8d, 0x48, 0x61, 0x60, 0x60, 0xa8, 0xb9, 0x92, + 0x10, 0xc6, 0x92, 0x2e, 0xf5, 0xb9, 0x62, 0x53, 0xe7, 0xd6, 0x17, 0x8f, 0x33, 0x45, 0x16, 0x8d, + 0xe6, 0x9b, 0x5d, 0xea, 0xd7, 0xa6, 0xa5, 0xe4, 0x31, 0xf6, 0x0b, 0xb9, 0x1c, 0xb2, 0x0b, 0x13, + 0x49, 0xea, 0xa5, 0xbd, 0x64, 0xbe, 0xcc, 0x25, 0x5e, 0x2b, 0x4c, 0x22, 0xe7, 0x5a, 0x9b, 0x95, + 0x32, 0x27, 0xc4, 0x6f, 0x94, 0xd2, 0xdc, 0xbf, 0x73, 0x60, 0xd6, 0x10, 0xaf, 0x07, 0x49, 0x4a, + 0xde, 0x33, 0xd0, 0xb9, 0x8b, 0x87, 0xeb, 0x5c, 0xf6, 0x35, 0xef, 0xda, 0x93, 0x52, 0x58, 0x45, + 0x41, 0xac, 0x8e, 0xed, 0xc0, 0x78, 0x90, 0xd2, 0x4e, 0x32, 0x5f, 0x3a, 0x5b, 0x7e, 0x76, 0xea, + 0xdc, 0xa5, 0xa2, 0xda, 0x59, 0x9b, 0x91, 0x42, 0xc7, 0xd7, 0x18, 0x7b, 0x14, 0x52, 0xdc, 0x1f, + 0x82, 0xdd, 0x3e, 0xd6, 0xe1, 0xe4, 0x39, 0x98, 0x4a, 0xa2, 0x5e, 0xec, 0x53, 0xa4, 0xdd, 0x28, + 0x99, 0x77, 0xce, 0x96, 0xd9, 0xd4, 0x63, 0x33, 0x75, 0xd3, 0x80, 0xd1, 0xa6, 0x21, 0x9f, 0x72, + 0x60, 0xba, 0x4e, 0x93, 0x34, 0x08, 0xb9, 0x7c, 0xa5, 0xfc, 0xd6, 0xb1, 0x95, 0x57, 0xc0, 0x55, + 0xc3, 0xbc, 0x76, 0x4a, 0x36, 0x64, 0xda, 0x02, 0x26, 0x98, 0x91, 0xcf, 0x56, 0x5c, 0x9d, 0x26, + 0x7e, 0x1c, 0x74, 0xd9, 0x6f, 0x3e, 0x67, 0xac, 0x15, 0xb7, 0x6a, 0x50, 0x68, 0xd3, 0x91, 0x10, + 0xc6, 0xd9, 0x8a, 0x4a, 0xe6, 0xc7, 0xb8, 0xfe, 0x6b, 0xc7, 0xd3, 0x5f, 0x76, 0x2a, 0x5b, 0xac, + 0xa6, 0xf7, 0xd9, 0xaf, 0x04, 0x85, 0x18, 0xf2, 0x49, 0x07, 0xe6, 0xe5, 0x8a, 0x47, 0x2a, 0x3a, + 0xf4, 0x56, 0x2b, 0x48, 0x69, 0x3b, 0x48, 0xd2, 0xf9, 0x71, 0xae, 0xc3, 0xd2, 0xe1, 0xe6, 0xd6, + 0xc5, 0x38, 0xea, 0x75, 0xaf, 0x04, 0x61, 0xbd, 0x76, 0x56, 0x4a, 0x9a, 0x5f, 0x19, 0xc1, 0x18, + 0x47, 0x8a, 0x24, 0x9f, 0x73, 0xe0, 0x74, 0xe8, 0x75, 0x68, 0xd2, 0xf5, 0xd8, 0xd0, 0x0a, 0x74, + 0xad, 0xed, 0xf9, 0x3b, 0x5c, 0xa3, 0x89, 0x07, 0xd3, 0xc8, 0x95, 0x1a, 0x9d, 0xbe, 0x36, 0x92, + 0x35, 0xde, 0x47, 0x2c, 0xf9, 0x1d, 0x07, 0xe6, 0xa2, 0xb8, 0xdb, 0xf2, 0x42, 0x5a, 0x57, 0xd8, + 0x64, 0x7e, 0x92, 0x2f, 0xbd, 0xf7, 0x1e, 0x6f, 0x88, 0xae, 0xe7, 0xd9, 0x5e, 0x8d, 0xc2, 0x20, + 0x8d, 0xe2, 0x4d, 0x9a, 0xa6, 0x41, 0xd8, 0x4c, 0x6a, 0x4f, 0xdc, 0xdd, 0x5f, 0x98, 0x1b, 0xa0, + 0xc2, 0x41, 0x7d, 0xc8, 0xfb, 0x61, 0x2a, 0xe9, 0x87, 0xfe, 0xad, 0x20, 0xac, 0x47, 0x77, 0x92, + 0xf9, 0x4a, 0x11, 0xcb, 0x77, 0x53, 0x33, 0x94, 0x0b, 0xd0, 0x08, 0x40, 0x5b, 0xda, 0xf0, 0x81, + 0x33, 0x53, 0xa9, 0x5a, 0xf4, 0xc0, 0x99, 0xc9, 0x74, 0x1f, 0xb1, 0xe4, 0x63, 0x0e, 0xcc, 0x24, + 0x41, 0x33, 0xf4, 0xd2, 0x5e, 0x4c, 0xaf, 0xd0, 0x7e, 0x32, 0x0f, 0x5c, 0x91, 0xcb, 0xc7, 0xec, + 0x15, 0x8b, 0x65, 0xed, 0x09, 0xa9, 0xe3, 0x8c, 0x0d, 0x4d, 0x30, 0x2b, 0x77, 0xd8, 0x42, 0x33, + 0xd3, 0x7a, 0xaa, 0xd8, 0x85, 0x66, 0x26, 0xf5, 0x48, 0x91, 0xee, 0x5f, 0x94, 0xe0, 0x64, 0x7e, + 0x0f, 0x22, 0xbf, 0xe7, 0xc0, 0x89, 0xdb, 0x77, 0xd2, 0xad, 0x68, 0x87, 0x86, 0x49, 0xad, 0xcf, + 0x2c, 0x05, 0xb7, 0xbe, 0x53, 0xe7, 0xfc, 0x62, 0x77, 0xbb, 0xc5, 0xcb, 0x59, 0x29, 0xe7, 0xc3, + 0x34, 0xee, 0xd7, 0x9e, 0x92, 0xed, 0x39, 0x71, 0xf9, 0xd6, 0x96, 0x8d, 0xc5, 0xbc, 0x52, 0xa7, + 0x3f, 0xee, 0xc0, 0xa9, 0x61, 0x2c, 0xc8, 0x49, 0x28, 0xef, 0xd0, 0xbe, 0x70, 0x70, 0x90, 0xfd, + 0x49, 0x7e, 0x11, 0xc6, 0x77, 0xbd, 0x76, 0x8f, 0x4a, 0x47, 0xe1, 0xe2, 0xf1, 0x1a, 0xa2, 0x35, + 0x43, 0xc1, 0xf5, 0xad, 0xa5, 0x17, 0x1c, 0xf7, 0xaf, 0xcb, 0x30, 0x65, 0x6d, 0x15, 0x8f, 0xc0, + 0xf9, 0x89, 0x32, 0xce, 0xcf, 0xd5, 0xc2, 0x76, 0xb9, 0x91, 0xde, 0xcf, 0x9d, 0x9c, 0xf7, 0x73, + 0xbd, 0x38, 0x91, 0xf7, 0x75, 0x7f, 0x48, 0x0a, 0xd5, 0xa8, 0xcb, 0x9c, 0x5b, 0xb6, 0x8b, 0x8e, + 0x15, 0x31, 0x84, 0xd7, 0x15, 0xbb, 0xda, 0xcc, 0xdd, 0xfd, 0x85, 0xaa, 0xfe, 0x89, 0x46, 0x90, + 0xfb, 0x6d, 0x07, 0x4e, 0x59, 0x3a, 0xae, 0x44, 0x61, 0x3d, 0xe0, 0x43, 0x7b, 0x16, 0xc6, 0xd2, + 0x7e, 0x57, 0x79, 0xd0, 0xba, 0xa7, 0xb6, 0xfa, 0x5d, 0x8a, 0x1c, 0xc3, 0x7c, 0xe6, 0x0e, 0x4d, + 0x12, 0xaf, 0x49, 0xf3, 0x3e, 0xf3, 0x55, 0x01, 0x46, 0x85, 0x27, 0x31, 0x90, 0xb6, 0x97, 0xa4, + 0x5b, 0xb1, 0x17, 0x26, 0x9c, 0xfd, 0x56, 0xd0, 0xa1, 0xb2, 0x83, 0xff, 0xdf, 0xe1, 0x66, 0x0c, + 0xfb, 0xa2, 0xf6, 0xe4, 0xdd, 0xfd, 0x05, 0xb2, 0x3e, 0xc0, 0x09, 0x87, 0x70, 0x77, 0x3f, 0xe7, + 0xc0, 0x93, 0xc3, 0xdd, 0x1a, 0xf2, 0x7a, 0x98, 0x48, 0x68, 0xbc, 0x4b, 0x63, 0xd9, 0x3a, 0x33, + 0x24, 0x1c, 0x8a, 0x12, 0x4b, 0x96, 0xa0, 0xaa, 0x4d, 0xae, 0x6c, 0xe3, 0x9c, 0x24, 0xad, 0x1a, + 0x3b, 0x6d, 0x68, 0x58, 0xa7, 0xb1, 0x1f, 0xd2, 0x09, 0xd2, 0x9d, 0xc6, 0xcf, 0x1b, 0x1c, 0xe3, + 0xfe, 0xbd, 0x03, 0x27, 0x2c, 0xad, 0x1e, 0x81, 0x97, 0x1b, 0x66, 0xbd, 0xdc, 0xb5, 0xc2, 0xe6, + 0xf3, 0x08, 0x37, 0xf7, 0x6b, 0x13, 0x30, 0x67, 0xcf, 0x7a, 0x6e, 0x8e, 0xf9, 0x01, 0x8b, 0x76, + 0xa3, 0x1b, 0xb8, 0x2e, 0xfb, 0xdc, 0x1c, 0xb0, 0x04, 0x18, 0x15, 0x9e, 0x75, 0x62, 0xd7, 0x4b, + 0x5b, 0xb2, 0xc3, 0x75, 0x27, 0x6e, 0x78, 0x69, 0x0b, 0x39, 0x86, 0xbc, 0x1d, 0x66, 0x53, 0x2f, + 0x6e, 0xd2, 0x14, 0xe9, 0x6e, 0x90, 0xa8, 0xf5, 0x52, 0xad, 0x3d, 0x29, 0x69, 0x67, 0xb7, 0x32, + 0x58, 0xcc, 0x51, 0x93, 0x57, 0x60, 0xac, 0x45, 0xdb, 0x1d, 0xe9, 0xd7, 0x6c, 0x16, 0xb7, 0xc2, + 0x79, 0x5b, 0x2f, 0xd1, 0x76, 0xa7, 0x56, 0x61, 0x2a, 0xb3, 0xbf, 0x90, 0x8b, 0x22, 0xbf, 0xea, + 0x40, 0x75, 0xa7, 0x97, 0xa4, 0x51, 0x27, 0x78, 0x1f, 0x9d, 0xaf, 0x70, 0xc1, 0xbf, 0x50, 0xb0, + 0xe0, 0x2b, 0x8a, 0xbf, 0x58, 0xef, 0xfa, 0x27, 0x1a, 0xc9, 0xe4, 0x03, 0x30, 0xb9, 0x93, 0x44, + 0x61, 0x48, 0x99, 0xa7, 0xc2, 0x94, 0xb8, 0x59, 0xb4, 0x12, 0x82, 0x7b, 0x6d, 0x8a, 0x8d, 0xad, + 0xfc, 0x81, 0x4a, 0x26, 0xef, 0x86, 0x7a, 0x10, 0x53, 0x3f, 0x8d, 0xe2, 0xfe, 0x3c, 0x3c, 0x94, + 0x6e, 0x58, 0x55, 0xfc, 0x45, 0x37, 0xe8, 0x9f, 0x68, 0x24, 0x93, 0x3e, 0x4c, 0x74, 0xdb, 0xbd, + 0x66, 0x10, 0xce, 0x4f, 0x71, 0x1d, 0x6e, 0x14, 0xac, 0xc3, 0x06, 0x67, 0x5e, 0x03, 0x66, 0x54, + 0xc4, 0xdf, 0x28, 0x05, 0x92, 0x67, 0x60, 0xdc, 0x6f, 0x79, 0x71, 0x3a, 0x3f, 0xcd, 0xe7, 0xac, + 0x5e, 0x44, 0x2b, 0x0c, 0x88, 0x02, 0xe7, 0xfe, 0x56, 0x09, 0x4e, 0x8f, 0x6e, 0x98, 0x58, 0x4d, + 0x7e, 0x2f, 0x4e, 0x84, 0x7d, 0xae, 0xd8, 0xab, 0x89, 0x83, 0x51, 0xe1, 0xc9, 0x47, 0x1c, 0x98, + 0xbc, 0x2d, 0x47, 0xbc, 0xf4, 0x50, 0x46, 0xfc, 0xb2, 0x1c, 0x71, 0xad, 0xc3, 0x65, 0x35, 0xea, + 0x52, 0x2e, 0x53, 0x97, 0xee, 0xf9, 0xed, 0x5e, 0x5d, 0x59, 0x46, 0x4d, 0x7a, 0x5e, 0x80, 0x51, + 0xe1, 0x19, 0x69, 0x10, 0x0a, 0xd2, 0xb1, 0x2c, 0xe9, 0x5a, 0x28, 0x49, 0x25, 0xde, 0xfd, 0x41, + 0x19, 0x9e, 0x18, 0xba, 0xf8, 0xc8, 0x22, 0x00, 0xf7, 0x59, 0x2e, 0x04, 0xec, 0x80, 0x29, 0x4e, + 0xd5, 0xb3, 0xcc, 0xc5, 0xb8, 0xa9, 0xa1, 0x68, 0x51, 0x90, 0x0f, 0x01, 0x74, 0xbd, 0xd8, 0xeb, + 0xd0, 0x94, 0xc6, 0xca, 0x4e, 0x5e, 0x39, 0x5e, 0x2f, 0x31, 0x3d, 0x36, 0x14, 0x4f, 0xe3, 0xe3, + 0x68, 0x50, 0x82, 0x96, 0x48, 0x76, 0x86, 0x8e, 0x69, 0x9b, 0x7a, 0x09, 0xbd, 0x66, 0xb6, 0x0f, + 0x7d, 0x86, 0x46, 0x83, 0x42, 0x9b, 0x8e, 0xed, 0x63, 0xbc, 0x15, 0x89, 0xec, 0x2b, 0xbd, 0x8f, + 0xf1, 0x76, 0x26, 0x28, 0xb1, 0xe4, 0xd3, 0x0e, 0xcc, 0x36, 0x82, 0x36, 0x35, 0xd2, 0xe5, 0x89, + 0xf7, 0xfa, 0xf1, 0x1b, 0x79, 0xc1, 0xe6, 0x6b, 0x2c, 0x70, 0x06, 0x9c, 0x60, 0x4e, 0x3c, 0x1b, + 0xe6, 0x5d, 0x1a, 0x73, 0xd3, 0x3d, 0x91, 0x1d, 0xe6, 0x9b, 0x02, 0x8c, 0x0a, 0xef, 0x7e, 0xa9, + 0x04, 0xf3, 0xa3, 0xe6, 0x1c, 0x49, 0xd8, 0xcc, 0x4a, 0x6f, 0x7a, 0x71, 0x22, 0xdd, 0xf7, 0x63, + 0x9e, 0x02, 0x25, 0xdf, 0x9b, 0x5e, 0x6c, 0xcf, 0x51, 0x2e, 0x00, 0x95, 0x24, 0x72, 0x1b, 0xc6, + 0xd2, 0xb6, 0x57, 0x50, 0xd8, 0xc8, 0x92, 0x68, 0x9c, 0xac, 0xf5, 0xe5, 0x04, 0xb9, 0x0c, 0xf2, + 0x34, 0x8c, 0xb5, 0x83, 0x6d, 0xe6, 0x8c, 0xb2, 0x49, 0xcc, 0x77, 0x95, 0xf5, 0x60, 0x3b, 0x41, + 0x0e, 0x75, 0xbf, 0xe5, 0x0c, 0xe9, 0x1b, 0x69, 0x74, 0xd9, 0xa4, 0xa2, 0xe1, 0x6e, 0x10, 0x47, + 0x61, 0x87, 0x86, 0x69, 0x3e, 0x14, 0x7a, 0xde, 0xa0, 0xd0, 0xa6, 0x23, 0xbf, 0xe2, 0x0c, 0x59, + 0x0d, 0xc7, 0x8c, 0x01, 0x4a, 0x95, 0x0e, 0xbd, 0x20, 0xdc, 0x6f, 0x8c, 0x0f, 0xb1, 0x7f, 0x7a, + 0x43, 0x23, 0xe7, 0x00, 0x98, 0x37, 0xb5, 0x11, 0xd3, 0x46, 0xb0, 0x27, 0x5b, 0xa6, 0x59, 0x5e, + 0xd3, 0x18, 0xb4, 0xa8, 0xd4, 0x37, 0x9b, 0xbd, 0x06, 0xfb, 0xa6, 0x34, 0xf8, 0x8d, 0xc0, 0xa0, + 0x45, 0x45, 0x9e, 0x87, 0x89, 0xa0, 0xe3, 0x35, 0xa9, 0xea, 0xff, 0xa7, 0xd9, 0xe2, 0x5a, 0xe3, + 0x90, 0x7b, 0xfb, 0x0b, 0xb3, 0x5a, 0x21, 0x0e, 0x42, 0x49, 0x4b, 0x7e, 0xd7, 0x81, 0x69, 0x3f, + 0xea, 0x74, 0xa2, 0x70, 0xdd, 0xdb, 0xa6, 0x6d, 0x15, 0xe2, 0xba, 0xfd, 0xb0, 0xb6, 0xfb, 0xc5, + 0x15, 0x4b, 0x98, 0x38, 0x60, 0xea, 0xc0, 0x9d, 0x8d, 0xc2, 0x8c, 0x56, 0xf6, 0x1a, 0x1c, 0xbf, + 0xff, 0x1a, 0x24, 0x7f, 0xe2, 0xc0, 0x9c, 0xf8, 0x76, 0x39, 0x0c, 0xa3, 0x54, 0x46, 0x1e, 0x45, + 0x8c, 0x2a, 0x7a, 0xc8, 0xcd, 0xb2, 0x24, 0x8a, 0xb6, 0xbd, 0x46, 0xaa, 0x39, 0x37, 0x80, 0xc7, + 0x41, 0x25, 0x4f, 0xbf, 0x03, 0xe6, 0x06, 0xba, 0x67, 0xc8, 0xe1, 0xf9, 0x94, 0x7d, 0x78, 0xae, + 0x5a, 0x67, 0xde, 0xd3, 0xab, 0xf0, 0xe4, 0x70, 0x45, 0x8e, 0xc2, 0xc5, 0xfd, 0x0d, 0x07, 0x9e, + 0x1a, 0xe1, 0x25, 0xe8, 0x53, 0x83, 0x33, 0xea, 0xd4, 0x40, 0x3c, 0x28, 0xd3, 0x70, 0x57, 0xae, + 0xc5, 0x0b, 0xc7, 0xeb, 0xf0, 0xf3, 0xe1, 0xae, 0xe8, 0xc7, 0xc9, 0xbb, 0xfb, 0x0b, 0xe5, 0xf3, + 0xe1, 0x2e, 0x32, 0xde, 0xee, 0xe7, 0x27, 0x32, 0x07, 0x93, 0x4d, 0x75, 0x16, 0xe6, 0x8a, 0xca, + 0x63, 0xc9, 0xf5, 0x82, 0x87, 0xda, 0x3a, 0x78, 0x89, 0x08, 0xb7, 0x14, 0x47, 0x3e, 0xee, 0xf0, + 0xa0, 0xb2, 0x3a, 0xb0, 0x49, 0xc7, 0xe5, 0xe1, 0xc4, 0xb8, 0xed, 0x50, 0xb5, 0x02, 0xa2, 0x2d, + 0x9d, 0x2d, 0x94, 0xae, 0x88, 0xe9, 0xe4, 0xdd, 0x17, 0x15, 0x76, 0x56, 0x78, 0xb2, 0x07, 0x90, + 0xf4, 0x43, 0x7f, 0x23, 0x6a, 0x07, 0x7e, 0x5f, 0x9e, 0xe2, 0x0b, 0x08, 0x4c, 0x0a, 0x7e, 0xc2, + 0x87, 0x31, 0xbf, 0xd1, 0x92, 0x45, 0xbe, 0xe2, 0xc0, 0x5c, 0xd0, 0x0c, 0xa3, 0x98, 0xae, 0x06, + 0x8d, 0x06, 0x8d, 0x69, 0xe8, 0x53, 0xb5, 0xcd, 0xdf, 0x3a, 0x9e, 0x06, 0x2a, 0xa6, 0xb6, 0x96, + 0x67, 0x6f, 0x96, 0xe2, 0x00, 0x0a, 0x07, 0x95, 0x21, 0x75, 0x18, 0x0b, 0xc2, 0x46, 0x24, 0xed, + 0x46, 0xed, 0x78, 0x4a, 0xad, 0x85, 0x8d, 0xc8, 0xac, 0x15, 0xf6, 0x0b, 0x39, 0x77, 0xb2, 0x0e, + 0xa7, 0x62, 0x79, 0xd0, 0xbb, 0x14, 0x24, 0xcc, 0x5d, 0x5e, 0x0f, 0x3a, 0x41, 0xca, 0x0f, 0x7b, + 0xe5, 0xda, 0xfc, 0xdd, 0xfd, 0x85, 0x53, 0x38, 0x04, 0x8f, 0x43, 0xbf, 0x72, 0x5f, 0xad, 0x66, + 0x4f, 0xb3, 0x22, 0x56, 0xf3, 0x01, 0xa8, 0xc6, 0x3a, 0x3a, 0x2e, 0x1c, 0x8f, 0xf5, 0x62, 0xfa, + 0x58, 0x06, 0x89, 0x74, 0x98, 0xc1, 0xc4, 0xc1, 0x8d, 0x44, 0xe6, 0x80, 0xb0, 0x91, 0x97, 0xcb, + 0xa2, 0x80, 0xf9, 0x25, 0xa5, 0x9a, 0x78, 0x58, 0x3f, 0xf4, 0x91, 0xcb, 0x20, 0x31, 0x4c, 0xb4, + 0xa8, 0xd7, 0x4e, 0x5b, 0x32, 0x5c, 0x73, 0xf9, 0xb8, 0x2e, 0x23, 0xe3, 0x95, 0x0f, 0x85, 0x09, + 0x28, 0x4a, 0x49, 0x64, 0x0f, 0x26, 0x5b, 0x62, 0x10, 0xe4, 0xd6, 0x79, 0xf5, 0xb8, 0x9d, 0x9b, + 0x19, 0x59, 0xb3, 0x7e, 0x25, 0x00, 0x95, 0x38, 0xf2, 0x6b, 0x0e, 0x80, 0xaf, 0x62, 0x60, 0x6a, + 0xf9, 0x60, 0x61, 0x76, 0x47, 0x87, 0xd7, 0x8c, 0xe7, 0xa1, 0x41, 0x09, 0x5a, 0x92, 0xc9, 0xcb, + 0x30, 0x1d, 0x53, 0x3f, 0x0a, 0xfd, 0xa0, 0x4d, 0xeb, 0xcb, 0x29, 0xf7, 0x92, 0x8f, 0x16, 0x2b, + 0x3b, 0xc9, 0xb6, 0x7f, 0xb4, 0x78, 0x60, 0x86, 0x23, 0x79, 0xd5, 0x81, 0x59, 0x1d, 0x07, 0x64, + 0x03, 0x42, 0x65, 0x3c, 0x64, 0xbd, 0xa0, 0xa8, 0x23, 0xe7, 0x59, 0x23, 0xec, 0x34, 0x90, 0x85, + 0x61, 0x4e, 0x2e, 0x79, 0x17, 0x40, 0xb4, 0xcd, 0x63, 0x6e, 0xac, 0xa9, 0x95, 0x23, 0x37, 0x75, + 0x56, 0x84, 0x8f, 0x15, 0x07, 0xb4, 0xb8, 0x91, 0x2b, 0x00, 0x62, 0xd9, 0x6c, 0xf5, 0xbb, 0x94, + 0xc7, 0x3c, 0xaa, 0xb5, 0x37, 0xaa, 0xce, 0xdf, 0xd4, 0x98, 0x7b, 0xfb, 0x0b, 0x83, 0x87, 0x49, + 0x1e, 0xec, 0xb4, 0x3e, 0x27, 0xef, 0x87, 0xc9, 0xa4, 0xd7, 0xe9, 0x78, 0x3a, 0x76, 0xb1, 0x51, + 0xdc, 0x8e, 0x28, 0xf8, 0x9a, 0xb9, 0x29, 0x01, 0xa8, 0x24, 0xba, 0x21, 0x90, 0x41, 0x7a, 0xf2, + 0x3c, 0x4c, 0xd3, 0xbd, 0x94, 0xc6, 0xa1, 0xd7, 0xbe, 0x81, 0xeb, 0xea, 0xb4, 0xcb, 0x07, 0xff, + 0xbc, 0x05, 0xc7, 0x0c, 0x15, 0x71, 0xb5, 0x63, 0x5b, 0xe2, 0xf4, 0x60, 0x1c, 0x5b, 0xe5, 0xc6, + 0xba, 0xff, 0x5d, 0xca, 0x78, 0x04, 0x5b, 0x31, 0xa5, 0x24, 0x82, 0xf1, 0x30, 0xaa, 0x6b, 0xa3, + 0x77, 0xb9, 0x18, 0xa3, 0x77, 0x2d, 0xaa, 0x5b, 0x69, 0x5b, 0xf6, 0x2b, 0x41, 0x21, 0x87, 0xe7, + 0xb5, 0x54, 0x02, 0x90, 0x23, 0xa4, 0x13, 0x54, 0xa4, 0x64, 0x9d, 0xd7, 0xba, 0x6e, 0x0b, 0xc2, + 0xac, 0x5c, 0xb2, 0x03, 0xe3, 0xad, 0x28, 0x49, 0xc5, 0x51, 0xe0, 0xd8, 0x5e, 0xd8, 0xa5, 0x28, + 0x49, 0xf9, 0x16, 0xa6, 0x9b, 0xcd, 0x20, 0x09, 0x0a, 0x19, 0xee, 0x3f, 0x39, 0x99, 0xd8, 0xc6, + 0x2d, 0x2f, 0xf5, 0x5b, 0xe7, 0x77, 0xd9, 0xf1, 0xec, 0x4a, 0x26, 0x2e, 0xff, 0x33, 0x76, 0x5c, + 0xfe, 0xde, 0xfe, 0xc2, 0x1b, 0x46, 0xd5, 0xd1, 0xdc, 0x61, 0x1c, 0x16, 0x39, 0x0b, 0x2b, 0x84, + 0xff, 0x61, 0x07, 0xa6, 0x2c, 0xf5, 0xe4, 0x86, 0x52, 0x60, 0x88, 0x58, 0x3b, 0x57, 0x16, 0x10, + 0x6d, 0x91, 0xee, 0x67, 0x1d, 0x98, 0xac, 0x79, 0xfe, 0x4e, 0xd4, 0x68, 0x90, 0x37, 0x41, 0xa5, + 0xde, 0x93, 0x19, 0x10, 0xd1, 0x3e, 0x1d, 0xd8, 0x5e, 0x95, 0x70, 0xd4, 0x14, 0x6c, 0x0e, 0x37, + 0x3c, 0x3f, 0x8d, 0x62, 0xae, 0x76, 0x59, 0xcc, 0xe1, 0x0b, 0x1c, 0x82, 0x12, 0xc3, 0xce, 0xc0, + 0x1d, 0x6f, 0x4f, 0x7d, 0x9c, 0x0f, 0xac, 0x5c, 0x35, 0x28, 0xb4, 0xe9, 0xdc, 0xbf, 0x1c, 0x87, + 0x49, 0x99, 0x6a, 0x3c, 0x74, 0xb2, 0x40, 0x79, 0xf1, 0xa5, 0x91, 0x5e, 0x7c, 0x02, 0x13, 0x3e, + 0xaf, 0x52, 0x92, 0x5b, 0xe9, 0x31, 0x43, 0x4c, 0x52, 0x41, 0x51, 0xf8, 0x64, 0xd4, 0x12, 0xbf, + 0x51, 0x8a, 0x22, 0x9f, 0x71, 0xe0, 0x84, 0xcf, 0x4e, 0xdf, 0xbe, 0xb1, 0xf3, 0x63, 0x45, 0x24, + 0xd3, 0x56, 0xb2, 0x4c, 0x4d, 0x4e, 0x33, 0x87, 0xc0, 0xbc, 0x78, 0xf2, 0x22, 0xcc, 0x88, 0x3e, + 0xbb, 0x99, 0x39, 0x7e, 0x9a, 0xf4, 0xb2, 0x8d, 0xc4, 0x2c, 0x2d, 0x59, 0x14, 0xc7, 0x78, 0x9e, + 0x6f, 0x11, 0x47, 0x50, 0x19, 0xdb, 0xd3, 0x09, 0x99, 0x04, 0x2d, 0x0a, 0x12, 0x03, 0x89, 0x69, + 0x23, 0xa6, 0x49, 0x0b, 0xe9, 0x2b, 0x3d, 0x9a, 0xa4, 0x7c, 0x8f, 0x99, 0x7c, 0xb0, 0xd4, 0x13, + 0x0e, 0x70, 0xc2, 0x21, 0xdc, 0xc9, 0x8e, 0x74, 0x74, 0x2b, 0x45, 0x2c, 0x27, 0x39, 0xcc, 0x23, + 0xfd, 0xdd, 0x05, 0x18, 0x4f, 0x5a, 0x5e, 0x5c, 0xe7, 0x7b, 0x5b, 0xb9, 0x56, 0x65, 0xb6, 0x64, + 0x93, 0x01, 0x50, 0xc0, 0xdd, 0x1f, 0x3a, 0x70, 0x52, 0xcd, 0x15, 0xcf, 0x6f, 0x51, 0xf6, 0x2d, + 0x79, 0x3b, 0xcc, 0x6a, 0x7f, 0x72, 0x25, 0xea, 0xc9, 0xf8, 0x50, 0xd9, 0x04, 0xf0, 0x30, 0x83, + 0xc5, 0x1c, 0x35, 0x59, 0x82, 0x2a, 0x53, 0x59, 0x7c, 0x2a, 0xd6, 0x9f, 0xf6, 0x59, 0x97, 0x37, + 0xd6, 0xe4, 0x57, 0x86, 0x86, 0x44, 0x30, 0xd7, 0xf6, 0x92, 0x94, 0x6b, 0xc0, 0xdc, 0xcb, 0x07, + 0xcc, 0x00, 0xf2, 0x22, 0x91, 0xf5, 0x3c, 0x23, 0x1c, 0xe4, 0xed, 0x7e, 0x7b, 0x0c, 0x66, 0x32, + 0x4b, 0x84, 0x99, 0x97, 0x5e, 0xc2, 0xf6, 0x40, 0x7d, 0xd6, 0xd6, 0xe6, 0xe5, 0x86, 0x84, 0xa3, + 0xa6, 0x60, 0xd4, 0x5d, 0x2f, 0x49, 0xee, 0x44, 0x71, 0x5d, 0xae, 0x69, 0x4d, 0xbd, 0x21, 0xe1, + 0xa8, 0x29, 0x98, 0xa1, 0xd9, 0xa6, 0x5e, 0x4c, 0x63, 0x9e, 0x34, 0xcf, 0x1b, 0x9a, 0x9a, 0x41, + 0xa1, 0x4d, 0xc7, 0x57, 0x67, 0xda, 0x4e, 0x56, 0xda, 0x01, 0x0d, 0x53, 0xa1, 0x66, 0x31, 0xab, + 0x73, 0x6b, 0x7d, 0xd3, 0x66, 0x6a, 0x56, 0x67, 0x0e, 0x81, 0x79, 0xf1, 0xe4, 0xa3, 0x0e, 0xcc, + 0x78, 0x77, 0x12, 0x53, 0x53, 0xc9, 0x97, 0xe7, 0xb1, 0xad, 0x55, 0xa6, 0x4c, 0xb3, 0x36, 0xc7, + 0xd6, 0x79, 0x06, 0x84, 0x59, 0xa1, 0xe4, 0x8b, 0x0e, 0x10, 0xba, 0x47, 0xfd, 0x8d, 0x38, 0xda, + 0x0d, 0xea, 0x6a, 0x0c, 0xa5, 0x1f, 0x7c, 0x4c, 0xb7, 0xeb, 0xfc, 0x00, 0x5f, 0xb1, 0xbc, 0x07, + 0xe1, 0x38, 0x44, 0x07, 0xf7, 0xf7, 0xcb, 0x30, 0x65, 0xad, 0xca, 0xa1, 0x26, 0xd6, 0xf9, 0x31, + 0x33, 0xb1, 0xa5, 0x23, 0x98, 0xd8, 0x0f, 0x41, 0xd5, 0x57, 0x86, 0xa2, 0x98, 0x1a, 0xd0, 0xbc, + 0xf9, 0x31, 0xb6, 0x42, 0x83, 0xd0, 0xc8, 0x24, 0x17, 0x61, 0xce, 0x62, 0x23, 0x8d, 0xcc, 0x18, + 0x37, 0x32, 0x3a, 0xe2, 0xb0, 0x9c, 0x27, 0xc0, 0xc1, 0x6f, 0xdc, 0x6f, 0x3b, 0x7a, 0xa4, 0x1e, + 0x41, 0xa6, 0xfd, 0x76, 0x36, 0xd3, 0x7e, 0xbe, 0x90, 0x3e, 0x1b, 0x91, 0x65, 0xbf, 0x06, 0x93, + 0x2b, 0x51, 0xa7, 0xe3, 0x85, 0x75, 0xf2, 0x3a, 0x98, 0xf4, 0xc5, 0x9f, 0xd2, 0xf9, 0xe7, 0xa9, + 0x57, 0x89, 0x45, 0x85, 0x23, 0x4f, 0xc3, 0x98, 0x17, 0x37, 0x95, 0xc3, 0xcf, 0x33, 0x09, 0xcb, + 0x71, 0x33, 0x41, 0x0e, 0x75, 0x3f, 0x57, 0x02, 0x58, 0x89, 0x3a, 0x5d, 0x2f, 0xa6, 0xf5, 0xad, + 0xe8, 0x7f, 0x23, 0x7f, 0xc2, 0x0f, 0xfc, 0x84, 0x03, 0x84, 0xf5, 0x4a, 0x14, 0xd2, 0xd0, 0x64, + 0x2f, 0xd8, 0xe6, 0xe7, 0x2b, 0xa8, 0xdc, 0x49, 0xcc, 0x84, 0x56, 0x08, 0x34, 0x34, 0x87, 0xf0, + 0x0d, 0x9f, 0x51, 0x91, 0xe3, 0x72, 0x36, 0x2b, 0xcc, 0x33, 0x79, 0x32, 0x90, 0xec, 0x7e, 0xbe, + 0x04, 0x4f, 0x0a, 0x1b, 0x74, 0xd5, 0x0b, 0xbd, 0x26, 0xed, 0x30, 0xad, 0x0e, 0x1b, 0x43, 0xf6, + 0x99, 0x53, 0x12, 0xa8, 0x24, 0xf0, 0x71, 0x27, 0xa7, 0x98, 0x54, 0x62, 0x1a, 0xad, 0x85, 0x41, + 0x8a, 0x9c, 0x39, 0x49, 0xa0, 0xa2, 0x4a, 0xf4, 0xa5, 0xe5, 0x28, 0x48, 0x90, 0x5e, 0x77, 0x17, + 0x25, 0x7b, 0xd4, 0x82, 0xdc, 0xaf, 0x39, 0x90, 0xb7, 0x88, 0xdc, 0x6b, 0x17, 0x65, 0x5c, 0x79, + 0xaf, 0x3d, 0x5b, 0x75, 0x75, 0x84, 0x22, 0xa6, 0xf7, 0xc0, 0x94, 0x97, 0xa6, 0xb4, 0xd3, 0x15, + 0x2e, 0x64, 0xf9, 0xc1, 0xc2, 0x14, 0x57, 0xa3, 0x7a, 0xd0, 0x08, 0xb8, 0xeb, 0x68, 0xb3, 0x73, + 0x5f, 0x82, 0x8a, 0x8a, 0xcc, 0x1f, 0x62, 0x30, 0x9f, 0xc9, 0x24, 0x1a, 0x46, 0x4c, 0x97, 0x7b, + 0x25, 0x18, 0xb2, 0xa5, 0xb1, 0x26, 0x1b, 0x7b, 0x91, 0x69, 0xf2, 0xd1, 0x6c, 0x06, 0xd9, 0x13, + 0x59, 0x09, 0x71, 0x1e, 0x7e, 0x67, 0xd1, 0x5b, 0xb2, 0x49, 0x54, 0x4c, 0x49, 0xfd, 0x74, 0xb2, + 0x82, 0x9c, 0x03, 0xf0, 0xba, 0x81, 0xda, 0xdb, 0xc6, 0xb2, 0xb9, 0xbc, 0xe5, 0x8d, 0x35, 0xb5, + 0xb1, 0x59, 0x54, 0xcc, 0x43, 0x0b, 0xc2, 0x24, 0xf5, 0xda, 0xed, 0x4b, 0x41, 0x98, 0xca, 0x33, + 0x87, 0x36, 0x01, 0x6b, 0x06, 0x85, 0x36, 0xdd, 0xe9, 0xb7, 0x58, 0xe3, 0x72, 0x94, 0x84, 0xcf, + 0x27, 0x4a, 0x30, 0x7b, 0x31, 0xec, 0x6d, 0x5c, 0xdc, 0xe8, 0x6d, 0xb7, 0x03, 0xff, 0x0a, 0xed, + 0xb3, 0x41, 0xdb, 0xa1, 0xfd, 0xb5, 0x55, 0xd9, 0xed, 0x7a, 0xd0, 0xae, 0x30, 0x20, 0x0a, 0x1c, + 0x53, 0xb3, 0x11, 0x84, 0x4d, 0x1a, 0x77, 0xe3, 0x40, 0xba, 0xd6, 0x96, 0x9a, 0x17, 0x0c, 0x0a, + 0x6d, 0x3a, 0xc6, 0x3b, 0xba, 0x13, 0xd2, 0x38, 0x6f, 0x3f, 0xae, 0x33, 0x20, 0x0a, 0x1c, 0x23, + 0x4a, 0xe3, 0x5e, 0x92, 0xca, 0x1e, 0xd3, 0x44, 0x5b, 0x0c, 0x88, 0x02, 0xc7, 0xa6, 0x47, 0xd2, + 0xdb, 0xe6, 0xd1, 0xb2, 0x5c, 0x5a, 0x70, 0x53, 0x80, 0x51, 0xe1, 0x19, 0xe9, 0x0e, 0xed, 0xaf, + 0xb2, 0xdd, 0x34, 0x97, 0xc5, 0xbf, 0x22, 0xc0, 0xa8, 0xf0, 0xee, 0x3f, 0x3a, 0x40, 0xb2, 0xdd, + 0xf1, 0x08, 0x36, 0xe4, 0x57, 0xb2, 0x1b, 0xf2, 0x31, 0x03, 0x9b, 0x59, 0xf5, 0x47, 0xec, 0xcb, + 0xbf, 0xed, 0xc0, 0xb4, 0x1d, 0xe3, 0x26, 0xcd, 0x9c, 0x21, 0xba, 0x9e, 0x35, 0x44, 0xf7, 0xf6, + 0x17, 0x7e, 0x6e, 0xd8, 0x0d, 0xb2, 0x66, 0x90, 0x46, 0xdd, 0xe4, 0xcd, 0x34, 0x6c, 0x06, 0x21, + 0xe5, 0x11, 0x1c, 0x11, 0x1b, 0xcf, 0x04, 0xd0, 0x57, 0xa2, 0x3a, 0x7d, 0x00, 0x4b, 0xe6, 0xde, + 0x82, 0xb9, 0x81, 0xd2, 0x8d, 0x43, 0x18, 0x9d, 0x03, 0x0b, 0xf3, 0xdc, 0x4f, 0x3a, 0x30, 0x93, + 0xa9, 0x7c, 0x29, 0xc8, 0x94, 0xf1, 0x55, 0x11, 0xf1, 0xf4, 0x48, 0x1c, 0x84, 0x22, 0x7e, 0x52, + 0xb1, 0x56, 0x85, 0x41, 0xa1, 0x4d, 0xe7, 0x7e, 0xb6, 0x04, 0x15, 0x15, 0x69, 0x3b, 0x84, 0x2a, + 0x1f, 0x77, 0x60, 0x46, 0x9f, 0x73, 0xb9, 0xf7, 0x5b, 0x48, 0xf5, 0x03, 0xd3, 0x40, 0xe7, 0xd0, + 0x98, 0xf7, 0xab, 0xdd, 0x70, 0xb4, 0x85, 0x61, 0x56, 0x36, 0xb9, 0x09, 0x90, 0xf4, 0x93, 0x94, + 0x76, 0x2c, 0x3f, 0xdc, 0xb5, 0x56, 0xc7, 0xa2, 0x1f, 0xc5, 0x94, 0xad, 0x85, 0x6b, 0x51, 0x9d, + 0x6e, 0x6a, 0x4a, 0x63, 0x08, 0x0d, 0x0c, 0x2d, 0x4e, 0xee, 0x1f, 0x96, 0xe0, 0x64, 0x5e, 0x25, + 0xf2, 0x6e, 0x98, 0x56, 0xd2, 0xad, 0x8b, 0x73, 0x2a, 0xbc, 0x38, 0x8d, 0x16, 0xee, 0xde, 0xfe, + 0xc2, 0xc2, 0xe0, 0xcd, 0xc1, 0x45, 0x9b, 0x04, 0x33, 0xcc, 0x44, 0xb0, 0x41, 0x86, 0x47, 0x6a, + 0xfd, 0xe5, 0x6e, 0x57, 0x46, 0x0c, 0xac, 0x60, 0x83, 0x8d, 0xc5, 0x1c, 0x35, 0xd9, 0x80, 0x53, + 0x16, 0xe4, 0x1a, 0x0d, 0x9a, 0xad, 0xed, 0x28, 0x16, 0x15, 0xda, 0xe5, 0xda, 0xd3, 0x92, 0xcb, + 0x29, 0x1c, 0x42, 0x83, 0x43, 0xbf, 0x64, 0x87, 0x7b, 0xdf, 0xeb, 0x7a, 0x7e, 0x90, 0xf6, 0xe5, + 0xc1, 0x42, 0xdb, 0x91, 0x15, 0x09, 0x47, 0x4d, 0xe1, 0x5e, 0x85, 0xb1, 0x43, 0xce, 0xa0, 0x43, + 0xed, 0xcb, 0x2f, 0x41, 0x85, 0xb1, 0x63, 0x76, 0xa3, 0x28, 0x96, 0x11, 0x54, 0x54, 0xc1, 0x3e, + 0x71, 0xa1, 0x1c, 0x78, 0x2a, 0x9e, 0xa3, 0x9b, 0xb5, 0x96, 0x24, 0x3d, 0xee, 0x75, 0x30, 0x24, + 0x79, 0x06, 0xca, 0x74, 0xaf, 0x9b, 0x0f, 0xdc, 0x9c, 0xdf, 0xeb, 0x06, 0x31, 0x4d, 0x18, 0x11, + 0xdd, 0xeb, 0x92, 0xd3, 0x50, 0x0a, 0xea, 0x72, 0x43, 0x01, 0x49, 0x53, 0x5a, 0x5b, 0xc5, 0x52, + 0x50, 0x77, 0xf7, 0xa0, 0xaa, 0x6f, 0x08, 0x90, 0x1d, 0x65, 0x67, 0x9d, 0x22, 0x42, 0xe3, 0x8a, + 0xef, 0x08, 0x0b, 0xdb, 0x03, 0x30, 0x35, 0x53, 0x45, 0xd9, 0x97, 0xb3, 0x30, 0xe6, 0x47, 0xb2, + 0x3c, 0xb1, 0x62, 0xd8, 0x70, 0x03, 0xcb, 0x31, 0xee, 0x2d, 0x98, 0xbd, 0x12, 0x46, 0x77, 0x42, + 0xb6, 0xf1, 0x5d, 0x08, 0x68, 0xbb, 0xce, 0x18, 0x37, 0xd8, 0x1f, 0xf9, 0xed, 0x9c, 0x63, 0x51, + 0xe0, 0x74, 0x19, 0x7d, 0x69, 0x54, 0x19, 0xbd, 0xfb, 0xeb, 0x0e, 0x9c, 0xcc, 0xd7, 0x47, 0xfd, + 0xc8, 0x4e, 0x18, 0x1f, 0x66, 0xca, 0xa8, 0x02, 0x9c, 0xeb, 0x5d, 0x91, 0x8b, 0x7c, 0x01, 0xa6, + 0xb7, 0x7b, 0x41, 0xbb, 0x2e, 0x7f, 0x4b, 0x7d, 0x74, 0x89, 0x51, 0xcd, 0xc2, 0x61, 0x86, 0x92, + 0xf9, 0x69, 0xdb, 0x41, 0xe8, 0xc5, 0xfd, 0x0d, 0xb3, 0x6f, 0x68, 0xf3, 0x54, 0xd3, 0x18, 0xb4, + 0xa8, 0xdc, 0xbf, 0x29, 0x83, 0xb9, 0xaa, 0x40, 0x02, 0x99, 0xea, 0x76, 0x8a, 0x88, 0x41, 0x6d, + 0xf6, 0x43, 0xdf, 0x5c, 0x8a, 0xa8, 0xe4, 0x32, 0xdd, 0x1f, 0x73, 0x98, 0x87, 0x18, 0xa4, 0x81, + 0xc7, 0x8d, 0x85, 0x3c, 0x28, 0x6d, 0x14, 0x94, 0x0d, 0x5d, 0x13, 0x9c, 0xa3, 0xd8, 0xf6, 0x39, + 0xb5, 0x30, 0xb4, 0x25, 0x93, 0x97, 0x65, 0xfc, 0xb8, 0x5c, 0x58, 0xa1, 0x44, 0x25, 0x17, 0x34, + 0xee, 0xc2, 0x78, 0x4c, 0xd3, 0x58, 0x95, 0xa8, 0x5c, 0x39, 0x6e, 0x36, 0x2d, 0x8d, 0xfb, 0x9b, + 0x29, 0x3b, 0x8c, 0x35, 0x2d, 0xc7, 0x88, 0x83, 0x51, 0x08, 0x72, 0x13, 0x20, 0x83, 0x7d, 0x71, + 0xc4, 0x90, 0xec, 0x12, 0x54, 0xbd, 0x5e, 0x1a, 0x75, 0x58, 0x37, 0xf1, 0xe1, 0xa9, 0x58, 0x41, + 0x67, 0x85, 0x40, 0x43, 0xe3, 0x7e, 0x7a, 0x1c, 0x72, 0xb9, 0x67, 0xb2, 0x67, 0x5f, 0xb3, 0x71, + 0x8a, 0xbd, 0x66, 0xa3, 0x95, 0x19, 0x76, 0xd5, 0x86, 0x34, 0x61, 0xbc, 0xdb, 0xf2, 0x12, 0xb5, + 0x46, 0x5f, 0x52, 0xdd, 0xb4, 0xc1, 0x80, 0xf7, 0xf6, 0x17, 0x7e, 0xfe, 0x70, 0x7e, 0x20, 0x9b, + 0xab, 0x4b, 0xa2, 0xce, 0xcd, 0x88, 0xe6, 0x3c, 0x50, 0xf0, 0xb7, 0x3d, 0xc1, 0xf2, 0x01, 0x67, + 0xda, 0x8f, 0x38, 0xa2, 0x60, 0x09, 0x69, 0xd2, 0x6b, 0xa7, 0x72, 0x36, 0xbc, 0x54, 0xe0, 0x2a, + 0x13, 0x8c, 0x4d, 0xe5, 0x92, 0xf8, 0x8d, 0x96, 0x50, 0xf2, 0x6e, 0xa8, 0x26, 0xa9, 0x17, 0xa7, + 0x0f, 0x58, 0xe7, 0xa0, 0x3b, 0x7d, 0x53, 0x31, 0x41, 0xc3, 0x8f, 0xbc, 0x0b, 0xa0, 0x11, 0x84, + 0x41, 0xd2, 0x7a, 0xc0, 0xb4, 0x0f, 0x57, 0xfc, 0x82, 0xe6, 0x80, 0x16, 0x37, 0x66, 0xdd, 0xf8, + 0xdc, 0x16, 0xf1, 0xc9, 0x0a, 0xdf, 0x4b, 0xb5, 0x75, 0x43, 0x8d, 0x41, 0x8b, 0xca, 0xfd, 0x20, + 0x3c, 0x9e, 0xbf, 0xe2, 0x2a, 0x8f, 0x86, 0xcd, 0x38, 0xea, 0x75, 0xf3, 0x7b, 0x09, 0xbf, 0x02, + 0x89, 0x02, 0xc7, 0x6c, 0xfc, 0x4e, 0x10, 0xd6, 0xf3, 0x36, 0xfe, 0x4a, 0x10, 0xd6, 0x91, 0x63, + 0x0e, 0x71, 0xff, 0xe8, 0xcf, 0x1c, 0x38, 0x7b, 0xd0, 0x4d, 0x5c, 0x76, 0xec, 0xbf, 0xe3, 0xc5, + 0xa1, 0xbc, 0x5b, 0xc0, 0x6d, 0xc7, 0x2d, 0x2f, 0x0e, 0x91, 0x43, 0x49, 0x1f, 0x26, 0x44, 0x6d, + 0x97, 0xf4, 0x8e, 0x5f, 0x2a, 0xf6, 0x5e, 0x30, 0x3b, 0x5b, 0xe9, 0x68, 0x8d, 0xa8, 0x2b, 0x43, + 0x29, 0xd0, 0xbd, 0x0c, 0xe4, 0xfa, 0x2e, 0x8d, 0xe3, 0xa0, 0x6e, 0x15, 0xa3, 0x91, 0xe7, 0x61, + 0xfa, 0xf6, 0xe6, 0xf5, 0x6b, 0x1b, 0x51, 0x10, 0xf2, 0x92, 0x65, 0xab, 0x04, 0xe2, 0xb2, 0x05, + 0xc7, 0x0c, 0x95, 0xfb, 0xd5, 0x12, 0x4c, 0x59, 0xd7, 0xc6, 0x0f, 0xe1, 0x49, 0xe4, 0x6e, 0xba, + 0x97, 0x0e, 0x79, 0xd3, 0xfd, 0x59, 0xa8, 0x74, 0xa3, 0x76, 0xe0, 0x07, 0xba, 0x8c, 0x78, 0x9a, + 0x27, 0x91, 0x24, 0x0c, 0x35, 0x96, 0xdc, 0x81, 0xaa, 0xbe, 0xff, 0x29, 0x2b, 0x9f, 0x8a, 0xf2, + 0xa5, 0xf4, 0x2a, 0x31, 0xf7, 0x3a, 0x8d, 0x2c, 0xe2, 0xc2, 0x04, 0x9f, 0x62, 0xa2, 0xe2, 0x49, + 0x96, 0x83, 0xf0, 0xb9, 0x97, 0xa0, 0xc4, 0xb8, 0x5f, 0x18, 0x87, 0x2a, 0xd2, 0x6e, 0xb4, 0x12, + 0xd3, 0x7a, 0x42, 0x5e, 0x0b, 0xe5, 0x5e, 0xdc, 0x96, 0x9d, 0xa5, 0x03, 0x34, 0x37, 0x70, 0x1d, + 0x19, 0x3c, 0x63, 0xd7, 0x4b, 0x47, 0x4a, 0xb5, 0x95, 0x0f, 0x4c, 0xb5, 0xbd, 0x08, 0x33, 0x49, + 0xd2, 0xda, 0x88, 0x83, 0x5d, 0x2f, 0x65, 0xb3, 0x45, 0x46, 0x33, 0x4c, 0x6e, 0x63, 0xf3, 0x92, + 0x41, 0x62, 0x96, 0x96, 0x5c, 0x84, 0x39, 0x93, 0xf0, 0xa2, 0x71, 0xca, 0x83, 0x17, 0x22, 0xce, + 0xa1, 0x53, 0x0b, 0x26, 0x45, 0x26, 0x09, 0x70, 0xf0, 0x1b, 0xb2, 0x0a, 0x27, 0x33, 0x40, 0xa6, + 0x88, 0x08, 0x82, 0xcc, 0x4b, 0x3e, 0x27, 0x33, 0x7c, 0x98, 0x2e, 0x03, 0x5f, 0x90, 0xab, 0xf0, + 0xb8, 0x18, 0x5f, 0x7e, 0x6f, 0x58, 0xb7, 0x68, 0x92, 0x33, 0xfa, 0x3f, 0x92, 0xd1, 0xe3, 0x17, + 0x07, 0x49, 0x70, 0xd8, 0x77, 0x6c, 0x86, 0x6a, 0xf0, 0xda, 0xaa, 0x34, 0x49, 0x7a, 0x86, 0x6a, + 0x36, 0x6b, 0x75, 0xb4, 0xe9, 0xc8, 0x3b, 0xe1, 0x29, 0xf3, 0x53, 0xc4, 0xbe, 0xc4, 0x3e, 0xbd, + 0x2a, 0x93, 0xca, 0x0b, 0x92, 0xc5, 0x53, 0x17, 0x87, 0x92, 0xd5, 0x71, 0xd4, 0xf7, 0x64, 0x1b, + 0x4e, 0x6b, 0xd4, 0x79, 0xb6, 0xf0, 0xba, 0x71, 0x90, 0xd0, 0x9a, 0x97, 0xd0, 0x1b, 0x71, 0x9b, + 0x17, 0x51, 0x55, 0xcd, 0xdd, 0xf7, 0x8b, 0x41, 0x7a, 0x69, 0x18, 0x25, 0xae, 0xe3, 0x7d, 0xb8, + 0xb8, 0xdf, 0x75, 0x60, 0x46, 0xcf, 0xcc, 0x47, 0x10, 0x56, 0x6a, 0x67, 0xc3, 0x4a, 0x17, 0x8f, + 0xeb, 0x3c, 0x49, 0xcd, 0x47, 0x9c, 0x77, 0xbe, 0x50, 0x05, 0xe0, 0x4f, 0x7f, 0x04, 0xbc, 0x42, + 0xf1, 0x2c, 0x8c, 0xc5, 0xb4, 0x1b, 0xe5, 0xcd, 0x14, 0xa3, 0x40, 0x8e, 0xf9, 0xf1, 0x5d, 0x7b, + 0xc3, 0xf2, 0xa4, 0xe3, 0x3f, 0xda, 0x3c, 0xe9, 0x26, 0x3c, 0x11, 0x84, 0x09, 0xf5, 0x7b, 0xb1, + 0xdc, 0x50, 0x2e, 0x45, 0x89, 0x5e, 0xca, 0x95, 0xda, 0x6b, 0x25, 0xa3, 0x27, 0xd6, 0x86, 0x11, + 0xe1, 0xf0, 0x6f, 0x59, 0x97, 0x2a, 0x04, 0x5f, 0xc9, 0x15, 0xeb, 0x14, 0x2e, 0xe1, 0xa8, 0x29, + 0x98, 0x53, 0x4b, 0x43, 0x6f, 0xbb, 0x4d, 0xd7, 0x1b, 0x09, 0x5f, 0xb1, 0x96, 0x53, 0x7b, 0x5e, + 0x20, 0x2e, 0x6c, 0xa2, 0xa1, 0x19, 0x6e, 0xc2, 0xaa, 0x05, 0x99, 0x30, 0x38, 0xb2, 0x09, 0x53, + 0x27, 0xdc, 0xa9, 0x91, 0x17, 0xc5, 0xd5, 0xce, 0x3a, 0x3d, 0x72, 0x67, 0x7d, 0x3b, 0xcc, 0x06, + 0x61, 0x8b, 0xc6, 0x41, 0x4a, 0xeb, 0x7c, 0x2d, 0xcc, 0xcf, 0xf0, 0x8e, 0xd0, 0x01, 0xa2, 0xb5, + 0x0c, 0x16, 0x73, 0xd4, 0xa6, 0x0f, 0xaf, 0xaf, 0xac, 0xcd, 0xcf, 0x0e, 0xeb, 0xc3, 0xeb, 0x2b, + 0x6b, 0x68, 0x68, 0x46, 0xd9, 0xdd, 0x13, 0xc5, 0xd8, 0xdd, 0x93, 0xc7, 0xb7, 0xbb, 0x73, 0x0f, + 0xd5, 0xee, 0x92, 0x42, 0xec, 0xee, 0xab, 0x25, 0x78, 0xc2, 0x58, 0x26, 0x36, 0x1f, 0x82, 0x06, + 0x5b, 0x9b, 0xfc, 0x7e, 0x96, 0x28, 0x29, 0xb0, 0x62, 0x89, 0x26, 0x2c, 0xa9, 0x31, 0x68, 0x51, + 0xf1, 0x90, 0x1c, 0x8d, 0x79, 0x75, 0x62, 0xde, 0x6c, 0xad, 0x48, 0x38, 0x6a, 0x0a, 0xfe, 0xce, + 0x17, 0x8d, 0x53, 0x99, 0x92, 0xc8, 0xd7, 0xdb, 0xac, 0x18, 0x14, 0xda, 0x74, 0xcc, 0x17, 0xf3, + 0xd5, 0x92, 0x61, 0xa6, 0x6b, 0x5a, 0xf8, 0x62, 0x7a, 0x95, 0x68, 0xac, 0x52, 0x87, 0xc7, 0x5e, + 0xc7, 0x07, 0xd5, 0xe1, 0x67, 0x69, 0x4d, 0xe1, 0xfe, 0x97, 0x03, 0xaf, 0x19, 0xda, 0x15, 0x8f, + 0x60, 0x3b, 0xda, 0xcb, 0x6e, 0x47, 0x9b, 0xc7, 0xdf, 0x8e, 0x06, 0x5a, 0x31, 0x62, 0x6b, 0xfa, + 0x5b, 0x07, 0x66, 0x0d, 0xfd, 0x23, 0x68, 0x6a, 0x50, 0xe8, 0x8b, 0x5d, 0x46, 0x75, 0x51, 0x35, + 0x97, 0x69, 0xdb, 0x77, 0x79, 0xdb, 0xc4, 0x91, 0x64, 0xd9, 0x57, 0x4f, 0x62, 0x1c, 0x70, 0x42, + 0xe8, 0xc3, 0x04, 0xbf, 0xc4, 0x98, 0x14, 0x73, 0x34, 0xca, 0xca, 0xe7, 0xd1, 0x41, 0x73, 0x34, + 0xe2, 0x3f, 0x13, 0x94, 0x02, 0x79, 0xed, 0x6c, 0x90, 0x30, 0xfb, 0x56, 0x97, 0x51, 0x4c, 0x53, + 0x3b, 0x2b, 0xe1, 0xa8, 0x29, 0xdc, 0x0e, 0xcc, 0x67, 0x99, 0xaf, 0xd2, 0x06, 0x8f, 0x40, 0x1d, + 0xaa, 0x99, 0x4b, 0x50, 0xf5, 0xf8, 0x57, 0xeb, 0x3d, 0x2f, 0xff, 0x2e, 0xc6, 0xb2, 0x42, 0xa0, + 0xa1, 0x71, 0xff, 0xc0, 0x81, 0xc7, 0x87, 0x34, 0xa6, 0xc0, 0xe8, 0x6d, 0x6a, 0xac, 0xc0, 0x88, + 0xb7, 0x4a, 0xea, 0xb4, 0xe1, 0xa9, 0x18, 0x87, 0x15, 0x12, 0x59, 0x15, 0x60, 0x54, 0x78, 0xf7, + 0xdf, 0x1c, 0x38, 0x91, 0xd5, 0x35, 0x21, 0x97, 0x81, 0x88, 0xc6, 0xac, 0x06, 0x89, 0x1f, 0xed, + 0xd2, 0xb8, 0xcf, 0x5a, 0x2e, 0xb4, 0x3e, 0x2d, 0x39, 0x91, 0xe5, 0x01, 0x0a, 0x1c, 0xf2, 0x15, + 0xf9, 0x24, 0xaf, 0x70, 0x51, 0xbd, 0xad, 0x66, 0xca, 0xcd, 0x22, 0x67, 0x8a, 0x19, 0x4c, 0xfb, + 0x78, 0xaa, 0x45, 0xa2, 0x2d, 0xdf, 0xfd, 0xde, 0x18, 0xe8, 0xf4, 0x0e, 0x3f, 0x4e, 0x17, 0x14, + 0x8b, 0xc8, 0x3c, 0x9e, 0x52, 0x3e, 0xc2, 0xe3, 0x29, 0x63, 0xf7, 0x3b, 0x80, 0x8b, 0x97, 0x3c, + 0x8c, 0xef, 0x68, 0x19, 0xfd, 0x2d, 0x83, 0x42, 0x9b, 0x8e, 0x69, 0xd2, 0x0e, 0x76, 0xa9, 0xf8, + 0x68, 0x22, 0xab, 0xc9, 0xba, 0x42, 0xa0, 0xa1, 0x61, 0x9a, 0xd4, 0x83, 0x46, 0x43, 0x1e, 0xc3, + 0xb4, 0x26, 0xac, 0x77, 0x90, 0x63, 0x18, 0x45, 0x2b, 0x8a, 0x76, 0xa4, 0xbf, 0xa6, 0x29, 0x2e, + 0x45, 0xd1, 0x0e, 0x72, 0x0c, 0xf3, 0x30, 0xc2, 0x28, 0xee, 0x78, 0xed, 0xe0, 0x7d, 0xb4, 0xae, + 0xa5, 0x48, 0x3f, 0x4d, 0x7b, 0x18, 0xd7, 0x06, 0x49, 0x70, 0xd8, 0x77, 0x6c, 0x06, 0x76, 0x63, + 0x5a, 0x0f, 0xfc, 0xd4, 0xe6, 0x06, 0xd9, 0x19, 0xb8, 0x31, 0x40, 0x81, 0x43, 0xbe, 0x22, 0xcb, + 0x70, 0x42, 0xa5, 0xe7, 0x54, 0x09, 0x85, 0x70, 0xde, 0xb4, 0xdf, 0x8c, 0x59, 0x34, 0xe6, 0xe9, + 0x99, 0xb5, 0xe9, 0xc8, 0x42, 0x16, 0xee, 0xd6, 0x59, 0xd6, 0x46, 0x15, 0xb8, 0xa0, 0xa6, 0x70, + 0xff, 0x95, 0xef, 0x8e, 0x23, 0x2e, 0x11, 0x3e, 0xb2, 0xd8, 0x57, 0x76, 0x46, 0x8e, 0x1d, 0x62, + 0x46, 0x3e, 0x0f, 0xd3, 0xb7, 0x93, 0x28, 0xd4, 0x81, 0xa5, 0xf1, 0x91, 0x81, 0x25, 0x8b, 0xca, + 0xfd, 0xab, 0x71, 0x78, 0x52, 0x27, 0x43, 0x69, 0x7a, 0x27, 0x8a, 0x77, 0x82, 0xb0, 0xc9, 0x13, + 0x88, 0x5f, 0x71, 0x60, 0x5a, 0xcc, 0x4c, 0x79, 0x33, 0x5c, 0x24, 0xcc, 0x1a, 0x05, 0x5d, 0x66, + 0xc9, 0x08, 0x5b, 0xdc, 0xb2, 0x04, 0xe5, 0x6e, 0x85, 0xdb, 0x28, 0xcc, 0x68, 0x44, 0x3e, 0x00, + 0xa0, 0x5e, 0xcb, 0x69, 0x14, 0xf4, 0x66, 0x90, 0xd2, 0x0f, 0x69, 0xc3, 0x78, 0x81, 0x5b, 0x5a, + 0x08, 0x5a, 0x02, 0xc9, 0xab, 0x0e, 0x4c, 0xb4, 0x45, 0xdf, 0x88, 0xec, 0xc7, 0xcb, 0x0f, 0xa5, + 0x6f, 0xec, 0x5e, 0xd1, 0x3b, 0xaa, 0xec, 0x0f, 0x29, 0x9f, 0x20, 0x4c, 0x06, 0x61, 0x33, 0xa6, + 0x89, 0x8a, 0xc5, 0xbd, 0x61, 0x58, 0xf2, 0x7d, 0x3d, 0xf2, 0xea, 0x35, 0xaf, 0xed, 0x85, 0x3e, + 0x8d, 0xd7, 0x04, 0xb9, 0xfd, 0x66, 0x09, 0x07, 0xa0, 0x62, 0x34, 0x70, 0x5b, 0x6b, 0xfc, 0x30, + 0xb7, 0xb5, 0x4e, 0xbf, 0x03, 0xe6, 0x06, 0x06, 0xf3, 0x48, 0x77, 0xd8, 0x7f, 0x16, 0xa6, 0x1e, + 0xf0, 0x53, 0xf7, 0xcf, 0x27, 0xcc, 0xf6, 0x70, 0x2d, 0xaa, 0x8b, 0x3b, 0x43, 0xb1, 0x19, 0x51, + 0xe9, 0xe5, 0x15, 0x38, 0x45, 0xac, 0x77, 0x4f, 0x34, 0x10, 0x6d, 0x91, 0x6c, 0x8e, 0x76, 0xbd, + 0x98, 0x86, 0x0f, 0x7b, 0x8e, 0x6e, 0x68, 0x21, 0x68, 0x09, 0x24, 0xad, 0x4c, 0x7a, 0xee, 0xc2, + 0xf1, 0xd3, 0x73, 0xcc, 0xf1, 0x1c, 0x7a, 0xb7, 0xe3, 0x33, 0x0e, 0xcc, 0x86, 0x99, 0x99, 0x2b, + 0x53, 0x34, 0x5b, 0x0f, 0x63, 0x55, 0x88, 0xbb, 0x9a, 0x59, 0x18, 0xe6, 0xe4, 0x0f, 0xdb, 0x3c, + 0xc6, 0x8f, 0xb8, 0x79, 0x98, 0xcb, 0x87, 0x13, 0xa3, 0x2e, 0x1f, 0x92, 0x50, 0x5f, 0x3b, 0x9e, + 0x2c, 0xfc, 0xda, 0x31, 0x0c, 0xb9, 0x72, 0x7c, 0x0b, 0xaa, 0x7e, 0x4c, 0xbd, 0xf4, 0x01, 0x6f, + 0xa0, 0xf2, 0x97, 0xa6, 0x56, 0x14, 0x03, 0x34, 0xbc, 0xdc, 0x2f, 0x97, 0xe1, 0xa4, 0xea, 0x11, + 0x95, 0xbb, 0x60, 0x3b, 0x91, 0x90, 0x6b, 0xdc, 0x48, 0xbd, 0x13, 0x5d, 0x52, 0x08, 0x34, 0x34, + 0xcc, 0x7f, 0x15, 0xae, 0x64, 0x92, 0x4f, 0xe9, 0x49, 0x17, 0x15, 0x15, 0x9e, 0x7c, 0x69, 0xe8, + 0x43, 0x00, 0xc5, 0x24, 0xb3, 0x07, 0x72, 0x2f, 0x47, 0x7c, 0x01, 0xe0, 0xd3, 0x0e, 0x9c, 0xd8, + 0xc9, 0x54, 0x51, 0x28, 0xdb, 0x7a, 0xcc, 0xda, 0xbc, 0x6c, 0x69, 0x86, 0x99, 0x8b, 0x59, 0x78, + 0x82, 0x79, 0xe9, 0xee, 0x7f, 0x38, 0x60, 0xdb, 0x99, 0xc3, 0x39, 0x23, 0xd6, 0xcb, 0x29, 0xa5, + 0x03, 0x5e, 0x4e, 0x51, 0x7e, 0x4b, 0xf9, 0x70, 0x7e, 0xf2, 0xd8, 0x11, 0xfc, 0xe4, 0xf1, 0x91, + 0x8e, 0xce, 0x6b, 0xa1, 0xdc, 0x0b, 0xea, 0xd2, 0xd5, 0x35, 0xc9, 0x99, 0xb5, 0x55, 0x64, 0x70, + 0xf7, 0x4f, 0xc7, 0xcd, 0xd1, 0x56, 0xe6, 0x60, 0x7f, 0x22, 0x9a, 0xdd, 0xd0, 0xa5, 0x96, 0xa2, + 0xe5, 0xd7, 0x06, 0x4a, 0x2d, 0xdf, 0x76, 0xf4, 0x14, 0xbb, 0xe8, 0xa0, 0x51, 0x95, 0x96, 0x93, + 0x07, 0xe4, 0xd7, 0x6f, 0x43, 0x85, 0x9d, 0x06, 0x78, 0x8c, 0xaa, 0x92, 0x51, 0xaa, 0x72, 0x49, + 0xc2, 0xef, 0xed, 0x2f, 0xbc, 0xf5, 0xe8, 0x6a, 0xa9, 0xaf, 0x51, 0xf3, 0x27, 0x09, 0x54, 0xd9, + 0xdf, 0xbc, 0x14, 0x40, 0x9e, 0x33, 0x6e, 0x68, 0xa3, 0xa2, 0x10, 0x85, 0xd4, 0x19, 0x18, 0x39, + 0x24, 0x84, 0x2a, 0x7f, 0x84, 0x84, 0x0b, 0x15, 0xc7, 0x91, 0x0d, 0x9d, 0x90, 0x57, 0x88, 0x7b, + 0xfb, 0x0b, 0x2f, 0x1e, 0x5d, 0xa8, 0xfe, 0x1c, 0x8d, 0x08, 0xf7, 0x07, 0x65, 0x33, 0x77, 0x65, + 0x85, 0xed, 0x4f, 0xc4, 0xdc, 0x7d, 0x21, 0x37, 0x77, 0xcf, 0x0e, 0xcc, 0xdd, 0x59, 0xf3, 0x50, + 0x47, 0x66, 0x36, 0x3e, 0xea, 0x9d, 0xf2, 0xe0, 0xa3, 0x2f, 0x77, 0x11, 0x5e, 0xe9, 0x05, 0x31, + 0x4d, 0x36, 0xe2, 0x5e, 0x18, 0x84, 0x4d, 0x3e, 0x1d, 0x2b, 0xb6, 0x8b, 0x90, 0x41, 0x63, 0x9e, + 0xde, 0xfd, 0x2a, 0x4f, 0xe9, 0x59, 0x55, 0x45, 0x6c, 0x94, 0xdb, 0xfc, 0x1d, 0x17, 0x51, 0xd7, + 0xa8, 0x47, 0x59, 0x3c, 0xde, 0x22, 0x70, 0xe4, 0x0e, 0x4c, 0x6e, 0x8b, 0xbb, 0xe4, 0xc5, 0x5c, + 0x73, 0x91, 0x17, 0xd3, 0xf9, 0xed, 0x40, 0x75, 0x4b, 0xfd, 0x9e, 0xf9, 0x13, 0x95, 0x34, 0xf7, + 0x37, 0xcb, 0x70, 0x22, 0xf7, 0xca, 0x08, 0x3b, 0x23, 0xab, 0x27, 0x65, 0xf2, 0x01, 0x6d, 0xfd, + 0x32, 0xa9, 0xa6, 0x20, 0xef, 0x05, 0xa8, 0xd3, 0x6e, 0x3b, 0xea, 0x73, 0x0f, 0x64, 0xec, 0xc8, + 0x1e, 0x88, 0x76, 0x5a, 0x57, 0x35, 0x17, 0xb4, 0x38, 0xca, 0x62, 0xce, 0x71, 0x71, 0x53, 0x3e, + 0x5b, 0xcc, 0x69, 0xdd, 0xf6, 0x9a, 0x78, 0xb4, 0xb7, 0xbd, 0x02, 0x38, 0x21, 0x54, 0xd4, 0xb5, + 0x3b, 0x0f, 0x50, 0xa2, 0xf3, 0x38, 0x9b, 0x51, 0xab, 0x59, 0x36, 0x98, 0xe7, 0xeb, 0x7e, 0xaa, + 0xc4, 0xfc, 0x30, 0xd1, 0xd9, 0x57, 0x55, 0x3c, 0xf9, 0xf5, 0x30, 0xe1, 0xf5, 0xd2, 0x56, 0x34, + 0x70, 0xb7, 0x7f, 0x99, 0x43, 0x51, 0x62, 0xc9, 0x3a, 0x8c, 0xd5, 0xbd, 0x54, 0xbd, 0xac, 0x7d, + 0x14, 0xe5, 0x4c, 0xf0, 0xc8, 0x4b, 0x29, 0x72, 0x2e, 0xe4, 0x69, 0x18, 0x4b, 0xbd, 0x66, 0xe6, + 0x4d, 0xbf, 0x2d, 0xaf, 0x99, 0x20, 0x87, 0xda, 0xbb, 0xcb, 0xd8, 0x01, 0xbb, 0xcb, 0x8b, 0xd6, + 0x9b, 0xef, 0x56, 0xa2, 0x62, 0xf0, 0x9d, 0x76, 0x51, 0x5e, 0x9e, 0xa1, 0x75, 0x7f, 0x0a, 0xa6, + 0xed, 0x77, 0xdc, 0x0f, 0x75, 0x3b, 0xc5, 0xfd, 0x97, 0x31, 0x98, 0xc9, 0xd4, 0x77, 0x65, 0x66, + 0xb9, 0x73, 0xe0, 0x2c, 0x7f, 0x06, 0xc6, 0xbb, 0x71, 0x2f, 0xa4, 0xb2, 0x7a, 0x4f, 0x0b, 0x61, + 0xeb, 0x9e, 0xa2, 0xc0, 0xb1, 0x51, 0xa9, 0xc7, 0x7d, 0xec, 0x85, 0x32, 0x90, 0xad, 0x47, 0x65, + 0x95, 0x43, 0x51, 0x62, 0xd9, 0x49, 0x74, 0x3a, 0xe1, 0x46, 0x51, 0xd8, 0x08, 0xb9, 0x6a, 0x2e, + 0x17, 0xf1, 0x1e, 0x92, 0xac, 0x65, 0xe4, 0x27, 0x73, 0x1b, 0x82, 0x19, 0x89, 0xe4, 0xa3, 0x8e, + 0xfd, 0x12, 0xd4, 0x44, 0x11, 0x09, 0x98, 0x7c, 0xf9, 0x9c, 0x58, 0x41, 0xf7, 0x7f, 0x10, 0x2a, + 0xd1, 0x0b, 0x78, 0xf2, 0xe1, 0x2c, 0x60, 0x18, 0xb2, 0x78, 0xdf, 0x08, 0xd5, 0x8e, 0x17, 0x06, + 0x0d, 0x9a, 0xa4, 0xe2, 0x7f, 0x30, 0x54, 0xc5, 0x31, 0xe8, 0xaa, 0x02, 0xa2, 0xc1, 0xf3, 0xff, + 0x74, 0xc2, 0x1b, 0x26, 0x0e, 0x31, 0x55, 0xeb, 0x3f, 0x9d, 0x18, 0x30, 0xda, 0x34, 0xee, 0x1f, + 0x39, 0xf0, 0xc4, 0xd0, 0xce, 0xf8, 0xf1, 0x8d, 0x18, 0xba, 0x7f, 0x5c, 0x82, 0xc7, 0x87, 0xd4, + 0x3f, 0x92, 0xfe, 0x43, 0x7b, 0x30, 0x4c, 0x16, 0x58, 0xce, 0x8c, 0x9c, 0x1b, 0x47, 0xdb, 0x86, + 0xcc, 0x56, 0x50, 0x7e, 0xa4, 0x5b, 0x81, 0xfb, 0xd5, 0x12, 0x58, 0x4f, 0xdb, 0x91, 0x0f, 0xda, + 0xa5, 0xbe, 0x4e, 0x51, 0x65, 0xa9, 0x82, 0xb9, 0x2e, 0x15, 0x16, 0xbd, 0x36, 0xac, 0x72, 0x38, + 0x3f, 0x5f, 0x4b, 0x07, 0xcf, 0x57, 0xd2, 0x56, 0x35, 0xd5, 0xe5, 0xe2, 0x6b, 0xaa, 0xab, 0x03, + 0xf5, 0xd4, 0x5f, 0x76, 0xc4, 0x4c, 0xcb, 0x35, 0xc9, 0x58, 0x58, 0xe7, 0x3e, 0x16, 0xf6, 0x4d, + 0x50, 0x49, 0x68, 0xbb, 0xc1, 0x3c, 0x3b, 0x69, 0x89, 0xf5, 0x9c, 0xd8, 0x94, 0x70, 0xd4, 0x14, + 0xfc, 0xb6, 0x65, 0xbb, 0x1d, 0xdd, 0x39, 0xdf, 0xe9, 0xa6, 0x7d, 0x69, 0x93, 0xcd, 0x6d, 0x4b, + 0x8d, 0x41, 0x8b, 0xca, 0xfd, 0x4f, 0x47, 0x0c, 0xa7, 0xf4, 0xd1, 0x5f, 0xc8, 0xdd, 0x82, 0x3b, + 0xbc, 0x7b, 0xfb, 0xcb, 0x00, 0xbe, 0xbe, 0x97, 0x5e, 0xcc, 0x8b, 0x77, 0xe6, 0x9e, 0xbb, 0xfd, + 0x0c, 0x9b, 0x82, 0xa1, 0x25, 0x2f, 0xb3, 0x78, 0xca, 0x07, 0x2d, 0x1e, 0xf7, 0xdf, 0x1d, 0xc8, + 0x6c, 0x16, 0xa4, 0x0b, 0xe3, 0x4c, 0x83, 0x7e, 0x31, 0xb7, 0xe8, 0x6d, 0xd6, 0x6c, 0x61, 0xc9, + 0x69, 0xc1, 0xff, 0x44, 0x21, 0x88, 0xb4, 0xa5, 0x77, 0x5e, 0x2a, 0xe2, 0xd9, 0x06, 0x5b, 0x20, + 0xf3, 0xef, 0xe5, 0xab, 0xf6, 0xda, 0xd3, 0x77, 0x5f, 0x80, 0xb9, 0x01, 0xa5, 0xf8, 0xbd, 0x98, + 0x48, 0x3d, 0x1d, 0x60, 0xcd, 0x40, 0x7e, 0x4b, 0x0f, 0x05, 0x8e, 0x39, 0xf8, 0x27, 0xf3, 0xec, + 0xc9, 0x17, 0x1d, 0x98, 0x4b, 0xf2, 0xfc, 0x1e, 0x56, 0xdf, 0xe9, 0xc8, 0xd5, 0x00, 0x0a, 0x07, + 0x95, 0x70, 0xbf, 0x21, 0xcd, 0x93, 0xf8, 0x2f, 0x40, 0x7a, 0x73, 0x71, 0x46, 0x6e, 0x2e, 0x6c, + 0x89, 0xf9, 0x2d, 0x5a, 0xef, 0xb5, 0x07, 0xca, 0x59, 0x36, 0x25, 0x1c, 0x35, 0x45, 0xe6, 0xe5, + 0xab, 0xf2, 0x81, 0x2f, 0x5f, 0x3d, 0x0f, 0xd3, 0xf6, 0x5b, 0x17, 0x3c, 0x84, 0x26, 0xb3, 0x08, + 0xf6, 0xb3, 0x18, 0x98, 0xa1, 0xca, 0xbd, 0x9c, 0x34, 0x7e, 0xe0, 0xcb, 0x49, 0xcf, 0x42, 0x45, + 0xfe, 0x53, 0x1d, 0x15, 0xa8, 0x15, 0xb5, 0x32, 0x12, 0x86, 0x1a, 0xcb, 0x0c, 0x44, 0xc7, 0x0b, + 0x7b, 0x5e, 0x9b, 0xf5, 0x90, 0x2c, 0x79, 0xd3, 0x2b, 0xeb, 0xaa, 0xc6, 0xa0, 0x45, 0xe5, 0xfe, + 0xb3, 0x03, 0xf9, 0xb7, 0x68, 0x32, 0x85, 0x73, 0xce, 0x81, 0x85, 0x73, 0xd9, 0x22, 0xa3, 0xd2, + 0xa1, 0x8a, 0x8c, 0xec, 0xfa, 0x9f, 0xf2, 0x7d, 0xeb, 0x7f, 0x5e, 0x67, 0xee, 0x36, 0x8b, 0x42, + 0xa1, 0xa9, 0x61, 0xf7, 0x9a, 0x89, 0x0b, 0x13, 0xbe, 0xa7, 0x8b, 0x88, 0xa7, 0x85, 0xa3, 0xb4, + 0xb2, 0xcc, 0x89, 0x24, 0xa6, 0xb6, 0xf8, 0xf5, 0xef, 0x9f, 0x79, 0xec, 0x9b, 0xdf, 0x3f, 0xf3, + 0xd8, 0x77, 0xbe, 0x7f, 0xe6, 0xb1, 0x0f, 0xdf, 0x3d, 0xe3, 0x7c, 0xfd, 0xee, 0x19, 0xe7, 0x9b, + 0x77, 0xcf, 0x38, 0xdf, 0xb9, 0x7b, 0xc6, 0xf9, 0xde, 0xdd, 0x33, 0xce, 0x67, 0xfe, 0xe1, 0xcc, + 0x63, 0xef, 0xaa, 0xa8, 0xb9, 0xfa, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7c, 0x74, 0x19, 0xfb, + 0x53, 0x72, 0x00, 0x00, } func (m *AWSAuthConfig) Marshal() (dAtA []byte, err error) { diff --git a/pkg/apis/application/v1alpha1/generated.proto b/pkg/apis/application/v1alpha1/generated.proto index 9e027b61f4c0d..155a83a768344 100644 --- a/pkg/apis/application/v1alpha1/generated.proto +++ b/pkg/apis/application/v1alpha1/generated.proto @@ -3,7 +3,7 @@ syntax = "proto2"; -package github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1; +package github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1; import "k8s.io/api/core/v1/generated.proto"; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; diff --git a/pkg/apis/application/v1alpha1/openapi_generated.go b/pkg/apis/application/v1alpha1/openapi_generated.go index 9a59054399e97..58418047a1f9a 100644 --- a/pkg/apis/application/v1alpha1/openapi_generated.go +++ b/pkg/apis/application/v1alpha1/openapi_generated.go @@ -13,97 +13,97 @@ import ( func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { return map[string]common.OpenAPIDefinition{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.AWSAuthConfig": schema_pkg_apis_application_v1alpha1_AWSAuthConfig(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.AppProject": schema_pkg_apis_application_v1alpha1_AppProject(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.AppProjectList": schema_pkg_apis_application_v1alpha1_AppProjectList(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.AppProjectSpec": schema_pkg_apis_application_v1alpha1_AppProjectSpec(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.AppProjectStatus": schema_pkg_apis_application_v1alpha1_AppProjectStatus(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Application": schema_pkg_apis_application_v1alpha1_Application(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationCondition": schema_pkg_apis_application_v1alpha1_ApplicationCondition(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationDestination": schema_pkg_apis_application_v1alpha1_ApplicationDestination(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationList": schema_pkg_apis_application_v1alpha1_ApplicationList(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSource": schema_pkg_apis_application_v1alpha1_ApplicationSource(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSourceDirectory": schema_pkg_apis_application_v1alpha1_ApplicationSourceDirectory(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSourceHelm": schema_pkg_apis_application_v1alpha1_ApplicationSourceHelm(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSourceJsonnet": schema_pkg_apis_application_v1alpha1_ApplicationSourceJsonnet(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSourceKsonnet": schema_pkg_apis_application_v1alpha1_ApplicationSourceKsonnet(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSourceKustomize": schema_pkg_apis_application_v1alpha1_ApplicationSourceKustomize(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSourcePlugin": schema_pkg_apis_application_v1alpha1_ApplicationSourcePlugin(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSpec": schema_pkg_apis_application_v1alpha1_ApplicationSpec(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationStatus": schema_pkg_apis_application_v1alpha1_ApplicationStatus(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSummary": schema_pkg_apis_application_v1alpha1_ApplicationSummary(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationTree": schema_pkg_apis_application_v1alpha1_ApplicationTree(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationWatchEvent": schema_pkg_apis_application_v1alpha1_ApplicationWatchEvent(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Backoff": schema_pkg_apis_application_v1alpha1_Backoff(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Cluster": schema_pkg_apis_application_v1alpha1_Cluster(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ClusterCacheInfo": schema_pkg_apis_application_v1alpha1_ClusterCacheInfo(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ClusterConfig": schema_pkg_apis_application_v1alpha1_ClusterConfig(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ClusterInfo": schema_pkg_apis_application_v1alpha1_ClusterInfo(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ClusterList": schema_pkg_apis_application_v1alpha1_ClusterList(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Command": schema_pkg_apis_application_v1alpha1_Command(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ComparedTo": schema_pkg_apis_application_v1alpha1_ComparedTo(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ComponentParameter": schema_pkg_apis_application_v1alpha1_ComponentParameter(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ConfigManagementPlugin": schema_pkg_apis_application_v1alpha1_ConfigManagementPlugin(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ConnectionState": schema_pkg_apis_application_v1alpha1_ConnectionState(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.EnvEntry": schema_pkg_apis_application_v1alpha1_EnvEntry(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ExecProviderConfig": schema_pkg_apis_application_v1alpha1_ExecProviderConfig(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.GnuPGPublicKey": schema_pkg_apis_application_v1alpha1_GnuPGPublicKey(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.GnuPGPublicKeyList": schema_pkg_apis_application_v1alpha1_GnuPGPublicKeyList(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.HealthStatus": schema_pkg_apis_application_v1alpha1_HealthStatus(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.HelmFileParameter": schema_pkg_apis_application_v1alpha1_HelmFileParameter(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.HelmParameter": schema_pkg_apis_application_v1alpha1_HelmParameter(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.HostInfo": schema_pkg_apis_application_v1alpha1_HostInfo(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.HostResourceInfo": schema_pkg_apis_application_v1alpha1_HostResourceInfo(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Info": schema_pkg_apis_application_v1alpha1_Info(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.InfoItem": schema_pkg_apis_application_v1alpha1_InfoItem(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.JWTToken": schema_pkg_apis_application_v1alpha1_JWTToken(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.JWTTokens": schema_pkg_apis_application_v1alpha1_JWTTokens(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.JsonnetVar": schema_pkg_apis_application_v1alpha1_JsonnetVar(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.KnownTypeField": schema_pkg_apis_application_v1alpha1_KnownTypeField(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.KsonnetParameter": schema_pkg_apis_application_v1alpha1_KsonnetParameter(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.KustomizeOptions": schema_pkg_apis_application_v1alpha1_KustomizeOptions(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Operation": schema_pkg_apis_application_v1alpha1_Operation(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.OperationInitiator": schema_pkg_apis_application_v1alpha1_OperationInitiator(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.OperationState": schema_pkg_apis_application_v1alpha1_OperationState(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.OrphanedResourceKey": schema_pkg_apis_application_v1alpha1_OrphanedResourceKey(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.OrphanedResourcesMonitorSettings": schema_pkg_apis_application_v1alpha1_OrphanedResourcesMonitorSettings(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.OverrideIgnoreDiff": schema_pkg_apis_application_v1alpha1_OverrideIgnoreDiff(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ProjectRole": schema_pkg_apis_application_v1alpha1_ProjectRole(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.RepoCreds": schema_pkg_apis_application_v1alpha1_RepoCreds(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.RepoCredsList": schema_pkg_apis_application_v1alpha1_RepoCredsList(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Repository": schema_pkg_apis_application_v1alpha1_Repository(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.RepositoryCertificate": schema_pkg_apis_application_v1alpha1_RepositoryCertificate(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.RepositoryCertificateList": schema_pkg_apis_application_v1alpha1_RepositoryCertificateList(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.RepositoryList": schema_pkg_apis_application_v1alpha1_RepositoryList(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceAction": schema_pkg_apis_application_v1alpha1_ResourceAction(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceActionDefinition": schema_pkg_apis_application_v1alpha1_ResourceActionDefinition(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceActionParam": schema_pkg_apis_application_v1alpha1_ResourceActionParam(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceActions": schema_pkg_apis_application_v1alpha1_ResourceActions(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceDiff": schema_pkg_apis_application_v1alpha1_ResourceDiff(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceIgnoreDifferences": schema_pkg_apis_application_v1alpha1_ResourceIgnoreDifferences(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceNetworkingInfo": schema_pkg_apis_application_v1alpha1_ResourceNetworkingInfo(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceNode": schema_pkg_apis_application_v1alpha1_ResourceNode(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceOverride": schema_pkg_apis_application_v1alpha1_ResourceOverride(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceRef": schema_pkg_apis_application_v1alpha1_ResourceRef(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceResult": schema_pkg_apis_application_v1alpha1_ResourceResult(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceStatus": schema_pkg_apis_application_v1alpha1_ResourceStatus(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.RetryStrategy": schema_pkg_apis_application_v1alpha1_RetryStrategy(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.RevisionHistory": schema_pkg_apis_application_v1alpha1_RevisionHistory(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.RevisionMetadata": schema_pkg_apis_application_v1alpha1_RevisionMetadata(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SignatureKey": schema_pkg_apis_application_v1alpha1_SignatureKey(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncOperation": schema_pkg_apis_application_v1alpha1_SyncOperation(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncOperationResource": schema_pkg_apis_application_v1alpha1_SyncOperationResource(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncOperationResult": schema_pkg_apis_application_v1alpha1_SyncOperationResult(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncPolicy": schema_pkg_apis_application_v1alpha1_SyncPolicy(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncPolicyAutomated": schema_pkg_apis_application_v1alpha1_SyncPolicyAutomated(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncStatus": schema_pkg_apis_application_v1alpha1_SyncStatus(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncStrategy": schema_pkg_apis_application_v1alpha1_SyncStrategy(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncStrategyApply": schema_pkg_apis_application_v1alpha1_SyncStrategyApply(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncStrategyHook": schema_pkg_apis_application_v1alpha1_SyncStrategyHook(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncWindow": schema_pkg_apis_application_v1alpha1_SyncWindow(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.TLSClientConfig": schema_pkg_apis_application_v1alpha1_TLSClientConfig(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.objectMeta": schema_pkg_apis_application_v1alpha1_objectMeta(ref), - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.rawResourceOverride": schema_pkg_apis_application_v1alpha1_rawResourceOverride(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.AWSAuthConfig": schema_pkg_apis_application_v1alpha1_AWSAuthConfig(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.AppProject": schema_pkg_apis_application_v1alpha1_AppProject(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.AppProjectList": schema_pkg_apis_application_v1alpha1_AppProjectList(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.AppProjectSpec": schema_pkg_apis_application_v1alpha1_AppProjectSpec(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.AppProjectStatus": schema_pkg_apis_application_v1alpha1_AppProjectStatus(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Application": schema_pkg_apis_application_v1alpha1_Application(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationCondition": schema_pkg_apis_application_v1alpha1_ApplicationCondition(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationDestination": schema_pkg_apis_application_v1alpha1_ApplicationDestination(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationList": schema_pkg_apis_application_v1alpha1_ApplicationList(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSource": schema_pkg_apis_application_v1alpha1_ApplicationSource(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSourceDirectory": schema_pkg_apis_application_v1alpha1_ApplicationSourceDirectory(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSourceHelm": schema_pkg_apis_application_v1alpha1_ApplicationSourceHelm(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSourceJsonnet": schema_pkg_apis_application_v1alpha1_ApplicationSourceJsonnet(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSourceKsonnet": schema_pkg_apis_application_v1alpha1_ApplicationSourceKsonnet(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSourceKustomize": schema_pkg_apis_application_v1alpha1_ApplicationSourceKustomize(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSourcePlugin": schema_pkg_apis_application_v1alpha1_ApplicationSourcePlugin(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSpec": schema_pkg_apis_application_v1alpha1_ApplicationSpec(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationStatus": schema_pkg_apis_application_v1alpha1_ApplicationStatus(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSummary": schema_pkg_apis_application_v1alpha1_ApplicationSummary(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationTree": schema_pkg_apis_application_v1alpha1_ApplicationTree(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationWatchEvent": schema_pkg_apis_application_v1alpha1_ApplicationWatchEvent(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Backoff": schema_pkg_apis_application_v1alpha1_Backoff(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Cluster": schema_pkg_apis_application_v1alpha1_Cluster(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ClusterCacheInfo": schema_pkg_apis_application_v1alpha1_ClusterCacheInfo(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ClusterConfig": schema_pkg_apis_application_v1alpha1_ClusterConfig(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ClusterInfo": schema_pkg_apis_application_v1alpha1_ClusterInfo(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ClusterList": schema_pkg_apis_application_v1alpha1_ClusterList(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Command": schema_pkg_apis_application_v1alpha1_Command(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ComparedTo": schema_pkg_apis_application_v1alpha1_ComparedTo(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ComponentParameter": schema_pkg_apis_application_v1alpha1_ComponentParameter(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ConfigManagementPlugin": schema_pkg_apis_application_v1alpha1_ConfigManagementPlugin(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ConnectionState": schema_pkg_apis_application_v1alpha1_ConnectionState(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.EnvEntry": schema_pkg_apis_application_v1alpha1_EnvEntry(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ExecProviderConfig": schema_pkg_apis_application_v1alpha1_ExecProviderConfig(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.GnuPGPublicKey": schema_pkg_apis_application_v1alpha1_GnuPGPublicKey(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.GnuPGPublicKeyList": schema_pkg_apis_application_v1alpha1_GnuPGPublicKeyList(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.HealthStatus": schema_pkg_apis_application_v1alpha1_HealthStatus(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.HelmFileParameter": schema_pkg_apis_application_v1alpha1_HelmFileParameter(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.HelmParameter": schema_pkg_apis_application_v1alpha1_HelmParameter(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.HostInfo": schema_pkg_apis_application_v1alpha1_HostInfo(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.HostResourceInfo": schema_pkg_apis_application_v1alpha1_HostResourceInfo(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Info": schema_pkg_apis_application_v1alpha1_Info(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.InfoItem": schema_pkg_apis_application_v1alpha1_InfoItem(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.JWTToken": schema_pkg_apis_application_v1alpha1_JWTToken(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.JWTTokens": schema_pkg_apis_application_v1alpha1_JWTTokens(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.JsonnetVar": schema_pkg_apis_application_v1alpha1_JsonnetVar(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.KnownTypeField": schema_pkg_apis_application_v1alpha1_KnownTypeField(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.KsonnetParameter": schema_pkg_apis_application_v1alpha1_KsonnetParameter(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.KustomizeOptions": schema_pkg_apis_application_v1alpha1_KustomizeOptions(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Operation": schema_pkg_apis_application_v1alpha1_Operation(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.OperationInitiator": schema_pkg_apis_application_v1alpha1_OperationInitiator(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.OperationState": schema_pkg_apis_application_v1alpha1_OperationState(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.OrphanedResourceKey": schema_pkg_apis_application_v1alpha1_OrphanedResourceKey(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.OrphanedResourcesMonitorSettings": schema_pkg_apis_application_v1alpha1_OrphanedResourcesMonitorSettings(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.OverrideIgnoreDiff": schema_pkg_apis_application_v1alpha1_OverrideIgnoreDiff(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ProjectRole": schema_pkg_apis_application_v1alpha1_ProjectRole(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.RepoCreds": schema_pkg_apis_application_v1alpha1_RepoCreds(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.RepoCredsList": schema_pkg_apis_application_v1alpha1_RepoCredsList(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Repository": schema_pkg_apis_application_v1alpha1_Repository(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.RepositoryCertificate": schema_pkg_apis_application_v1alpha1_RepositoryCertificate(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.RepositoryCertificateList": schema_pkg_apis_application_v1alpha1_RepositoryCertificateList(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.RepositoryList": schema_pkg_apis_application_v1alpha1_RepositoryList(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceAction": schema_pkg_apis_application_v1alpha1_ResourceAction(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceActionDefinition": schema_pkg_apis_application_v1alpha1_ResourceActionDefinition(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceActionParam": schema_pkg_apis_application_v1alpha1_ResourceActionParam(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceActions": schema_pkg_apis_application_v1alpha1_ResourceActions(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceDiff": schema_pkg_apis_application_v1alpha1_ResourceDiff(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceIgnoreDifferences": schema_pkg_apis_application_v1alpha1_ResourceIgnoreDifferences(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceNetworkingInfo": schema_pkg_apis_application_v1alpha1_ResourceNetworkingInfo(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceNode": schema_pkg_apis_application_v1alpha1_ResourceNode(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceOverride": schema_pkg_apis_application_v1alpha1_ResourceOverride(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceRef": schema_pkg_apis_application_v1alpha1_ResourceRef(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceResult": schema_pkg_apis_application_v1alpha1_ResourceResult(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceStatus": schema_pkg_apis_application_v1alpha1_ResourceStatus(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.RetryStrategy": schema_pkg_apis_application_v1alpha1_RetryStrategy(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.RevisionHistory": schema_pkg_apis_application_v1alpha1_RevisionHistory(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.RevisionMetadata": schema_pkg_apis_application_v1alpha1_RevisionMetadata(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SignatureKey": schema_pkg_apis_application_v1alpha1_SignatureKey(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncOperation": schema_pkg_apis_application_v1alpha1_SyncOperation(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncOperationResource": schema_pkg_apis_application_v1alpha1_SyncOperationResource(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncOperationResult": schema_pkg_apis_application_v1alpha1_SyncOperationResult(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncPolicy": schema_pkg_apis_application_v1alpha1_SyncPolicy(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncPolicyAutomated": schema_pkg_apis_application_v1alpha1_SyncPolicyAutomated(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncStatus": schema_pkg_apis_application_v1alpha1_SyncStatus(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncStrategy": schema_pkg_apis_application_v1alpha1_SyncStrategy(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncStrategyApply": schema_pkg_apis_application_v1alpha1_SyncStrategyApply(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncStrategyHook": schema_pkg_apis_application_v1alpha1_SyncStrategyHook(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncWindow": schema_pkg_apis_application_v1alpha1_SyncWindow(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.TLSClientConfig": schema_pkg_apis_application_v1alpha1_TLSClientConfig(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.objectMeta": schema_pkg_apis_application_v1alpha1_objectMeta(ref), + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.rawResourceOverride": schema_pkg_apis_application_v1alpha1_rawResourceOverride(ref), } } @@ -164,13 +164,13 @@ func schema_pkg_apis_application_v1alpha1_AppProject(ref common.ReferenceCallbac "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.AppProjectSpec"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.AppProjectSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.AppProjectStatus"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.AppProjectStatus"), }, }, }, @@ -178,7 +178,7 @@ func schema_pkg_apis_application_v1alpha1_AppProject(ref common.ReferenceCallbac }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.AppProjectSpec", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.AppProjectStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.AppProjectSpec", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.AppProjectStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } @@ -216,7 +216,7 @@ func schema_pkg_apis_application_v1alpha1_AppProjectList(ref common.ReferenceCal Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.AppProject"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.AppProject"), }, }, }, @@ -227,7 +227,7 @@ func schema_pkg_apis_application_v1alpha1_AppProjectList(ref common.ReferenceCal }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.AppProject", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.AppProject", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } @@ -261,7 +261,7 @@ func schema_pkg_apis_application_v1alpha1_AppProjectSpec(ref common.ReferenceCal Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationDestination"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationDestination"), }, }, }, @@ -282,7 +282,7 @@ func schema_pkg_apis_application_v1alpha1_AppProjectSpec(ref common.ReferenceCal Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ProjectRole"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ProjectRole"), }, }, }, @@ -319,7 +319,7 @@ func schema_pkg_apis_application_v1alpha1_AppProjectSpec(ref common.ReferenceCal "orphanedResources": { SchemaProps: spec.SchemaProps{ Description: "OrphanedResources specifies if controller should monitor orphaned resources of apps in this project", - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.OrphanedResourcesMonitorSettings"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.OrphanedResourcesMonitorSettings"), }, }, "syncWindows": { @@ -329,7 +329,7 @@ func schema_pkg_apis_application_v1alpha1_AppProjectSpec(ref common.ReferenceCal Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncWindow"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncWindow"), }, }, }, @@ -357,7 +357,7 @@ func schema_pkg_apis_application_v1alpha1_AppProjectSpec(ref common.ReferenceCal Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SignatureKey"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SignatureKey"), }, }, }, @@ -381,7 +381,7 @@ func schema_pkg_apis_application_v1alpha1_AppProjectSpec(ref common.ReferenceCal }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationDestination", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.OrphanedResourcesMonitorSettings", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ProjectRole", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SignatureKey", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncWindow", "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationDestination", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.OrphanedResourcesMonitorSettings", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ProjectRole", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SignatureKey", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncWindow", "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind"}, } } @@ -401,7 +401,7 @@ func schema_pkg_apis_application_v1alpha1_AppProjectStatus(ref common.ReferenceC Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.JWTTokens"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.JWTTokens"), }, }, }, @@ -411,7 +411,7 @@ func schema_pkg_apis_application_v1alpha1_AppProjectStatus(ref common.ReferenceC }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.JWTTokens"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.JWTTokens"}, } } @@ -445,18 +445,18 @@ func schema_pkg_apis_application_v1alpha1_Application(ref common.ReferenceCallba "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSpec"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationStatus"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationStatus"), }, }, "operation": { SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Operation"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Operation"), }, }, }, @@ -464,7 +464,7 @@ func schema_pkg_apis_application_v1alpha1_Application(ref common.ReferenceCallba }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSpec", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationStatus", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Operation", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSpec", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationStatus", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Operation", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } @@ -574,7 +574,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationList(ref common.ReferenceCa Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Application"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Application"), }, }, }, @@ -585,7 +585,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationList(ref common.ReferenceCa }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Application", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Application", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } @@ -621,31 +621,31 @@ func schema_pkg_apis_application_v1alpha1_ApplicationSource(ref common.Reference "helm": { SchemaProps: spec.SchemaProps{ Description: "Helm holds helm specific options", - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSourceHelm"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSourceHelm"), }, }, "kustomize": { SchemaProps: spec.SchemaProps{ Description: "Kustomize holds kustomize specific options", - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSourceKustomize"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSourceKustomize"), }, }, "ksonnet": { SchemaProps: spec.SchemaProps{ Description: "Ksonnet holds ksonnet specific options", - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSourceKsonnet"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSourceKsonnet"), }, }, "directory": { SchemaProps: spec.SchemaProps{ Description: "Directory holds path/directory specific options", - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSourceDirectory"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSourceDirectory"), }, }, "plugin": { SchemaProps: spec.SchemaProps{ Description: "ConfigManagementPlugin holds config management plugin specific options", - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSourcePlugin"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSourcePlugin"), }, }, "chart": { @@ -660,7 +660,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationSource(ref common.Reference }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSourceDirectory", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSourceHelm", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSourceKsonnet", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSourceKustomize", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSourcePlugin"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSourceDirectory", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSourceHelm", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSourceKsonnet", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSourceKustomize", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSourcePlugin"}, } } @@ -682,7 +682,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationSourceDirectory(ref common. SchemaProps: spec.SchemaProps{ Description: "Jsonnet holds options specific to Jsonnet", Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSourceJsonnet"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSourceJsonnet"), }, }, "exclude": { @@ -703,7 +703,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationSourceDirectory(ref common. }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSourceJsonnet"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSourceJsonnet"}, } } @@ -737,7 +737,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationSourceHelm(ref common.Refer Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.HelmParameter"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.HelmParameter"), }, }, }, @@ -765,7 +765,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationSourceHelm(ref common.Refer Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.HelmFileParameter"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.HelmFileParameter"), }, }, }, @@ -782,7 +782,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationSourceHelm(ref common.Refer }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.HelmFileParameter", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.HelmParameter"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.HelmFileParameter", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.HelmParameter"}, } } @@ -801,7 +801,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationSourceJsonnet(ref common.Re Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.JsonnetVar"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.JsonnetVar"), }, }, }, @@ -815,7 +815,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationSourceJsonnet(ref common.Re Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.JsonnetVar"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.JsonnetVar"), }, }, }, @@ -840,7 +840,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationSourceJsonnet(ref common.Re }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.JsonnetVar"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.JsonnetVar"}, } } @@ -866,7 +866,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationSourceKsonnet(ref common.Re Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.KsonnetParameter"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.KsonnetParameter"), }, }, }, @@ -876,7 +876,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationSourceKsonnet(ref common.Re }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.KsonnetParameter"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.KsonnetParameter"}, } } @@ -980,7 +980,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationSourcePlugin(ref common.Ref Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.EnvEntry"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.EnvEntry"), }, }, }, @@ -990,7 +990,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationSourcePlugin(ref common.Ref }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.EnvEntry"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.EnvEntry"}, } } @@ -1005,14 +1005,14 @@ func schema_pkg_apis_application_v1alpha1_ApplicationSpec(ref common.ReferenceCa SchemaProps: spec.SchemaProps{ Description: "Source is a reference to the location of the application's manifests or chart", Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSource"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSource"), }, }, "destination": { SchemaProps: spec.SchemaProps{ Description: "Destination is a reference to the target Kubernetes server and namespace", Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationDestination"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationDestination"), }, }, "project": { @@ -1026,7 +1026,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationSpec(ref common.ReferenceCa "syncPolicy": { SchemaProps: spec.SchemaProps{ Description: "SyncPolicy controls when and how a sync will be performed", - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncPolicy"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncPolicy"), }, }, "ignoreDifferences": { @@ -1037,7 +1037,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationSpec(ref common.ReferenceCa Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceIgnoreDifferences"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceIgnoreDifferences"), }, }, }, @@ -1051,7 +1051,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationSpec(ref common.ReferenceCa Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Info"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Info"), }, }, }, @@ -1069,7 +1069,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationSpec(ref common.ReferenceCa }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationDestination", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSource", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Info", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceIgnoreDifferences", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncPolicy"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationDestination", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSource", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Info", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceIgnoreDifferences", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncPolicy"}, } } @@ -1088,7 +1088,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationStatus(ref common.Reference Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceStatus"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceStatus"), }, }, }, @@ -1098,14 +1098,14 @@ func schema_pkg_apis_application_v1alpha1_ApplicationStatus(ref common.Reference SchemaProps: spec.SchemaProps{ Description: "Sync contains information about the application's current sync status", Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncStatus"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncStatus"), }, }, "health": { SchemaProps: spec.SchemaProps{ Description: "Health contains information about the application's current health status", Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.HealthStatus"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.HealthStatus"), }, }, "history": { @@ -1116,7 +1116,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationStatus(ref common.Reference Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.RevisionHistory"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.RevisionHistory"), }, }, }, @@ -1130,7 +1130,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationStatus(ref common.Reference Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationCondition"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationCondition"), }, }, }, @@ -1145,7 +1145,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationStatus(ref common.Reference "operationState": { SchemaProps: spec.SchemaProps{ Description: "OperationState contains information about any ongoing operations, such as a sync", - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.OperationState"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.OperationState"), }, }, "observedAt": { @@ -1165,14 +1165,14 @@ func schema_pkg_apis_application_v1alpha1_ApplicationStatus(ref common.Reference SchemaProps: spec.SchemaProps{ Description: "Summary contains a list of URLs and container images used by this application", Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSummary"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSummary"), }, }, }, }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationCondition", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSummary", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.HealthStatus", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.OperationState", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceStatus", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.RevisionHistory", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationCondition", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSummary", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.HealthStatus", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.OperationState", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceStatus", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.RevisionHistory", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, } } @@ -1234,7 +1234,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationTree(ref common.ReferenceCa Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceNode"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceNode"), }, }, }, @@ -1248,7 +1248,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationTree(ref common.ReferenceCa Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceNode"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceNode"), }, }, }, @@ -1262,7 +1262,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationTree(ref common.ReferenceCa Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.HostInfo"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.HostInfo"), }, }, }, @@ -1272,7 +1272,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationTree(ref common.ReferenceCa }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.HostInfo", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceNode"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.HostInfo", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceNode"}, } } @@ -1294,7 +1294,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationWatchEvent(ref common.Refer SchemaProps: spec.SchemaProps{ Description: "Application is:\n * If Type is Added or Modified: the new state of the object.\n * If Type is Deleted: the state of the object immediately before deletion.\n * If Type is Error: *api.Status is recommended; other types may make sense\n depending on context.", Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Application"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Application"), }, }, }, @@ -1302,7 +1302,7 @@ func schema_pkg_apis_application_v1alpha1_ApplicationWatchEvent(ref common.Refer }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Application"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Application"}, } } @@ -1367,14 +1367,14 @@ func schema_pkg_apis_application_v1alpha1_Cluster(ref common.ReferenceCallback) SchemaProps: spec.SchemaProps{ Description: "Config holds cluster information for connecting to a cluster", Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ClusterConfig"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ClusterConfig"), }, }, "connectionState": { SchemaProps: spec.SchemaProps{ Description: "DEPRECATED: use Info.ConnectionState field instead. ConnectionState contains information about cluster connection state", Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ConnectionState"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ConnectionState"), }, }, "serverVersion": { @@ -1409,7 +1409,7 @@ func schema_pkg_apis_application_v1alpha1_Cluster(ref common.ReferenceCallback) SchemaProps: spec.SchemaProps{ Description: "Info holds information about cluster cache and state", Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ClusterInfo"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ClusterInfo"), }, }, "shard": { @@ -1424,7 +1424,7 @@ func schema_pkg_apis_application_v1alpha1_Cluster(ref common.ReferenceCallback) }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ClusterConfig", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ClusterInfo", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ConnectionState", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ClusterConfig", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ClusterInfo", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ConnectionState", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, } } @@ -1494,19 +1494,19 @@ func schema_pkg_apis_application_v1alpha1_ClusterConfig(ref common.ReferenceCall SchemaProps: spec.SchemaProps{ Description: "TLSClientConfig contains settings to enable transport layer security", Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.TLSClientConfig"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.TLSClientConfig"), }, }, "awsAuthConfig": { SchemaProps: spec.SchemaProps{ Description: "AWSAuthConfig contains IAM authentication configuration", - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.AWSAuthConfig"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.AWSAuthConfig"), }, }, "execProviderConfig": { SchemaProps: spec.SchemaProps{ Description: "ExecProviderConfig contains configuration for an exec provider", - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ExecProviderConfig"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ExecProviderConfig"), }, }, }, @@ -1514,7 +1514,7 @@ func schema_pkg_apis_application_v1alpha1_ClusterConfig(ref common.ReferenceCall }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.AWSAuthConfig", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ExecProviderConfig", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.TLSClientConfig"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.AWSAuthConfig", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ExecProviderConfig", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.TLSClientConfig"}, } } @@ -1529,7 +1529,7 @@ func schema_pkg_apis_application_v1alpha1_ClusterInfo(ref common.ReferenceCallba SchemaProps: spec.SchemaProps{ Description: "ConnectionState contains information about the connection to the cluster", Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ConnectionState"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ConnectionState"), }, }, "serverVersion": { @@ -1543,7 +1543,7 @@ func schema_pkg_apis_application_v1alpha1_ClusterInfo(ref common.ReferenceCallba SchemaProps: spec.SchemaProps{ Description: "CacheInfo contains information about the cluster cache", Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ClusterCacheInfo"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ClusterCacheInfo"), }, }, "applicationsCount": { @@ -1559,7 +1559,7 @@ func schema_pkg_apis_application_v1alpha1_ClusterInfo(ref common.ReferenceCallba }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ClusterCacheInfo", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ConnectionState"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ClusterCacheInfo", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ConnectionState"}, } } @@ -1583,7 +1583,7 @@ func schema_pkg_apis_application_v1alpha1_ClusterList(ref common.ReferenceCallba Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Cluster"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Cluster"), }, }, }, @@ -1594,7 +1594,7 @@ func schema_pkg_apis_application_v1alpha1_ClusterList(ref common.ReferenceCallba }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Cluster", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Cluster", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } @@ -1650,14 +1650,14 @@ func schema_pkg_apis_application_v1alpha1_ComparedTo(ref common.ReferenceCallbac SchemaProps: spec.SchemaProps{ Description: "Source is a reference to the application's source used for comparison", Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSource"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSource"), }, }, "destination": { SchemaProps: spec.SchemaProps{ Description: "Destination is a reference to the application's destination used for comparison", Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationDestination"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationDestination"), }, }, }, @@ -1665,7 +1665,7 @@ func schema_pkg_apis_application_v1alpha1_ComparedTo(ref common.ReferenceCallbac }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationDestination", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSource"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationDestination", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSource"}, } } @@ -1719,13 +1719,13 @@ func schema_pkg_apis_application_v1alpha1_ConfigManagementPlugin(ref common.Refe }, "init": { SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Command"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Command"), }, }, "generate": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Command"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Command"), }, }, }, @@ -1733,7 +1733,7 @@ func schema_pkg_apis_application_v1alpha1_ConfigManagementPlugin(ref common.Refe }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Command"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Command"}, } } @@ -1947,7 +1947,7 @@ func schema_pkg_apis_application_v1alpha1_GnuPGPublicKeyList(ref common.Referenc Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.GnuPGPublicKey"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.GnuPGPublicKey"), }, }, }, @@ -1958,7 +1958,7 @@ func schema_pkg_apis_application_v1alpha1_GnuPGPublicKeyList(ref common.Referenc }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.GnuPGPublicKey", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.GnuPGPublicKey", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } @@ -2070,7 +2070,7 @@ func schema_pkg_apis_application_v1alpha1_HostInfo(ref common.ReferenceCallback) Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.HostResourceInfo"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.HostResourceInfo"), }, }, }, @@ -2086,7 +2086,7 @@ func schema_pkg_apis_application_v1alpha1_HostInfo(ref common.ReferenceCallback) }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.HostResourceInfo", "k8s.io/api/core/v1.NodeSystemInfo"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.HostResourceInfo", "k8s.io/api/core/v1.NodeSystemInfo"}, } } @@ -2227,7 +2227,7 @@ func schema_pkg_apis_application_v1alpha1_JWTTokens(ref common.ReferenceCallback Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.JWTToken"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.JWTToken"), }, }, }, @@ -2237,7 +2237,7 @@ func schema_pkg_apis_application_v1alpha1_JWTTokens(ref common.ReferenceCallback }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.JWTToken"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.JWTToken"}, } } @@ -2374,14 +2374,14 @@ func schema_pkg_apis_application_v1alpha1_Operation(ref common.ReferenceCallback "sync": { SchemaProps: spec.SchemaProps{ Description: "Sync contains parameters for the operation", - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncOperation"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncOperation"), }, }, "initiatedBy": { SchemaProps: spec.SchemaProps{ Description: "InitiatedBy contains information about who initiated the operations", Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.OperationInitiator"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.OperationInitiator"), }, }, "info": { @@ -2391,7 +2391,7 @@ func schema_pkg_apis_application_v1alpha1_Operation(ref common.ReferenceCallback Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Info"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Info"), }, }, }, @@ -2401,14 +2401,14 @@ func schema_pkg_apis_application_v1alpha1_Operation(ref common.ReferenceCallback SchemaProps: spec.SchemaProps{ Description: "Retry controls the strategy to apply if a sync fails", Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.RetryStrategy"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.RetryStrategy"), }, }, }, }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Info", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.OperationInitiator", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.RetryStrategy", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncOperation"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Info", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.OperationInitiator", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.RetryStrategy", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncOperation"}, } } @@ -2450,7 +2450,7 @@ func schema_pkg_apis_application_v1alpha1_OperationState(ref common.ReferenceCal SchemaProps: spec.SchemaProps{ Description: "Operation is the original requested operation", Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Operation"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Operation"), }, }, "phase": { @@ -2471,7 +2471,7 @@ func schema_pkg_apis_application_v1alpha1_OperationState(ref common.ReferenceCal "syncResult": { SchemaProps: spec.SchemaProps{ Description: "SyncResult is the result of a Sync operation", - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncOperationResult"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncOperationResult"), }, }, "startedAt": { @@ -2499,7 +2499,7 @@ func schema_pkg_apis_application_v1alpha1_OperationState(ref common.ReferenceCal }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Operation", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncOperationResult", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Operation", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncOperationResult", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, } } @@ -2556,7 +2556,7 @@ func schema_pkg_apis_application_v1alpha1_OrphanedResourcesMonitorSettings(ref c Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.OrphanedResourceKey"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.OrphanedResourceKey"), }, }, }, @@ -2566,7 +2566,7 @@ func schema_pkg_apis_application_v1alpha1_OrphanedResourcesMonitorSettings(ref c }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.OrphanedResourceKey"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.OrphanedResourceKey"}, } } @@ -2642,7 +2642,7 @@ func schema_pkg_apis_application_v1alpha1_ProjectRole(ref common.ReferenceCallba Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.JWTToken"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.JWTToken"), }, }, }, @@ -2668,7 +2668,7 @@ func schema_pkg_apis_application_v1alpha1_ProjectRole(ref common.ReferenceCallba }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.JWTToken"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.JWTToken"}, } } @@ -2777,7 +2777,7 @@ func schema_pkg_apis_application_v1alpha1_RepoCredsList(ref common.ReferenceCall Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.RepoCreds"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.RepoCreds"), }, }, }, @@ -2788,7 +2788,7 @@ func schema_pkg_apis_application_v1alpha1_RepoCredsList(ref common.ReferenceCall }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.RepoCreds", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.RepoCreds", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } @@ -2832,7 +2832,7 @@ func schema_pkg_apis_application_v1alpha1_Repository(ref common.ReferenceCallbac SchemaProps: spec.SchemaProps{ Description: "ConnectionState contains information about the current state of connection to the repository server", Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ConnectionState"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ConnectionState"), }, }, "insecureIgnoreHostKey": { @@ -2931,7 +2931,7 @@ func schema_pkg_apis_application_v1alpha1_Repository(ref common.ReferenceCallbac }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ConnectionState"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ConnectionState"}, } } @@ -3009,7 +3009,7 @@ func schema_pkg_apis_application_v1alpha1_RepositoryCertificateList(ref common.R Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.RepositoryCertificate"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.RepositoryCertificate"), }, }, }, @@ -3020,7 +3020,7 @@ func schema_pkg_apis_application_v1alpha1_RepositoryCertificateList(ref common.R }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.RepositoryCertificate", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.RepositoryCertificate", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } @@ -3043,7 +3043,7 @@ func schema_pkg_apis_application_v1alpha1_RepositoryList(ref common.ReferenceCal Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Repository"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Repository"), }, }, }, @@ -3054,7 +3054,7 @@ func schema_pkg_apis_application_v1alpha1_RepositoryList(ref common.ReferenceCal }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Repository", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Repository", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } @@ -3077,7 +3077,7 @@ func schema_pkg_apis_application_v1alpha1_ResourceAction(ref common.ReferenceCal Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceActionParam"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceActionParam"), }, }, }, @@ -3093,7 +3093,7 @@ func schema_pkg_apis_application_v1alpha1_ResourceAction(ref common.ReferenceCal }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceActionParam"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceActionParam"}, } } @@ -3179,7 +3179,7 @@ func schema_pkg_apis_application_v1alpha1_ResourceActions(ref common.ReferenceCa Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceActionDefinition"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceActionDefinition"), }, }, }, @@ -3189,7 +3189,7 @@ func schema_pkg_apis_application_v1alpha1_ResourceActions(ref common.ReferenceCa }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceActionDefinition"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceActionDefinition"}, } } @@ -3365,7 +3365,7 @@ func schema_pkg_apis_application_v1alpha1_ResourceNetworkingInfo(ref common.Refe Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceRef"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceRef"), }, }, }, @@ -3418,7 +3418,7 @@ func schema_pkg_apis_application_v1alpha1_ResourceNetworkingInfo(ref common.Refe }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceRef", "k8s.io/api/core/v1.LoadBalancerIngress"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceRef", "k8s.io/api/core/v1.LoadBalancerIngress"}, } } @@ -3472,7 +3472,7 @@ func schema_pkg_apis_application_v1alpha1_ResourceNode(ref common.ReferenceCallb Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceRef"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceRef"), }, }, }, @@ -3485,7 +3485,7 @@ func schema_pkg_apis_application_v1alpha1_ResourceNode(ref common.ReferenceCallb Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.InfoItem"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.InfoItem"), }, }, }, @@ -3493,7 +3493,7 @@ func schema_pkg_apis_application_v1alpha1_ResourceNode(ref common.ReferenceCallb }, "networkingInfo": { SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceNetworkingInfo"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceNetworkingInfo"), }, }, "resourceVersion": { @@ -3518,7 +3518,7 @@ func schema_pkg_apis_application_v1alpha1_ResourceNode(ref common.ReferenceCallb }, "health": { SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.HealthStatus"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.HealthStatus"), }, }, "createdAt": { @@ -3530,7 +3530,7 @@ func schema_pkg_apis_application_v1alpha1_ResourceNode(ref common.ReferenceCallb }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.HealthStatus", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.InfoItem", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceNetworkingInfo", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceRef", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.HealthStatus", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.InfoItem", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceNetworkingInfo", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceRef", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, } } @@ -3558,7 +3558,7 @@ func schema_pkg_apis_application_v1alpha1_ResourceOverride(ref common.ReferenceC "IgnoreDifferences": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.OverrideIgnoreDiff"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.OverrideIgnoreDiff"), }, }, "KnownTypeFields": { @@ -3568,7 +3568,7 @@ func schema_pkg_apis_application_v1alpha1_ResourceOverride(ref common.ReferenceC Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.KnownTypeField"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.KnownTypeField"), }, }, }, @@ -3579,7 +3579,7 @@ func schema_pkg_apis_application_v1alpha1_ResourceOverride(ref common.ReferenceC }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.KnownTypeField", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.OverrideIgnoreDiff"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.KnownTypeField", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.OverrideIgnoreDiff"}, } } @@ -3766,7 +3766,7 @@ func schema_pkg_apis_application_v1alpha1_ResourceStatus(ref common.ReferenceCal }, "health": { SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.HealthStatus"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.HealthStatus"), }, }, "hook": { @@ -3785,7 +3785,7 @@ func schema_pkg_apis_application_v1alpha1_ResourceStatus(ref common.ReferenceCal }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.HealthStatus"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.HealthStatus"}, } } @@ -3806,14 +3806,14 @@ func schema_pkg_apis_application_v1alpha1_RetryStrategy(ref common.ReferenceCall "backoff": { SchemaProps: spec.SchemaProps{ Description: "Backoff controls how to backoff on subsequent retries of failed syncs", - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Backoff"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Backoff"), }, }, }, }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.Backoff"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.Backoff"}, } } @@ -3851,7 +3851,7 @@ func schema_pkg_apis_application_v1alpha1_RevisionHistory(ref common.ReferenceCa SchemaProps: spec.SchemaProps{ Description: "Source is a reference to the application source used for the sync operation", Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSource"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSource"), }, }, "deployStartedAt": { @@ -3865,7 +3865,7 @@ func schema_pkg_apis_application_v1alpha1_RevisionHistory(ref common.ReferenceCa }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSource", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSource", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, } } @@ -3981,7 +3981,7 @@ func schema_pkg_apis_application_v1alpha1_SyncOperation(ref common.ReferenceCall "syncStrategy": { SchemaProps: spec.SchemaProps{ Description: "SyncStrategy describes how to perform the sync", - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncStrategy"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncStrategy"), }, }, "resources": { @@ -3992,7 +3992,7 @@ func schema_pkg_apis_application_v1alpha1_SyncOperation(ref common.ReferenceCall Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncOperationResource"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncOperationResource"), }, }, }, @@ -4001,7 +4001,7 @@ func schema_pkg_apis_application_v1alpha1_SyncOperation(ref common.ReferenceCall "source": { SchemaProps: spec.SchemaProps{ Description: "Source overrides the source definition set in the application. This is typically set in a Rollback operation and is nil during a Sync operation", - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSource"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSource"), }, }, "manifests": { @@ -4038,7 +4038,7 @@ func schema_pkg_apis_application_v1alpha1_SyncOperation(ref common.ReferenceCall }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSource", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncOperationResource", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncStrategy"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSource", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncOperationResource", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncStrategy"}, } } @@ -4096,7 +4096,7 @@ func schema_pkg_apis_application_v1alpha1_SyncOperationResult(ref common.Referen Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceResult"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceResult"), }, }, }, @@ -4114,7 +4114,7 @@ func schema_pkg_apis_application_v1alpha1_SyncOperationResult(ref common.Referen SchemaProps: spec.SchemaProps{ Description: "Source records the application source information of the sync, used for comparing auto-sync", Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSource"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSource"), }, }, }, @@ -4122,7 +4122,7 @@ func schema_pkg_apis_application_v1alpha1_SyncOperationResult(ref common.Referen }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ApplicationSource", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ResourceResult"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ApplicationSource", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ResourceResult"}, } } @@ -4136,7 +4136,7 @@ func schema_pkg_apis_application_v1alpha1_SyncPolicy(ref common.ReferenceCallbac "automated": { SchemaProps: spec.SchemaProps{ Description: "Automated will keep an application synced to the target revision", - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncPolicyAutomated"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncPolicyAutomated"), }, }, "syncOptions": { @@ -4157,14 +4157,14 @@ func schema_pkg_apis_application_v1alpha1_SyncPolicy(ref common.ReferenceCallbac "retry": { SchemaProps: spec.SchemaProps{ Description: "Retry controls failed sync retry behavior", - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.RetryStrategy"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.RetryStrategy"), }, }, }, }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.RetryStrategy", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncPolicyAutomated"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.RetryStrategy", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncPolicyAutomated"}, } } @@ -4221,7 +4221,7 @@ func schema_pkg_apis_application_v1alpha1_SyncStatus(ref common.ReferenceCallbac SchemaProps: spec.SchemaProps{ Description: "ComparedTo contains information about what has been compared", Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ComparedTo"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ComparedTo"), }, }, "revision": { @@ -4236,7 +4236,7 @@ func schema_pkg_apis_application_v1alpha1_SyncStatus(ref common.ReferenceCallbac }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.ComparedTo"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.ComparedTo"}, } } @@ -4250,20 +4250,20 @@ func schema_pkg_apis_application_v1alpha1_SyncStrategy(ref common.ReferenceCallb "apply": { SchemaProps: spec.SchemaProps{ Description: "Apply will perform a `kubectl apply` to perform the sync.", - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncStrategyApply"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncStrategyApply"), }, }, "hook": { SchemaProps: spec.SchemaProps{ Description: "Hook will submit any referenced resources to perform the sync. This is the default strategy", - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncStrategyHook"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncStrategyHook"), }, }, }, }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncStrategyApply", "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.SyncStrategyHook"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncStrategyApply", "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.SyncStrategyHook"}, } } @@ -4494,7 +4494,7 @@ func schema_pkg_apis_application_v1alpha1_rawResourceOverride(ref common.Referen Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.KnownTypeField"), + Ref: ref("github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.KnownTypeField"), }, }, }, @@ -4504,6 +4504,6 @@ func schema_pkg_apis_application_v1alpha1_rawResourceOverride(ref common.Referen }, }, Dependencies: []string{ - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1.KnownTypeField"}, + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1.KnownTypeField"}, } } diff --git a/pkg/apis/application/v1alpha1/register.go b/pkg/apis/application/v1alpha1/register.go index e7e43bdfc6fdf..c3d912c37f7d2 100644 --- a/pkg/apis/application/v1alpha1/register.go +++ b/pkg/apis/application/v1alpha1/register.go @@ -1,7 +1,7 @@ package v1alpha1 import ( - "github.com/argoproj/argo-cd/pkg/apis/application" + "github.com/argoproj/argo-cd/v2/pkg/apis/application" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/apis/application/v1alpha1/types.go b/pkg/apis/application/v1alpha1/types.go index 1e7c5f2c354ac..31fad8a575bf1 100644 --- a/pkg/apis/application/v1alpha1/types.go +++ b/pkg/apis/application/v1alpha1/types.go @@ -34,11 +34,11 @@ import ( "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd/api" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/util/cert" - "github.com/argoproj/argo-cd/util/git" - "github.com/argoproj/argo-cd/util/glob" - "github.com/argoproj/argo-cd/util/helm" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/util/cert" + "github.com/argoproj/argo-cd/v2/util/git" + "github.com/argoproj/argo-cd/v2/util/glob" + "github.com/argoproj/argo-cd/v2/util/helm" ) // Application is a definition of Application resource. diff --git a/pkg/apis/application/v1alpha1/types_test.go b/pkg/apis/application/v1alpha1/types_test.go index f69e99beac86e..6dc90aa8912a1 100644 --- a/pkg/apis/application/v1alpha1/types_test.go +++ b/pkg/apis/application/v1alpha1/types_test.go @@ -12,7 +12,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" - argocommon "github.com/argoproj/argo-cd/common" + argocommon "github.com/argoproj/argo-cd/v2/common" ) func TestAppProject_IsSourcePermitted(t *testing.T) { diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go index 9ec17be58d270..8ee896758ee8e 100644 --- a/pkg/client/clientset/versioned/clientset.go +++ b/pkg/client/clientset/versioned/clientset.go @@ -5,7 +5,7 @@ package versioned import ( "fmt" - argoprojv1alpha1 "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/typed/application/v1alpha1" + argoprojv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/typed/application/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go index 37058056fed18..872838a31531f 100644 --- a/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -3,9 +3,9 @@ package fake import ( - clientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned" - argoprojv1alpha1 "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/typed/application/v1alpha1" - fakeargoprojv1alpha1 "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/typed/application/v1alpha1/fake" + clientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned" + argoprojv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/typed/application/v1alpha1" + fakeargoprojv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/typed/application/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go index f42476edc8187..115e39faa197d 100644 --- a/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -3,7 +3,7 @@ package fake import ( - argoprojv1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + argoprojv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go index 0b4529a1ab6b0..a334cbed3235a 100644 --- a/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -3,7 +3,7 @@ package scheme import ( - argoprojv1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + argoprojv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/typed/application/v1alpha1/application.go b/pkg/client/clientset/versioned/typed/application/v1alpha1/application.go index 8e65694638a3d..b51e0cb94ea22 100644 --- a/pkg/client/clientset/versioned/typed/application/v1alpha1/application.go +++ b/pkg/client/clientset/versioned/typed/application/v1alpha1/application.go @@ -6,8 +6,8 @@ import ( "context" "time" - v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - scheme "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + scheme "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/versioned/typed/application/v1alpha1/application_client.go b/pkg/client/clientset/versioned/typed/application/v1alpha1/application_client.go index 59eee5c9c69bb..8a2d164888fc9 100644 --- a/pkg/client/clientset/versioned/typed/application/v1alpha1/application_client.go +++ b/pkg/client/clientset/versioned/typed/application/v1alpha1/application_client.go @@ -3,8 +3,8 @@ package v1alpha1 import ( - v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/client/clientset/versioned/typed/application/v1alpha1/appproject.go b/pkg/client/clientset/versioned/typed/application/v1alpha1/appproject.go index 0499efcb0db94..386f2db3f5822 100644 --- a/pkg/client/clientset/versioned/typed/application/v1alpha1/appproject.go +++ b/pkg/client/clientset/versioned/typed/application/v1alpha1/appproject.go @@ -6,8 +6,8 @@ import ( "context" "time" - v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - scheme "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + scheme "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_application.go b/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_application.go index 968769d978f58..876da6b06c836 100644 --- a/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_application.go +++ b/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_application.go @@ -5,7 +5,7 @@ package fake import ( "context" - v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_application_client.go b/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_application_client.go index 86ac5a1fc03bc..aacbefee5ad0f 100644 --- a/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_application_client.go +++ b/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_application_client.go @@ -3,7 +3,7 @@ package fake import ( - v1alpha1 "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/typed/application/v1alpha1" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/typed/application/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_appproject.go b/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_appproject.go index e2179a2abd2f7..efdda4b2ac6af 100644 --- a/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_appproject.go +++ b/pkg/client/clientset/versioned/typed/application/v1alpha1/fake/fake_appproject.go @@ -5,7 +5,7 @@ package fake import ( "context" - v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/informers/externalversions/application/interface.go b/pkg/client/informers/externalversions/application/interface.go index 740e039af378e..e5345a18cba40 100644 --- a/pkg/client/informers/externalversions/application/interface.go +++ b/pkg/client/informers/externalversions/application/interface.go @@ -3,8 +3,8 @@ package application import ( - v1alpha1 "github.com/argoproj/argo-cd/pkg/client/informers/externalversions/application/v1alpha1" - internalinterfaces "github.com/argoproj/argo-cd/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/client/informers/externalversions/application/v1alpha1" + internalinterfaces "github.com/argoproj/argo-cd/v2/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/pkg/client/informers/externalversions/application/v1alpha1/application.go b/pkg/client/informers/externalversions/application/v1alpha1/application.go index 6bcc05e17f080..e29ec65c8df30 100644 --- a/pkg/client/informers/externalversions/application/v1alpha1/application.go +++ b/pkg/client/informers/externalversions/application/v1alpha1/application.go @@ -6,10 +6,10 @@ import ( "context" time "time" - applicationv1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - versioned "github.com/argoproj/argo-cd/pkg/client/clientset/versioned" - internalinterfaces "github.com/argoproj/argo-cd/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/argoproj/argo-cd/pkg/client/listers/application/v1alpha1" + applicationv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + versioned "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned" + internalinterfaces "github.com/argoproj/argo-cd/v2/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/application/v1alpha1/appproject.go b/pkg/client/informers/externalversions/application/v1alpha1/appproject.go index db8422289ec04..234e3053bd462 100644 --- a/pkg/client/informers/externalversions/application/v1alpha1/appproject.go +++ b/pkg/client/informers/externalversions/application/v1alpha1/appproject.go @@ -6,10 +6,10 @@ import ( "context" time "time" - applicationv1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - versioned "github.com/argoproj/argo-cd/pkg/client/clientset/versioned" - internalinterfaces "github.com/argoproj/argo-cd/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/argoproj/argo-cd/pkg/client/listers/application/v1alpha1" + applicationv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + versioned "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned" + internalinterfaces "github.com/argoproj/argo-cd/v2/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/client/informers/externalversions/application/v1alpha1/interface.go b/pkg/client/informers/externalversions/application/v1alpha1/interface.go index 3fc91b2b59d92..46af8dc831d17 100644 --- a/pkg/client/informers/externalversions/application/v1alpha1/interface.go +++ b/pkg/client/informers/externalversions/application/v1alpha1/interface.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - internalinterfaces "github.com/argoproj/argo-cd/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/argoproj/argo-cd/v2/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/client/informers/externalversions/factory.go b/pkg/client/informers/externalversions/factory.go index 942a88578b0d0..57bd66c672490 100644 --- a/pkg/client/informers/externalversions/factory.go +++ b/pkg/client/informers/externalversions/factory.go @@ -7,9 +7,9 @@ import ( sync "sync" time "time" - versioned "github.com/argoproj/argo-cd/pkg/client/clientset/versioned" - application "github.com/argoproj/argo-cd/pkg/client/informers/externalversions/application" - internalinterfaces "github.com/argoproj/argo-cd/pkg/client/informers/externalversions/internalinterfaces" + versioned "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned" + application "github.com/argoproj/argo-cd/v2/pkg/client/informers/externalversions/application" + internalinterfaces "github.com/argoproj/argo-cd/v2/pkg/client/informers/externalversions/internalinterfaces" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go index 4000333367747..422279d2d1f7b 100644 --- a/pkg/client/informers/externalversions/generic.go +++ b/pkg/client/informers/externalversions/generic.go @@ -5,7 +5,7 @@ package externalversions import ( "fmt" - v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 2e4fb7824ae1c..710dda8e37c52 100644 --- a/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -5,7 +5,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/argoproj/argo-cd/pkg/client/clientset/versioned" + versioned "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/application/v1alpha1/application.go b/pkg/client/listers/application/v1alpha1/application.go index 3efe7e71fc4e0..9b51b24284f3e 100644 --- a/pkg/client/listers/application/v1alpha1/application.go +++ b/pkg/client/listers/application/v1alpha1/application.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/pkg/client/listers/application/v1alpha1/appproject.go b/pkg/client/listers/application/v1alpha1/appproject.go index d6039ed6d6d6a..f0813232c4cd7 100644 --- a/pkg/client/listers/application/v1alpha1/appproject.go +++ b/pkg/client/listers/application/v1alpha1/appproject.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/reposerver/apiclient/clientset.go b/reposerver/apiclient/clientset.go index c8129847458f3..200a75dbe0359 100644 --- a/reposerver/apiclient/clientset.go +++ b/reposerver/apiclient/clientset.go @@ -11,8 +11,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - argogrpc "github.com/argoproj/argo-cd/util/grpc" - "github.com/argoproj/argo-cd/util/io" + argogrpc "github.com/argoproj/argo-cd/v2/util/grpc" + "github.com/argoproj/argo-cd/v2/util/io" ) const ( diff --git a/reposerver/apiclient/mocks/Clientset.go b/reposerver/apiclient/mocks/Clientset.go index a41b33455e58e..292b0de5d3651 100644 --- a/reposerver/apiclient/mocks/Clientset.go +++ b/reposerver/apiclient/mocks/Clientset.go @@ -1,9 +1,9 @@ package mocks import ( - apiclient "github.com/argoproj/argo-cd/reposerver/apiclient" + apiclient "github.com/argoproj/argo-cd/v2/reposerver/apiclient" - io "github.com/argoproj/argo-cd/util/io" + io "github.com/argoproj/argo-cd/v2/util/io" ) type Clientset struct { diff --git a/reposerver/apiclient/mocks/RepoServerServiceClient.go b/reposerver/apiclient/mocks/RepoServerServiceClient.go index 39d0a15afc23e..f615a05819d29 100644 --- a/reposerver/apiclient/mocks/RepoServerServiceClient.go +++ b/reposerver/apiclient/mocks/RepoServerServiceClient.go @@ -5,13 +5,13 @@ package mocks import ( context "context" - apiclient "github.com/argoproj/argo-cd/reposerver/apiclient" + apiclient "github.com/argoproj/argo-cd/v2/reposerver/apiclient" grpc "google.golang.org/grpc" mock "github.com/stretchr/testify/mock" - v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" ) // RepoServerServiceClient is an autogenerated mock type for the RepoServerServiceClient type diff --git a/reposerver/apiclient/repository.pb.go b/reposerver/apiclient/repository.pb.go index b8d03b4f60750..39d9a9b63f052 100644 --- a/reposerver/apiclient/repository.pb.go +++ b/reposerver/apiclient/repository.pb.go @@ -6,7 +6,7 @@ package apiclient import ( context "context" fmt "fmt" - v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -1236,88 +1236,89 @@ func init() { } var fileDescriptor_dd8723cfcc820480 = []byte{ - // 1292 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xdd, 0x6e, 0x1b, 0xc5, - 0x17, 0xcf, 0xda, 0xce, 0x87, 0x8f, 0xdb, 0xc4, 0x99, 0xf6, 0xdf, 0xff, 0x62, 0x52, 0x2b, 0xac, - 0x44, 0x15, 0x28, 0xb5, 0x69, 0xa8, 0xa0, 0x6a, 0xa5, 0x4a, 0xa1, 0x9f, 0x28, 0x29, 0x4d, 0x37, - 0x80, 0xc4, 0x87, 0x54, 0x4d, 0xd6, 0x27, 0xeb, 0xc1, 0xeb, 0xdd, 0x61, 0x67, 0x6c, 0x94, 0xbe, - 0x00, 0xdc, 0x23, 0x9e, 0x01, 0xf1, 0x08, 0xdc, 0x22, 0x84, 0xb8, 0xe0, 0x82, 0x47, 0x40, 0x7d, - 0x12, 0x34, 0xb3, 0x5f, 0xe3, 0xb5, 0x93, 0x1b, 0x37, 0xed, 0x4d, 0x32, 0x73, 0xbe, 0xcf, 0x99, - 0xdf, 0x9c, 0x39, 0x5e, 0xb8, 0x12, 0x23, 0x8f, 0x04, 0xc6, 0x63, 0x8c, 0xbb, 0x7a, 0xc9, 0x64, - 0x14, 0x1f, 0x1b, 0xcb, 0x0e, 0x8f, 0x23, 0x19, 0x11, 0x28, 0x28, 0xad, 0x8b, 0x7e, 0xe4, 0x47, - 0x9a, 0xdc, 0x55, 0xab, 0x44, 0xa2, 0xb5, 0xe1, 0x47, 0x91, 0x1f, 0x60, 0x97, 0x72, 0xd6, 0xa5, - 0x61, 0x18, 0x49, 0x2a, 0x59, 0x14, 0x8a, 0x94, 0xeb, 0x0c, 0x6e, 0x8a, 0x0e, 0x8b, 0x34, 0xd7, - 0x8b, 0x62, 0xec, 0x8e, 0xaf, 0x77, 0x7d, 0x0c, 0x31, 0xa6, 0x12, 0x7b, 0xa9, 0xcc, 0x27, 0x3e, - 0x93, 0xfd, 0xd1, 0x61, 0xc7, 0x8b, 0x86, 0x5d, 0x1a, 0x6b, 0x17, 0xdf, 0xea, 0xc5, 0x35, 0xaf, - 0xd7, 0xe5, 0x03, 0x5f, 0x29, 0x8b, 0x2e, 0xe5, 0x3c, 0x60, 0x9e, 0x36, 0xde, 0x1d, 0x5f, 0xa7, - 0x01, 0xef, 0xd3, 0x29, 0x53, 0xce, 0xaf, 0x4b, 0xb0, 0xf6, 0x98, 0x86, 0xec, 0x08, 0x85, 0x74, - 0xf1, 0xbb, 0x11, 0x0a, 0x49, 0xbe, 0x84, 0x9a, 0x4a, 0xc2, 0xb6, 0x36, 0xad, 0xad, 0xc6, 0xf6, - 0xfd, 0x4e, 0xe1, 0xad, 0x93, 0x79, 0xd3, 0x8b, 0x67, 0x5e, 0xaf, 0xc3, 0x07, 0x7e, 0x47, 0x79, - 0xeb, 0x18, 0xde, 0x3a, 0x99, 0xb7, 0x8e, 0x9b, 0xd7, 0xc2, 0xd5, 0x26, 0x49, 0x0b, 0x56, 0x62, - 0x1c, 0x33, 0xc1, 0xa2, 0xd0, 0xae, 0x6c, 0x5a, 0x5b, 0x75, 0x37, 0xdf, 0x13, 0x1b, 0x96, 0xc3, - 0xe8, 0x2e, 0xf5, 0xfa, 0x68, 0x57, 0x37, 0xad, 0xad, 0x15, 0x37, 0xdb, 0x92, 0x4d, 0x68, 0x50, - 0xce, 0xf7, 0xe8, 0x21, 0x06, 0xbb, 0x78, 0x6c, 0xd7, 0xb4, 0xa2, 0x49, 0x52, 0xba, 0x94, 0xf3, - 0x4f, 0xe9, 0x10, 0xed, 0x45, 0xcd, 0xcd, 0xb6, 0x64, 0x03, 0xea, 0x21, 0x1d, 0xa2, 0xe0, 0xd4, - 0x43, 0x7b, 0x45, 0xf3, 0x0a, 0x02, 0x79, 0x0e, 0xeb, 0x46, 0xe0, 0x07, 0xd1, 0x28, 0xf6, 0xd0, - 0x06, 0x9d, 0xf7, 0xde, 0x1c, 0x79, 0xef, 0x94, 0x6d, 0xba, 0xd3, 0x6e, 0xc8, 0xd7, 0xb0, 0xa8, - 0xb1, 0x62, 0x37, 0x36, 0xab, 0x2f, 0xaf, 0xce, 0x89, 0x4d, 0x32, 0x80, 0x65, 0x1e, 0x8c, 0x7c, - 0x16, 0x0a, 0xfb, 0x9c, 0x36, 0xff, 0x74, 0x0e, 0xf3, 0x77, 0xa3, 0xf0, 0x88, 0xf9, 0x8f, 0x69, - 0x48, 0x7d, 0x1c, 0x62, 0x28, 0xf7, 0xb5, 0x65, 0x37, 0xf3, 0x40, 0xbe, 0x87, 0xe6, 0x60, 0x24, - 0x64, 0x34, 0x64, 0xcf, 0xf1, 0x09, 0xd7, 0x68, 0xb6, 0xcf, 0xeb, 0x22, 0xee, 0xce, 0xe1, 0x75, - 0xb7, 0x64, 0xd2, 0x9d, 0x72, 0xa2, 0x80, 0x31, 0x18, 0x1d, 0xe2, 0x17, 0x18, 0x6b, 0x44, 0xad, - 0x26, 0xc0, 0x30, 0x48, 0x09, 0x74, 0x58, 0xba, 0x13, 0xf6, 0xda, 0x66, 0x35, 0x81, 0x4e, 0x4e, - 0x22, 0x5b, 0xb0, 0x36, 0xc6, 0x98, 0x1d, 0x1d, 0x1f, 0x30, 0x3f, 0xa4, 0x72, 0x14, 0xa3, 0xdd, - 0xd4, 0xf0, 0x2b, 0x93, 0x9d, 0x3f, 0x2d, 0x68, 0x16, 0x77, 0x45, 0xf0, 0x28, 0x14, 0x1a, 0x5f, - 0xc3, 0x94, 0x26, 0x6c, 0x4b, 0x9b, 0x2f, 0x08, 0x93, 0xe8, 0xab, 0x94, 0xd1, 0x77, 0x09, 0x96, - 0x92, 0x8e, 0xa2, 0x01, 0x5f, 0x77, 0xd3, 0xdd, 0xc4, 0x2d, 0xa9, 0x95, 0x6e, 0x49, 0x1b, 0x40, - 0x68, 0xfc, 0x7c, 0x76, 0xcc, 0xd1, 0x5e, 0xd2, 0x5c, 0x83, 0x42, 0x1c, 0x38, 0x97, 0xc4, 0xed, - 0xa2, 0x18, 0x05, 0xd2, 0x5e, 0xd6, 0x12, 0x13, 0x34, 0x27, 0x80, 0xb5, 0x3d, 0xa6, 0x72, 0x38, - 0x12, 0x67, 0x7f, 0xe7, 0x9d, 0x0f, 0xa1, 0xa6, 0x3c, 0xa9, 0xac, 0x0e, 0x63, 0x1a, 0x7a, 0x7d, - 0xcc, 0x0a, 0x95, 0xef, 0x09, 0x81, 0x9a, 0xa4, 0xbe, 0xb0, 0x2b, 0x9a, 0xae, 0xd7, 0xce, 0x8f, - 0x56, 0x12, 0xe6, 0x0e, 0xe7, 0xe2, 0xf5, 0xb6, 0x26, 0x67, 0x04, 0xcb, 0x3b, 0x9c, 0xab, 0x60, - 0xc8, 0x75, 0xa8, 0x51, 0xce, 0x93, 0x0c, 0x1a, 0xdb, 0x97, 0x3b, 0xc6, 0x03, 0x90, 0x8a, 0xa8, - 0xff, 0xe2, 0x7e, 0x28, 0x95, 0x65, 0x25, 0xda, 0xfa, 0x08, 0xea, 0x39, 0x89, 0x34, 0xa1, 0x3a, - 0xc0, 0x63, 0x9d, 0x40, 0xdd, 0x55, 0x4b, 0x72, 0x11, 0x16, 0xc7, 0x34, 0x18, 0x65, 0xf8, 0x48, - 0x36, 0xb7, 0x2a, 0x37, 0x2d, 0xe7, 0xef, 0x2a, 0xbc, 0xa1, 0xe2, 0x3c, 0xd0, 0xb0, 0xd8, 0xe1, - 0xfc, 0x1e, 0x4a, 0xca, 0x02, 0xf1, 0x74, 0x84, 0xf1, 0xf1, 0x59, 0xd6, 0xa2, 0x07, 0x4b, 0x09, - 0xa4, 0x74, 0x4c, 0x2f, 0xbb, 0x17, 0xa6, 0xb6, 0x8b, 0x06, 0x58, 0x3d, 0x83, 0x06, 0x38, 0xab, - 0x27, 0xd5, 0x5e, 0x45, 0x4f, 0x3a, 0xf1, 0x29, 0x72, 0x7e, 0xa8, 0xc0, 0x25, 0x15, 0x68, 0x71, - 0x90, 0x79, 0x17, 0x51, 0xf8, 0x57, 0xf7, 0x39, 0x81, 0x85, 0x5e, 0x93, 0x1b, 0xb0, 0x3c, 0x10, - 0x51, 0x18, 0xa2, 0x4c, 0x4f, 0xa1, 0x65, 0x82, 0x6d, 0x37, 0x61, 0xed, 0x70, 0x7e, 0xc0, 0xd1, - 0x73, 0x33, 0x51, 0x72, 0x15, 0x6a, 0x7d, 0x0c, 0x86, 0xba, 0xa3, 0x34, 0xb6, 0xff, 0x6f, 0xaa, - 0x3c, 0xc2, 0x60, 0x98, 0xc9, 0x6b, 0x21, 0x72, 0x0b, 0xea, 0x79, 0xfc, 0x69, 0x75, 0x36, 0x26, - 0x9c, 0x64, 0xcc, 0x4c, 0xad, 0x10, 0x57, 0xba, 0x3d, 0x16, 0xa3, 0xa7, 0x04, 0x75, 0xa6, 0x25, - 0xdd, 0x7b, 0x19, 0x33, 0xd7, 0xcd, 0xc5, 0x9d, 0xdf, 0x2d, 0x78, 0xab, 0x00, 0xb6, 0x9b, 0x5e, - 0xb3, 0xc7, 0x28, 0x69, 0x8f, 0x4a, 0xfa, 0x9a, 0xe7, 0x90, 0x2b, 0xb0, 0xea, 0xf5, 0xd1, 0x1b, - 0x14, 0xef, 0x41, 0x32, 0x8e, 0x94, 0xa8, 0xce, 0x1f, 0x15, 0x58, 0x9d, 0x3c, 0x05, 0x75, 0x8c, - 0xaa, 0xbb, 0x67, 0xc7, 0xa8, 0xd6, 0x64, 0x1f, 0xce, 0x61, 0x38, 0x66, 0x71, 0x14, 0xaa, 0xa7, - 0x33, 0x03, 0xfb, 0x7b, 0x27, 0x9f, 0x65, 0xe7, 0xbe, 0x21, 0x9e, 0xf4, 0x91, 0x09, 0x0b, 0x64, - 0x00, 0xc0, 0x69, 0x4c, 0x87, 0x28, 0x31, 0x56, 0xa0, 0xae, 0xce, 0x0b, 0xea, 0xc4, 0xfd, 0x7e, - 0x66, 0xd3, 0x35, 0xcc, 0xb7, 0x9e, 0xc1, 0xfa, 0x54, 0x3c, 0x33, 0x9a, 0xd8, 0x0d, 0xb3, 0x89, - 0x35, 0xb6, 0xdb, 0x33, 0xd2, 0x33, 0xcc, 0x98, 0x4d, 0xee, 0xb7, 0x0a, 0x34, 0x0c, 0x64, 0xce, - 0xac, 0x61, 0x1b, 0x40, 0x2b, 0x3c, 0x60, 0x01, 0x26, 0x15, 0xac, 0xbb, 0x06, 0x85, 0xf4, 0x67, - 0x54, 0xe4, 0xd1, 0x1c, 0x15, 0x51, 0xf1, 0xcc, 0x2c, 0x87, 0x7a, 0xb2, 0xb5, 0x5f, 0x91, 0x5e, - 0xee, 0x74, 0x47, 0x24, 0xac, 0x1e, 0xb1, 0x00, 0xf7, 0x8b, 0x28, 0x96, 0x74, 0x14, 0x7b, 0x73, - 0x46, 0xf1, 0xc0, 0x34, 0xea, 0x96, 0x7c, 0x38, 0xef, 0x42, 0xb3, 0x7c, 0x45, 0x55, 0x84, 0x6c, - 0x48, 0xfd, 0xbc, 0x4e, 0xe9, 0xce, 0xf9, 0xd9, 0x02, 0x32, 0x7d, 0x12, 0x27, 0x95, 0x7b, 0x70, - 0x53, 0x64, 0x53, 0x55, 0x72, 0x3f, 0x0c, 0x0a, 0xd9, 0x85, 0x46, 0x0f, 0x85, 0x64, 0xa1, 0x0e, - 0x38, 0x6d, 0x1c, 0xef, 0x9c, 0x7e, 0xe4, 0xf7, 0x0a, 0x05, 0xd7, 0xd4, 0x76, 0x3e, 0x87, 0xcb, - 0xa7, 0x4a, 0x1b, 0x53, 0x92, 0x35, 0x31, 0x25, 0x9d, 0x3a, 0x5b, 0x39, 0x04, 0x9a, 0xe5, 0x0e, - 0xe4, 0x84, 0xb0, 0xae, 0x6a, 0x7a, 0xb7, 0x4f, 0x63, 0xf9, 0x2a, 0x26, 0x9f, 0xdb, 0x50, 0xcf, - 0xfd, 0xcd, 0x2c, 0x74, 0x0b, 0x56, 0xc6, 0xd9, 0x68, 0x9a, 0x8c, 0x3e, 0xf9, 0xde, 0xd9, 0x01, - 0x62, 0x06, 0x9b, 0x3e, 0x14, 0x57, 0x61, 0x91, 0x49, 0x1c, 0x66, 0xf3, 0xc7, 0xff, 0xca, 0xfd, - 0x5d, 0x8b, 0xbb, 0x89, 0xcc, 0xf6, 0x2f, 0x35, 0x58, 0x2f, 0xda, 0xac, 0xfa, 0xcb, 0x3c, 0x24, - 0x4f, 0xa0, 0xf9, 0x30, 0xfd, 0x15, 0x98, 0x4d, 0xb3, 0xe4, 0x4d, 0xd3, 0x4e, 0xe9, 0xf7, 0x60, - 0x6b, 0x63, 0x36, 0x33, 0x89, 0xc8, 0x59, 0x20, 0xb7, 0x61, 0x25, 0x1b, 0x27, 0x27, 0x0d, 0x95, - 0x86, 0xcc, 0x56, 0xd3, 0x64, 0x2a, 0x86, 0xb3, 0x40, 0xee, 0x24, 0xca, 0x6a, 0x40, 0x9a, 0x56, - 0x36, 0x46, 0xbf, 0xd6, 0x85, 0x19, 0xa3, 0x96, 0xb3, 0x40, 0xbe, 0x81, 0xf3, 0x0f, 0x75, 0xeb, - 0x4c, 0x9f, 0x54, 0xf2, 0xf6, 0xa4, 0x93, 0x13, 0xa6, 0xa7, 0x96, 0x53, 0x16, 0x9b, 0x7e, 0x95, - 0x9d, 0x05, 0xf2, 0x93, 0x05, 0x17, 0x1e, 0xa2, 0x2c, 0xbf, 0x50, 0xe4, 0xda, 0x6c, 0x27, 0x27, - 0xbc, 0x64, 0xad, 0xdd, 0xb9, 0x50, 0x35, 0x69, 0xd3, 0x59, 0x20, 0xfb, 0x3a, 0xe7, 0x02, 0x1d, - 0xe4, 0xf2, 0x4c, 0x18, 0xe4, 0xa5, 0x6b, 0x9f, 0xc4, 0xce, 0xf2, 0xfc, 0xf8, 0xce, 0x5f, 0x2f, - 0xda, 0xd6, 0x3f, 0x2f, 0xda, 0xd6, 0xbf, 0x2f, 0xda, 0xd6, 0x57, 0xef, 0x9f, 0xf6, 0x7d, 0xc1, - 0xf8, 0x0e, 0x42, 0x39, 0xf3, 0x02, 0x86, 0xa1, 0x3c, 0x5c, 0xd2, 0x5f, 0x13, 0x3e, 0xf8, 0x2f, - 0x00, 0x00, 0xff, 0xff, 0x73, 0xa9, 0x07, 0xe6, 0x26, 0x11, 0x00, 0x00, + // 1300 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x4b, 0x6f, 0xdb, 0xc6, + 0x13, 0x37, 0x25, 0xf9, 0xa1, 0x51, 0x62, 0xcb, 0x9b, 0xfc, 0xf3, 0x67, 0x59, 0x47, 0x70, 0x09, + 0x34, 0x70, 0x9b, 0x86, 0x42, 0x94, 0xa0, 0x0d, 0x12, 0xa0, 0x80, 0x9a, 0x27, 0xe0, 0x24, 0x76, + 0xe9, 0xb4, 0x87, 0x22, 0x68, 0xb0, 0xa6, 0xc7, 0xd4, 0x56, 0x14, 0xb9, 0xe1, 0x52, 0x2a, 0x1c, + 0xa0, 0xe7, 0x1e, 0x7a, 0x6e, 0x3f, 0x44, 0x3f, 0x41, 0x6f, 0x3d, 0xf5, 0x71, 0xec, 0xb1, 0xc7, + 0x22, 0x9f, 0xa4, 0xd8, 0xe5, 0x6b, 0x45, 0xc9, 0xe9, 0xc1, 0x89, 0x73, 0xb1, 0x77, 0xe7, 0x3d, + 0xb3, 0xbf, 0x9d, 0x1d, 0x11, 0x2e, 0xc5, 0xc8, 0x23, 0x81, 0xf1, 0x04, 0xe3, 0xae, 0x5a, 0xb2, + 0x24, 0x8a, 0x8f, 0xb4, 0xa5, 0xc3, 0xe3, 0x28, 0x89, 0x08, 0x94, 0x14, 0xeb, 0xbc, 0x1f, 0xf9, + 0x91, 0x22, 0x77, 0xe5, 0x2a, 0x95, 0xb0, 0x36, 0xfc, 0x28, 0xf2, 0x03, 0xec, 0x52, 0xce, 0xba, + 0x34, 0x0c, 0xa3, 0x84, 0x26, 0x2c, 0x0a, 0x45, 0xc6, 0xb5, 0x87, 0x37, 0x84, 0xc3, 0x22, 0xc5, + 0xf5, 0xa2, 0x18, 0xbb, 0x93, 0xab, 0x5d, 0x1f, 0x43, 0x8c, 0x69, 0x82, 0x07, 0x99, 0xcc, 0x43, + 0x9f, 0x25, 0x83, 0xf1, 0xbe, 0xe3, 0x45, 0xa3, 0x2e, 0x8d, 0x95, 0x8b, 0x6f, 0xd4, 0xe2, 0x8a, + 0x77, 0xd0, 0x9d, 0xf4, 0xba, 0x7c, 0xe8, 0x4b, 0x7d, 0xd1, 0xa5, 0x9c, 0x07, 0xcc, 0x53, 0xf6, + 0xbb, 0x93, 0xab, 0x34, 0xe0, 0x03, 0x3a, 0x63, 0xcd, 0xfe, 0x65, 0x09, 0xd6, 0x1e, 0xd1, 0x90, + 0x1d, 0xa2, 0x48, 0x5c, 0x7c, 0x3e, 0x46, 0x91, 0x90, 0xa7, 0xd0, 0x90, 0x79, 0x98, 0xc6, 0xa6, + 0xb1, 0xd5, 0xea, 0x3d, 0x70, 0x4a, 0x87, 0x4e, 0xee, 0x50, 0x2d, 0x9e, 0x79, 0x07, 0xce, 0xa4, + 0xe7, 0xf0, 0xa1, 0xef, 0x48, 0x87, 0x8e, 0xe6, 0xd0, 0xc9, 0x1d, 0x3a, 0x6e, 0x51, 0x11, 0x57, + 0x59, 0x25, 0x16, 0xac, 0xc4, 0x38, 0x61, 0x82, 0x45, 0xa1, 0x59, 0xdb, 0x34, 0xb6, 0x9a, 0x6e, + 0xb1, 0x27, 0x26, 0x2c, 0x87, 0xd1, 0x6d, 0xea, 0x0d, 0xd0, 0xac, 0x6f, 0x1a, 0x5b, 0x2b, 0x6e, + 0xbe, 0x25, 0x9b, 0xd0, 0xa2, 0x9c, 0x3f, 0xa4, 0xfb, 0x18, 0x6c, 0xe3, 0x91, 0xd9, 0x50, 0x8a, + 0x3a, 0x49, 0xea, 0x52, 0xce, 0x1f, 0xd3, 0x11, 0x9a, 0x8b, 0x8a, 0x9b, 0x6f, 0xc9, 0x06, 0x34, + 0x43, 0x3a, 0x42, 0xc1, 0xa9, 0x87, 0xe6, 0x8a, 0xe2, 0x95, 0x04, 0xf2, 0x1d, 0xac, 0x6b, 0x81, + 0xef, 0x45, 0xe3, 0xd8, 0x43, 0x13, 0x54, 0xea, 0x3b, 0x27, 0x4b, 0xbd, 0x5f, 0x35, 0xeb, 0xce, + 0x7a, 0x22, 0x5f, 0xc3, 0xa2, 0x02, 0x8d, 0xd9, 0xda, 0xac, 0xbf, 0xd6, 0x6a, 0xa7, 0x66, 0x49, + 0x08, 0xcb, 0x3c, 0x18, 0xfb, 0x2c, 0x14, 0xe6, 0x19, 0xe5, 0xe1, 0xc9, 0xc9, 0x3c, 0xdc, 0x8e, + 0xc2, 0x43, 0xe6, 0x3f, 0xa2, 0x21, 0xf5, 0x71, 0x84, 0x61, 0xb2, 0xab, 0x8c, 0xbb, 0xb9, 0x13, + 0xf2, 0x02, 0xda, 0xc3, 0xb1, 0x48, 0xa2, 0x11, 0x7b, 0x81, 0x3b, 0x5c, 0x81, 0xdb, 0x3c, 0xab, + 0xaa, 0xf9, 0xf8, 0x64, 0x8e, 0xb7, 0x2b, 0x56, 0xdd, 0x19, 0x3f, 0x12, 0x24, 0xc3, 0xf1, 0x3e, + 0x7e, 0x89, 0xb1, 0x42, 0xd7, 0x6a, 0x0a, 0x12, 0x8d, 0x94, 0xc2, 0x88, 0x65, 0x3b, 0x61, 0xae, + 0x6d, 0xd6, 0x53, 0x18, 0x15, 0x24, 0xb2, 0x05, 0x6b, 0x13, 0x8c, 0xd9, 0xe1, 0xd1, 0x1e, 0xf3, + 0x43, 0x9a, 0x8c, 0x63, 0x34, 0xdb, 0x0a, 0x8a, 0x55, 0xb2, 0xfd, 0xbb, 0x01, 0xed, 0xf2, 0xea, + 0x08, 0x1e, 0x85, 0x42, 0x61, 0x6d, 0x94, 0xd1, 0x84, 0x69, 0x28, 0xf3, 0x25, 0x61, 0x1a, 0x89, + 0xb5, 0x2a, 0x12, 0x2f, 0xc0, 0x52, 0xda, 0x63, 0x14, 0xf8, 0x9b, 0x6e, 0xb6, 0x9b, 0xba, 0x31, + 0x8d, 0xca, 0x8d, 0xe9, 0x00, 0x08, 0x05, 0xa4, 0x27, 0x47, 0x1c, 0xcd, 0x25, 0xc5, 0xd5, 0x28, + 0xc4, 0x86, 0x33, 0x69, 0xdc, 0x2e, 0x8a, 0x71, 0x90, 0x98, 0xcb, 0x4a, 0x62, 0x8a, 0x66, 0x47, + 0xb0, 0xf6, 0x90, 0xc9, 0x1c, 0x0e, 0xc5, 0xa9, 0xb4, 0x00, 0xfb, 0x63, 0x68, 0x48, 0x67, 0x32, + 0xb1, 0xfd, 0x98, 0x86, 0xde, 0x00, 0xf3, 0x5a, 0x15, 0x7b, 0x42, 0xa0, 0x91, 0x50, 0x5f, 0x98, + 0x35, 0x45, 0x57, 0x6b, 0xfb, 0x07, 0x23, 0x8d, 0xb4, 0xcf, 0xb9, 0x78, 0xeb, 0xcd, 0xca, 0x1e, + 0xc3, 0x72, 0x9f, 0x73, 0x19, 0x0f, 0xb9, 0x0a, 0x0d, 0xca, 0x79, 0x9a, 0x44, 0xab, 0x77, 0xd1, + 0xd1, 0x1e, 0x86, 0x4c, 0x44, 0xfe, 0x17, 0x77, 0xc3, 0x44, 0x5a, 0x96, 0xa2, 0xd6, 0x27, 0xd0, + 0x2c, 0x48, 0xa4, 0x0d, 0xf5, 0x21, 0x1e, 0xa9, 0x1c, 0x9a, 0xae, 0x5c, 0x92, 0xf3, 0xb0, 0x38, + 0xa1, 0xc1, 0x38, 0x47, 0x49, 0xba, 0xb9, 0x59, 0xbb, 0x61, 0xd8, 0x7f, 0xd7, 0xe1, 0x1d, 0x19, + 0xe7, 0x9e, 0x02, 0x47, 0x9f, 0xf3, 0x3b, 0x98, 0x50, 0x16, 0x88, 0xcf, 0xc7, 0x18, 0x1f, 0xbd, + 0xe1, 0x72, 0xf8, 0xb0, 0x94, 0x62, 0x4b, 0x85, 0xf5, 0x06, 0x1a, 0x64, 0x66, 0xbe, 0xec, 0x8a, + 0xf5, 0x37, 0xd3, 0x15, 0xe7, 0x75, 0xa9, 0xc6, 0x29, 0x75, 0xa9, 0x63, 0x1f, 0x2a, 0xfb, 0xfb, + 0x1a, 0x5c, 0x90, 0xb1, 0x96, 0x87, 0x5a, 0xf4, 0x15, 0x79, 0x1d, 0xe4, 0x0d, 0x4f, 0x21, 0xa2, + 0xd6, 0xe4, 0x3a, 0x2c, 0x0f, 0x45, 0x14, 0x86, 0x98, 0x64, 0xc7, 0x61, 0xe9, 0xc0, 0xdb, 0x4e, + 0x59, 0x7d, 0xce, 0xf7, 0x38, 0x7a, 0x6e, 0x2e, 0x4a, 0x2e, 0x43, 0x63, 0x80, 0xc1, 0x48, 0xf5, + 0x98, 0x56, 0xef, 0xff, 0xba, 0xca, 0x03, 0x0c, 0x46, 0xb9, 0xbc, 0x12, 0x22, 0x37, 0xa1, 0x59, + 0xc4, 0x9f, 0x15, 0x68, 0x63, 0xca, 0x49, 0xce, 0xcc, 0xd5, 0x4a, 0x71, 0xa9, 0x7b, 0xc0, 0x62, + 0xf4, 0xa4, 0xa0, 0xca, 0xb4, 0xa2, 0x7b, 0x27, 0x67, 0x16, 0xba, 0x85, 0xb8, 0xfd, 0x9b, 0x01, + 0xef, 0x95, 0x20, 0x77, 0xb3, 0x2b, 0xf7, 0x08, 0x13, 0x7a, 0x40, 0x13, 0xfa, 0xf6, 0x07, 0x95, + 0x4b, 0xb0, 0xea, 0x0d, 0xd0, 0x1b, 0x96, 0x8f, 0x44, 0x3a, 0xaf, 0x54, 0xa8, 0xf6, 0x1f, 0x35, + 0x58, 0x9d, 0x3e, 0x08, 0x79, 0x92, 0xb2, 0xe5, 0xe7, 0x27, 0x29, 0xd7, 0x64, 0x17, 0xce, 0x60, + 0x38, 0x61, 0x71, 0x14, 0xca, 0x27, 0x35, 0x47, 0xfd, 0x47, 0xc7, 0x1f, 0xa7, 0x73, 0x57, 0x13, + 0x4f, 0xdb, 0xca, 0x94, 0x05, 0x12, 0x02, 0x70, 0x1a, 0xd3, 0x11, 0x26, 0x18, 0x4b, 0x68, 0xd7, + 0x5f, 0x03, 0xb4, 0xd3, 0x08, 0x76, 0x73, 0xb3, 0xae, 0xe6, 0xc1, 0x7a, 0x06, 0xeb, 0x33, 0x21, + 0xcd, 0x69, 0x6b, 0xd7, 0xf5, 0xb6, 0xd6, 0xea, 0x75, 0xe6, 0x64, 0xa8, 0x99, 0xd1, 0xdb, 0xde, + 0xaf, 0x35, 0x68, 0x69, 0xf8, 0x9c, 0x5b, 0xc6, 0x0e, 0x80, 0x52, 0xb8, 0xc7, 0x02, 0x4c, 0x8b, + 0xd8, 0x74, 0x35, 0x0a, 0x19, 0xce, 0x29, 0xca, 0xf6, 0xc9, 0x8a, 0x22, 0x43, 0x9a, 0x5b, 0x11, + 0xf9, 0x9a, 0x2b, 0xd7, 0x22, 0xbb, 0xe5, 0xd9, 0x8e, 0x7c, 0x0b, 0xab, 0x87, 0x2c, 0xc0, 0xdd, + 0x32, 0x90, 0x25, 0x15, 0xc8, 0xce, 0xc9, 0x03, 0xb9, 0xa7, 0xdb, 0x75, 0x2b, 0x6e, 0xec, 0x0f, + 0xa1, 0x5d, 0xbd, 0xae, 0x32, 0x48, 0x36, 0xa2, 0x7e, 0x51, 0xad, 0x6c, 0x67, 0xff, 0x68, 0x00, + 0x99, 0x3d, 0x8f, 0xe3, 0x8a, 0x3e, 0xbc, 0x21, 0xf2, 0x99, 0x2b, 0xbd, 0x28, 0x1a, 0x85, 0x6c, + 0x43, 0xeb, 0x00, 0x45, 0xc2, 0x42, 0x15, 0x70, 0xd6, 0x44, 0x3e, 0x78, 0xf5, 0xc1, 0xdf, 0x29, + 0x15, 0x5c, 0x5d, 0xdb, 0xfe, 0x02, 0x2e, 0xbe, 0x52, 0x5a, 0x9b, 0xa1, 0x8c, 0xa9, 0x19, 0xea, + 0x95, 0x93, 0x97, 0x4d, 0xa0, 0x5d, 0xed, 0x46, 0xf6, 0x73, 0x58, 0x97, 0x35, 0xbd, 0x3d, 0xa0, + 0x71, 0x72, 0x4a, 0x73, 0xd1, 0x2d, 0x68, 0x16, 0x2e, 0xe7, 0xd6, 0xda, 0x82, 0x95, 0x49, 0x3e, + 0xbb, 0xa6, 0x83, 0x51, 0xb1, 0xb7, 0xfb, 0x40, 0xf4, 0x78, 0xb3, 0x77, 0xe3, 0x32, 0x2c, 0xb2, + 0x04, 0x47, 0xf9, 0x68, 0xf2, 0xbf, 0x6a, 0xbb, 0x57, 0xe2, 0x6e, 0x2a, 0xd3, 0xfb, 0xb9, 0x01, + 0xeb, 0x65, 0xd7, 0x95, 0x7f, 0x99, 0x87, 0x64, 0x07, 0xda, 0xf7, 0xb3, 0x5f, 0x8d, 0xf9, 0xb8, + 0x4b, 0xde, 0xd5, 0xed, 0x54, 0x7e, 0x3f, 0x5a, 0x1b, 0xf3, 0x99, 0x69, 0x44, 0xf6, 0x02, 0xb9, + 0x05, 0x2b, 0xf9, 0xbc, 0x39, 0x6d, 0xa8, 0x32, 0x85, 0x5a, 0x6d, 0x9d, 0x29, 0x19, 0xf6, 0x02, + 0xf9, 0x34, 0x55, 0x96, 0xb3, 0xd3, 0xac, 0xb2, 0x36, 0x18, 0x5a, 0xe7, 0xe6, 0x4c, 0x61, 0xf6, + 0x02, 0x79, 0x0a, 0x67, 0xef, 0xab, 0x36, 0x9a, 0xbd, 0xb0, 0xe4, 0xfd, 0x69, 0x27, 0xc7, 0x0c, + 0x56, 0x96, 0x5d, 0x15, 0x9b, 0x7d, 0xa4, 0xed, 0x05, 0xf2, 0x93, 0x01, 0xe7, 0xee, 0x63, 0x52, + 0x7d, 0xb0, 0xc8, 0x95, 0xf9, 0x4e, 0x8e, 0x79, 0xd8, 0xac, 0xc7, 0x27, 0x05, 0xd6, 0xb4, 0x59, + 0x7b, 0x81, 0xec, 0xaa, 0xb4, 0x4b, 0x80, 0x90, 0x8b, 0x73, 0x91, 0x50, 0x54, 0xaf, 0x73, 0x1c, + 0x3b, 0x4f, 0xf5, 0xb3, 0xfe, 0x9f, 0x2f, 0x3b, 0xc6, 0x5f, 0x2f, 0x3b, 0xc6, 0x3f, 0x2f, 0x3b, + 0xc6, 0x57, 0xd7, 0xfe, 0xe3, 0xab, 0x84, 0xf6, 0x01, 0x85, 0x72, 0xe6, 0x05, 0x0c, 0xc3, 0x64, + 0x7f, 0x49, 0x7d, 0x83, 0xb8, 0xf6, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x72, 0xbc, 0x47, 0x0a, + 0x5f, 0x11, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/reposerver/cache/cache.go b/reposerver/cache/cache.go index 9fd7b1a485892..65ebbec95efaa 100644 --- a/reposerver/cache/cache.go +++ b/reposerver/cache/cache.go @@ -10,10 +10,10 @@ import ( "github.com/go-redis/redis/v8" "github.com/spf13/cobra" - appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/reposerver/apiclient" - cacheutil "github.com/argoproj/argo-cd/util/cache" - "github.com/argoproj/argo-cd/util/hash" + appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + cacheutil "github.com/argoproj/argo-cd/v2/util/cache" + "github.com/argoproj/argo-cd/v2/util/hash" log "github.com/sirupsen/logrus" ) diff --git a/reposerver/cache/cache_test.go b/reposerver/cache/cache_test.go index bc60fb2c5feba..290134831ff95 100644 --- a/reposerver/cache/cache_test.go +++ b/reposerver/cache/cache_test.go @@ -10,10 +10,10 @@ import ( "github.com/spf13/cobra" "github.com/stretchr/testify/assert" - . "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/reposerver/apiclient" - cacheutil "github.com/argoproj/argo-cd/util/cache" + . "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + cacheutil "github.com/argoproj/argo-cd/v2/util/cache" ) type fixtures struct { diff --git a/reposerver/gpgwatcher.go b/reposerver/gpgwatcher.go index 8af59f180e60d..f2bf09722680d 100644 --- a/reposerver/gpgwatcher.go +++ b/reposerver/gpgwatcher.go @@ -8,7 +8,7 @@ import ( "github.com/fsnotify/fsnotify" log "github.com/sirupsen/logrus" - "github.com/argoproj/argo-cd/util/gpg" + "github.com/argoproj/argo-cd/v2/util/gpg" ) const maxRecreateRetries = 5 diff --git a/reposerver/metrics/gitwrapper.go b/reposerver/metrics/gitwrapper.go index 637e752375ab2..59aa9736fa780 100644 --- a/reposerver/metrics/gitwrapper.go +++ b/reposerver/metrics/gitwrapper.go @@ -3,7 +3,7 @@ package metrics import ( "time" - "github.com/argoproj/argo-cd/util/git" + "github.com/argoproj/argo-cd/v2/util/git" ) type gitClientWrapper struct { diff --git a/reposerver/repository/lock.go b/reposerver/repository/lock.go index 86cb371867861..14a2e6f07a422 100644 --- a/reposerver/repository/lock.go +++ b/reposerver/repository/lock.go @@ -4,7 +4,7 @@ import ( "io" "sync" - ioutil "github.com/argoproj/argo-cd/util/io" + ioutil "github.com/argoproj/argo-cd/v2/util/io" ) func NewRepositoryLock() *repositoryLock { diff --git a/reposerver/repository/lock_test.go b/reposerver/repository/lock_test.go index b3b5f449b4e58..e3000128c41c4 100644 --- a/reposerver/repository/lock_test.go +++ b/reposerver/repository/lock_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - util "github.com/argoproj/argo-cd/util/io" + util "github.com/argoproj/argo-cd/v2/util/io" ) // execute given action and return false if action have not completed within 1 second diff --git a/reposerver/repository/repository.go b/reposerver/repository/repository.go index 90d63cfce7c94..e7e1f66cbb5df 100644 --- a/reposerver/repository/repository.go +++ b/reposerver/repository/repository.go @@ -32,25 +32,25 @@ 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/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/reposerver/apiclient" - "github.com/argoproj/argo-cd/reposerver/cache" - reposervercache "github.com/argoproj/argo-cd/reposerver/cache" - "github.com/argoproj/argo-cd/reposerver/metrics" - "github.com/argoproj/argo-cd/util/app/discovery" - argopath "github.com/argoproj/argo-cd/util/app/path" - executil "github.com/argoproj/argo-cd/util/exec" - "github.com/argoproj/argo-cd/util/git" - "github.com/argoproj/argo-cd/util/glob" - "github.com/argoproj/argo-cd/util/gpg" - "github.com/argoproj/argo-cd/util/helm" - "github.com/argoproj/argo-cd/util/io" - "github.com/argoproj/argo-cd/util/ksonnet" - argokube "github.com/argoproj/argo-cd/util/kube" - "github.com/argoproj/argo-cd/util/kustomize" - "github.com/argoproj/argo-cd/util/security" - "github.com/argoproj/argo-cd/util/text" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + "github.com/argoproj/argo-cd/v2/reposerver/cache" + reposervercache "github.com/argoproj/argo-cd/v2/reposerver/cache" + "github.com/argoproj/argo-cd/v2/reposerver/metrics" + "github.com/argoproj/argo-cd/v2/util/app/discovery" + argopath "github.com/argoproj/argo-cd/v2/util/app/path" + executil "github.com/argoproj/argo-cd/v2/util/exec" + "github.com/argoproj/argo-cd/v2/util/git" + "github.com/argoproj/argo-cd/v2/util/glob" + "github.com/argoproj/argo-cd/v2/util/gpg" + "github.com/argoproj/argo-cd/v2/util/helm" + "github.com/argoproj/argo-cd/v2/util/io" + "github.com/argoproj/argo-cd/v2/util/ksonnet" + argokube "github.com/argoproj/argo-cd/v2/util/kube" + "github.com/argoproj/argo-cd/v2/util/kustomize" + "github.com/argoproj/argo-cd/v2/util/security" + "github.com/argoproj/argo-cd/v2/util/text" ) const ( diff --git a/reposerver/repository/repository.proto b/reposerver/repository/repository.proto index 6c6dc72346d25..74ead59adeaa4 100644 --- a/reposerver/repository/repository.proto +++ b/reposerver/repository/repository.proto @@ -1,16 +1,16 @@ syntax = "proto3"; -option go_package = "github.com/argoproj/argo-cd/reposerver/apiclient"; +option go_package = "github.com/argoproj/argo-cd/v2/reposerver/apiclient"; package repository; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "k8s.io/api/core/v1/generated.proto"; -import "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1/generated.proto"; +import "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/generated.proto"; // ManifestRequest is a query for manifest generation. message ManifestRequest { - github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Repository repo = 1; + github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Repository repo = 1; // revision, potentially un-resolved string revision = 2; bool noCache = 3; @@ -18,10 +18,10 @@ message ManifestRequest { // Name of the application for which the request is triggered string appName = 5; string namespace = 8; - github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationSource applicationSource = 10; - repeated github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Repository repos = 11; - repeated github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ConfigManagementPlugin plugins = 12; - github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.KustomizeOptions kustomizeOptions = 13; + github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationSource applicationSource = 10; + repeated github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Repository repos = 11; + repeated github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ConfigManagementPlugin plugins = 12; + github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.KustomizeOptions kustomizeOptions = 13; string kubeVersion = 14; repeated string apiVersions = 15; // Request to verify the signature when generating the manifests (only for Git repositories) @@ -40,7 +40,7 @@ message ManifestResponse { } message ListRefsRequest { - github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Repository repo = 1; + github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Repository repo = 1; } // A subset of the repository's named refs @@ -51,7 +51,7 @@ message Refs { // ListAppsRequest requests a repository directory structure message ListAppsRequest { - github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Repository repo = 1; + github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Repository repo = 1; string revision = 2; } @@ -62,10 +62,10 @@ message AppList { // RepoServerAppDetailsQuery contains query information for app details request message RepoServerAppDetailsQuery { - github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Repository repo = 1; - github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationSource source = 2; - repeated github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Repository repos = 3; - github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.KustomizeOptions kustomizeOptions = 4; + github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Repository repo = 1; + github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationSource source = 2; + repeated github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Repository repos = 3; + github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.KustomizeOptions kustomizeOptions = 4; string appName = 5; } @@ -80,7 +80,7 @@ message RepoAppDetailsResponse { message RepoServerRevisionMetadataRequest { // the repo - github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Repository repo = 1; + github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Repository repo = 1; // the revision within the repo string revision = 2; // whether to check signature on revision @@ -92,7 +92,7 @@ message RepoServerRevisionMetadataRequest { message KsonnetAppSpec { string name = 1; map environments = 3; - repeated github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.KsonnetParameter parameters = 4; + repeated github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.KsonnetParameter parameters = 4; } // HelmAppSpec contains helm app name in source repo @@ -100,11 +100,11 @@ message HelmAppSpec { string name = 1; repeated string valueFiles = 3; // the output of `helm inspect values` - repeated github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.HelmParameter parameters = 4; + repeated github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.HelmParameter parameters = 4; // the contents of values.yaml string values = 5; // helm file parameters - repeated github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.HelmFileParameter fileParameters = 6; + repeated github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.HelmFileParameter fileParameters = 6; } // KustomizeAppSpec contains kustomize images @@ -135,7 +135,7 @@ message DirectoryAppSpec { message HelmChartsRequest { - github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Repository repo = 1; + github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Repository repo = 1; } message HelmChart { @@ -167,7 +167,7 @@ service RepoServerService { } // Get the meta-data (author, date, tags, message) for a specific revision of the repo - rpc GetRevisionMetadata(RepoServerRevisionMetadataRequest) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.RevisionMetadata) { + rpc GetRevisionMetadata(RepoServerRevisionMetadataRequest) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RevisionMetadata) { } // GetHelmCharts returns list of helm charts in the specified repository diff --git a/reposerver/repository/repository_norace_test.go b/reposerver/repository/repository_norace_test.go index d73b6dfd5d091..ac49fe90b1d1b 100644 --- a/reposerver/repository/repository_norace_test.go +++ b/reposerver/repository/repository_norace_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" - argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/reposerver/apiclient" + argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" ) func TestHelmDependencyWithConcurrency(t *testing.T) { diff --git a/reposerver/repository/repository_test.go b/reposerver/repository/repository_test.go index a55a700851b5e..84dc780966e93 100644 --- a/reposerver/repository/repository_test.go +++ b/reposerver/repository/repository_test.go @@ -22,17 +22,17 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/reposerver/apiclient" - "github.com/argoproj/argo-cd/reposerver/cache" - "github.com/argoproj/argo-cd/reposerver/metrics" - fileutil "github.com/argoproj/argo-cd/test/fixture/path" - cacheutil "github.com/argoproj/argo-cd/util/cache" - "github.com/argoproj/argo-cd/util/git" - gitmocks "github.com/argoproj/argo-cd/util/git/mocks" - "github.com/argoproj/argo-cd/util/helm" - helmmocks "github.com/argoproj/argo-cd/util/helm/mocks" - "github.com/argoproj/argo-cd/util/io" + argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + "github.com/argoproj/argo-cd/v2/reposerver/cache" + "github.com/argoproj/argo-cd/v2/reposerver/metrics" + fileutil "github.com/argoproj/argo-cd/v2/test/fixture/path" + cacheutil "github.com/argoproj/argo-cd/v2/util/cache" + "github.com/argoproj/argo-cd/v2/util/git" + gitmocks "github.com/argoproj/argo-cd/v2/util/git/mocks" + "github.com/argoproj/argo-cd/v2/util/helm" + helmmocks "github.com/argoproj/argo-cd/v2/util/helm/mocks" + "github.com/argoproj/argo-cd/v2/util/io" ) const testSignature = `gpg: Signature made Wed Feb 26 23:22:34 2020 CET @@ -129,7 +129,7 @@ func TestGenerateYamlManifestInDir(t *testing.T) { q := apiclient.ManifestRequest{Repo: &argoappv1.Repository{}, ApplicationSource: &src} // update this value if we add/remove manifests - const countOfManifests = 29 + const countOfManifests = 28 res1, err := service.GenerateManifest(context.Background(), &q) diff --git a/reposerver/server.go b/reposerver/server.go index f6f89c56f6354..a0a206efe0706 100644 --- a/reposerver/server.go +++ b/reposerver/server.go @@ -15,16 +15,16 @@ import ( "google.golang.org/grpc/health/grpc_health_v1" "google.golang.org/grpc/reflection" - "github.com/argoproj/argo-cd/common" - versionpkg "github.com/argoproj/argo-cd/pkg/apiclient/version" - "github.com/argoproj/argo-cd/reposerver/apiclient" - reposervercache "github.com/argoproj/argo-cd/reposerver/cache" - "github.com/argoproj/argo-cd/reposerver/metrics" - "github.com/argoproj/argo-cd/reposerver/repository" - "github.com/argoproj/argo-cd/server/version" - "github.com/argoproj/argo-cd/util/env" - grpc_util "github.com/argoproj/argo-cd/util/grpc" - tlsutil "github.com/argoproj/argo-cd/util/tls" + "github.com/argoproj/argo-cd/v2/common" + versionpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/version" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + reposervercache "github.com/argoproj/argo-cd/v2/reposerver/cache" + "github.com/argoproj/argo-cd/v2/reposerver/metrics" + "github.com/argoproj/argo-cd/v2/reposerver/repository" + "github.com/argoproj/argo-cd/v2/server/version" + "github.com/argoproj/argo-cd/v2/util/env" + grpc_util "github.com/argoproj/argo-cd/v2/util/grpc" + tlsutil "github.com/argoproj/argo-cd/v2/util/tls" ) // ArgoCDRepoServer is the repo server implementation diff --git a/resource_customizations/custom_actions_test.go b/resource_customizations/custom_actions_test.go index 9c74d014678bd..2abce7fecbd2f 100644 --- a/resource_customizations/custom_actions_test.go +++ b/resource_customizations/custom_actions_test.go @@ -16,9 +16,9 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - appsv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/cli" - "github.com/argoproj/argo-cd/util/lua" + appsv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/cli" + "github.com/argoproj/argo-cd/v2/util/lua" ) type testNormalizer struct{} diff --git a/resource_customizations/health_test.go b/resource_customizations/health_test.go index 2f669c82b7881..6b418671ee304 100644 --- a/resource_customizations/health_test.go +++ b/resource_customizations/health_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/lua" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/lua" ) type TestStructure struct { diff --git a/server/account/account.go b/server/account/account.go index 007ec6d1f4b11..1e037dc45508b 100644 --- a/server/account/account.go +++ b/server/account/account.go @@ -13,13 +13,13 @@ import ( "google.golang.org/grpc/status" "k8s.io/kubectl/pkg/util/slice" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/pkg/apiclient/account" - "github.com/argoproj/argo-cd/server/rbacpolicy" - "github.com/argoproj/argo-cd/util/password" - "github.com/argoproj/argo-cd/util/rbac" - "github.com/argoproj/argo-cd/util/session" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apiclient/account" + "github.com/argoproj/argo-cd/v2/server/rbacpolicy" + "github.com/argoproj/argo-cd/v2/util/password" + "github.com/argoproj/argo-cd/v2/util/rbac" + "github.com/argoproj/argo-cd/v2/util/session" + "github.com/argoproj/argo-cd/v2/util/settings" ) // Server provides a Session service diff --git a/server/account/account.proto b/server/account/account.proto index b27b2e3cf52d4..bbb8589791831 100644 --- a/server/account/account.proto +++ b/server/account/account.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -option go_package = "github.com/argoproj/argo-cd/pkg/apiclient/account"; +option go_package = "github.com/argoproj/argo-cd/v2/pkg/apiclient/account"; // Account Service // diff --git a/server/account/account_test.go b/server/account/account_test.go index 7cc84100e6310..b75f816fd3943 100644 --- a/server/account/account_test.go +++ b/server/account/account_test.go @@ -13,16 +13,16 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/pkg/apiclient/account" - sessionpkg "github.com/argoproj/argo-cd/pkg/apiclient/session" - "github.com/argoproj/argo-cd/server/session" - "github.com/argoproj/argo-cd/test" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/password" - "github.com/argoproj/argo-cd/util/rbac" - sessionutil "github.com/argoproj/argo-cd/util/session" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apiclient/account" + sessionpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/session" + "github.com/argoproj/argo-cd/v2/server/session" + "github.com/argoproj/argo-cd/v2/test" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/password" + "github.com/argoproj/argo-cd/v2/util/rbac" + sessionutil "github.com/argoproj/argo-cd/v2/util/session" + "github.com/argoproj/argo-cd/v2/util/settings" ) const ( diff --git a/server/application/application.go b/server/application/application.go index 84acde6d68708..1142c7a288478 100644 --- a/server/application/application.go +++ b/server/application/application.go @@ -35,26 +35,26 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/utils/pointer" - argocommon "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/pkg/apiclient/application" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned" - applisters "github.com/argoproj/argo-cd/pkg/client/listers/application/v1alpha1" - "github.com/argoproj/argo-cd/reposerver/apiclient" - servercache "github.com/argoproj/argo-cd/server/cache" - "github.com/argoproj/argo-cd/server/rbacpolicy" - "github.com/argoproj/argo-cd/util/argo" - argoutil "github.com/argoproj/argo-cd/util/argo" - "github.com/argoproj/argo-cd/util/db" - "github.com/argoproj/argo-cd/util/env" - "github.com/argoproj/argo-cd/util/git" - "github.com/argoproj/argo-cd/util/helm" - ioutil "github.com/argoproj/argo-cd/util/io" - "github.com/argoproj/argo-cd/util/lua" - "github.com/argoproj/argo-cd/util/rbac" - "github.com/argoproj/argo-cd/util/session" - "github.com/argoproj/argo-cd/util/settings" + argocommon "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apiclient/application" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned" + applisters "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + servercache "github.com/argoproj/argo-cd/v2/server/cache" + "github.com/argoproj/argo-cd/v2/server/rbacpolicy" + "github.com/argoproj/argo-cd/v2/util/argo" + argoutil "github.com/argoproj/argo-cd/v2/util/argo" + "github.com/argoproj/argo-cd/v2/util/db" + "github.com/argoproj/argo-cd/v2/util/env" + "github.com/argoproj/argo-cd/v2/util/git" + "github.com/argoproj/argo-cd/v2/util/helm" + ioutil "github.com/argoproj/argo-cd/v2/util/io" + "github.com/argoproj/argo-cd/v2/util/lua" + "github.com/argoproj/argo-cd/v2/util/rbac" + "github.com/argoproj/argo-cd/v2/util/session" + "github.com/argoproj/argo-cd/v2/util/settings" ) const ( diff --git a/server/application/application.proto b/server/application/application.proto index 7f32c2aa7889c..385191377e09e 100644 --- a/server/application/application.proto +++ b/server/application/application.proto @@ -1,5 +1,5 @@ syntax = "proto2"; -option go_package = "github.com/argoproj/argo-cd/pkg/apiclient/application"; +option go_package = "github.com/argoproj/argo-cd/v2/pkg/apiclient/application"; // Application Service // @@ -10,8 +10,8 @@ import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "k8s.io/api/core/v1/generated.proto"; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; -import "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1/generated.proto"; -import "github.com/argoproj/argo-cd/reposerver/repository/repository.proto"; +import "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/generated.proto"; +import "github.com/argoproj/argo-cd/v2/reposerver/repository/repository.proto"; // ApplicationQuery is a query for application resources @@ -59,13 +59,13 @@ message ApplicationManifestQuery { message ApplicationResponse {} message ApplicationCreateRequest { - required github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Application application = 1 [(gogoproto.nullable) = false]; + required github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Application application = 1 [(gogoproto.nullable) = false]; optional bool upsert = 2; optional bool validate = 3; } message ApplicationUpdateRequest { - required github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Application application = 1; + required github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Application application = 1; optional bool validate = 2; } @@ -85,18 +85,18 @@ message ApplicationSyncRequest { optional string revision = 2 [(gogoproto.nullable) = false]; optional bool dryRun = 3 [(gogoproto.nullable) = false]; optional bool prune = 4 [(gogoproto.nullable) = false]; - optional github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.SyncStrategy strategy = 5; - repeated github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.SyncOperationResource resources = 7 [(gogoproto.nullable) = false]; + optional github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.SyncStrategy strategy = 5; + repeated github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.SyncOperationResource resources = 7 [(gogoproto.nullable) = false]; repeated string manifests = 8; - repeated github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Info infos = 9; - optional github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.RetryStrategy retryStrategy = 10; + repeated github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Info infos = 9; + optional github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RetryStrategy retryStrategy = 10; optional SyncOptions syncOptions = 11; } // ApplicationUpdateSpecRequest is a request to update application spec message ApplicationUpdateSpecRequest { required string name = 1; - required github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationSpec spec = 2 [(gogoproto.nullable) = false]; + required github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationSpec spec = 2 [(gogoproto.nullable) = false]; optional bool validate = 3; } @@ -156,7 +156,7 @@ message ResourceActionRunRequest { } message ResourceActionsListResponse { - repeated github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ResourceAction actions = 1 [(gogoproto.nullable) = false]; + repeated github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ResourceAction actions = 1 [(gogoproto.nullable) = false]; } message ApplicationResourceResponse { @@ -224,14 +224,14 @@ message ResourcesQuery { } message ManagedResourcesResponse { - repeated github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ResourceDiff items = 1; + repeated github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ResourceDiff items = 1; } // ApplicationService service ApplicationService { // List returns list of applications - rpc List(ApplicationQuery) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationList) { + rpc List(ApplicationQuery) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationList) { option (google.api.http).get = "/api/v1/applications"; } @@ -241,12 +241,12 @@ service ApplicationService { } // Watch returns stream of application change events - rpc Watch(ApplicationQuery) returns (stream github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationWatchEvent) { + rpc Watch(ApplicationQuery) returns (stream github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationWatchEvent) { option (google.api.http).get = "/api/v1/stream/applications"; } // Create creates an application - rpc Create (ApplicationCreateRequest) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Application) { + rpc Create (ApplicationCreateRequest) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Application) { option (google.api.http) = { post: "/api/v1/applications" body: "application" @@ -254,7 +254,7 @@ service ApplicationService { } // Get returns an application by name - rpc Get (ApplicationQuery) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Application) { + rpc Get (ApplicationQuery) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Application) { option (google.api.http).get = "/api/v1/applications/{name}"; } @@ -264,7 +264,7 @@ service ApplicationService { } // Get the meta-data (author, date, tags, message) for a specific revision of the application - rpc RevisionMetadata (RevisionMetadataQuery) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.RevisionMetadata) { + rpc RevisionMetadata (RevisionMetadataQuery) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RevisionMetadata) { option (google.api.http).get = "/api/v1/applications/{name}/revisions/{revision}/metadata"; } @@ -274,7 +274,7 @@ service ApplicationService { } // Update updates an application - rpc Update(ApplicationUpdateRequest) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Application) { + rpc Update(ApplicationUpdateRequest) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Application) { option (google.api.http) = { put: "/api/v1/applications/{application.metadata.name}" body: "application" @@ -282,7 +282,7 @@ service ApplicationService { } // UpdateSpec updates an application spec - rpc UpdateSpec(ApplicationUpdateSpecRequest) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationSpec) { + rpc UpdateSpec(ApplicationUpdateSpecRequest) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationSpec) { option (google.api.http) = { put: "/api/v1/applications/{name}/spec" body: "spec" @@ -290,7 +290,7 @@ service ApplicationService { } // Patch patch an application - rpc Patch(ApplicationPatchRequest) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Application) { + rpc Patch(ApplicationPatchRequest) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Application) { option (google.api.http) = { patch: "/api/v1/applications/{name}" body: "*" @@ -303,7 +303,7 @@ service ApplicationService { } // Sync syncs an application to its target state - rpc Sync(ApplicationSyncRequest) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Application) { + rpc Sync(ApplicationSyncRequest) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Application) { option (google.api.http) = { post: "/api/v1/applications/{name}/sync" body: "*" @@ -316,17 +316,17 @@ service ApplicationService { } // ResourceTree returns resource tree - rpc ResourceTree(ResourcesQuery) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationTree) { + rpc ResourceTree(ResourcesQuery) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationTree) { option (google.api.http).get = "/api/v1/applications/{applicationName}/resource-tree"; } // Watch returns stream of application resource tree - rpc WatchResourceTree(ResourcesQuery) returns (stream github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationTree) { + rpc WatchResourceTree(ResourcesQuery) returns (stream github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationTree) { option (google.api.http).get = "/api/v1/stream/applications/{applicationName}/resource-tree"; } // Rollback syncs an application to its target state - rpc Rollback(ApplicationRollbackRequest) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Application) { + rpc Rollback(ApplicationRollbackRequest) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Application) { option (google.api.http) = { post: "/api/v1/applications/{name}/rollback" body: "*" diff --git a/server/application/application_test.go b/server/application/application_test.go index fcf069d767f80..fd8c791086285 100644 --- a/server/application/application_test.go +++ b/server/application/application_test.go @@ -25,21 +25,21 @@ import ( k8scache "k8s.io/client-go/tools/cache" "k8s.io/utils/pointer" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/pkg/apiclient/application" - appsv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - apps "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/fake" - appinformer "github.com/argoproj/argo-cd/pkg/client/informers/externalversions" - "github.com/argoproj/argo-cd/reposerver/apiclient" - "github.com/argoproj/argo-cd/reposerver/apiclient/mocks" - "github.com/argoproj/argo-cd/server/rbacpolicy" - "github.com/argoproj/argo-cd/test" - "github.com/argoproj/argo-cd/util/assets" - "github.com/argoproj/argo-cd/util/cache" - "github.com/argoproj/argo-cd/util/db" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/rbac" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apiclient/application" + appsv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + apps "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/fake" + appinformer "github.com/argoproj/argo-cd/v2/pkg/client/informers/externalversions" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient/mocks" + "github.com/argoproj/argo-cd/v2/server/rbacpolicy" + "github.com/argoproj/argo-cd/v2/test" + "github.com/argoproj/argo-cd/v2/util/assets" + "github.com/argoproj/argo-cd/v2/util/cache" + "github.com/argoproj/argo-cd/v2/util/db" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/rbac" + "github.com/argoproj/argo-cd/v2/util/settings" ) const ( diff --git a/server/application/broadcaster.go b/server/application/broadcaster.go index 729e3b05f1bab..6d2dbeebccc7b 100644 --- a/server/application/broadcaster.go +++ b/server/application/broadcaster.go @@ -6,7 +6,7 @@ import ( log "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/watch" - appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" ) type subscriber struct { diff --git a/server/application/broadcaster_test.go b/server/application/broadcaster_test.go index 37fa36f0b1660..c95d65eb9ddc3 100644 --- a/server/application/broadcaster_test.go +++ b/server/application/broadcaster_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" ) func TestBroadcasterHandler_SubscribeUnsubscribe(t *testing.T) { diff --git a/server/badge/badge.go b/server/badge/badge.go index 3636d691da07f..f82924559a375 100644 --- a/server/badge/badge.go +++ b/server/badge/badge.go @@ -10,11 +10,11 @@ import ( "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/pkg/client/clientset/versioned" - "github.com/argoproj/argo-cd/util/argo" - "github.com/argoproj/argo-cd/util/assets" - "github.com/argoproj/argo-cd/util/settings" + appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned" + "github.com/argoproj/argo-cd/v2/util/argo" + "github.com/argoproj/argo-cd/v2/util/assets" + "github.com/argoproj/argo-cd/v2/util/settings" ) //NewHandler creates handler serving to do api/badge endpoint diff --git a/server/badge/badge_test.go b/server/badge/badge_test.go index 244d060bc192c..89651932e039d 100644 --- a/server/badge/badge_test.go +++ b/server/badge/badge_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/fake" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/fake" + "github.com/argoproj/argo-cd/v2/util/settings" "github.com/argoproj/gitops-engine/pkg/health" "github.com/stretchr/testify/assert" diff --git a/server/badge/color.go b/server/badge/color.go index eac6b8d09b796..b9edb82227bca 100644 --- a/server/badge/color.go +++ b/server/badge/color.go @@ -4,7 +4,7 @@ import ( "fmt" "image/color" - appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" "github.com/argoproj/gitops-engine/pkg/health" ) diff --git a/server/cache/cache.go b/server/cache/cache.go index 86c5944dbef86..2625c9134753c 100644 --- a/server/cache/cache.go +++ b/server/cache/cache.go @@ -8,10 +8,10 @@ import ( "github.com/go-redis/redis/v8" "github.com/spf13/cobra" - appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - cacheutil "github.com/argoproj/argo-cd/util/cache" - appstatecache "github.com/argoproj/argo-cd/util/cache/appstate" - "github.com/argoproj/argo-cd/util/oidc" + appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + cacheutil "github.com/argoproj/argo-cd/v2/util/cache" + appstatecache "github.com/argoproj/argo-cd/v2/util/cache/appstate" + "github.com/argoproj/argo-cd/v2/util/oidc" ) var ErrCacheMiss = appstatecache.ErrCacheMiss diff --git a/server/cache/cache_test.go b/server/cache/cache_test.go index 339e650ab4b2c..e92c966788fc8 100644 --- a/server/cache/cache_test.go +++ b/server/cache/cache_test.go @@ -7,10 +7,10 @@ import ( "github.com/spf13/cobra" "github.com/stretchr/testify/assert" - . "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - cacheutil "github.com/argoproj/argo-cd/util/cache" - appstatecache "github.com/argoproj/argo-cd/util/cache/appstate" - "github.com/argoproj/argo-cd/util/oidc" + . "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + cacheutil "github.com/argoproj/argo-cd/v2/util/cache" + appstatecache "github.com/argoproj/argo-cd/v2/util/cache/appstate" + "github.com/argoproj/argo-cd/v2/util/oidc" ) type fixtures struct { diff --git a/server/certificate/certificate.go b/server/certificate/certificate.go index 9cfba01e77047..51989b62253c9 100644 --- a/server/certificate/certificate.go +++ b/server/certificate/certificate.go @@ -3,12 +3,12 @@ package certificate import ( "golang.org/x/net/context" - certificatepkg "github.com/argoproj/argo-cd/pkg/apiclient/certificate" - appsv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/reposerver/apiclient" - "github.com/argoproj/argo-cd/server/rbacpolicy" - "github.com/argoproj/argo-cd/util/db" - "github.com/argoproj/argo-cd/util/rbac" + certificatepkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/certificate" + appsv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + "github.com/argoproj/argo-cd/v2/server/rbacpolicy" + "github.com/argoproj/argo-cd/v2/util/db" + "github.com/argoproj/argo-cd/v2/util/rbac" ) // Server provides a Certificate service diff --git a/server/certificate/certificate.proto b/server/certificate/certificate.proto index 30c1b2456cd64..c97e770ab97bf 100644 --- a/server/certificate/certificate.proto +++ b/server/certificate/certificate.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -option go_package = "github.com/argoproj/argo-cd/pkg/apiclient/certificate"; +option go_package = "github.com/argoproj/argo-cd/v2/pkg/apiclient/certificate"; // Certificate Service // @@ -9,7 +9,7 @@ package certificate; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -import "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1/generated.proto"; +import "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/generated.proto"; // Message to query the server for configured repository certificates message RepositoryCertificateQuery { @@ -24,7 +24,7 @@ message RepositoryCertificateQuery { // Request to create a set of certificates message RepositoryCertificateCreateRequest { // List of certificates to be created - github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.RepositoryCertificateList certificates = 1; + github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RepositoryCertificateList certificates = 1; // Whether to upsert already existing certificates bool upsert = 2; } @@ -33,12 +33,12 @@ message RepositoryCertificateResponse {} service CertificateService { // List all available repository certificates - rpc ListCertificates(RepositoryCertificateQuery) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.RepositoryCertificateList) { + rpc ListCertificates(RepositoryCertificateQuery) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RepositoryCertificateList) { option (google.api.http).get = "/api/v1/certificates"; } // Creates repository certificates on the server - rpc CreateCertificate(RepositoryCertificateCreateRequest) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.RepositoryCertificateList) { + rpc CreateCertificate(RepositoryCertificateCreateRequest) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RepositoryCertificateList) { option (google.api.http) = { post: "/api/v1/certificates" body: "certificates" @@ -46,7 +46,7 @@ service CertificateService { } // Delete the certificates that match the RepositoryCertificateQuery - rpc DeleteCertificate(RepositoryCertificateQuery) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.RepositoryCertificateList) { + rpc DeleteCertificate(RepositoryCertificateQuery) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RepositoryCertificateList) { option (google.api.http).delete = "/api/v1/certificates"; } } \ No newline at end of file diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go index e21f6f28f771c..e304149d0c48b 100644 --- a/server/cluster/cluster.go +++ b/server/cluster/cluster.go @@ -11,13 +11,13 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - "github.com/argoproj/argo-cd/pkg/apiclient/cluster" - appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - servercache "github.com/argoproj/argo-cd/server/cache" - "github.com/argoproj/argo-cd/server/rbacpolicy" - "github.com/argoproj/argo-cd/util/clusterauth" - "github.com/argoproj/argo-cd/util/db" - "github.com/argoproj/argo-cd/util/rbac" + "github.com/argoproj/argo-cd/v2/pkg/apiclient/cluster" + appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + servercache "github.com/argoproj/argo-cd/v2/server/cache" + "github.com/argoproj/argo-cd/v2/server/rbacpolicy" + "github.com/argoproj/argo-cd/v2/util/clusterauth" + "github.com/argoproj/argo-cd/v2/util/db" + "github.com/argoproj/argo-cd/v2/util/rbac" ) // Server provides a Cluster service diff --git a/server/cluster/cluster.proto b/server/cluster/cluster.proto index a7ea15ff993df..43c7b860fa566 100644 --- a/server/cluster/cluster.proto +++ b/server/cluster/cluster.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -option go_package = "github.com/argoproj/argo-cd/pkg/apiclient/cluster"; +option go_package = "github.com/argoproj/argo-cd/v2/pkg/apiclient/cluster"; // Cluster Service // @@ -9,7 +9,7 @@ package cluster; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "k8s.io/api/core/v1/generated.proto"; -import "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1/generated.proto"; +import "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/generated.proto"; // ClusterQuery is a query for cluster resources @@ -21,12 +21,12 @@ message ClusterQuery { message ClusterResponse {} message ClusterCreateRequest { - github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Cluster cluster = 1; + github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Cluster cluster = 1; bool upsert = 2; } message ClusterUpdateRequest { - github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Cluster cluster = 1; + github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Cluster cluster = 1; repeated string updatedFields = 2; } @@ -34,12 +34,12 @@ message ClusterUpdateRequest { service ClusterService { // List returns list of clusters - rpc List(ClusterQuery) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ClusterList) { + rpc List(ClusterQuery) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ClusterList) { option (google.api.http).get = "/api/v1/clusters"; } // Create creates a cluster - rpc Create(ClusterCreateRequest) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Cluster) { + rpc Create(ClusterCreateRequest) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Cluster) { option (google.api.http) = { post: "/api/v1/clusters" body: "cluster" @@ -47,12 +47,12 @@ service ClusterService { } // Get returns a cluster by server address - rpc Get(ClusterQuery) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Cluster) { + rpc Get(ClusterQuery) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Cluster) { option (google.api.http).get = "/api/v1/clusters/{server}"; } // Update updates a cluster - rpc Update(ClusterUpdateRequest) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Cluster) { + rpc Update(ClusterUpdateRequest) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Cluster) { option (google.api.http) = { put: "/api/v1/clusters/{cluster.server}" body: "cluster" @@ -70,7 +70,7 @@ service ClusterService { } // InvalidateCache invalidates cluster cache - rpc InvalidateCache(ClusterQuery) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Cluster) { + rpc InvalidateCache(ClusterQuery) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Cluster) { option (google.api.http).post = "/api/v1/clusters/{server}/invalidate-cache"; } diff --git a/server/cluster/cluster_test.go b/server/cluster/cluster_test.go index 819b3cd7b7bbd..b073b281e9396 100644 --- a/server/cluster/cluster_test.go +++ b/server/cluster/cluster_test.go @@ -12,15 +12,15 @@ import ( "k8s.io/client-go/kubernetes/fake" "k8s.io/utils/pointer" - "github.com/argoproj/argo-cd/common" - clusterapi "github.com/argoproj/argo-cd/pkg/apiclient/cluster" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - servercache "github.com/argoproj/argo-cd/server/cache" - "github.com/argoproj/argo-cd/test" - cacheutil "github.com/argoproj/argo-cd/util/cache" - appstatecache "github.com/argoproj/argo-cd/util/cache/appstate" - dbmocks "github.com/argoproj/argo-cd/util/db/mocks" - "github.com/argoproj/argo-cd/util/rbac" + "github.com/argoproj/argo-cd/v2/common" + clusterapi "github.com/argoproj/argo-cd/v2/pkg/apiclient/cluster" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + servercache "github.com/argoproj/argo-cd/v2/server/cache" + "github.com/argoproj/argo-cd/v2/test" + cacheutil "github.com/argoproj/argo-cd/v2/util/cache" + appstatecache "github.com/argoproj/argo-cd/v2/util/cache/appstate" + dbmocks "github.com/argoproj/argo-cd/v2/util/db/mocks" + "github.com/argoproj/argo-cd/v2/util/rbac" ) func newServerInMemoryCache() *servercache.Cache { diff --git a/server/gpgkey/gpgkey.go b/server/gpgkey/gpgkey.go index c9b7822181ded..02f316717b6de 100644 --- a/server/gpgkey/gpgkey.go +++ b/server/gpgkey/gpgkey.go @@ -6,13 +6,13 @@ import ( "golang.org/x/net/context" - gpgkeypkg "github.com/argoproj/argo-cd/pkg/apiclient/gpgkey" - appsv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/reposerver/apiclient" - "github.com/argoproj/argo-cd/server/rbacpolicy" - "github.com/argoproj/argo-cd/util/db" - "github.com/argoproj/argo-cd/util/gpg" - "github.com/argoproj/argo-cd/util/rbac" + gpgkeypkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/gpgkey" + appsv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + "github.com/argoproj/argo-cd/v2/server/rbacpolicy" + "github.com/argoproj/argo-cd/v2/util/db" + "github.com/argoproj/argo-cd/v2/util/gpg" + "github.com/argoproj/argo-cd/v2/util/rbac" ) // Server provides a service of type GPGKeyService diff --git a/server/gpgkey/gpgkey.proto b/server/gpgkey/gpgkey.proto index d219e719c4ad3..b743c4431c639 100644 --- a/server/gpgkey/gpgkey.proto +++ b/server/gpgkey/gpgkey.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -option go_package = "github.com/argoproj/argo-cd/pkg/apiclient/gpgkey"; +option go_package = "github.com/argoproj/argo-cd/v2/pkg/apiclient/gpgkey"; // GPG public key service // @@ -8,7 +8,7 @@ package gpgkey; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -import "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1/generated.proto"; +import "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/generated.proto"; // Message to query the server for configured GPG public keys message GnuPGPublicKeyQuery { @@ -19,7 +19,7 @@ message GnuPGPublicKeyQuery { // Request to create one or more public keys on the server message GnuPGPublicKeyCreateRequest { // Raw key data of the GPG key(s) to create - github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.GnuPGPublicKey publickey = 1; + github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.GnuPGPublicKey publickey = 1; // Whether to upsert already existing public keys bool upsert = 2; } @@ -27,7 +27,7 @@ message GnuPGPublicKeyCreateRequest { // Response to a public key creation request message GnuPGPublicKeyCreateResponse { // List of GPG public keys that have been created - github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.GnuPGPublicKeyList created = 1; + github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.GnuPGPublicKeyList created = 1; // List of key IDs that haven been skipped because they already exist on the server repeated string skipped = 2; } @@ -38,12 +38,12 @@ message GnuPGPublicKeyResponse {} // GPGKeyService implements API for managing GPG public keys on the server service GPGKeyService { // List all available repository certificates - rpc List(GnuPGPublicKeyQuery) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.GnuPGPublicKeyList) { + rpc List(GnuPGPublicKeyQuery) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.GnuPGPublicKeyList) { option (google.api.http).get = "/api/v1/gpgkeys"; } // Get information about specified GPG public key from the server - rpc Get(GnuPGPublicKeyQuery) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.GnuPGPublicKey) { + rpc Get(GnuPGPublicKeyQuery) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.GnuPGPublicKey) { option (google.api.http).get = "/api/v1/gpgkeys/{keyID}"; } diff --git a/server/logout/logout.go b/server/logout/logout.go index b0409590bbfed..02337e610ae7d 100644 --- a/server/logout/logout.go +++ b/server/logout/logout.go @@ -11,12 +11,12 @@ import ( "github.com/dgrijalva/jwt-go/v4" log "github.com/sirupsen/logrus" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/pkg/client/clientset/versioned" - httputil "github.com/argoproj/argo-cd/util/http" - jwtutil "github.com/argoproj/argo-cd/util/jwt" - "github.com/argoproj/argo-cd/util/session" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned" + httputil "github.com/argoproj/argo-cd/v2/util/http" + jwtutil "github.com/argoproj/argo-cd/v2/util/jwt" + "github.com/argoproj/argo-cd/v2/util/session" + "github.com/argoproj/argo-cd/v2/util/settings" ) //NewHandler creates handler serving to do api/logout endpoint diff --git a/server/logout/logout_test.go b/server/logout/logout_test.go index d141b341a1c72..5ee23bc2e451f 100644 --- a/server/logout/logout_test.go +++ b/server/logout/logout_test.go @@ -9,11 +9,11 @@ import ( "regexp" "testing" - "github.com/argoproj/argo-cd/common" - appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/fake" - "github.com/argoproj/argo-cd/test" - "github.com/argoproj/argo-cd/util/session" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/fake" + "github.com/argoproj/argo-cd/v2/test" + "github.com/argoproj/argo-cd/v2/util/session" + "github.com/argoproj/argo-cd/v2/util/settings" "github.com/dgrijalva/jwt-go/v4" "github.com/stretchr/testify/assert" diff --git a/server/project/project.go b/server/project/project.go index 2556b9abf8912..70d0d5316a20d 100644 --- a/server/project/project.go +++ b/server/project/project.go @@ -19,17 +19,17 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/pkg/apiclient/project" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned" - listersv1alpha1 "github.com/argoproj/argo-cd/pkg/client/listers/application/v1alpha1" - "github.com/argoproj/argo-cd/server/rbacpolicy" - "github.com/argoproj/argo-cd/util/argo" - jwtutil "github.com/argoproj/argo-cd/util/jwt" - "github.com/argoproj/argo-cd/util/rbac" - "github.com/argoproj/argo-cd/util/session" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apiclient/project" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned" + listersv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/server/rbacpolicy" + "github.com/argoproj/argo-cd/v2/util/argo" + jwtutil "github.com/argoproj/argo-cd/v2/util/jwt" + "github.com/argoproj/argo-cd/v2/util/rbac" + "github.com/argoproj/argo-cd/v2/util/session" + "github.com/argoproj/argo-cd/v2/util/settings" ) const ( diff --git a/server/project/project.proto b/server/project/project.proto index 87ba842e85b42..37aa158491af9 100644 --- a/server/project/project.proto +++ b/server/project/project.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -option go_package = "github.com/argoproj/argo-cd/pkg/apiclient/project"; +option go_package = "github.com/argoproj/argo-cd/v2/pkg/apiclient/project"; // Project Service // @@ -10,12 +10,12 @@ import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "k8s.io/api/core/v1/generated.proto"; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; -import "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1/generated.proto"; +import "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/generated.proto"; // ProjectCreateRequest defines project creation parameters. message ProjectCreateRequest { - github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.AppProject project = 1; + github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.AppProject project = 1; bool upsert = 2; } @@ -48,7 +48,7 @@ message ProjectQuery { } message ProjectUpdateRequest { - github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.AppProject project = 1; + github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.AppProject project = 1; } message EmptyResponse {} @@ -58,11 +58,11 @@ message SyncWindowsQuery { } message SyncWindowsResponse { - repeated github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.SyncWindow windows = 1; + repeated github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.SyncWindow windows = 1; } message GlobalProjectsResponse { - repeated github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.AppProject items = 1; + repeated github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.AppProject items = 1; } // ProjectService @@ -82,7 +82,7 @@ service ProjectService { } // Create a new project - rpc Create(ProjectCreateRequest) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.AppProject) { + rpc Create(ProjectCreateRequest) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.AppProject) { option (google.api.http) = { post: "/api/v1/projects" body: "*" @@ -90,12 +90,12 @@ service ProjectService { } // List returns list of projects - rpc List(ProjectQuery) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.AppProjectList) { + rpc List(ProjectQuery) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.AppProjectList) { option (google.api.http).get = "/api/v1/projects"; } // Get returns a project by name - rpc Get(ProjectQuery) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.AppProject) { + rpc Get(ProjectQuery) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.AppProject) { option (google.api.http).get = "/api/v1/projects/{name}"; } @@ -105,7 +105,7 @@ service ProjectService { } // Update updates a project - rpc Update(ProjectUpdateRequest) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.AppProject) { + rpc Update(ProjectUpdateRequest) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.AppProject) { option (google.api.http) = { put: "/api/v1/projects/{project.metadata.name}" body: "*" diff --git a/server/project/project_test.go b/server/project/project_test.go index 0a6d69d444d44..a87bef3cc3ff7 100644 --- a/server/project/project_test.go +++ b/server/project/project_test.go @@ -18,18 +18,18 @@ import ( "k8s.io/client-go/kubernetes/fake" k8scache "k8s.io/client-go/tools/cache" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/pkg/apiclient/project" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - apps "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/fake" - informer "github.com/argoproj/argo-cd/pkg/client/informers/externalversions" - "github.com/argoproj/argo-cd/server/rbacpolicy" - "github.com/argoproj/argo-cd/test" - "github.com/argoproj/argo-cd/util/assets" - jwtutil "github.com/argoproj/argo-cd/util/jwt" - "github.com/argoproj/argo-cd/util/rbac" - "github.com/argoproj/argo-cd/util/session" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apiclient/project" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + apps "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/fake" + informer "github.com/argoproj/argo-cd/v2/pkg/client/informers/externalversions" + "github.com/argoproj/argo-cd/v2/server/rbacpolicy" + "github.com/argoproj/argo-cd/v2/test" + "github.com/argoproj/argo-cd/v2/util/assets" + jwtutil "github.com/argoproj/argo-cd/v2/util/jwt" + "github.com/argoproj/argo-cd/v2/util/rbac" + "github.com/argoproj/argo-cd/v2/util/session" + "github.com/argoproj/argo-cd/v2/util/settings" ) const testNamespace = "default" diff --git a/server/rbacpolicy/rbacpolicy.go b/server/rbacpolicy/rbacpolicy.go index 968d60413c837..e7b2683f4b3db 100644 --- a/server/rbacpolicy/rbacpolicy.go +++ b/server/rbacpolicy/rbacpolicy.go @@ -6,10 +6,10 @@ import ( jwt "github.com/dgrijalva/jwt-go/v4" log "github.com/sirupsen/logrus" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - applister "github.com/argoproj/argo-cd/pkg/client/listers/application/v1alpha1" - jwtutil "github.com/argoproj/argo-cd/util/jwt" - "github.com/argoproj/argo-cd/util/rbac" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + applister "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1" + jwtutil "github.com/argoproj/argo-cd/v2/util/jwt" + "github.com/argoproj/argo-cd/v2/util/rbac" ) const ( diff --git a/server/rbacpolicy/rbacpolicy_test.go b/server/rbacpolicy/rbacpolicy_test.go index f9ff759d35770..99c26dca964c3 100644 --- a/server/rbacpolicy/rbacpolicy_test.go +++ b/server/rbacpolicy/rbacpolicy_test.go @@ -9,10 +9,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" - "github.com/argoproj/argo-cd/common" - argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/test" - "github.com/argoproj/argo-cd/util/rbac" + "github.com/argoproj/argo-cd/v2/common" + argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/test" + "github.com/argoproj/argo-cd/v2/util/rbac" ) func newFakeProj() *argoappv1.AppProject { diff --git a/server/repocreds/repocreds.go b/server/repocreds/repocreds.go index 4be420a0265bd..ee38096fedbcc 100644 --- a/server/repocreds/repocreds.go +++ b/server/repocreds/repocreds.go @@ -7,13 +7,13 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - repocredspkg "github.com/argoproj/argo-cd/pkg/apiclient/repocreds" - appsv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/reposerver/apiclient" - "github.com/argoproj/argo-cd/server/rbacpolicy" - "github.com/argoproj/argo-cd/util/db" - "github.com/argoproj/argo-cd/util/rbac" - "github.com/argoproj/argo-cd/util/settings" + repocredspkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/repocreds" + appsv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + "github.com/argoproj/argo-cd/v2/server/rbacpolicy" + "github.com/argoproj/argo-cd/v2/util/db" + "github.com/argoproj/argo-cd/v2/util/rbac" + "github.com/argoproj/argo-cd/v2/util/settings" ) // Server provides a Repository service diff --git a/server/repocreds/repocreds.proto b/server/repocreds/repocreds.proto index 5cbc510f41cb3..8161e5eb8e1c5 100644 --- a/server/repocreds/repocreds.proto +++ b/server/repocreds/repocreds.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -option go_package = "github.com/argoproj/argo-cd/pkg/apiclient/repocreds"; +option go_package = "github.com/argoproj/argo-cd/v2/pkg/apiclient/repocreds"; // Repository Service // @@ -9,7 +9,7 @@ package repocreds; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "k8s.io/api/core/v1/generated.proto"; -import "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1/generated.proto"; +import "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/generated.proto"; // RepoCredsQuery is a query for RepoCreds resources message RepoCredsQuery { @@ -27,26 +27,26 @@ message RepoCredsResponse {} // RepoCreateRequest is a request for creating repository credentials config message RepoCredsCreateRequest { // Repository definition - github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.RepoCreds creds = 1; + github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RepoCreds creds = 1; // Whether to create in upsert mode bool upsert = 2; } // RepoCredsUpdateRequest is a request for updating existing repository credentials config message RepoCredsUpdateRequest { - github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.RepoCreds creds = 1; + github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RepoCreds creds = 1; } // RepoCredsService implements CRUD actions for managing repository credentials config service RepoCredsService { // ListRepositoryCredentials gets a list of all configured repository credential sets - rpc ListRepositoryCredentials(RepoCredsQuery) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.RepoCredsList) { + rpc ListRepositoryCredentials(RepoCredsQuery) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RepoCredsList) { option (google.api.http).get = "/api/v1/repocreds"; } // CreateRepositoryCredentials creates a new repository credential set - rpc CreateRepositoryCredentials(RepoCredsCreateRequest) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.RepoCreds) { + rpc CreateRepositoryCredentials(RepoCredsCreateRequest) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RepoCreds) { option (google.api.http) = { post: "/api/v1/repocreds" body: "creds" @@ -54,7 +54,7 @@ service RepoCredsService { } // UpdateRepositoryCredentials updates a repository credential set - rpc UpdateRepositoryCredentials(RepoCredsUpdateRequest) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.RepoCreds) { + rpc UpdateRepositoryCredentials(RepoCredsUpdateRequest) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RepoCreds) { option (google.api.http) = { put: "/api/v1/repocreds/{creds.url}" body: "creds" diff --git a/server/repository/repository.go b/server/repository/repository.go index ba4c7a394deb3..36a69c3e57a65 100644 --- a/server/repository/repository.go +++ b/server/repository/repository.go @@ -12,18 +12,18 @@ import ( "google.golang.org/grpc/status" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/argoproj/argo-cd/common" - repositorypkg "github.com/argoproj/argo-cd/pkg/apiclient/repository" - appsv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/reposerver/apiclient" - servercache "github.com/argoproj/argo-cd/server/cache" - "github.com/argoproj/argo-cd/server/rbacpolicy" - "github.com/argoproj/argo-cd/util/argo" - "github.com/argoproj/argo-cd/util/db" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/io" - "github.com/argoproj/argo-cd/util/rbac" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + repositorypkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/repository" + appsv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + servercache "github.com/argoproj/argo-cd/v2/server/cache" + "github.com/argoproj/argo-cd/v2/server/rbacpolicy" + "github.com/argoproj/argo-cd/v2/util/argo" + "github.com/argoproj/argo-cd/v2/util/db" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/io" + "github.com/argoproj/argo-cd/v2/util/rbac" + "github.com/argoproj/argo-cd/v2/util/settings" ) // Server provides a Repository service diff --git a/server/repository/repository.proto b/server/repository/repository.proto index 275c85d04da04..5e80cea61de3f 100644 --- a/server/repository/repository.proto +++ b/server/repository/repository.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -option go_package = "github.com/argoproj/argo-cd/pkg/apiclient/repository"; +option go_package = "github.com/argoproj/argo-cd/v2/pkg/apiclient/repository"; // Repository Service // @@ -9,8 +9,8 @@ package repository; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "k8s.io/api/core/v1/generated.proto"; -import "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1/generated.proto"; -import "github.com/argoproj/argo-cd/reposerver/repository/repository.proto"; +import "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/generated.proto"; +import "github.com/argoproj/argo-cd/v2/reposerver/repository/repository.proto"; // RepoAppsQuery is a query for Repository apps message RepoAppsQuery { @@ -27,7 +27,7 @@ message AppInfo { // RepoAppDetailsQuery contains query information for app details request message RepoAppDetailsQuery { - github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ApplicationSource source = 1; + github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ApplicationSource source = 1; string appName = 2; } @@ -81,7 +81,7 @@ message RepoResponse {} // RepoCreateRequest is a request for creating repository config message RepoCreateRequest { // Repository definition - github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Repository repo = 1; + github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Repository repo = 1; // Whether to create in upsert mode bool upsert = 2; // Whether to operate on credential set instead of repository @@ -89,25 +89,25 @@ message RepoCreateRequest { } message RepoUpdateRequest { - github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Repository repo = 1; + github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Repository repo = 1; } // RepositoryService service RepositoryService { // List returns list of repos or repository credentials - rpc List(RepoQuery) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.RepositoryList) { + rpc List(RepoQuery) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RepositoryList) { option (google.api.http).get = "/api/v1/repositories"; option deprecated = true; } // Get returns a repository or its credentials - rpc Get(RepoQuery) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Repository) { + rpc Get(RepoQuery) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Repository) { option (google.api.http).get = "/api/v1/repositories/{repo}"; } // ListRepositories gets a list of all configured repositories - rpc ListRepositories(RepoQuery) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.RepositoryList) { + rpc ListRepositories(RepoQuery) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.RepositoryList) { option (google.api.http).get = "/api/v1/repositories"; } @@ -134,7 +134,7 @@ service RepositoryService { } // Create creates a repo or a repo credential set - rpc Create(RepoCreateRequest) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Repository) { + rpc Create(RepoCreateRequest) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Repository) { option (google.api.http) = { post: "/api/v1/repositories" body: "repo" @@ -143,7 +143,7 @@ service RepositoryService { } // CreateRepository creates a new repository configuration - rpc CreateRepository(RepoCreateRequest) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Repository) { + rpc CreateRepository(RepoCreateRequest) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Repository) { option (google.api.http) = { post: "/api/v1/repositories" body: "repo" @@ -151,7 +151,7 @@ service RepositoryService { } // Update updates a repo or repo credential set - rpc Update(RepoUpdateRequest) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Repository) { + rpc Update(RepoUpdateRequest) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Repository) { option (google.api.http) = { put: "/api/v1/repositories/{repo.repo}" body: "repo" @@ -160,7 +160,7 @@ service RepositoryService { } // UpdateRepository updates a repository configuration - rpc UpdateRepository(RepoUpdateRequest) returns (github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.Repository) { + rpc UpdateRepository(RepoUpdateRequest) returns (github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.Repository) { option (google.api.http) = { put: "/api/v1/repositories/{repo.repo}" body: "repo" diff --git a/server/server.go b/server/server.go index 4bfe69aa80a69..a159cafbf6db9 100644 --- a/server/server.go +++ b/server/server.go @@ -47,61 +47,61 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/pkg/apiclient" - accountpkg "github.com/argoproj/argo-cd/pkg/apiclient/account" - applicationpkg "github.com/argoproj/argo-cd/pkg/apiclient/application" - certificatepkg "github.com/argoproj/argo-cd/pkg/apiclient/certificate" - clusterpkg "github.com/argoproj/argo-cd/pkg/apiclient/cluster" - gpgkeypkg "github.com/argoproj/argo-cd/pkg/apiclient/gpgkey" - projectpkg "github.com/argoproj/argo-cd/pkg/apiclient/project" - repocredspkg "github.com/argoproj/argo-cd/pkg/apiclient/repocreds" - repositorypkg "github.com/argoproj/argo-cd/pkg/apiclient/repository" - sessionpkg "github.com/argoproj/argo-cd/pkg/apiclient/session" - settingspkg "github.com/argoproj/argo-cd/pkg/apiclient/settings" - versionpkg "github.com/argoproj/argo-cd/pkg/apiclient/version" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned" - appinformer "github.com/argoproj/argo-cd/pkg/client/informers/externalversions" - applisters "github.com/argoproj/argo-cd/pkg/client/listers/application/v1alpha1" - repoapiclient "github.com/argoproj/argo-cd/reposerver/apiclient" - repocache "github.com/argoproj/argo-cd/reposerver/cache" - "github.com/argoproj/argo-cd/server/account" - "github.com/argoproj/argo-cd/server/application" - "github.com/argoproj/argo-cd/server/badge" - servercache "github.com/argoproj/argo-cd/server/cache" - "github.com/argoproj/argo-cd/server/certificate" - "github.com/argoproj/argo-cd/server/cluster" - "github.com/argoproj/argo-cd/server/gpgkey" - "github.com/argoproj/argo-cd/server/logout" - "github.com/argoproj/argo-cd/server/metrics" - "github.com/argoproj/argo-cd/server/project" - "github.com/argoproj/argo-cd/server/rbacpolicy" - "github.com/argoproj/argo-cd/server/repocreds" - "github.com/argoproj/argo-cd/server/repository" - "github.com/argoproj/argo-cd/server/session" - "github.com/argoproj/argo-cd/server/settings" - "github.com/argoproj/argo-cd/server/version" - "github.com/argoproj/argo-cd/util/assets" - cacheutil "github.com/argoproj/argo-cd/util/cache" - "github.com/argoproj/argo-cd/util/db" - "github.com/argoproj/argo-cd/util/dex" - dexutil "github.com/argoproj/argo-cd/util/dex" - "github.com/argoproj/argo-cd/util/env" - "github.com/argoproj/argo-cd/util/errors" - grpc_util "github.com/argoproj/argo-cd/util/grpc" - "github.com/argoproj/argo-cd/util/healthz" - httputil "github.com/argoproj/argo-cd/util/http" - "github.com/argoproj/argo-cd/util/io" - jwtutil "github.com/argoproj/argo-cd/util/jwt" - kubeutil "github.com/argoproj/argo-cd/util/kube" - "github.com/argoproj/argo-cd/util/oidc" - "github.com/argoproj/argo-cd/util/rbac" - util_session "github.com/argoproj/argo-cd/util/session" - settings_util "github.com/argoproj/argo-cd/util/settings" - "github.com/argoproj/argo-cd/util/swagger" - tlsutil "github.com/argoproj/argo-cd/util/tls" - "github.com/argoproj/argo-cd/util/webhook" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apiclient" + accountpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/account" + applicationpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/application" + certificatepkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/certificate" + clusterpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/cluster" + gpgkeypkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/gpgkey" + projectpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/project" + repocredspkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/repocreds" + repositorypkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/repository" + sessionpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/session" + settingspkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/settings" + versionpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/version" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned" + appinformer "github.com/argoproj/argo-cd/v2/pkg/client/informers/externalversions" + applisters "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1" + repoapiclient "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + repocache "github.com/argoproj/argo-cd/v2/reposerver/cache" + "github.com/argoproj/argo-cd/v2/server/account" + "github.com/argoproj/argo-cd/v2/server/application" + "github.com/argoproj/argo-cd/v2/server/badge" + servercache "github.com/argoproj/argo-cd/v2/server/cache" + "github.com/argoproj/argo-cd/v2/server/certificate" + "github.com/argoproj/argo-cd/v2/server/cluster" + "github.com/argoproj/argo-cd/v2/server/gpgkey" + "github.com/argoproj/argo-cd/v2/server/logout" + "github.com/argoproj/argo-cd/v2/server/metrics" + "github.com/argoproj/argo-cd/v2/server/project" + "github.com/argoproj/argo-cd/v2/server/rbacpolicy" + "github.com/argoproj/argo-cd/v2/server/repocreds" + "github.com/argoproj/argo-cd/v2/server/repository" + "github.com/argoproj/argo-cd/v2/server/session" + "github.com/argoproj/argo-cd/v2/server/settings" + "github.com/argoproj/argo-cd/v2/server/version" + "github.com/argoproj/argo-cd/v2/util/assets" + cacheutil "github.com/argoproj/argo-cd/v2/util/cache" + "github.com/argoproj/argo-cd/v2/util/db" + "github.com/argoproj/argo-cd/v2/util/dex" + dexutil "github.com/argoproj/argo-cd/v2/util/dex" + "github.com/argoproj/argo-cd/v2/util/env" + "github.com/argoproj/argo-cd/v2/util/errors" + grpc_util "github.com/argoproj/argo-cd/v2/util/grpc" + "github.com/argoproj/argo-cd/v2/util/healthz" + httputil "github.com/argoproj/argo-cd/v2/util/http" + "github.com/argoproj/argo-cd/v2/util/io" + jwtutil "github.com/argoproj/argo-cd/v2/util/jwt" + kubeutil "github.com/argoproj/argo-cd/v2/util/kube" + "github.com/argoproj/argo-cd/v2/util/oidc" + "github.com/argoproj/argo-cd/v2/util/rbac" + util_session "github.com/argoproj/argo-cd/v2/util/session" + settings_util "github.com/argoproj/argo-cd/v2/util/settings" + "github.com/argoproj/argo-cd/v2/util/swagger" + tlsutil "github.com/argoproj/argo-cd/v2/util/tls" + "github.com/argoproj/argo-cd/v2/util/webhook" ) const maxConcurrentLoginRequestsCountEnv = "ARGOCD_MAX_CONCURRENT_LOGIN_REQUESTS_COUNT" diff --git a/server/server_norace_test.go b/server/server_norace_test.go index 5f11abde4c95b..c13ca3b07a7e2 100644 --- a/server/server_norace_test.go +++ b/server/server_norace_test.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/pkg/apiclient" - applicationpkg "github.com/argoproj/argo-cd/pkg/apiclient/application" - "github.com/argoproj/argo-cd/test" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apiclient" + applicationpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/application" + "github.com/argoproj/argo-cd/v2/test" ) func TestUserAgent(t *testing.T) { diff --git a/server/server_test.go b/server/server_test.go index 226b1ca01d8a0..edbfce1d3b3b5 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -15,18 +15,18 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/pkg/apiclient" - "github.com/argoproj/argo-cd/pkg/apiclient/session" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - apps "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/fake" - servercache "github.com/argoproj/argo-cd/server/cache" - "github.com/argoproj/argo-cd/server/rbacpolicy" - "github.com/argoproj/argo-cd/test" - "github.com/argoproj/argo-cd/util/assets" - cacheutil "github.com/argoproj/argo-cd/util/cache" - appstatecache "github.com/argoproj/argo-cd/util/cache/appstate" - "github.com/argoproj/argo-cd/util/rbac" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apiclient" + "github.com/argoproj/argo-cd/v2/pkg/apiclient/session" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + apps "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/fake" + servercache "github.com/argoproj/argo-cd/v2/server/cache" + "github.com/argoproj/argo-cd/v2/server/rbacpolicy" + "github.com/argoproj/argo-cd/v2/test" + "github.com/argoproj/argo-cd/v2/util/assets" + cacheutil "github.com/argoproj/argo-cd/v2/util/cache" + appstatecache "github.com/argoproj/argo-cd/v2/util/cache/appstate" + "github.com/argoproj/argo-cd/v2/util/rbac" ) func fakeServer() (*ArgoCDServer, func()) { diff --git a/server/session/ratelimiter.go b/server/session/ratelimiter.go index cd1b2ed98dff4..84967a4072e7c 100644 --- a/server/session/ratelimiter.go +++ b/server/session/ratelimiter.go @@ -1,8 +1,8 @@ package session import ( - util "github.com/argoproj/argo-cd/util/io" - "github.com/argoproj/argo-cd/util/session" + util "github.com/argoproj/argo-cd/v2/util/io" + "github.com/argoproj/argo-cd/v2/util/session" log "github.com/sirupsen/logrus" "golang.org/x/sync/semaphore" diff --git a/server/session/ratelimiter_test.go b/server/session/ratelimiter_test.go index 1b9524e79a0ba..69a6a2e78f606 100644 --- a/server/session/ratelimiter_test.go +++ b/server/session/ratelimiter_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" - util "github.com/argoproj/argo-cd/util/io" - "github.com/argoproj/argo-cd/util/session" + util "github.com/argoproj/argo-cd/v2/util/io" + "github.com/argoproj/argo-cd/v2/util/session" ) func TestRateLimiter(t *testing.T) { diff --git a/server/session/session.go b/server/session/session.go index b3fe399fa54fd..c3837d7f4af4f 100644 --- a/server/session/session.go +++ b/server/session/session.go @@ -4,16 +4,16 @@ import ( "context" "fmt" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/util/settings" "github.com/google/uuid" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/argoproj/argo-cd/pkg/apiclient/session" - "github.com/argoproj/argo-cd/server/rbacpolicy" - util "github.com/argoproj/argo-cd/util/io" - sessionmgr "github.com/argoproj/argo-cd/util/session" + "github.com/argoproj/argo-cd/v2/pkg/apiclient/session" + "github.com/argoproj/argo-cd/v2/server/rbacpolicy" + util "github.com/argoproj/argo-cd/v2/util/io" + sessionmgr "github.com/argoproj/argo-cd/v2/util/session" ) // Server provides a Session service diff --git a/server/session/session.proto b/server/session/session.proto index 6001af9dcc501..d1cb0ad58fef7 100644 --- a/server/session/session.proto +++ b/server/session/session.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -option go_package = "github.com/argoproj/argo-cd/pkg/apiclient/session"; +option go_package = "github.com/argoproj/argo-cd/v2/pkg/apiclient/session"; // Session Service // @@ -8,9 +8,6 @@ package session; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -import "k8s.io/api/core/v1/generated.proto"; -import "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1/generated.proto"; - // SessionCreateRequest is for logging in. message SessionCreateRequest { diff --git a/server/settings/oidc/claims.pb.go b/server/settings/oidc/claims.pb.go index 8f524b6110f91..fd841817029ef 100644 --- a/server/settings/oidc/claims.pb.go +++ b/server/settings/oidc/claims.pb.go @@ -92,7 +92,7 @@ func init() { func init() { proto.RegisterFile("server/settings/oidc/claims.proto", fileDescriptor_7d353f964edf8c0f) } var fileDescriptor_7d353f964edf8c0f = []byte{ - // 191 bytes of a gzipped FileDescriptorProto + // 195 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2c, 0x4e, 0x2d, 0x2a, 0x4b, 0x2d, 0xd2, 0x2f, 0x4e, 0x2d, 0x29, 0xc9, 0xcc, 0x4b, 0x2f, 0xd6, 0xcf, 0xcf, 0x4c, 0x49, 0xd6, 0x4f, 0xce, 0x49, 0xcc, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x32, 0x48, @@ -101,10 +101,11 @@ var fileDescriptor_7d353f964edf8c0f = []byte{ 0x95, 0x82, 0xb9, 0x58, 0x9d, 0x41, 0x26, 0x08, 0xc9, 0x70, 0x71, 0xa6, 0x16, 0x17, 0xa7, 0xe6, 0x95, 0x64, 0x26, 0xe6, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x04, 0x21, 0x04, 0x84, 0x44, 0xb8, 0x58, 0xcb, 0x12, 0x73, 0x4a, 0x53, 0x25, 0x98, 0x14, 0x18, 0x35, 0x38, 0x83, 0x20, 0x1c, 0x21, - 0x31, 0x2e, 0x36, 0x30, 0xa3, 0x58, 0x82, 0x59, 0x81, 0x59, 0x83, 0x33, 0x08, 0xca, 0x73, 0xb2, - 0x3b, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0xa3, 0x90, 0x1c, - 0xa5, 0x0f, 0x73, 0x14, 0x98, 0xa1, 0x9b, 0x9c, 0xa2, 0x8f, 0xcd, 0x4f, 0x49, 0x6c, 0x60, 0xdf, - 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xaa, 0x85, 0xca, 0x05, 0xf2, 0x00, 0x00, 0x00, + 0x31, 0x2e, 0x36, 0x30, 0xa3, 0x58, 0x82, 0x59, 0x81, 0x59, 0x83, 0x33, 0x08, 0xca, 0x73, 0x72, + 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0xa3, 0x8c, 0x11, + 0x8e, 0xd2, 0x87, 0x39, 0x0a, 0xcc, 0xd0, 0x4d, 0x4e, 0xd1, 0x2f, 0x33, 0xd2, 0xc7, 0xe6, 0xad, + 0x24, 0x36, 0xb0, 0x87, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe4, 0x04, 0xe3, 0x4e, 0xf5, + 0x00, 0x00, 0x00, } func (m *Claim) Marshal() (dAtA []byte, err error) { diff --git a/server/settings/oidc/claims.proto b/server/settings/oidc/claims.proto index aae549b389f31..3943fbce8a0fa 100644 --- a/server/settings/oidc/claims.proto +++ b/server/settings/oidc/claims.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -option go_package = "github.com/argoproj/argo-cd/server/settings/oidc"; +option go_package = "github.com/argoproj/argo-cd/v2/server/settings/oidc"; package github.com.argoproj.argo_cd.server.settings.oidc; diff --git a/server/settings/settings.go b/server/settings/settings.go index d573672dddc35..7a2a7a267aca4 100644 --- a/server/settings/settings.go +++ b/server/settings/settings.go @@ -4,11 +4,11 @@ import ( "github.com/ghodss/yaml" "golang.org/x/net/context" - sessionmgr "github.com/argoproj/argo-cd/util/session" + sessionmgr "github.com/argoproj/argo-cd/v2/util/session" - settingspkg "github.com/argoproj/argo-cd/pkg/apiclient/settings" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/settings" + settingspkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/settings" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/settings" ) // Server provides a Settings service diff --git a/server/settings/settings.proto b/server/settings/settings.proto index e6b24700509fc..4f688e4edfd8d 100644 --- a/server/settings/settings.proto +++ b/server/settings/settings.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -option go_package = "github.com/argoproj/argo-cd/pkg/apiclient/settings"; +option go_package = "github.com/argoproj/argo-cd/v2/pkg/apiclient/settings"; // Settings Service // @@ -8,8 +8,8 @@ package cluster; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -import "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1/generated.proto"; -import "github.com/argoproj/argo-cd/server/settings/oidc/claims.proto"; +import "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/generated.proto"; +import "github.com/argoproj/argo-cd/v2/server/settings/oidc/claims.proto"; // SettingsQuery is a query for Argo CD settings message SettingsQuery { @@ -20,15 +20,15 @@ message Settings { DexConfig dexConfig = 2; OIDCConfig oidcConfig = 3 [(gogoproto.customname) = "OIDCConfig"]; string appLabelKey = 4; - map resourceOverrides = 5; + map resourceOverrides = 5; bool statusBadgeEnabled = 6; GoogleAnalyticsConfig googleAnalytics = 7; - github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.KustomizeOptions kustomizeOptions = 8; + github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.KustomizeOptions kustomizeOptions = 8; // Help settings Help help = 9; repeated Plugin plugins = 10; bool userLoginsDisabled = 11; - repeated github.com.argoproj.argo_cd.pkg.apis.application.v1alpha1.ConfigManagementPlugin configManagementPlugins = 12; + repeated github.com.argoproj.argo_cd.v2.pkg.apis.application.v1alpha1.ConfigManagementPlugin configManagementPlugins = 12; repeated string kustomizeVersions = 13; string uiCssURL = 14; string uiBannerContent = 15; diff --git a/server/version/version.go b/server/version/version.go index 0bf9a5f41262e..bb7710c0d2676 100644 --- a/server/version/version.go +++ b/server/version/version.go @@ -5,13 +5,13 @@ import ( "github.com/google/go-jsonnet" "golang.org/x/net/context" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/pkg/apiclient/version" - "github.com/argoproj/argo-cd/server/settings" - "github.com/argoproj/argo-cd/util/helm" - ksutil "github.com/argoproj/argo-cd/util/ksonnet" - "github.com/argoproj/argo-cd/util/kustomize" - sessionmgr "github.com/argoproj/argo-cd/util/session" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apiclient/version" + "github.com/argoproj/argo-cd/v2/server/settings" + "github.com/argoproj/argo-cd/v2/util/helm" + ksutil "github.com/argoproj/argo-cd/v2/util/ksonnet" + "github.com/argoproj/argo-cd/v2/util/kustomize" + sessionmgr "github.com/argoproj/argo-cd/v2/util/session" ) type server struct { diff --git a/server/version/version.proto b/server/version/version.proto index 41ed69bf0d62d..bdd3681566704 100644 --- a/server/version/version.proto +++ b/server/version/version.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -option go_package = "github.com/argoproj/argo-cd/pkg/apiclient/version"; +option go_package = "github.com/argoproj/argo-cd/v2/pkg/apiclient/version"; // Version Service // diff --git a/test/e2e/accounts_test.go b/test/e2e/accounts_test.go index 10fff428c3694..af623763d377e 100644 --- a/test/e2e/accounts_test.go +++ b/test/e2e/accounts_test.go @@ -9,10 +9,10 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - argocdclient "github.com/argoproj/argo-cd/pkg/apiclient" - "github.com/argoproj/argo-cd/pkg/apiclient/session" - . "github.com/argoproj/argo-cd/test/e2e/fixture" - "github.com/argoproj/argo-cd/util/io" + argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient" + "github.com/argoproj/argo-cd/v2/pkg/apiclient/session" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + "github.com/argoproj/argo-cd/v2/util/io" ) func TestCreateAndUseAccount(t *testing.T) { diff --git a/test/e2e/app_autosync_test.go b/test/e2e/app_autosync_test.go index a6385ea5d290e..4367fb72291bf 100644 --- a/test/e2e/app_autosync_test.go +++ b/test/e2e/app_autosync_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/types" - . "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/test/e2e/fixture" - . "github.com/argoproj/argo-cd/test/e2e/fixture/app" - "github.com/argoproj/argo-cd/util/errors" + . "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture/app" + "github.com/argoproj/argo-cd/v2/util/errors" ) func TestAutoSyncSelfHealDisabled(t *testing.T) { diff --git a/test/e2e/app_deletion_test.go b/test/e2e/app_deletion_test.go index a617956c7ab18..87f504e9afec0 100644 --- a/test/e2e/app_deletion_test.go +++ b/test/e2e/app_deletion_test.go @@ -5,9 +5,9 @@ import ( . "github.com/argoproj/gitops-engine/pkg/sync/common" - . "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - . "github.com/argoproj/argo-cd/test/e2e/fixture" - . "github.com/argoproj/argo-cd/test/e2e/fixture/app" + . "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture/app" ) // when a app gets stuck in sync, and we try to delete it, it won't delete, instead we must then terminate it diff --git a/test/e2e/app_management_test.go b/test/e2e/app_management_test.go index 45c3e14538dd1..6b9079eb377c0 100644 --- a/test/e2e/app_management_test.go +++ b/test/e2e/app_management_test.go @@ -29,16 +29,16 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/pointer" - "github.com/argoproj/argo-cd/common" - applicationpkg "github.com/argoproj/argo-cd/pkg/apiclient/application" - repositorypkg "github.com/argoproj/argo-cd/pkg/apiclient/repository" - . "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - . "github.com/argoproj/argo-cd/test/e2e/fixture" - . "github.com/argoproj/argo-cd/test/e2e/fixture/app" - . "github.com/argoproj/argo-cd/util/argo" - . "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/io" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + applicationpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/application" + repositorypkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/repository" + . "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture/app" + . "github.com/argoproj/argo-cd/v2/util/argo" + . "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/io" + "github.com/argoproj/argo-cd/v2/util/settings" ) const ( diff --git a/test/e2e/cli_test.go b/test/e2e/cli_test.go index 01e6ac4079935..16e119c51a711 100644 --- a/test/e2e/cli_test.go +++ b/test/e2e/cli_test.go @@ -7,9 +7,9 @@ import ( . "github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/stretchr/testify/assert" - . "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - . "github.com/argoproj/argo-cd/test/e2e/fixture" - . "github.com/argoproj/argo-cd/test/e2e/fixture/app" + . "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture/app" ) func TestCliAppCommand(t *testing.T) { diff --git a/test/e2e/cluster_objects_test.go b/test/e2e/cluster_objects_test.go index c8ac1068b64c9..d22fd875bf66c 100644 --- a/test/e2e/cluster_objects_test.go +++ b/test/e2e/cluster_objects_test.go @@ -6,8 +6,8 @@ import ( "github.com/argoproj/gitops-engine/pkg/health" . "github.com/argoproj/gitops-engine/pkg/sync/common" - . "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - . "github.com/argoproj/argo-cd/test/e2e/fixture/app" + . "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture/app" ) // ensure that cluster scoped objects, like a cluster role, as a hok, can be successfully deployed diff --git a/test/e2e/cluster_test.go b/test/e2e/cluster_test.go index 9c94d987e912d..d67b642827ca5 100644 --- a/test/e2e/cluster_test.go +++ b/test/e2e/cluster_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" - . "github.com/argoproj/argo-cd/test/e2e/fixture" - . "github.com/argoproj/argo-cd/util/errors" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + . "github.com/argoproj/argo-cd/v2/util/errors" ) func TestClusterList(t *testing.T) { diff --git a/test/e2e/custom_tool_test.go b/test/e2e/custom_tool_test.go index ba66eebd46005..04fb24678862b 100644 --- a/test/e2e/custom_tool_test.go +++ b/test/e2e/custom_tool_test.go @@ -10,10 +10,10 @@ import ( . "github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/stretchr/testify/assert" - . "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - . "github.com/argoproj/argo-cd/test/e2e/fixture" - . "github.com/argoproj/argo-cd/test/e2e/fixture/app" - . "github.com/argoproj/argo-cd/util/errors" + . "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture/app" + . "github.com/argoproj/argo-cd/v2/util/errors" ) // make sure we can echo back the Git creds diff --git a/test/e2e/delarative_test.go b/test/e2e/delarative_test.go index 03cb627efd37a..dcfd5bb225ade 100644 --- a/test/e2e/delarative_test.go +++ b/test/e2e/delarative_test.go @@ -6,8 +6,8 @@ import ( "github.com/argoproj/gitops-engine/pkg/health" . "github.com/argoproj/gitops-engine/pkg/sync/common" - . "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - . "github.com/argoproj/argo-cd/test/e2e/fixture/app" + . "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture/app" ) func TestDeclarativeHappyApp(t *testing.T) { diff --git a/test/e2e/deployment_test.go b/test/e2e/deployment_test.go index 49dd578316b4c..bb12e5efbbd9f 100644 --- a/test/e2e/deployment_test.go +++ b/test/e2e/deployment_test.go @@ -6,8 +6,8 @@ import ( "github.com/argoproj/gitops-engine/pkg/health" . "github.com/argoproj/gitops-engine/pkg/sync/common" - . "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - . "github.com/argoproj/argo-cd/test/e2e/fixture/app" + . "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture/app" ) // when we have a config map generator, AND the ignore annotation, it is ignored in the app's sync status diff --git a/test/e2e/diff_test.go b/test/e2e/diff_test.go index f91c025b71457..9be02e904cd36 100644 --- a/test/e2e/diff_test.go +++ b/test/e2e/diff_test.go @@ -5,9 +5,9 @@ import ( . "github.com/argoproj/gitops-engine/pkg/sync/common" - . "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - . "github.com/argoproj/argo-cd/test/e2e/fixture/app" - "github.com/argoproj/argo-cd/test/fixture/test" + . "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture/app" + "github.com/argoproj/argo-cd/v2/test/fixture/test" ) func TestPatch(t *testing.T) { diff --git a/test/e2e/fixture/app/actions.go b/test/e2e/fixture/app/actions.go index 287bb36a3ea33..3fe3c35cd598a 100644 --- a/test/e2e/fixture/app/actions.go +++ b/test/e2e/fixture/app/actions.go @@ -7,10 +7,10 @@ import ( log "github.com/sirupsen/logrus" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - . "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/test/e2e/fixture" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/grpc" + . "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/grpc" ) // this implements the "when" part of given/when/then diff --git a/test/e2e/fixture/app/consequences.go b/test/e2e/fixture/app/consequences.go index 1fecf4e4a515d..5530666a5ce0b 100644 --- a/test/e2e/fixture/app/consequences.go +++ b/test/e2e/fixture/app/consequences.go @@ -8,9 +8,9 @@ import ( log "github.com/sirupsen/logrus" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - . "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/test/e2e/fixture" - "github.com/argoproj/argo-cd/util/errors" + . "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + "github.com/argoproj/argo-cd/v2/util/errors" ) // this implements the "then" part of given/when/then diff --git a/test/e2e/fixture/app/context.go b/test/e2e/fixture/app/context.go index 44d0dbd1d3225..4c68c888f21d7 100644 --- a/test/e2e/fixture/app/context.go +++ b/test/e2e/fixture/app/context.go @@ -4,13 +4,13 @@ import ( "testing" "time" - . "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/test/e2e/fixture" - "github.com/argoproj/argo-cd/test/e2e/fixture/certs" - "github.com/argoproj/argo-cd/test/e2e/fixture/gpgkeys" - "github.com/argoproj/argo-cd/test/e2e/fixture/repos" - "github.com/argoproj/argo-cd/util/settings" + . "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + "github.com/argoproj/argo-cd/v2/test/e2e/fixture/certs" + "github.com/argoproj/argo-cd/v2/test/e2e/fixture/gpgkeys" + "github.com/argoproj/argo-cd/v2/test/e2e/fixture/repos" + "github.com/argoproj/argo-cd/v2/util/settings" ) // this implements the "given" part of given/when/then diff --git a/test/e2e/fixture/app/expectation.go b/test/e2e/fixture/app/expectation.go index 7abb15d2e9eb8..3c92aca31846d 100644 --- a/test/e2e/fixture/app/expectation.go +++ b/test/e2e/fixture/app/expectation.go @@ -13,8 +13,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" - . "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/test/e2e/fixture" + . "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/test/e2e/fixture" ) type state = string diff --git a/test/e2e/fixture/certs/certs.go b/test/e2e/fixture/certs/certs.go index eff09a96be0bc..0b25f1217811f 100644 --- a/test/e2e/fixture/certs/certs.go +++ b/test/e2e/fixture/certs/certs.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "github.com/argoproj/argo-cd/test/e2e/fixture" - "github.com/argoproj/argo-cd/util/errors" + "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + "github.com/argoproj/argo-cd/v2/util/errors" ) // Add a custom CA certificate to the test and also create the certificate file diff --git a/test/e2e/fixture/fixture.go b/test/e2e/fixture/fixture.go index 901197c4d076f..205a7dfab6413 100644 --- a/test/e2e/fixture/fixture.go +++ b/test/e2e/fixture/fixture.go @@ -22,16 +22,16 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - "github.com/argoproj/argo-cd/common" - argocdclient "github.com/argoproj/argo-cd/pkg/apiclient" - sessionpkg "github.com/argoproj/argo-cd/pkg/apiclient/session" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned" - . "github.com/argoproj/argo-cd/util/errors" - grpcutil "github.com/argoproj/argo-cd/util/grpc" - "github.com/argoproj/argo-cd/util/io" - "github.com/argoproj/argo-cd/util/rand" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + argocdclient "github.com/argoproj/argo-cd/v2/pkg/apiclient" + sessionpkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/session" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned" + . "github.com/argoproj/argo-cd/v2/util/errors" + grpcutil "github.com/argoproj/argo-cd/v2/util/grpc" + "github.com/argoproj/argo-cd/v2/util/io" + "github.com/argoproj/argo-cd/v2/util/rand" + "github.com/argoproj/argo-cd/v2/util/settings" ) const ( diff --git a/test/e2e/fixture/gpgkeys/gpgkeys.go b/test/e2e/fixture/gpgkeys/gpgkeys.go index 968493d7b5c7c..c724d5dd28612 100644 --- a/test/e2e/fixture/gpgkeys/gpgkeys.go +++ b/test/e2e/fixture/gpgkeys/gpgkeys.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/argoproj/argo-cd/test/e2e/fixture" - "github.com/argoproj/argo-cd/util/errors" + "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + "github.com/argoproj/argo-cd/v2/util/errors" ) // Add GPG public key via API and create appropriate file where the ConfigMap mount would de it as well diff --git a/test/e2e/fixture/repos/repos.go b/test/e2e/fixture/repos/repos.go index 64d6d2220cb76..5fa169e7d8d5c 100644 --- a/test/e2e/fixture/repos/repos.go +++ b/test/e2e/fixture/repos/repos.go @@ -3,8 +3,8 @@ package repos import ( "path/filepath" - "github.com/argoproj/argo-cd/test/e2e/fixture" - "github.com/argoproj/argo-cd/util/errors" + "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + "github.com/argoproj/argo-cd/v2/util/errors" ) var ( diff --git a/test/e2e/fixture/tmpl.go b/test/e2e/fixture/tmpl.go index c489ebb2eba3a..559c910144dd1 100644 --- a/test/e2e/fixture/tmpl.go +++ b/test/e2e/fixture/tmpl.go @@ -6,7 +6,7 @@ import ( "strings" "text/template" - . "github.com/argoproj/argo-cd/util/errors" + . "github.com/argoproj/argo-cd/v2/util/errors" ) // utility method to template a string using a map diff --git a/test/e2e/fixture/versions.go b/test/e2e/fixture/versions.go index c76aef5fc950f..b57879208b378 100644 --- a/test/e2e/fixture/versions.go +++ b/test/e2e/fixture/versions.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/argoproj/argo-cd/util/errors" + "github.com/argoproj/argo-cd/v2/util/errors" ) type Versions struct { diff --git a/test/e2e/git_submodule_test.go b/test/e2e/git_submodule_test.go index f6f13a1617966..27476db84a1ed 100644 --- a/test/e2e/git_submodule_test.go +++ b/test/e2e/git_submodule_test.go @@ -5,10 +5,10 @@ import ( v1 "k8s.io/api/core/v1" - "github.com/argoproj/argo-cd/test/e2e/fixture" + "github.com/argoproj/argo-cd/v2/test/e2e/fixture" - . "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - . "github.com/argoproj/argo-cd/test/e2e/fixture/app" + . "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture/app" ) func TestGitSubmoduleSSHSupport(t *testing.T) { diff --git a/test/e2e/helm_test.go b/test/e2e/helm_test.go index dde2d34e79e43..3ce7e4989540b 100644 --- a/test/e2e/helm_test.go +++ b/test/e2e/helm_test.go @@ -17,13 +17,13 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - . "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/test/e2e/fixture" - . "github.com/argoproj/argo-cd/test/e2e/fixture" - . "github.com/argoproj/argo-cd/test/e2e/fixture/app" - "github.com/argoproj/argo-cd/test/e2e/fixture/repos" - . "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/settings" + . "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture/app" + "github.com/argoproj/argo-cd/v2/test/e2e/fixture/repos" + . "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/settings" ) func TestHelmHooksAreCreated(t *testing.T) { diff --git a/test/e2e/hook_test.go b/test/e2e/hook_test.go index 177725534b4b5..d318721c781b5 100644 --- a/test/e2e/hook_test.go +++ b/test/e2e/hook_test.go @@ -11,10 +11,10 @@ import ( "github.com/argoproj/gitops-engine/pkg/health" . "github.com/argoproj/gitops-engine/pkg/sync/common" - . "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - . "github.com/argoproj/argo-cd/test/e2e/fixture" - . "github.com/argoproj/argo-cd/test/e2e/fixture/app" - . "github.com/argoproj/argo-cd/util/errors" + . "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture/app" + . "github.com/argoproj/argo-cd/v2/util/errors" ) func TestPreSyncHookSuccessful(t *testing.T) { diff --git a/test/e2e/jsonnet_test.go b/test/e2e/jsonnet_test.go index 6adf0df9fd10a..507caf341f38b 100644 --- a/test/e2e/jsonnet_test.go +++ b/test/e2e/jsonnet_test.go @@ -7,10 +7,10 @@ import ( "github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/stretchr/testify/assert" - . "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - . "github.com/argoproj/argo-cd/test/e2e/fixture" - . "github.com/argoproj/argo-cd/test/e2e/fixture/app" - . "github.com/argoproj/argo-cd/util/errors" + . "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture/app" + . "github.com/argoproj/argo-cd/v2/util/errors" ) func TestJsonnetAppliedCorrectly(t *testing.T) { diff --git a/test/e2e/kustomize_test.go b/test/e2e/kustomize_test.go index d123feb81b566..c7061e7bf2408 100644 --- a/test/e2e/kustomize_test.go +++ b/test/e2e/kustomize_test.go @@ -7,10 +7,10 @@ import ( . "github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/stretchr/testify/assert" - . "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/test/e2e/fixture" - . "github.com/argoproj/argo-cd/test/e2e/fixture/app" - "github.com/argoproj/argo-cd/util/errors" + . "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture/app" + "github.com/argoproj/argo-cd/v2/util/errors" ) func TestKustomize2AppSource(t *testing.T) { diff --git a/test/e2e/project_management_test.go b/test/e2e/project_management_test.go index f2e3dc98f5937..637ff3fdbe870 100644 --- a/test/e2e/project_management_test.go +++ b/test/e2e/project_management_test.go @@ -15,10 +15,10 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/utils/pointer" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/test/e2e/fixture" - "github.com/argoproj/argo-cd/util/argo" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + "github.com/argoproj/argo-cd/v2/util/argo" ) func assertProjHasEvent(t *testing.T, a *v1alpha1.AppProject, message string, reason string) { diff --git a/test/e2e/pruning_required_test.go b/test/e2e/pruning_required_test.go index 5b6e71e03e250..e7f0e65fbade8 100644 --- a/test/e2e/pruning_required_test.go +++ b/test/e2e/pruning_required_test.go @@ -5,7 +5,7 @@ import ( . "github.com/argoproj/gitops-engine/pkg/sync/common" - . "github.com/argoproj/argo-cd/test/e2e/fixture/app" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture/app" ) // check we fail with message if we delete a non-prunable resource diff --git a/test/e2e/repo_creds_test.go b/test/e2e/repo_creds_test.go index 35e458807e450..f0e10973e0835 100644 --- a/test/e2e/repo_creds_test.go +++ b/test/e2e/repo_creds_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/argoproj/argo-cd/test/e2e/fixture" - . "github.com/argoproj/argo-cd/test/e2e/fixture/app" - . "github.com/argoproj/argo-cd/util/errors" + "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture/app" + . "github.com/argoproj/argo-cd/v2/util/errors" ) // make sure you cannot create an app from a private repo without set-up diff --git a/test/e2e/repo_management_test.go b/test/e2e/repo_management_test.go index 1944ca94f89a1..5dbc23f52596b 100644 --- a/test/e2e/repo_management_test.go +++ b/test/e2e/repo_management_test.go @@ -6,12 +6,12 @@ import ( "github.com/stretchr/testify/assert" - repositorypkg "github.com/argoproj/argo-cd/pkg/apiclient/repository" - "github.com/argoproj/argo-cd/test/e2e/fixture" - "github.com/argoproj/argo-cd/test/e2e/fixture/app" - "github.com/argoproj/argo-cd/test/e2e/fixture/repos" - argoio "github.com/argoproj/argo-cd/util/io" - "github.com/argoproj/argo-cd/util/settings" + repositorypkg "github.com/argoproj/argo-cd/v2/pkg/apiclient/repository" + "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + "github.com/argoproj/argo-cd/v2/test/e2e/fixture/app" + "github.com/argoproj/argo-cd/v2/test/e2e/fixture/repos" + argoio "github.com/argoproj/argo-cd/v2/util/io" + "github.com/argoproj/argo-cd/v2/util/settings" ) func TestAddRemovePublicRepo(t *testing.T) { diff --git a/test/e2e/selective_sync_test.go b/test/e2e/selective_sync_test.go index b66171f768900..2c7476ce1f98e 100644 --- a/test/e2e/selective_sync_test.go +++ b/test/e2e/selective_sync_test.go @@ -8,12 +8,12 @@ import ( "github.com/argoproj/gitops-engine/pkg/health" . "github.com/argoproj/gitops-engine/pkg/sync/common" - . "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/test/e2e/fixture" - . "github.com/argoproj/argo-cd/test/e2e/fixture" - . "github.com/argoproj/argo-cd/test/e2e/fixture/app" - . "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/rand" + . "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture/app" + . "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/rand" ) // when you selectively sync, only selected resources should be synced, but the app will be out of sync diff --git a/test/e2e/ssh_repo_test.go b/test/e2e/ssh_repo_test.go index 2d188e03dcd1d..90fb618bbb19e 100644 --- a/test/e2e/ssh_repo_test.go +++ b/test/e2e/ssh_repo_test.go @@ -5,8 +5,8 @@ import ( . "github.com/argoproj/gitops-engine/pkg/sync/common" - "github.com/argoproj/argo-cd/test/e2e/fixture" - . "github.com/argoproj/argo-cd/test/e2e/fixture/app" + "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture/app" ) func TestCanAccessInsecureSSHRepo(t *testing.T) { diff --git a/test/e2e/sync_options_test.go b/test/e2e/sync_options_test.go index 2913db902cf21..569f2795d4a5f 100644 --- a/test/e2e/sync_options_test.go +++ b/test/e2e/sync_options_test.go @@ -9,10 +9,10 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - . "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/test/e2e/fixture" - . "github.com/argoproj/argo-cd/test/e2e/fixture/app" - "github.com/argoproj/argo-cd/util/errors" + . "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture/app" + "github.com/argoproj/argo-cd/v2/util/errors" ) // TestSyncOptionsValidateFalse verifies we can disable validation during kubectl apply, using the diff --git a/test/e2e/sync_waves_test.go b/test/e2e/sync_waves_test.go index e0c3241fb5039..f85faf67bd627 100644 --- a/test/e2e/sync_waves_test.go +++ b/test/e2e/sync_waves_test.go @@ -3,9 +3,9 @@ package e2e import ( "testing" - . "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - . "github.com/argoproj/argo-cd/test/e2e/fixture" - . "github.com/argoproj/argo-cd/test/e2e/fixture/app" + . "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture/app" "github.com/argoproj/gitops-engine/pkg/health" . "github.com/argoproj/gitops-engine/pkg/sync/common" diff --git a/test/e2e/testdata/cluster-role/cluster-role.yaml b/test/e2e/testdata/cluster-role/cluster-role.yaml index df61ddfe1c759..cb6cd7c1b3e42 100644 --- a/test/e2e/testdata/cluster-role/cluster-role.yaml +++ b/test/e2e/testdata/cluster-role/cluster-role.yaml @@ -1,4 +1,4 @@ -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: namespace: cert-manager diff --git a/test/e2e/user_info_test.go b/test/e2e/user_info_test.go index ec8533576b076..db352b816e82a 100644 --- a/test/e2e/user_info_test.go +++ b/test/e2e/user_info_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - . "github.com/argoproj/argo-cd/test/e2e/fixture" + . "github.com/argoproj/argo-cd/v2/test/e2e/fixture" ) func TestUserInfo(t *testing.T) { diff --git a/test/fixture/path/hack_path.go b/test/fixture/path/hack_path.go index 9e83ce512712d..e15102224d365 100644 --- a/test/fixture/path/hack_path.go +++ b/test/fixture/path/hack_path.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "github.com/argoproj/argo-cd/util/errors" + "github.com/argoproj/argo-cd/v2/util/errors" ) type AddBinDirToPath struct { diff --git a/test/fixture/revision_metadata/author.go b/test/fixture/revision_metadata/author.go index d1887a30b9eb9..ccc5f0952c3ea 100644 --- a/test/fixture/revision_metadata/author.go +++ b/test/fixture/revision_metadata/author.go @@ -6,7 +6,7 @@ import ( argoexec "github.com/argoproj/pkg/exec" - "github.com/argoproj/argo-cd/util/errors" + "github.com/argoproj/argo-cd/v2/util/errors" ) var Author string diff --git a/test/manifests_test.go b/test/manifests_test.go index 1a29b0315a584..268a98645e80f 100644 --- a/test/manifests_test.go +++ b/test/manifests_test.go @@ -9,7 +9,7 @@ import ( argoexec "github.com/argoproj/pkg/exec" "github.com/stretchr/testify/assert" - "github.com/argoproj/argo-cd/test/fixture/test" + "github.com/argoproj/argo-cd/v2/test/fixture/test" ) func TestKustomizeVersion(t *testing.T) { diff --git a/test/testdata.go b/test/testdata.go index 268b88f7424c8..872b732f0830c 100644 --- a/test/testdata.go +++ b/test/testdata.go @@ -13,12 +13,12 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - apps "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/fake" - appclient "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/typed/application/v1alpha1" - appinformer "github.com/argoproj/argo-cd/pkg/client/informers/externalversions" - applister "github.com/argoproj/argo-cd/pkg/client/listers/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + apps "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/fake" + appclient "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/typed/application/v1alpha1" + appinformer "github.com/argoproj/argo-cd/v2/pkg/client/informers/externalversions" + applister "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1" ) const ( diff --git a/tools/cmd-docs/main.go b/tools/cmd-docs/main.go index a44df55791345..e6e5b4bdb3322 100644 --- a/tools/cmd-docs/main.go +++ b/tools/cmd-docs/main.go @@ -6,12 +6,12 @@ import ( "github.com/spf13/cobra/doc" - controller "github.com/argoproj/argo-cd/cmd/argocd-application-controller/commands" - argocddex "github.com/argoproj/argo-cd/cmd/argocd-dex/commands" - reposerver "github.com/argoproj/argo-cd/cmd/argocd-repo-server/commands" - argocdserver "github.com/argoproj/argo-cd/cmd/argocd-server/commands" - argocdutil "github.com/argoproj/argo-cd/cmd/argocd-util/commands" - argocdcli "github.com/argoproj/argo-cd/cmd/argocd/commands" + controller "github.com/argoproj/argo-cd/v2/cmd/argocd-application-controller/commands" + argocddex "github.com/argoproj/argo-cd/v2/cmd/argocd-dex/commands" + reposerver "github.com/argoproj/argo-cd/v2/cmd/argocd-repo-server/commands" + argocdserver "github.com/argoproj/argo-cd/v2/cmd/argocd-server/commands" + argocdutil "github.com/argoproj/argo-cd/v2/cmd/argocd-util/commands" + argocdcli "github.com/argoproj/argo-cd/v2/cmd/argocd/commands" ) func main() { diff --git a/ui/src/app/login/components/login.tsx b/ui/src/app/login/components/login.tsx index 0c7ce2e775fc5..8662d4c2f132d 100644 --- a/ui/src/app/login/components/login.tsx +++ b/ui/src/app/login/components/login.tsx @@ -51,7 +51,7 @@ export class Login extends React.Component, State> { const ssoConfigured = authSettings && ((authSettings.dexConfig && (authSettings.dexConfig.connectors || []).length > 0) || authSettings.oidcConfig); return (
-
+
Let's get stuff deployed!
@@ -87,7 +87,7 @@ export class Login extends React.Component, State> { {formApi => (
- +
diff --git a/ui/src/app/shared/components/page/page.scss b/ui/src/app/shared/components/page/page.scss index 52ab370810b5e..0b1b6be97eced 100644 --- a/ui/src/app/shared/components/page/page.scss +++ b/ui/src/app/shared/components/page/page.scss @@ -2,6 +2,37 @@ .page-wrapper { .page { + @media (max-width: map-get($breakpoints, medium)) { + &--has-toolbar { + padding-top: 0 + } + + &--has-toolbar &__top-bar { + height: auto; + position: initial; + + .top-bar.row > div { + max-width: 100%; + flex: 0 0 100%; + text-align: center; + + &.top-bar__right-side > div { + display: inline-block; + } + + & > div { + display: flex; + flex-wrap: wrap; + justify-content: center; + + button { + margin-bottom: 2px + } + } + } + } + } + $single-toolbar-height: 50px; &--has-toolbar { padding-top: $single-toolbar-height; @@ -24,4 +55,4 @@ &:hover { color: $argo-color-teal-5; } -} +} diff --git a/ui/src/app/shared/components/paginate/paginate.scss b/ui/src/app/shared/components/paginate/paginate.scss index dd29d7f8bae8a..053961e02c503 100644 --- a/ui/src/app/shared/components/paginate/paginate.scss +++ b/ui/src/app/shared/components/paginate/paginate.scss @@ -4,13 +4,31 @@ position: relative; height: 25px; + + @media (max-width: map-get($breakpoints, medium)) { + & { + position: initial; + height: auto; + text-align: center; + } + + li.previous, + li.next { + display: none; + } + + &__size-menu { + position: initial; + } + } + &__paginator { ul { display: inline-block; margin: 0; padding: 0; } - + li { display: inline-block; margin-right: 1em; diff --git a/ui/yarn.lock b/ui/yarn.lock index 3b520c31b0af3..1ff56934c6267 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -10511,9 +10511,9 @@ xterm@2.4.0: integrity sha1-1wInmTt0Mj42SVq5x73uC8jQ27o= y18n@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" - integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== + version "4.0.1" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4" + integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ== yallist@^2.1.2: version "2.1.2" diff --git a/util/app/discovery/discovery.go b/util/app/discovery/discovery.go index 227330c9ec01f..3643a9a7af3e2 100644 --- a/util/app/discovery/discovery.go +++ b/util/app/discovery/discovery.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strings" - "github.com/argoproj/argo-cd/util/kustomize" + "github.com/argoproj/argo-cd/v2/util/kustomize" ) func Discover(root string) (map[string]string, error) { diff --git a/util/argo/argo.go b/util/argo/argo.go index d1790f5c0a8a5..0e4805d8926db 100644 --- a/util/argo/argo.go +++ b/util/argo/argo.go @@ -19,16 +19,16 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" - "github.com/argoproj/argo-cd/common" - argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/typed/application/v1alpha1" - applicationsv1 "github.com/argoproj/argo-cd/pkg/client/listers/application/v1alpha1" - "github.com/argoproj/argo-cd/reposerver/apiclient" - "github.com/argoproj/argo-cd/util/db" - "github.com/argoproj/argo-cd/util/git" - "github.com/argoproj/argo-cd/util/helm" - "github.com/argoproj/argo-cd/util/io" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/typed/application/v1alpha1" + applicationsv1 "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + "github.com/argoproj/argo-cd/v2/util/db" + "github.com/argoproj/argo-cd/v2/util/git" + "github.com/argoproj/argo-cd/v2/util/helm" + "github.com/argoproj/argo-cd/v2/util/io" + "github.com/argoproj/argo-cd/v2/util/settings" ) const ( diff --git a/util/argo/argo_test.go b/util/argo/argo_test.go index 8806163384a4e..a44a91474a9c6 100644 --- a/util/argo/argo_test.go +++ b/util/argo/argo_test.go @@ -17,15 +17,15 @@ import ( "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/tools/cache" - argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/fake" - "github.com/argoproj/argo-cd/pkg/client/informers/externalversions/application/v1alpha1" - applisters "github.com/argoproj/argo-cd/pkg/client/listers/application/v1alpha1" - "github.com/argoproj/argo-cd/reposerver/apiclient" - "github.com/argoproj/argo-cd/reposerver/apiclient/mocks" - "github.com/argoproj/argo-cd/test" - dbmocks "github.com/argoproj/argo-cd/util/db/mocks" - "github.com/argoproj/argo-cd/util/settings" + argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/fake" + "github.com/argoproj/argo-cd/v2/pkg/client/informers/externalversions/application/v1alpha1" + applisters "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient" + "github.com/argoproj/argo-cd/v2/reposerver/apiclient/mocks" + "github.com/argoproj/argo-cd/v2/test" + dbmocks "github.com/argoproj/argo-cd/v2/util/db/mocks" + "github.com/argoproj/argo-cd/v2/util/settings" ) func TestRefreshApp(t *testing.T) { diff --git a/util/argo/audit_logger.go b/util/argo/audit_logger.go index ed4c3d45c6197..42827c6ed9800 100644 --- a/util/argo/audit_logger.go +++ b/util/argo/audit_logger.go @@ -13,7 +13,7 @@ import ( "fmt" "time" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" ) type AuditLogger struct { diff --git a/util/argo/audit_logger_test.go b/util/argo/audit_logger_test.go index 12765f40952a9..a36cf21dec0e3 100644 --- a/util/argo/audit_logger_test.go +++ b/util/argo/audit_logger_test.go @@ -11,7 +11,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" - argoappv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" ) // Helper to capture log entries generated by the logger and return it as string diff --git a/util/argo/normalizer.go b/util/argo/normalizer.go index 88fc7ee0a74ad..7b1e0d2c36477 100644 --- a/util/argo/normalizer.go +++ b/util/argo/normalizer.go @@ -1,8 +1,8 @@ package argo import ( - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/argo/normalizers" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/argo/normalizers" "github.com/argoproj/gitops-engine/pkg/diff" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/util/argo/normalizers/diff_normalizer.go b/util/argo/normalizers/diff_normalizer.go index 5082a6f1ed2f4..1ccf6a0f8115f 100644 --- a/util/argo/normalizers/diff_normalizer.go +++ b/util/argo/normalizers/diff_normalizer.go @@ -9,8 +9,8 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/glob" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/glob" ) type normalizerPatch struct { diff --git a/util/argo/normalizers/diff_normalizer_test.go b/util/argo/normalizers/diff_normalizer_test.go index 46f9e7019236d..f1abb714f09dd 100644 --- a/util/argo/normalizers/diff_normalizer_test.go +++ b/util/argo/normalizers/diff_normalizer_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/test" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/test" ) func TestNormalizeObjectWithMatchedGroupKind(t *testing.T) { diff --git a/util/argo/normalizers/knowntypes_normalizer.go b/util/argo/normalizers/knowntypes_normalizer.go index 83b170d21e25d..403065c58a6df 100644 --- a/util/argo/normalizers/knowntypes_normalizer.go +++ b/util/argo/normalizers/knowntypes_normalizer.go @@ -11,11 +11,11 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/argoproj/argo-cd/pkg/apis/application" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/pkg/apis/application" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" ) -//go:generate go run github.com/argoproj/argo-cd/hack/known_types corev1 k8s.io/api/core/v1 corev1_known_types.go --docs diffing_known_types.txt +//go:generate go run github.com/argoproj/argo-cd/v2/hack/known_types corev1 k8s.io/api/core/v1 corev1_known_types.go --docs diffing_known_types.txt var knownTypes = map[string]func() interface{}{} type knownTypeField struct { diff --git a/util/argo/normalizers/knowntypes_normalizer_test.go b/util/argo/normalizers/knowntypes_normalizer_test.go index 6971c1beac9aa..ce6acfeff4c32 100644 --- a/util/argo/normalizers/knowntypes_normalizer_test.go +++ b/util/argo/normalizers/knowntypes_normalizer_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/argoproj/argo-cd/pkg/apis/application" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/pkg/apis/application" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" "github.com/argoproj/pkg/errors" "github.com/ghodss/yaml" diff --git a/util/cache/appstate/cache.go b/util/cache/appstate/cache.go index 9c9cb90dd75c3..c370f8c185f4c 100644 --- a/util/cache/appstate/cache.go +++ b/util/cache/appstate/cache.go @@ -9,8 +9,8 @@ import ( "github.com/go-redis/redis/v8" "github.com/spf13/cobra" - appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - cacheutil "github.com/argoproj/argo-cd/util/cache" + appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + cacheutil "github.com/argoproj/argo-cd/v2/util/cache" ) var ErrCacheMiss = cacheutil.ErrCacheMiss diff --git a/util/cache/appstate/cache_test.go b/util/cache/appstate/cache_test.go index 54f6126ed60e2..59b125fca3bea 100644 --- a/util/cache/appstate/cache_test.go +++ b/util/cache/appstate/cache_test.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/cobra" "github.com/stretchr/testify/assert" - . "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - cacheutil "github.com/argoproj/argo-cd/util/cache" + . "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + cacheutil "github.com/argoproj/argo-cd/v2/util/cache" ) type fixtures struct { diff --git a/util/cache/cache.go b/util/cache/cache.go index 95322092c6ae6..bca5bcc65baca 100644 --- a/util/cache/cache.go +++ b/util/cache/cache.go @@ -10,8 +10,8 @@ import ( "github.com/go-redis/redis/v8" "github.com/spf13/cobra" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/util/env" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/util/env" ) const ( diff --git a/util/cache/redis.go b/util/cache/redis.go index 2cd3545bf8a97..b3c989c87e426 100644 --- a/util/cache/redis.go +++ b/util/cache/redis.go @@ -5,7 +5,7 @@ import ( "encoding/json" "time" - ioutil "github.com/argoproj/argo-cd/util/io" + ioutil "github.com/argoproj/argo-cd/v2/util/io" rediscache "github.com/go-redis/cache/v8" "github.com/go-redis/redis/v8" diff --git a/util/cert/cert.go b/util/cert/cert.go index 3d874c26f9597..2e06ec4f2a88d 100644 --- a/util/cert/cert.go +++ b/util/cert/cert.go @@ -18,7 +18,7 @@ import ( "golang.org/x/crypto/ssh" - "github.com/argoproj/argo-cd/common" + "github.com/argoproj/argo-cd/v2/common" ) // A struct representing an entry in the list of SSH known hosts. diff --git a/util/cert/cert_test.go b/util/cert/cert_test.go index a2d70ecb92a4b..6ac839f2efac5 100644 --- a/util/cert/cert_test.go +++ b/util/cert/cert_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/argoproj/argo-cd/common" + "github.com/argoproj/argo-cd/v2/common" ) const Test_Cert1CN = "CN=foo.example.com,OU=SpecOps,O=Capone\\, Inc,L=Chicago,ST=IL,C=US" diff --git a/util/cli/cli.go b/util/cli/cli.go index 0a13c0546c2dd..30237d337ebd4 100644 --- a/util/cli/cli.go +++ b/util/cli/cli.go @@ -24,9 +24,9 @@ import ( "k8s.io/kubectl/pkg/util/term" "sigs.k8s.io/yaml" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/io" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/io" ) // NewVersionCmd returns a new `version` command to be used as a sub-command to root diff --git a/util/clusterauth/clusterauth_test.go b/util/clusterauth/clusterauth_test.go index dce221fc7af17..88c6e9946391e 100644 --- a/util/clusterauth/clusterauth_test.go +++ b/util/clusterauth/clusterauth_test.go @@ -14,7 +14,7 @@ import ( "k8s.io/client-go/kubernetes/fake" kubetesting "k8s.io/client-go/testing" - "github.com/argoproj/argo-cd/util/errors" + "github.com/argoproj/argo-cd/v2/util/errors" ) const ( diff --git a/util/db/certificate.go b/util/db/certificate.go index 1fa33a818b8cb..0e45705984410 100644 --- a/util/db/certificate.go +++ b/util/db/certificate.go @@ -10,9 +10,9 @@ import ( log "github.com/sirupsen/logrus" - "github.com/argoproj/argo-cd/common" - appsv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - certutil "github.com/argoproj/argo-cd/util/cert" + "github.com/argoproj/argo-cd/v2/common" + appsv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + certutil "github.com/argoproj/argo-cd/v2/util/cert" ) // A struct representing an entry in the list of SSH known hosts. diff --git a/util/db/certificate_test.go b/util/db/certificate_test.go index e4d286129facf..aee3ed475bede 100644 --- a/util/db/certificate_test.go +++ b/util/db/certificate_test.go @@ -10,8 +10,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/fake" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/settings" ) const Test_Cert1CN = "CN=foo.example.com,OU=SpecOps,O=Capone\\, Inc,L=Chicago,ST=IL,C=US" diff --git a/util/db/cluster.go b/util/db/cluster.go index 9bb5b97fe6e68..446cba82a3b0e 100644 --- a/util/db/cluster.go +++ b/util/db/cluster.go @@ -25,8 +25,8 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/utils/pointer" - "github.com/argoproj/argo-cd/common" - appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/common" + appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" ) var ( diff --git a/util/db/cluster_norace_test.go b/util/db/cluster_norace_test.go index c3d046e29cdbc..24043bd2a77ed 100644 --- a/util/db/cluster_norace_test.go +++ b/util/db/cluster_norace_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/client-go/kubernetes/fake" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/settings" ) func TestWatchClusters_CreateRemoveCluster(t *testing.T) { diff --git a/util/db/cluster_test.go b/util/db/cluster_test.go index d57bea6ce5934..95b0dc50cb2ee 100644 --- a/util/db/cluster_test.go +++ b/util/db/cluster_test.go @@ -10,9 +10,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/settings" ) const ( diff --git a/util/db/db.go b/util/db/db.go index 754d441d5f0bd..9fc2dcc11174e 100644 --- a/util/db/db.go +++ b/util/db/db.go @@ -7,8 +7,8 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" - appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/settings" + appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/settings" ) // SecretMaperValidation determine whether the secret should be transformed(i.e. trailing CRLF characters trimmed) diff --git a/util/db/db_test.go b/util/db/db_test.go index 0c4e814fee37a..0a13e0245d16a 100644 --- a/util/db/db_test.go +++ b/util/db/db_test.go @@ -15,9 +15,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/fake" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/settings" ) const ( diff --git a/util/db/gpgkeys.go b/util/db/gpgkeys.go index 776a41a9741e5..09372b8303849 100644 --- a/util/db/gpgkeys.go +++ b/util/db/gpgkeys.go @@ -8,9 +8,9 @@ import ( log "github.com/sirupsen/logrus" - "github.com/argoproj/argo-cd/common" - appsv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/gpg" + "github.com/argoproj/argo-cd/v2/common" + appsv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/gpg" ) // Validates a single GnuPG key and returns the key's ID diff --git a/util/db/gpgkeys_test.go b/util/db/gpgkeys_test.go index 4d1ad9eac7b3c..55166458cb56d 100644 --- a/util/db/gpgkeys_test.go +++ b/util/db/gpgkeys_test.go @@ -11,9 +11,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/fake" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/test" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/test" + "github.com/argoproj/argo-cd/v2/util/settings" ) // GPG config map with a single key and good mapping diff --git a/util/db/helmrepository.go b/util/db/helmrepository.go index 3afb7cbdf640d..f369ef3da6bc5 100644 --- a/util/db/helmrepository.go +++ b/util/db/helmrepository.go @@ -9,8 +9,8 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/utils/pointer" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/settings" ) func getHelmRepoCredIndex(helmRepositories []settings.HelmRepoCredentials, repoURL string) int { diff --git a/util/db/mocks/ArgoDB.go b/util/db/mocks/ArgoDB.go index e5e3d3cb6c767..84d4baee9c570 100644 --- a/util/db/mocks/ArgoDB.go +++ b/util/db/mocks/ArgoDB.go @@ -5,10 +5,10 @@ package mocks import ( context "context" - db "github.com/argoproj/argo-cd/util/db" + db "github.com/argoproj/argo-cd/v2/util/db" mock "github.com/stretchr/testify/mock" - v1alpha1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + v1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" ) // ArgoDB is an autogenerated mock type for the ArgoDB type diff --git a/util/db/repository.go b/util/db/repository.go index 5a2398fc97ba2..5c0e13b0e7e40 100644 --- a/util/db/repository.go +++ b/util/db/repository.go @@ -14,11 +14,11 @@ import ( log "github.com/sirupsen/logrus" - "github.com/argoproj/argo-cd/common" - appsv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/git" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + appsv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/git" + "github.com/argoproj/argo-cd/v2/util/settings" ) const ( diff --git a/util/db/repository_test.go b/util/db/repository_test.go index bd0a90f7cfeff..b4526193e74fa 100644 --- a/util/db/repository_test.go +++ b/util/db/repository_test.go @@ -3,7 +3,7 @@ package db import ( "testing" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/util/settings" ) func TestRepoURLToSecretName(t *testing.T) { diff --git a/util/dex/config.go b/util/dex/config.go index 89660011e0bdb..d975d38140490 100644 --- a/util/dex/config.go +++ b/util/dex/config.go @@ -5,8 +5,8 @@ import ( "github.com/ghodss/yaml" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/util/settings" ) func GenerateDexConfigYAML(settings *settings.ArgoCDSettings) ([]byte, error) { diff --git a/util/dex/dex.go b/util/dex/dex.go index 9676d1efa8b60..dd239d34abcd5 100644 --- a/util/dex/dex.go +++ b/util/dex/dex.go @@ -12,7 +12,7 @@ import ( "regexp" "strconv" - "github.com/argoproj/argo-cd/util/errors" + "github.com/argoproj/argo-cd/v2/util/errors" ) var messageRe = regexp.MustCompile(`

(.*)([\s\S]*?)<\/p>`) diff --git a/util/dex/dex_test.go b/util/dex/dex_test.go index 44fd41d453bb9..114903902bd59 100644 --- a/util/dex/dex_test.go +++ b/util/dex/dex_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" // "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/util/settings" ) const invalidURL = ":://localhost/foo/bar" diff --git a/util/env/env_test.go b/util/env/env_test.go index 53843690b8459..9bb0e83c78362 100644 --- a/util/env/env_test.go +++ b/util/env/env_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - util "github.com/argoproj/argo-cd/util/io" + util "github.com/argoproj/argo-cd/v2/util/io" "github.com/stretchr/testify/assert" ) diff --git a/util/exec/exec.go b/util/exec/exec.go index 67727651443c3..95a930af677e0 100644 --- a/util/exec/exec.go +++ b/util/exec/exec.go @@ -8,7 +8,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/argoproj/argo-cd/util/log" + "github.com/argoproj/argo-cd/v2/util/log" argoexec "github.com/argoproj/pkg/exec" diff --git a/util/git/client.go b/util/git/client.go index 13d7c1d2f7255..80bbc40254078 100644 --- a/util/git/client.go +++ b/util/git/client.go @@ -14,20 +14,20 @@ import ( "strings" "time" + "github.com/go-git/go-git/v5" + "github.com/go-git/go-git/v5/config" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/transport" + githttp "github.com/go-git/go-git/v5/plumbing/transport/http" + ssh2 "github.com/go-git/go-git/v5/plumbing/transport/ssh" + "github.com/go-git/go-git/v5/storage/memory" log "github.com/sirupsen/logrus" "golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh/knownhosts" - "gopkg.in/src-d/go-git.v4" - "gopkg.in/src-d/go-git.v4/config" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - githttp "gopkg.in/src-d/go-git.v4/plumbing/transport/http" - ssh2 "gopkg.in/src-d/go-git.v4/plumbing/transport/ssh" - "gopkg.in/src-d/go-git.v4/storage/memory" - - "github.com/argoproj/argo-cd/common" - certutil "github.com/argoproj/argo-cd/util/cert" - executil "github.com/argoproj/argo-cd/util/exec" + + "github.com/argoproj/argo-cd/v2/common" + certutil "github.com/argoproj/argo-cd/v2/util/cert" + executil "github.com/argoproj/argo-cd/v2/util/exec" ) type RevisionMetadata struct { diff --git a/util/git/creds.go b/util/git/creds.go index 410aed2f87d32..891bdf83e9681 100644 --- a/util/git/creds.go +++ b/util/git/creds.go @@ -17,9 +17,9 @@ import ( "github.com/bradleyfalzon/ghinstallation" log "github.com/sirupsen/logrus" - "github.com/argoproj/argo-cd/common" + "github.com/argoproj/argo-cd/v2/common" - certutil "github.com/argoproj/argo-cd/util/cert" + certutil "github.com/argoproj/argo-cd/v2/util/cert" ) // In memory cache for storing github APP api token credentials diff --git a/util/git/git_test.go b/util/git/git_test.go index bb26483c15aa1..c84f949df8a30 100644 --- a/util/git/git_test.go +++ b/util/git/git_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/argoproj/argo-cd/test/fixture/log" - "github.com/argoproj/argo-cd/test/fixture/path" - "github.com/argoproj/argo-cd/test/fixture/test" + "github.com/argoproj/argo-cd/v2/test/fixture/log" + "github.com/argoproj/argo-cd/v2/test/fixture/path" + "github.com/argoproj/argo-cd/v2/test/fixture/test" ) func TestIsCommitSHA(t *testing.T) { diff --git a/util/git/mocks/Client.go b/util/git/mocks/Client.go index a42e21bd9946a..963817108135e 100644 --- a/util/git/mocks/Client.go +++ b/util/git/mocks/Client.go @@ -3,7 +3,7 @@ package mocks import ( - git "github.com/argoproj/argo-cd/util/git" + git "github.com/argoproj/argo-cd/v2/util/git" mock "github.com/stretchr/testify/mock" ) diff --git a/util/git/workaround.go b/util/git/workaround.go index 5e89acfa76166..5e24612bca704 100644 --- a/util/git/workaround.go +++ b/util/git/workaround.go @@ -1,12 +1,12 @@ package git import ( - "gopkg.in/src-d/go-git.v4" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - "gopkg.in/src-d/go-git.v4/plumbing/transport/client" - "gopkg.in/src-d/go-git.v4/plumbing/transport/http" - "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-git/v5" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/transport" + "github.com/go-git/go-git/v5/plumbing/transport/client" + "github.com/go-git/go-git/v5/plumbing/transport/http" + "github.com/go-git/go-git/v5/utils/ioutil" ) // Below is a workaround for https://github.com/src-d/go-git/issues/1177: the `github.com/src-d/go-git` does not support disable SSL cert verification is a single repo. diff --git a/util/gpg/gpg.go b/util/gpg/gpg.go index c727e2a28048e..3627e4288e98e 100644 --- a/util/gpg/gpg.go +++ b/util/gpg/gpg.go @@ -12,9 +12,9 @@ import ( "regexp" "strings" - "github.com/argoproj/argo-cd/common" - appsv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - executil "github.com/argoproj/argo-cd/util/exec" + "github.com/argoproj/argo-cd/v2/common" + appsv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + executil "github.com/argoproj/argo-cd/v2/util/exec" ) // Regular expression to match public key beginning diff --git a/util/gpg/gpg_test.go b/util/gpg/gpg_test.go index 095d05b79ab86..bee11eea62ece 100644 --- a/util/gpg/gpg_test.go +++ b/util/gpg/gpg_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/test" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/test" ) const ( diff --git a/util/grpc/logging_test.go b/util/grpc/logging_test.go index 64d211ad47a4b..f98077a9e1849 100644 --- a/util/grpc/logging_test.go +++ b/util/grpc/logging_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/grpc" - "github.com/argoproj/argo-cd/pkg/apiclient/account" + "github.com/argoproj/argo-cd/v2/pkg/apiclient/account" ) func Test_JSONLogging(t *testing.T) { diff --git a/util/health/health.go b/util/health/health.go index c69a5fee4daf7..26042e92ccf0e 100644 --- a/util/health/health.go +++ b/util/health/health.go @@ -6,8 +6,8 @@ import ( "github.com/argoproj/gitops-engine/pkg/sync/ignore" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/lua" + appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/lua" ) // SetApplicationHealth updates the health statuses of all resources performed in the comparison diff --git a/util/health/health_test.go b/util/health/health_test.go index 4952bb0098ff0..52f0c4aea6912 100644 --- a/util/health/health_test.go +++ b/util/health/health_test.go @@ -12,7 +12,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" ) func TestSetApplicationHealth(t *testing.T) { diff --git a/util/helm/client.go b/util/helm/client.go index 453750c3902e8..d9a37b148ac59 100644 --- a/util/helm/client.go +++ b/util/helm/client.go @@ -20,11 +20,11 @@ import ( log "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/util/cache" - "github.com/argoproj/argo-cd/util/env" - executil "github.com/argoproj/argo-cd/util/exec" - "github.com/argoproj/argo-cd/util/io" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/util/cache" + "github.com/argoproj/argo-cd/v2/util/env" + executil "github.com/argoproj/argo-cd/v2/util/exec" + "github.com/argoproj/argo-cd/v2/util/io" ) var ( diff --git a/util/helm/client_test.go b/util/helm/client_test.go index 7ac853422fe05..7036c1f4c63ce 100644 --- a/util/helm/client_test.go +++ b/util/helm/client_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/argoproj/argo-cd/util/io" + "github.com/argoproj/argo-cd/v2/util/io" ) func TestIndex(t *testing.T) { diff --git a/util/helm/cmd.go b/util/helm/cmd.go index 17f841e01cacb..3dd767ae77039 100644 --- a/util/helm/cmd.go +++ b/util/helm/cmd.go @@ -9,8 +9,8 @@ import ( "path/filepath" "regexp" - executil "github.com/argoproj/argo-cd/util/exec" - "github.com/argoproj/argo-cd/util/io" + executil "github.com/argoproj/argo-cd/v2/util/exec" + "github.com/argoproj/argo-cd/v2/util/io" ) // A thin wrapper around the "helm" command, adding logging and error translation. diff --git a/util/helm/helm.go b/util/helm/helm.go index 22effb4dfd8a1..9ba25575b316a 100644 --- a/util/helm/helm.go +++ b/util/helm/helm.go @@ -11,8 +11,8 @@ import ( "github.com/ghodss/yaml" - "github.com/argoproj/argo-cd/util/config" - executil "github.com/argoproj/argo-cd/util/exec" + "github.com/argoproj/argo-cd/v2/util/config" + executil "github.com/argoproj/argo-cd/v2/util/exec" ) type HelmRepository struct { diff --git a/util/helm/mocks/Client.go b/util/helm/mocks/Client.go index 3eefcc7719ed5..c87c584b6b166 100644 --- a/util/helm/mocks/Client.go +++ b/util/helm/mocks/Client.go @@ -3,8 +3,8 @@ package mocks import ( - helm "github.com/argoproj/argo-cd/util/helm" - io "github.com/argoproj/argo-cd/util/io" + helm "github.com/argoproj/argo-cd/v2/util/helm" + io "github.com/argoproj/argo-cd/v2/util/io" mock "github.com/stretchr/testify/mock" ) diff --git a/util/helm/testdata/redis/templates/redis-rolebinding.yaml b/util/helm/testdata/redis/templates/redis-rolebinding.yaml index 3a641097e5cb8..251c8c681b41d 100644 --- a/util/helm/testdata/redis/templates/redis-rolebinding.yaml +++ b/util/helm/testdata/redis/templates/redis-rolebinding.yaml @@ -1,5 +1,5 @@ {{- if .Values.rbac.create -}} -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: {{ template "redis.fullname" . }} diff --git a/util/ksonnet/ksonnet.go b/util/ksonnet/ksonnet.go index b90e97a7d4dc4..202502e00df51 100644 --- a/util/ksonnet/ksonnet.go +++ b/util/ksonnet/ksonnet.go @@ -13,8 +13,8 @@ import ( "github.com/ghodss/yaml" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - executil "github.com/argoproj/argo-cd/util/exec" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + executil "github.com/argoproj/argo-cd/v2/util/exec" ) // Destination returns the deployment destination for an environment in app spec data diff --git a/util/kube/kube.go b/util/kube/kube.go index 67d3f88a5d9ad..7b73eeafba812 100644 --- a/util/kube/kube.go +++ b/util/kube/kube.go @@ -7,7 +7,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/argoproj/argo-cd/common" + "github.com/argoproj/argo-cd/v2/common" ) var resourceNamePattern = regexp.MustCompile("^[a-z0-9]([-a-z0-9]*[a-z0-9])?$") diff --git a/util/kube/kube_test.go b/util/kube/kube_test.go index ef754a175be9f..b0d89e3264ad3 100644 --- a/util/kube/kube_test.go +++ b/util/kube/kube_test.go @@ -13,7 +13,7 @@ import ( extv1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/argoproj/argo-cd/common" + "github.com/argoproj/argo-cd/v2/common" ) const depWithoutSelector = ` diff --git a/util/kube/kubectl.go b/util/kube/kubectl.go index bca8aa3ed2bd2..02001d729f1a4 100644 --- a/util/kube/kubectl.go +++ b/util/kube/kubectl.go @@ -3,7 +3,7 @@ package kube import ( "os" - "github.com/argoproj/argo-cd/util/log" + "github.com/argoproj/argo-cd/v2/util/log" "github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/gitops-engine/pkg/utils/tracing" diff --git a/util/kube/portforwarder.go b/util/kube/portforwarder.go index addcb3ad93e44..5dd3cc4c4e7fb 100644 --- a/util/kube/portforwarder.go +++ b/util/kube/portforwarder.go @@ -16,14 +16,13 @@ import ( "k8s.io/client-go/tools/portforward" "k8s.io/client-go/transport/spdy" - "github.com/argoproj/argo-cd/util/io" + "github.com/argoproj/argo-cd/v2/util/io" ) -func PortForward(podSelector string, targetPort int, namespace string) (int, error) { +func PortForward(podSelector string, targetPort int, namespace string, overrides *clientcmd.ConfigOverrides) (int, error) { loadingRules := clientcmd.NewDefaultClientConfigLoadingRules() loadingRules.DefaultClientConfig = &clientcmd.DefaultClientConfig - overrides := clientcmd.ConfigOverrides{} - clientConfig := clientcmd.NewInteractiveDeferredLoadingClientConfig(loadingRules, &overrides, os.Stdin) + clientConfig := clientcmd.NewInteractiveDeferredLoadingClientConfig(loadingRules, overrides, os.Stdin) config, err := clientConfig.ClientConfig() if err != nil { return -1, err diff --git a/util/kustomize/kustomize.go b/util/kustomize/kustomize.go index 4d64fe7f53bfb..d840d90658520 100644 --- a/util/kustomize/kustomize.go +++ b/util/kustomize/kustomize.go @@ -18,10 +18,10 @@ import ( log "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - certutil "github.com/argoproj/argo-cd/util/cert" - executil "github.com/argoproj/argo-cd/util/exec" - "github.com/argoproj/argo-cd/util/git" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + certutil "github.com/argoproj/argo-cd/v2/util/cert" + executil "github.com/argoproj/argo-cd/v2/util/exec" + "github.com/argoproj/argo-cd/v2/util/git" ) // represents a Docker image in the format NAME[:TAG]. diff --git a/util/kustomize/kustomize_test.go b/util/kustomize/kustomize_test.go index 032c52be92bf8..a68adcec19110 100644 --- a/util/kustomize/kustomize_test.go +++ b/util/kustomize/kustomize_test.go @@ -10,8 +10,8 @@ import ( "github.com/argoproj/pkg/exec" "github.com/stretchr/testify/assert" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/git" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/git" ) const kustomization1 = "kustomization_yaml" diff --git a/util/localconfig/localconfig.go b/util/localconfig/localconfig.go index 1d00a121f75be..7bb10286b1088 100644 --- a/util/localconfig/localconfig.go +++ b/util/localconfig/localconfig.go @@ -9,7 +9,7 @@ import ( "github.com/dgrijalva/jwt-go/v4" - configUtil "github.com/argoproj/argo-cd/util/config" + configUtil "github.com/argoproj/argo-cd/v2/util/config" ) // LocalConfig is a local Argo CD config file diff --git a/util/lua/lua.go b/util/lua/lua.go index bb14bfde98737..826e387db6d4c 100644 --- a/util/lua/lua.go +++ b/util/lua/lua.go @@ -14,7 +14,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" luajson "layeh.com/gopher-json" - appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" ) const ( diff --git a/util/lua/lua_test.go b/util/lua/lua_test.go index 2dd2c6b53971b..e0a1a5c4884ba 100644 --- a/util/lua/lua_test.go +++ b/util/lua/lua_test.go @@ -10,8 +10,8 @@ import ( lua "github.com/yuin/gopher-lua" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/util/grpc" + appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/util/grpc" ) const objJSON = ` diff --git a/util/oidc/oidc.go b/util/oidc/oidc.go index 06f0083a750a6..610abac6e6d52 100644 --- a/util/oidc/oidc.go +++ b/util/oidc/oidc.go @@ -18,13 +18,13 @@ import ( log "github.com/sirupsen/logrus" "golang.org/x/oauth2" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/server/settings/oidc" - appstatecache "github.com/argoproj/argo-cd/util/cache/appstate" - "github.com/argoproj/argo-cd/util/dex" - httputil "github.com/argoproj/argo-cd/util/http" - "github.com/argoproj/argo-cd/util/rand" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/server/settings/oidc" + appstatecache "github.com/argoproj/argo-cd/v2/util/cache/appstate" + "github.com/argoproj/argo-cd/v2/util/dex" + httputil "github.com/argoproj/argo-cd/v2/util/http" + "github.com/argoproj/argo-cd/v2/util/rand" + "github.com/argoproj/argo-cd/v2/util/settings" ) const ( diff --git a/util/oidc/oidc_test.go b/util/oidc/oidc_test.go index 7966281c09c8e..179a575f56be2 100644 --- a/util/oidc/oidc_test.go +++ b/util/oidc/oidc_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/oauth2" - "github.com/argoproj/argo-cd/server/settings/oidc" + "github.com/argoproj/argo-cd/v2/server/settings/oidc" ) func TestInferGrantType(t *testing.T) { diff --git a/util/rbac/rbac.go b/util/rbac/rbac.go index 3a9e8f12dee9a..5efcccb4a70c3 100644 --- a/util/rbac/rbac.go +++ b/util/rbac/rbac.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "github.com/argoproj/argo-cd/util/assets" - "github.com/argoproj/argo-cd/util/glob" - jwtutil "github.com/argoproj/argo-cd/util/jwt" + "github.com/argoproj/argo-cd/v2/util/assets" + "github.com/argoproj/argo-cd/v2/util/glob" + jwtutil "github.com/argoproj/argo-cd/v2/util/jwt" "github.com/casbin/casbin" "github.com/casbin/casbin/model" diff --git a/util/rbac/rbac_test.go b/util/rbac/rbac_test.go index 81ef74326c267..43f03aec0f6b0 100644 --- a/util/rbac/rbac_test.go +++ b/util/rbac/rbac_test.go @@ -13,7 +13,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" ) const ( diff --git a/util/resource/revision_test.go b/util/resource/revision_test.go index 69bc080738157..b6bd395ad7f44 100644 --- a/util/resource/revision_test.go +++ b/util/resource/revision_test.go @@ -6,7 +6,7 @@ import ( . "github.com/argoproj/gitops-engine/pkg/utils/testing" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/argoproj/argo-cd/test" + "github.com/argoproj/argo-cd/v2/test" ) func TestGetRevision(t *testing.T) { diff --git a/util/session/sessionmanager.go b/util/session/sessionmanager.go index e6df04edbdcf8..687492e1e4d6e 100644 --- a/util/session/sessionmanager.go +++ b/util/session/sessionmanager.go @@ -20,17 +20,17 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/pkg/client/listers/application/v1alpha1" - "github.com/argoproj/argo-cd/server/rbacpolicy" - "github.com/argoproj/argo-cd/util/cache/appstate" - "github.com/argoproj/argo-cd/util/dex" - "github.com/argoproj/argo-cd/util/env" - httputil "github.com/argoproj/argo-cd/util/http" - jwtutil "github.com/argoproj/argo-cd/util/jwt" - oidcutil "github.com/argoproj/argo-cd/util/oidc" - passwordutil "github.com/argoproj/argo-cd/util/password" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/server/rbacpolicy" + "github.com/argoproj/argo-cd/v2/util/cache/appstate" + "github.com/argoproj/argo-cd/v2/util/dex" + "github.com/argoproj/argo-cd/v2/util/env" + httputil "github.com/argoproj/argo-cd/v2/util/http" + jwtutil "github.com/argoproj/argo-cd/v2/util/jwt" + oidcutil "github.com/argoproj/argo-cd/v2/util/oidc" + passwordutil "github.com/argoproj/argo-cd/v2/util/password" + "github.com/argoproj/argo-cd/v2/util/settings" ) // SessionManager generates and validates JWT tokens for login sessions. diff --git a/util/session/sessionmanager_norace_test.go b/util/session/sessionmanager_norace_test.go index 97bbefe58cae4..af5fcdf26724d 100644 --- a/util/session/sessionmanager_norace_test.go +++ b/util/session/sessionmanager_norace_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/util/settings" ) func TestRandomPasswordVerificationDelay(t *testing.T) { diff --git a/util/session/sessionmanager_test.go b/util/session/sessionmanager_test.go index 1ebda7cb3fa73..3072e2573251a 100644 --- a/util/session/sessionmanager_test.go +++ b/util/session/sessionmanager_test.go @@ -20,14 +20,14 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/fake" - "github.com/argoproj/argo-cd/common" - appv1 "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - apps "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/fake" - "github.com/argoproj/argo-cd/pkg/client/listers/application/v1alpha1" - "github.com/argoproj/argo-cd/test" - "github.com/argoproj/argo-cd/util/errors" - "github.com/argoproj/argo-cd/util/password" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + appv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + apps "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/fake" + "github.com/argoproj/argo-cd/v2/pkg/client/listers/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/test" + "github.com/argoproj/argo-cd/v2/util/errors" + "github.com/argoproj/argo-cd/v2/util/password" + "github.com/argoproj/argo-cd/v2/util/settings" ) func getProjLister(objects ...runtime.Object) v1alpha1.AppProjectNamespaceLister { diff --git a/util/session/state.go b/util/session/state.go index d84fc5b9a2a95..28b46ef0ef6a1 100644 --- a/util/session/state.go +++ b/util/session/state.go @@ -9,7 +9,7 @@ import ( "github.com/go-redis/redis/v8" log "github.com/sirupsen/logrus" - util "github.com/argoproj/argo-cd/util/io" + util "github.com/argoproj/argo-cd/v2/util/io" ) const ( diff --git a/util/session/state_test.go b/util/session/state_test.go index f76b470d6428d..35c2dbcc716cb 100644 --- a/util/session/state_test.go +++ b/util/session/state_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/argoproj/argo-cd/test" + "github.com/argoproj/argo-cd/v2/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/util/settings/accounts.go b/util/settings/accounts.go index 03f669f0edca9..114a27b9c9fab 100644 --- a/util/settings/accounts.go +++ b/util/settings/accounts.go @@ -12,7 +12,7 @@ import ( "google.golang.org/grpc/status" v1 "k8s.io/api/core/v1" - "github.com/argoproj/argo-cd/common" + "github.com/argoproj/argo-cd/v2/common" ) const ( diff --git a/util/settings/accounts_test.go b/util/settings/accounts_test.go index ce54f05e6e47b..61eb8e31365a6 100644 --- a/util/settings/accounts_test.go +++ b/util/settings/accounts_test.go @@ -11,7 +11,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/argoproj/argo-cd/common" + "github.com/argoproj/argo-cd/v2/common" ) func TestGetAccounts_NoAccountsConfigured(t *testing.T) { diff --git a/util/settings/filtered_resource.go b/util/settings/filtered_resource.go index 04b1ed3e95068..29c5d5cef51c9 100644 --- a/util/settings/filtered_resource.go +++ b/util/settings/filtered_resource.go @@ -1,6 +1,6 @@ package settings -import "github.com/argoproj/argo-cd/util/glob" +import "github.com/argoproj/argo-cd/v2/util/glob" type FilteredResource struct { APIGroups []string `json:"apiGroups,omitempty"` diff --git a/util/settings/settings.go b/util/settings/settings.go index 5e7b56c878a6f..b6695d0231e40 100644 --- a/util/settings/settings.go +++ b/util/settings/settings.go @@ -27,14 +27,14 @@ import ( v1listers "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/cache" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - "github.com/argoproj/argo-cd/server/settings/oidc" - "github.com/argoproj/argo-cd/util" - "github.com/argoproj/argo-cd/util/kube" - "github.com/argoproj/argo-cd/util/password" - argorand "github.com/argoproj/argo-cd/util/rand" - tlsutil "github.com/argoproj/argo-cd/util/tls" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/server/settings/oidc" + "github.com/argoproj/argo-cd/v2/util" + "github.com/argoproj/argo-cd/v2/util/kube" + "github.com/argoproj/argo-cd/v2/util/password" + argorand "github.com/argoproj/argo-cd/v2/util/rand" + tlsutil "github.com/argoproj/argo-cd/v2/util/tls" ) // ArgoCDSettings holds in-memory runtime configuration options. @@ -122,8 +122,10 @@ type HelmRepoCredentials struct { type KustomizeVersion struct { // Name holds Kustomize version name Name string - // Name holds corresponding binary path + // Path holds corresponding binary path Path string + // BuildOptions that are specific to Kustomize version + BuildOptions string } // KustomizeSettings holds kustomize settings @@ -134,19 +136,25 @@ type KustomizeSettings struct { func (ks *KustomizeSettings) GetOptions(source v1alpha1.ApplicationSource) (*v1alpha1.KustomizeOptions, error) { binaryPath := "" + buildOptions := "" if source.Kustomize != nil && source.Kustomize.Version != "" { for _, ver := range ks.Versions { if ver.Name == source.Kustomize.Version { + // add version specific path and build options binaryPath = ver.Path + buildOptions = ver.BuildOptions break } } if binaryPath == "" { return nil, fmt.Errorf("kustomize version %s is not registered", source.Kustomize.Version) } + } else { + // add build options for the default version + buildOptions = ks.BuildOptions } return &v1alpha1.KustomizeOptions{ - BuildOptions: ks.BuildOptions, + BuildOptions: buildOptions, BinaryPath: binaryPath, }, nil } @@ -264,6 +272,8 @@ const ( kustomizeBuildOptionsKey = "kustomize.buildOptions" // kustomizeVersionKeyPrefix is a kustomize version key prefix kustomizeVersionKeyPrefix = "kustomize.version" + // kustomizePathPrefixKey is a kustomize path for a specific version + kustomizePathPrefixKey = "kustomize.path" // anonymousUserEnabledKey is the key which enables or disables anonymous user anonymousUserEnabledKey = "users.anonymous.enabled" // anonymousUserEnabledKey is the key which specifies token expiration duration @@ -586,22 +596,60 @@ func (mgr *SettingsManager) GetKustomizeSettings() (*KustomizeSettings, error) { if err != nil { return nil, err } + kustomizeVersionsMap := map[string]KustomizeVersion{} + buildOptions := map[string]string{} settings := &KustomizeSettings{} - if value, ok := argoCDCM.Data[kustomizeBuildOptionsKey]; ok { - settings.BuildOptions = value + + // extract build options for the default version + if options, ok := argoCDCM.Data[kustomizeBuildOptionsKey]; ok { + settings.BuildOptions = options } + + // extract per-version binary paths and build options for k, v := range argoCDCM.Data { - if !strings.HasPrefix(k, kustomizeVersionKeyPrefix) { - continue + // extract version and path from kustomize.version. + if strings.HasPrefix(k, kustomizeVersionKeyPrefix) { + err = addKustomizeVersion(kustomizeVersionKeyPrefix, k, v, kustomizeVersionsMap) + if err != nil { + return nil, err + } + } + + // extract version and path from kustomize.path. + if strings.HasPrefix(k, kustomizePathPrefixKey) { + err = addKustomizeVersion(kustomizePathPrefixKey, k, v, kustomizeVersionsMap) + if err != nil { + return nil, err + } + } + + // extract version and build options from kustomize.buildOptions. + if strings.HasPrefix(k, kustomizeBuildOptionsKey) && k != kustomizeBuildOptionsKey { + buildOptions[k[len(kustomizeBuildOptionsKey)+1:]] = v + } + } + + for _, v := range kustomizeVersionsMap { + if _, ok := buildOptions[v.Name]; ok { + v.BuildOptions = buildOptions[v.Name] } - settings.Versions = append(settings.Versions, KustomizeVersion{ - Name: k[len(kustomizeVersionKeyPrefix)+1:], - Path: v, - }) + settings.Versions = append(settings.Versions, v) } return settings, nil } +func addKustomizeVersion(prefix, name, path string, kvMap map[string]KustomizeVersion) error { + version := name[len(prefix)+1:] + if _, ok := kvMap[version]; ok { + return fmt.Errorf("found duplicate kustomize version: %s", version) + } + kvMap[version] = KustomizeVersion{ + Name: version, + Path: path, + } + return nil +} + // DEPRECATED. Helm repository credentials are now managed using RepoCredentials func (mgr *SettingsManager) GetHelmRepositories() ([]HelmRepoCredentials, error) { argoCDCM, err := mgr.getConfigMap() diff --git a/util/settings/settings_test.go b/util/settings/settings_test.go index b29d77267766a..ed2c92fbf8d85 100644 --- a/util/settings/settings_test.go +++ b/util/settings/settings_test.go @@ -2,10 +2,11 @@ package settings import ( "context" + "sort" "testing" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" @@ -296,14 +297,74 @@ func TestSettingsManager_GetKustomizeBuildOptions(t *testing.T) { assert.Equal(t, "foo", options.BuildOptions) assert.Equal(t, []KustomizeVersion{{Name: "v3.2.1", Path: "somePath"}}, options.Versions) }) + + t.Run("Kustomize settings per-version", func(t *testing.T) { + _, settingsManager := fixtures(map[string]string{ + "kustomize.buildOptions": "--global true", + "kustomize.version.v3.2.1": "/path_3.2.1", + "kustomize.buildOptions.v3.2.3": "--options v3.2.3", + "kustomize.path.v3.2.3": "/path_3.2.3", + "kustomize.path.v3.2.4": "/path_3.2.4", + "kustomize.buildOptions.v3.2.4": "--options v3.2.4", + "kustomize.buildOptions.v3.2.5": "--options v3.2.5", + }) + + got, err := settingsManager.GetKustomizeSettings() + + assert.NoError(t, err) + assert.Equal(t, "--global true", got.BuildOptions) + want := &KustomizeSettings{ + BuildOptions: "--global true", + Versions: []KustomizeVersion{ + {Name: "v3.2.1", Path: "/path_3.2.1"}, + {Name: "v3.2.3", Path: "/path_3.2.3", BuildOptions: "--options v3.2.3"}, + {Name: "v3.2.4", Path: "/path_3.2.4", BuildOptions: "--options v3.2.4"}, + }, + } + sortVersionsByName := func(versions []KustomizeVersion) { + sort.Slice(versions, func(i, j int) bool { + return versions[i].Name > versions[j].Name + }) + } + sortVersionsByName(want.Versions) + sortVersionsByName(got.Versions) + assert.EqualValues(t, want, got) + }) + + t.Run("Kustomize settings per-version with duplicate versions", func(t *testing.T) { + _, settingsManager := fixtures(map[string]string{ + "kustomize.buildOptions": "--global true", + "kustomize.version.v3.2.1": "/path_3.2.1", + "kustomize.buildOptions.v3.2.1": "--options v3.2.3", + "kustomize.path.v3.2.2": "/other_path_3.2.2", + "kustomize.path.v3.2.1": "/other_path_3.2.1", + }) + + got, err := settingsManager.GetKustomizeSettings() + assert.EqualError(t, err, "found duplicate kustomize version: v3.2.1") + assert.Empty(t, got) + }) + + t.Run("Config map with no Kustomize settings", func(t *testing.T) { + _, settingsManager := fixtures(map[string]string{ + "other.options": "--global true", + }) + + got, err := settingsManager.GetKustomizeSettings() + assert.NoError(t, err) + assert.Empty(t, got) + }) } func TestKustomizeSettings_GetOptions(t *testing.T) { - settings := KustomizeSettings{Versions: []KustomizeVersion{ - {Name: "v1", Path: "path_v1"}, - {Name: "v2", Path: "path_v2"}, - {Name: "v3", Path: "path_v3"}, - }} + settings := KustomizeSettings{ + BuildOptions: "--opt1 val1", + Versions: []KustomizeVersion{ + {Name: "v1", Path: "path_v1"}, + {Name: "v2", Path: "path_v2"}, + {Name: "v3", Path: "path_v3", BuildOptions: "--opt2 val2"}, + }, + } t.Run("VersionDoesNotExist", func(t *testing.T) { _, err := settings.GetOptions(v1alpha1.ApplicationSource{ @@ -311,6 +372,15 @@ func TestKustomizeSettings_GetOptions(t *testing.T) { assert.Error(t, err) }) + t.Run("DefaultBuildOptions", func(t *testing.T) { + ver, err := settings.GetOptions(v1alpha1.ApplicationSource{}) + if !assert.NoError(t, err) { + return + } + assert.Equal(t, "", ver.BinaryPath) + assert.Equal(t, "--opt1 val1", ver.BuildOptions) + }) + t.Run("VersionExists", func(t *testing.T) { ver, err := settings.GetOptions(v1alpha1.ApplicationSource{ Kustomize: &v1alpha1.ApplicationSourceKustomize{Version: "v2"}}) @@ -318,6 +388,17 @@ func TestKustomizeSettings_GetOptions(t *testing.T) { return } assert.Equal(t, "path_v2", ver.BinaryPath) + assert.Equal(t, "", ver.BuildOptions) + }) + + t.Run("VersionExistsWithBuildOption", func(t *testing.T) { + ver, err := settings.GetOptions(v1alpha1.ApplicationSource{ + Kustomize: &v1alpha1.ApplicationSourceKustomize{Version: "v3"}}) + if !assert.NoError(t, err) { + return + } + assert.Equal(t, "path_v3", ver.BinaryPath) + assert.Equal(t, "--opt2 val2", ver.BuildOptions) }) } diff --git a/util/swagger/swagger_test.go b/util/swagger/swagger_test.go index ce6c0ca8aabdc..3561ab18bab00 100644 --- a/util/swagger/swagger_test.go +++ b/util/swagger/swagger_test.go @@ -8,7 +8,7 @@ import ( "github.com/go-openapi/loads" - "github.com/argoproj/argo-cd/util/assets" + "github.com/argoproj/argo-cd/v2/util/assets" ) func TestSwaggerUI(t *testing.T) { diff --git a/util/util_test.go b/util/util_test.go index 57e02c264ad9b..18d7148d244e5 100644 --- a/util/util_test.go +++ b/util/util_test.go @@ -3,7 +3,7 @@ package util_test import ( "testing" - "github.com/argoproj/argo-cd/util" + "github.com/argoproj/argo-cd/v2/util" ) func TestMakeSignature(t *testing.T) { diff --git a/util/webhook/webhook.go b/util/webhook/webhook.go index 583fbc73df9c6..cd2019cc8c30d 100644 --- a/util/webhook/webhook.go +++ b/util/webhook/webhook.go @@ -19,13 +19,13 @@ import ( "gopkg.in/go-playground/webhooks.v5/gogs" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned" - "github.com/argoproj/argo-cd/reposerver/cache" - "github.com/argoproj/argo-cd/util/argo" - "github.com/argoproj/argo-cd/util/security" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned" + "github.com/argoproj/argo-cd/v2/reposerver/cache" + "github.com/argoproj/argo-cd/v2/util/argo" + "github.com/argoproj/argo-cd/v2/util/security" + "github.com/argoproj/argo-cd/v2/util/settings" ) type settingsSource interface { diff --git a/util/webhook/webhook_test.go b/util/webhook/webhook_test.go index fa0985ad4440f..54b8f01a6b33a 100644 --- a/util/webhook/webhook_test.go +++ b/util/webhook/webhook_test.go @@ -12,12 +12,12 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/argoproj/argo-cd/common" - "github.com/argoproj/argo-cd/pkg/apis/application/v1alpha1" - appclientset "github.com/argoproj/argo-cd/pkg/client/clientset/versioned/fake" - "github.com/argoproj/argo-cd/reposerver/cache" - cacheutil "github.com/argoproj/argo-cd/util/cache" - "github.com/argoproj/argo-cd/util/settings" + "github.com/argoproj/argo-cd/v2/common" + "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1" + appclientset "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/fake" + "github.com/argoproj/argo-cd/v2/reposerver/cache" + cacheutil "github.com/argoproj/argo-cd/v2/util/cache" + "github.com/argoproj/argo-cd/v2/util/settings" ) type fakeSettingsSrc struct {