Skip to content

Commit 11a5c8e

Browse files
committed
chore: Upgrade Argo CD dependencies to v2.0.5
Signed-off-by: jannfis <[email protected]>
1 parent b4db40b commit 11a5c8e

File tree

15 files changed

+554
-374
lines changed

15 files changed

+554
-374
lines changed

ext/git/client.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
ssh2 "gopkg.in/src-d/go-git.v4/plumbing/transport/ssh"
2525
"gopkg.in/src-d/go-git.v4/storage/memory"
2626

27-
"github.com/argoproj/argo-cd/common"
28-
certutil "github.com/argoproj/argo-cd/util/cert"
29-
executil "github.com/argoproj/argo-cd/util/exec"
27+
"github.com/argoproj/argo-cd/v2/common"
28+
certutil "github.com/argoproj/argo-cd/v2/util/cert"
29+
executil "github.com/argoproj/argo-cd/v2/util/exec"
3030

3131
"github.com/argoproj-labs/argocd-image-updater/pkg/log"
3232
)

ext/git/creds.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
argoio "github.com/argoproj/gitops-engine/pkg/utils/io"
1111
log "github.com/sirupsen/logrus"
1212

13-
certutil "github.com/argoproj/argo-cd/util/cert"
13+
certutil "github.com/argoproj/argo-cd/v2/util/cert"
1414
)
1515

1616
type Creds interface {

ext/git/git_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010

1111
"github.com/stretchr/testify/assert"
1212

13-
"github.com/argoproj/argo-cd/test/fixture/log"
14-
"github.com/argoproj/argo-cd/test/fixture/path"
15-
"github.com/argoproj/argo-cd/test/fixture/test"
13+
"github.com/argoproj/argo-cd/v2/test/fixture/log"
14+
"github.com/argoproj/argo-cd/v2/test/fixture/path"
15+
"github.com/argoproj/argo-cd/v2/test/fixture/test"
1616
)
1717

1818
func TestIsCommitSHA(t *testing.T) {

go.mod

Lines changed: 35 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -4,64 +4,58 @@ go 1.16
44

55
require (
66
github.com/Masterminds/semver v1.5.0
7-
github.com/argoproj/argo-cd v1.7.4
8-
github.com/argoproj/gitops-engine v0.1.3-0.20200904164417-c04f859da9b2
9-
github.com/argoproj/pkg v0.0.0-20200624215116-23e74cb168fe
7+
github.com/argoproj/argo-cd/v2 v2.0.5
8+
github.com/argoproj/gitops-engine v0.3.3
9+
github.com/argoproj/pkg v0.9.1
1010
github.com/docker/distribution v2.7.1+incompatible
1111
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
1212
github.com/go-openapi/spec v0.19.5 // indirect
13-
github.com/google/go-cmp v0.4.0 // indirect
14-
github.com/gorilla/mux v1.7.4 // indirect
1513
github.com/nokia/docker-registry-client v0.0.0-20201015093031-af1a6d3b4fb1
1614
github.com/patrickmn/go-cache v2.1.0+incompatible
17-
github.com/prometheus/client_golang v1.0.0
15+
github.com/prometheus/client_golang v1.7.1
1816
github.com/sirupsen/logrus v1.6.0
19-
github.com/spf13/cobra v1.0.0
17+
github.com/spf13/cobra v1.1.1
2018
github.com/stretchr/testify v1.6.1
2119
go.uber.org/ratelimit v0.1.1-0.20201110185707-e86515f0dda9
22-
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
23-
golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
24-
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
20+
golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
21+
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
2522
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 // indirect
26-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
2723
gopkg.in/src-d/go-git.v4 v4.13.1
2824
gopkg.in/yaml.v2 v2.4.0
29-
k8s.io/api v1.18.8
30-
k8s.io/apimachinery v1.18.8
25+
k8s.io/api v1.20.4
26+
k8s.io/apimachinery v1.20.4
3127
k8s.io/client-go v11.0.1-0.20190816222228-6d55c1b1f1ca+incompatible
32-
k8s.io/kubectl v1.18.8 // indirect
28+
k8s.io/kubectl v1.20.4 // indirect
3329
sigs.k8s.io/kustomize v2.0.3+incompatible
3430
)
3531

3632
replace (
37-
github.com/golang/protobuf => github.com/golang/protobuf v1.3.2
38-
github.com/grpc-ecosystem/grpc-gateway => github.com/grpc-ecosystem/grpc-gateway v1.9.5
39-
github.com/improbable-eng/grpc-web => github.com/improbable-eng/grpc-web v0.0.0-20181111100011-16092bd1d58a
33+
github.com/golang/protobuf => github.com/golang/protobuf v1.4.2
4034

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

43-
k8s.io/api => k8s.io/api v0.18.8
44-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.8
45-
k8s.io/apimachinery => k8s.io/apimachinery v0.18.8
46-
k8s.io/apiserver => k8s.io/apiserver v0.18.8
47-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.8
48-
k8s.io/client-go => k8s.io/client-go v0.18.8
49-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.8
50-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.8
51-
k8s.io/code-generator => k8s.io/code-generator v0.18.8
52-
k8s.io/component-base => k8s.io/component-base v0.18.8
53-
k8s.io/cri-api => k8s.io/cri-api v0.18.8
54-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.8
55-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.8
56-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.8
57-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.8
58-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.8
59-
k8s.io/kubectl => k8s.io/kubectl v0.18.8
60-
k8s.io/kubelet => k8s.io/kubelet v0.18.8
61-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.8
62-
k8s.io/metrics => k8s.io/metrics v0.18.8
63-
k8s.io/node-api => k8s.io/node-api v0.18.8
64-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.8
65-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.18.8
66-
k8s.io/sample-controller => k8s.io/sample-controller v0.18.8
37+
k8s.io/api => k8s.io/api v0.20.4
38+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.4
39+
k8s.io/apimachinery => k8s.io/apimachinery v0.20.4
40+
k8s.io/apiserver => k8s.io/apiserver v0.20.4
41+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.4
42+
k8s.io/client-go => k8s.io/client-go v0.20.4
43+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.20.4
44+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.4
45+
k8s.io/code-generator => k8s.io/code-generator v0.20.4
46+
k8s.io/component-base => k8s.io/component-base v0.20.4
47+
k8s.io/component-helpers => k8s.io/component-helpers v0.20.4
48+
k8s.io/controller-manager => k8s.io/controller-manager v0.20.4
49+
k8s.io/cri-api => k8s.io/cri-api v0.20.4
50+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.20.4
51+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.4
52+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.4
53+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.4
54+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.4
55+
k8s.io/kubectl => k8s.io/kubectl v0.20.4
56+
k8s.io/kubelet => k8s.io/kubelet v0.20.4
57+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.20.4
58+
k8s.io/metrics => k8s.io/metrics v0.20.4
59+
k8s.io/mount-utils => k8s.io/mount-utils v0.20.4
60+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.4
6761
)

0 commit comments

Comments
 (0)