Skip to content

Commit 50f3cc7

Browse files
committed
feat: upgrade k8s & argocd pkg (argoproj-labs#513)
1 parent 49825ec commit 50f3cc7

File tree

7 files changed

+584
-706
lines changed

7 files changed

+584
-706
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.18 AS builder
1+
FROM golang:1.20 AS builder
22

33
RUN mkdir -p /src/argocd-image-updater
44
WORKDIR /src/argocd-image-updater

go.mod

+110-108
Original file line numberDiff line numberDiff line change
@@ -1,192 +1,194 @@
11
module github.com/argoproj-labs/argocd-image-updater
22

3-
go 1.18
3+
go 1.20
44

55
require (
66
github.com/Masterminds/semver v1.5.0
7-
github.com/argoproj/argo-cd/v2 v2.2.7
8-
github.com/argoproj/gitops-engine v0.5.2
9-
github.com/argoproj/pkg v0.11.1-0.20211203175135-36c59d8fafe0
7+
github.com/argoproj/argo-cd/v2 v2.6.7
8+
github.com/argoproj/gitops-engine v0.7.1-0.20221208230615-917f5a0f16d5
9+
github.com/argoproj/pkg v0.13.7-0.20221221191914-44694015343d
1010
github.com/bradleyfalzon/ghinstallation v1.1.1
1111
github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2
12-
github.com/go-git/go-git/v5 v5.2.0
12+
github.com/go-git/go-git/v5 v5.4.2
1313
github.com/opencontainers/go-digest v1.0.0
1414
github.com/opencontainers/image-spec v1.0.2
1515
github.com/patrickmn/go-cache v2.1.0+incompatible
16-
github.com/prometheus/client_golang v1.12.1
17-
github.com/sirupsen/logrus v1.8.1
16+
github.com/prometheus/client_golang v1.14.0
17+
github.com/sirupsen/logrus v1.9.0
1818
github.com/spf13/cobra v1.6.1
1919
github.com/spf13/pflag v1.0.5
20-
github.com/stretchr/testify v1.7.0
20+
github.com/stretchr/testify v1.8.1
2121
go.uber.org/ratelimit v0.1.1-0.20201110185707-e86515f0dda9
22-
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
22+
golang.org/x/crypto v0.1.0
2323
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
2424
gopkg.in/yaml.v2 v2.4.0
2525
k8s.io/api v1.22.4
2626
k8s.io/apimachinery v1.22.4
27-
k8s.io/client-go v11.0.1-0.20190816222228-6d55c1b1f1ca+incompatible
28-
sigs.k8s.io/kustomize/api v0.8.11
29-
sigs.k8s.io/kustomize/kyaml v0.11.0
27+
k8s.io/client-go v0.26.3
28+
sigs.k8s.io/kustomize/api v0.12.1
29+
sigs.k8s.io/kustomize/kyaml v0.13.9
3030
)
3131

3232
require (
33-
cloud.google.com/go v0.65.0 // indirect
33+
cloud.google.com/go v0.99.0 // indirect
3434
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
35-
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
36-
github.com/Azure/go-autorest/autorest v0.11.24 // indirect
37-
github.com/Azure/go-autorest/autorest/adal v0.9.18 // indirect
38-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
39-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
40-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
41-
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
42-
github.com/PuerkitoBio/purell v1.1.1 // indirect
43-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
35+
github.com/MakeNowJust/heredoc v1.0.0 // indirect
36+
github.com/Masterminds/semver/v3 v3.2.0 // indirect
37+
github.com/Microsoft/go-winio v0.4.17 // indirect
38+
github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
39+
github.com/acomagu/bufpipe v1.0.3 // indirect
4440
github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 // indirect
4541
github.com/beorn7/perks v1.0.1 // indirect
46-
github.com/bombsimon/logrusr v1.0.0 // indirect
47-
github.com/bradleyfalzon/ghinstallation/v2 v2.0.2 // indirect
42+
github.com/blang/semver/v4 v4.0.0 // indirect
43+
github.com/bombsimon/logrusr/v2 v2.0.1 // indirect
44+
github.com/bradleyfalzon/ghinstallation/v2 v2.1.0 // indirect
4845
github.com/cespare/xxhash/v2 v2.1.2 // indirect
49-
github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 // indirect
50-
github.com/coreos/go-oidc v2.1.0+incompatible // indirect
46+
github.com/chai2010/gettext-go v1.0.2 // indirect
47+
github.com/coreos/go-oidc v2.2.1+incompatible // indirect
5148
github.com/davecgh/go-spew v1.1.1 // indirect
5249
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
53-
github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1 // indirect
5450
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
55-
github.com/docker/distribution v2.7.1+incompatible // indirect
51+
github.com/docker/distribution v2.8.1+incompatible // indirect
5652
github.com/docker/go-metrics v0.0.1 // indirect
5753
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
58-
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
54+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
5955
github.com/emirpasic/gods v1.12.0 // indirect
60-
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
56+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
6157
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
6258
github.com/fatih/camelcase v1.0.0 // indirect
63-
github.com/felixge/httpsnoop v1.0.1 // indirect
59+
github.com/felixge/httpsnoop v1.0.3 // indirect
6460
github.com/fvbommel/sortorder v1.0.1 // indirect
6561
github.com/ghodss/yaml v1.0.0 // indirect
6662
github.com/go-errors/errors v1.0.1 // indirect
6763
github.com/go-git/gcfg v1.5.0 // indirect
68-
github.com/go-git/go-billy/v5 v5.0.0 // indirect
69-
github.com/go-logr/logr v0.4.0 // indirect
64+
github.com/go-git/go-billy/v5 v5.3.1 // indirect
65+
github.com/go-logr/logr v1.2.3 // indirect
66+
github.com/go-logr/stdr v1.2.2 // indirect
7067
github.com/go-openapi/jsonpointer v0.19.5 // indirect
71-
github.com/go-openapi/jsonreference v0.19.5 // indirect
72-
github.com/go-openapi/swag v0.19.14 // indirect
68+
github.com/go-openapi/jsonreference v0.20.0 // indirect
69+
github.com/go-openapi/swag v0.21.1 // indirect
7370
github.com/go-redis/cache/v8 v8.4.2 // indirect
74-
github.com/go-redis/redis/v8 v8.11.3 // indirect
71+
github.com/go-redis/redis/v8 v8.11.5 // indirect
7572
github.com/gobwas/glob v0.2.3 // indirect
7673
github.com/gogo/protobuf v1.3.2 // indirect
77-
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
74+
github.com/golang-jwt/jwt/v4 v4.4.3 // indirect
7875
github.com/golang/protobuf v1.5.2 // indirect
7976
github.com/google/btree v1.0.1 // indirect
80-
github.com/google/go-cmp v0.5.6 // indirect
77+
github.com/google/gnostic v0.5.7-v3refs // indirect
78+
github.com/google/go-cmp v0.5.9 // indirect
8179
github.com/google/go-github/v29 v29.0.2 // indirect
82-
github.com/google/go-github/v38 v38.0.0 // indirect
80+
github.com/google/go-github/v45 v45.2.0 // indirect
8381
github.com/google/go-querystring v1.1.0 // indirect
8482
github.com/google/gofuzz v1.1.0 // indirect
8583
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
86-
github.com/google/uuid v1.1.2 // indirect
87-
github.com/googleapis/gnostic v0.5.5 // indirect
84+
github.com/google/uuid v1.3.0 // indirect
8885
github.com/gorilla/mux v1.8.0 // indirect
8986
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
9087
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
9188
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
92-
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
89+
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
9390
github.com/hashicorp/go-retryablehttp v0.7.0 // indirect
9491
github.com/hashicorp/golang-lru v0.5.4 // indirect
95-
github.com/imdario/mergo v0.3.10 // indirect
92+
github.com/imdario/mergo v0.3.13 // indirect
9693
github.com/inconshreveable/mousetrap v1.0.1 // indirect
9794
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
9895
github.com/jonboulle/clockwork v0.2.2 // indirect
9996
github.com/josharian/intern v1.0.0 // indirect
10097
github.com/json-iterator/go v1.1.12 // indirect
10198
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
102-
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
103-
github.com/klauspost/compress v1.13.5 // indirect
99+
github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
100+
github.com/klauspost/compress v1.15.9 // indirect
104101
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
105-
github.com/mailru/easyjson v0.7.6 // indirect
106-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
102+
github.com/mailru/easyjson v0.7.7 // indirect
103+
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
107104
github.com/mitchellh/go-homedir v1.1.0 // indirect
108105
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
109106
github.com/moby/spdystream v0.2.0 // indirect
110-
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
107+
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
111108
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
112109
github.com/modern-go/reflect2 v1.0.2 // indirect
113110
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
111+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
114112
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
115113
github.com/pkg/errors v0.9.1 // indirect
116114
github.com/pmezard/go-difflib v1.0.0 // indirect
117-
github.com/pquerna/cachecontrol v0.0.0-20180306154005-525d0eb5f91d // indirect
118-
github.com/prometheus/client_model v0.2.0 // indirect
119-
github.com/prometheus/common v0.32.1 // indirect
120-
github.com/prometheus/procfs v0.7.3 // indirect
121-
github.com/robfig/cron v1.1.0 // indirect
122-
github.com/russross/blackfriday v1.5.2 // indirect
115+
github.com/pquerna/cachecontrol v0.1.0 // indirect
116+
github.com/prometheus/client_model v0.3.0 // indirect
117+
github.com/prometheus/common v0.37.0 // indirect
118+
github.com/prometheus/procfs v0.8.0 // indirect
119+
github.com/r3labs/diff v1.1.0 // indirect
120+
github.com/robfig/cron/v3 v3.0.1 // indirect
121+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
123122
github.com/sergi/go-diff v1.1.0 // indirect
124-
github.com/stretchr/objx v0.2.0 // indirect
123+
github.com/stretchr/objx v0.5.0 // indirect
125124
github.com/vmihailenco/go-tinylfu v0.2.1 // indirect
126125
github.com/vmihailenco/msgpack/v5 v5.3.4 // indirect
127126
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
128-
github.com/xanzy/ssh-agent v0.2.1 // indirect
129-
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
127+
github.com/xanzy/ssh-agent v0.3.0 // indirect
128+
github.com/xlab/treeprint v1.1.0 // indirect
129+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
130+
go.opentelemetry.io/otel v1.11.1 // indirect
131+
go.opentelemetry.io/otel/trace v1.11.1 // indirect
130132
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
131133
golang.org/x/exp v0.0.0-20210901193431-a062eea981d2 // indirect
132-
golang.org/x/net v0.4.0 // indirect
133-
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
134-
golang.org/x/sys v0.3.0 // indirect
135-
golang.org/x/term v0.3.0 // indirect
136-
golang.org/x/text v0.5.0 // indirect
137-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
138-
google.golang.org/appengine v1.6.6 // indirect
139-
google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
140-
google.golang.org/grpc v1.38.0 // indirect
141-
google.golang.org/protobuf v1.26.0 // indirect
134+
golang.org/x/net v0.7.0 // indirect
135+
golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb // indirect
136+
golang.org/x/sys v0.5.0 // indirect
137+
golang.org/x/term v0.5.0 // indirect
138+
golang.org/x/text v0.7.0 // indirect
139+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
140+
google.golang.org/appengine v1.6.7 // indirect
141+
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
142+
google.golang.org/grpc v1.51.0 // indirect
143+
google.golang.org/protobuf v1.28.1 // indirect
142144
gopkg.in/inf.v0 v0.9.1 // indirect
143-
gopkg.in/square/go-jose.v2 v2.2.2 // indirect
145+
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
144146
gopkg.in/warnings.v0 v0.1.2 // indirect
145147
gopkg.in/yaml.v3 v3.0.1 // indirect
146-
k8s.io/apiserver v0.22.4 // indirect
147-
k8s.io/cli-runtime v0.22.4 // indirect
148-
k8s.io/component-base v0.22.4 // indirect
149-
k8s.io/component-helpers v0.22.4 // indirect
150-
k8s.io/klog/v2 v2.9.0 // indirect
151-
k8s.io/kube-aggregator v0.22.2 // indirect
152-
k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c // indirect
153-
k8s.io/kubectl v0.22.2 // indirect
154-
k8s.io/kubernetes v1.22.2 // indirect
155-
k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect
156-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
157-
sigs.k8s.io/yaml v1.2.0 // indirect
148+
k8s.io/apiextensions-apiserver v0.24.2 // indirect
149+
k8s.io/apiserver v0.26.3 // indirect
150+
k8s.io/cli-runtime v0.26.3 // indirect
151+
k8s.io/component-base v0.26.3 // indirect
152+
k8s.io/component-helpers v0.26.3 // indirect
153+
k8s.io/klog/v2 v2.80.1 // indirect
154+
k8s.io/kube-aggregator v0.24.2 // indirect
155+
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
156+
k8s.io/kubectl v0.24.2 // indirect
157+
k8s.io/kubernetes v1.26.3 // indirect
158+
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
159+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
160+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
161+
sigs.k8s.io/yaml v1.3.0 // indirect
158162
)
159163

160164
replace (
161165
github.com/docker/distribution => github.com/docker/distribution v2.8.1+incompatible
162166
github.com/golang/protobuf => github.com/golang/protobuf v1.4.2
163167

164-
google.golang.org/grpc => google.golang.org/grpc v1.15.0
165-
166-
k8s.io/api => k8s.io/api v0.22.4
167-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.4
168-
k8s.io/apimachinery => k8s.io/apimachinery v0.22.4
169-
k8s.io/apiserver => k8s.io/apiserver v0.22.4
170-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.22.4
171-
k8s.io/client-go => k8s.io/client-go v0.22.4
172-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.22.4
173-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.22.4
174-
k8s.io/code-generator => k8s.io/code-generator v0.22.4
175-
k8s.io/component-base => k8s.io/component-base v0.22.4
176-
k8s.io/component-helpers => k8s.io/component-helpers v0.22.4
177-
k8s.io/controller-manager => k8s.io/controller-manager v0.22.4
178-
k8s.io/cri-api => k8s.io/cri-api v0.22.4
179-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.22.4
180-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.22.4
181-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.22.4
182-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.22.4
183-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.22.4
184-
k8s.io/kubectl => k8s.io/kubectl v0.22.4
185-
k8s.io/kubelet => k8s.io/kubelet v0.22.4
186-
k8s.io/kubernetes => k8s.io/kubernetes v1.22.4
187-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.22.4
188-
k8s.io/metrics => k8s.io/metrics v0.22.4
189-
k8s.io/mount-utils => k8s.io/mount-utils v0.22.4
190-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.22.4
191-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.4
168+
k8s.io/api => k8s.io/api v0.26.3
169+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.3
170+
k8s.io/apimachinery => k8s.io/apimachinery v0.26.3
171+
k8s.io/apiserver => k8s.io/apiserver v0.26.3
172+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.3
173+
k8s.io/client-go => k8s.io/client-go v0.26.3
174+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.3
175+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.3
176+
k8s.io/code-generator => k8s.io/code-generator v0.26.3
177+
k8s.io/component-base => k8s.io/component-base v0.26.3
178+
k8s.io/component-helpers => k8s.io/component-helpers v0.26.3
179+
k8s.io/controller-manager => k8s.io/controller-manager v0.26.3
180+
k8s.io/cri-api => k8s.io/cri-api v0.26.3
181+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.3
182+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.3
183+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.3
184+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.3
185+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.3
186+
k8s.io/kubectl => k8s.io/kubectl v0.26.3
187+
k8s.io/kubelet => k8s.io/kubelet v0.26.3
188+
k8s.io/kubernetes => k8s.io/kubernetes v1.26.3
189+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.3
190+
k8s.io/metrics => k8s.io/metrics v0.26.3
191+
k8s.io/mount-utils => k8s.io/mount-utils v0.26.3
192+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.3
193+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.3
192194
)

0 commit comments

Comments
 (0)