Skip to content

Commit d16e3e6

Browse files
authored
chore(deps): Update Argo CD dependencies to 2.2.2 (argoproj-labs#351)
* chore(deps): Update Argo CD dependencies to 2.2.2 Signed-off-by: jannfis <jann@mistrust.net> * Do not vendor before image build Signed-off-by: jannfis <jann@mistrust.net>
1 parent 4219456 commit d16e3e6

File tree

3 files changed

+360
-221
lines changed

3 files changed

+360
-221
lines changed

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,11 @@ controller:
7171
CGO_ENABLED=0 GOOS=${OS} GOARCH=${ARCH} go build -ldflags '${LDFLAGS}' -o ${OUTDIR}/${BINNAME} cmd/*.go
7272

7373
.PHONY: image
74-
image: clean-image mod-vendor
74+
image: clean-image
7575
docker build \
7676
-t ${IMAGE_PREFIX}${IMAGE_NAME}:${IMAGE_TAG} \
7777
--pull \
7878
.
79-
rm -rf vendor/
8079

8180
.PHONY: multiarch-image
8281
multiarch-image:

go.mod

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,18 @@ go 1.16
44

55
require (
66
github.com/Masterminds/semver v1.5.0
7-
github.com/argoproj/argo-cd/v2 v2.1.2
8-
github.com/argoproj/gitops-engine v0.4.1
9-
github.com/argoproj/pkg v0.9.1
7+
github.com/argoproj/argo-cd/v2 v2.2.2
8+
github.com/argoproj/gitops-engine v0.5.2
9+
github.com/argoproj/pkg v0.11.1-0.20211203175135-36c59d8fafe0
1010
github.com/bradleyfalzon/ghinstallation v1.1.1
1111
github.com/distribution/distribution/v3 v3.0.0-20210820130019-1cdeff259b9d
1212
github.com/docker/distribution v2.7.1+incompatible
1313
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
1414
github.com/go-git/go-git/v5 v5.2.0
15-
github.com/google/go-cmp v0.5.6 // indirect
1615
github.com/google/go-querystring v1.1.0 // indirect
1716
github.com/opencontainers/go-digest v1.0.0
1817
github.com/patrickmn/go-cache v2.1.0+incompatible
19-
github.com/prometheus/client_golang v1.7.1
18+
github.com/prometheus/client_golang v1.11.0
2019
github.com/sirupsen/logrus v1.8.1
2120
github.com/spf13/cobra v1.1.3
2221
github.com/spf13/pflag v1.0.5
@@ -26,40 +25,41 @@ require (
2625
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
2726
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
2827
gopkg.in/yaml.v2 v2.4.0
29-
k8s.io/api v1.21.0
30-
k8s.io/apimachinery v1.21.0
28+
k8s.io/api v1.22.2
29+
k8s.io/apimachinery v1.22.2
3130
k8s.io/client-go v11.0.1-0.20190816222228-6d55c1b1f1ca+incompatible
32-
sigs.k8s.io/kustomize/api v0.8.5
33-
sigs.k8s.io/kustomize/kyaml v0.10.15
31+
sigs.k8s.io/kustomize/api v0.8.11
32+
sigs.k8s.io/kustomize/kyaml v0.11.0
3433
)
3534

3635
replace (
3736
github.com/golang/protobuf => github.com/golang/protobuf v1.4.2
3837

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

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

0 commit comments

Comments
 (0)