Skip to content

Commit

Permalink
chore: Upgrade Argo CD dependencies to v2.0.5 (#230)
Browse files Browse the repository at this point in the history
Signed-off-by: jannfis <jann@mistrust.net>
  • Loading branch information
jannfis authored Aug 2, 2021
1 parent b4db40b commit 3a773ea
Show file tree
Hide file tree
Showing 15 changed files with 554 additions and 374 deletions.
6 changes: 3 additions & 3 deletions ext/git/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
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"

"github.com/argoproj-labs/argocd-image-updater/pkg/log"
)
Expand Down
2 changes: 1 addition & 1 deletion ext/git/creds.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
argoio "github.com/argoproj/gitops-engine/pkg/utils/io"
log "github.com/sirupsen/logrus"

certutil "github.com/argoproj/argo-cd/util/cert"
certutil "github.com/argoproj/argo-cd/v2/util/cert"
)

type Creds interface {
Expand Down
6 changes: 3 additions & 3 deletions ext/git/git_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
76 changes: 35 additions & 41 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,64 +4,58 @@ go 1.16

require (
github.com/Masterminds/semver v1.5.0
github.com/argoproj/argo-cd v1.7.4
github.com/argoproj/gitops-engine v0.1.3-0.20200904164417-c04f859da9b2
github.com/argoproj/pkg v0.0.0-20200624215116-23e74cb168fe
github.com/argoproj/argo-cd/v2 v2.0.5
github.com/argoproj/gitops-engine v0.3.3
github.com/argoproj/pkg v0.9.1
github.com/docker/distribution v2.7.1+incompatible
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
github.com/go-openapi/spec v0.19.5 // indirect
github.com/google/go-cmp v0.4.0 // indirect
github.com/gorilla/mux v1.7.4 // indirect
github.com/nokia/docker-registry-client v0.0.0-20201015093031-af1a6d3b4fb1
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/prometheus/client_golang v1.0.0
github.com/prometheus/client_golang v1.7.1
github.com/sirupsen/logrus v1.6.0
github.com/spf13/cobra v1.0.0
github.com/spf13/cobra v1.1.1
github.com/stretchr/testify v1.6.1
go.uber.org/ratelimit v0.1.1-0.20201110185707-e86515f0dda9
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
gopkg.in/src-d/go-git.v4 v4.13.1
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v1.18.8
k8s.io/apimachinery v1.18.8
k8s.io/api v1.20.4
k8s.io/apimachinery v1.20.4
k8s.io/client-go v11.0.1-0.20190816222228-6d55c1b1f1ca+incompatible
k8s.io/kubectl v1.18.8 // indirect
k8s.io/kubectl v1.20.4 // indirect
sigs.k8s.io/kustomize v2.0.3+incompatible
)

replace (
github.com/golang/protobuf => github.com/golang/protobuf v1.3.2
github.com/grpc-ecosystem/grpc-gateway => github.com/grpc-ecosystem/grpc-gateway v1.9.5
github.com/improbable-eng/grpc-web => github.com/improbable-eng/grpc-web v0.0.0-20181111100011-16092bd1d58a
github.com/golang/protobuf => github.com/golang/protobuf v1.4.2

google.golang.org/grpc => google.golang.org/grpc v1.15.0

k8s.io/api => k8s.io/api v0.18.8
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.8
k8s.io/apimachinery => k8s.io/apimachinery v0.18.8
k8s.io/apiserver => k8s.io/apiserver v0.18.8
k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.8
k8s.io/client-go => k8s.io/client-go v0.18.8
k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.8
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.8
k8s.io/code-generator => k8s.io/code-generator v0.18.8
k8s.io/component-base => k8s.io/component-base v0.18.8
k8s.io/cri-api => k8s.io/cri-api v0.18.8
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.8
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.8
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.8
k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.8
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.8
k8s.io/kubectl => k8s.io/kubectl v0.18.8
k8s.io/kubelet => k8s.io/kubelet v0.18.8
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.8
k8s.io/metrics => k8s.io/metrics v0.18.8
k8s.io/node-api => k8s.io/node-api v0.18.8
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.8
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.18.8
k8s.io/sample-controller => k8s.io/sample-controller v0.18.8
k8s.io/api => k8s.io/api v0.20.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.4
k8s.io/apimachinery => k8s.io/apimachinery v0.20.4
k8s.io/apiserver => k8s.io/apiserver v0.20.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.4
k8s.io/client-go => k8s.io/client-go v0.20.4
k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.4
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.4
k8s.io/code-generator => k8s.io/code-generator v0.20.4
k8s.io/component-base => k8s.io/component-base v0.20.4
k8s.io/component-helpers => k8s.io/component-helpers v0.20.4
k8s.io/controller-manager => k8s.io/controller-manager v0.20.4
k8s.io/cri-api => k8s.io/cri-api v0.20.4
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.4
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.4
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.4
k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.4
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.4
k8s.io/kubectl => k8s.io/kubectl v0.20.4
k8s.io/kubelet => k8s.io/kubelet v0.20.4
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.4
k8s.io/metrics => k8s.io/metrics v0.20.4
k8s.io/mount-utils => k8s.io/mount-utils v0.20.4
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.4
)
Loading

0 comments on commit 3a773ea

Please sign in to comment.