Skip to content

Commit f6acea4

Browse files
fix(deps): update github.com/argoproj/argo-cd/v2 to v2.12.0, k8s.io to v0.29.6 (#1118)
* fix(deps): update module github.com/argoproj/argo-cd/v2 to v2.12.0 * Update gitops-engine, k8s.io * Fix go.mod replace * Fix metricsserver --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Hidetake Iwata <[email protected]>
1 parent 43bba6d commit f6acea4

3 files changed

Lines changed: 233 additions & 208 deletions

File tree

cmd/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
ctrl "sigs.k8s.io/controller-runtime"
3333
"sigs.k8s.io/controller-runtime/pkg/healthz"
3434
"sigs.k8s.io/controller-runtime/pkg/log/zap"
35+
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
3536

3637
argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
3738

@@ -76,8 +77,7 @@ func main() {
7677

7778
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
7879
Scheme: scheme,
79-
MetricsBindAddress: metricsAddr,
80-
Port: 9443,
80+
Metrics: metricsserver.Options{BindAddress: metricsAddr},
8181
HealthProbeBindAddress: probeAddr,
8282
LeaderElection: enableLeaderElection,
8383
LeaderElectionID: "f0f5bc5c.int128.github.io",

go.mod

Lines changed: 75 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/int128/argocd-commenter
33
go 1.21.6
44

55
require (
6-
github.com/argoproj/argo-cd/v2 v2.11.7
7-
github.com/argoproj/gitops-engine v0.7.1-0.20240715141605-18ba62e1f1fb
6+
github.com/argoproj/argo-cd/v2 v2.12.0
7+
github.com/argoproj/gitops-engine v0.7.1-0.20240714153147-adb68bcaab73
88
github.com/go-logr/logr v1.4.2
99
github.com/google/go-cmp v0.6.0
1010
github.com/google/go-github/v63 v63.0.0
@@ -14,10 +14,10 @@ require (
1414
github.com/onsi/gomega v1.34.1
1515
go.uber.org/zap v1.27.0
1616
golang.org/x/oauth2 v0.22.0
17-
k8s.io/api v0.26.11
18-
k8s.io/apimachinery v0.26.11
19-
k8s.io/client-go v0.26.11
20-
sigs.k8s.io/controller-runtime v0.14.7
17+
k8s.io/api v0.29.6
18+
k8s.io/apimachinery v0.29.6
19+
k8s.io/client-go v0.29.6
20+
sigs.k8s.io/controller-runtime v0.17.2
2121
)
2222

2323
require (
@@ -27,7 +27,7 @@ require (
2727
github.com/MakeNowJust/heredoc v1.0.0 // indirect
2828
github.com/Masterminds/semver/v3 v3.2.1 // indirect
2929
github.com/Microsoft/go-winio v0.6.1 // indirect
30-
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
30+
github.com/ProtonMail/go-crypto v1.0.0 // indirect
3131
github.com/argoproj/pkg v0.13.7-0.20230627120311-a4dd357b057e // indirect
3232
github.com/beorn7/perks v1.0.1 // indirect
3333
github.com/blang/semver/v4 v4.0.0 // indirect
@@ -36,26 +36,26 @@ require (
3636
github.com/bradleyfalzon/ghinstallation/v2 v2.6.0 // indirect
3737
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3838
github.com/chai2010/gettext-go v1.0.2 // indirect
39-
github.com/cloudflare/circl v1.3.3 // indirect
39+
github.com/cloudflare/circl v1.3.7 // indirect
4040
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
4141
github.com/davecgh/go-spew v1.1.1 // indirect
4242
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
43-
github.com/docker/distribution v2.8.2+incompatible // indirect
44-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
43+
github.com/distribution/reference v0.5.0 // indirect
44+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
4545
github.com/emirpasic/gods v1.18.1 // indirect
4646
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
47-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
47+
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
4848
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
4949
github.com/fatih/camelcase v1.0.0 // indirect
50-
github.com/fsnotify/fsnotify v1.6.0 // indirect
51-
github.com/fvbommel/sortorder v1.0.1 // indirect
50+
github.com/fsnotify/fsnotify v1.7.0 // indirect
51+
github.com/fvbommel/sortorder v1.1.0 // indirect
5252
github.com/go-errors/errors v1.4.2 // indirect
5353
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
5454
github.com/go-git/go-billy/v5 v5.5.0 // indirect
55-
github.com/go-git/go-git/v5 v5.11.0 // indirect
56-
github.com/go-logr/zapr v1.2.3 // indirect
55+
github.com/go-git/go-git/v5 v5.12.0 // indirect
56+
github.com/go-logr/zapr v1.3.0 // indirect
5757
github.com/go-openapi/jsonpointer v0.19.6 // indirect
58-
github.com/go-openapi/jsonreference v0.20.1 // indirect
58+
github.com/go-openapi/jsonreference v0.20.2 // indirect
5959
github.com/go-openapi/swag v0.22.3 // indirect
6060
github.com/go-redis/cache/v9 v9.0.0 // indirect
6161
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
@@ -65,13 +65,14 @@ require (
6565
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6666
github.com/golang/protobuf v1.5.4 // indirect
6767
github.com/google/btree v1.1.2 // indirect
68-
github.com/google/gnostic v0.6.9 // indirect
68+
github.com/google/gnostic-models v0.6.8 // indirect
6969
github.com/google/go-github/v53 v53.2.0 // indirect
7070
github.com/google/go-querystring v1.1.0 // indirect
7171
github.com/google/gofuzz v1.2.0 // indirect
7272
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
7373
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
7474
github.com/google/uuid v1.3.1 // indirect
75+
github.com/gorilla/websocket v1.5.0 // indirect
7576
github.com/imdario/mergo v0.3.16 // indirect
7677
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7778
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
@@ -83,28 +84,29 @@ require (
8384
github.com/klauspost/compress v1.16.5 // indirect
8485
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
8586
github.com/mailru/easyjson v0.7.7 // indirect
86-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
87-
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
87+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
88+
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
8889
github.com/moby/spdystream v0.2.0 // indirect
89-
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
90+
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
9091
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9192
github.com/modern-go/reflect2 v1.0.2 // indirect
9293
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
9394
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
95+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
9496
github.com/opencontainers/go-digest v1.0.0 // indirect
9597
github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
9698
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
9799
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
98100
github.com/pjbgf/sha1cd v0.3.0 // indirect
99101
github.com/pkg/errors v0.9.1 // indirect
100-
github.com/prometheus/client_golang v1.16.0 // indirect
101-
github.com/prometheus/client_model v0.3.0 // indirect
102-
github.com/prometheus/common v0.42.0 // indirect
103-
github.com/prometheus/procfs v0.10.1 // indirect
102+
github.com/prometheus/client_golang v1.18.0 // indirect
103+
github.com/prometheus/client_model v0.5.0 // indirect
104+
github.com/prometheus/common v0.45.0 // indirect
105+
github.com/prometheus/procfs v0.12.0 // indirect
104106
github.com/redis/go-redis/v9 v9.0.5 // indirect
105107
github.com/robfig/cron/v3 v3.0.1 // indirect
106108
github.com/russross/blackfriday/v2 v2.1.0 // indirect
107-
github.com/sergi/go-diff v1.1.0 // indirect
109+
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
108110
github.com/sirupsen/logrus v1.9.3 // indirect
109111
github.com/skeema/knownhosts v1.2.2 // indirect
110112
github.com/spf13/cobra v1.7.0 // indirect
@@ -113,9 +115,9 @@ require (
113115
github.com/vmihailenco/msgpack/v5 v5.3.4 // indirect
114116
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
115117
github.com/xanzy/ssh-agent v0.3.3 // indirect
116-
github.com/xlab/treeprint v1.1.0 // indirect
117-
go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd // indirect
118-
go.uber.org/multierr v1.10.0 // indirect
118+
github.com/xlab/treeprint v1.2.0 // indirect
119+
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
120+
go.uber.org/multierr v1.11.0 // indirect
119121
golang.org/x/crypto v0.26.0 // indirect
120122
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
121123
golang.org/x/mod v0.20.0 // indirect
@@ -126,62 +128,63 @@ require (
126128
golang.org/x/text v0.17.0 // indirect
127129
golang.org/x/time v0.5.0 // indirect
128130
golang.org/x/tools v0.24.0 // indirect
129-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
131+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
130132
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
131133
google.golang.org/grpc v1.59.0 // indirect
132134
google.golang.org/protobuf v1.34.1 // indirect
133135
gopkg.in/inf.v0 v0.9.1 // indirect
134136
gopkg.in/warnings.v0 v0.1.2 // indirect
135137
gopkg.in/yaml.v2 v2.4.0 // indirect
136138
gopkg.in/yaml.v3 v3.0.1 // indirect
137-
k8s.io/apiextensions-apiserver v0.26.10 // indirect
138-
k8s.io/apiserver v0.26.11 // indirect
139-
k8s.io/cli-runtime v0.26.11 // indirect
140-
k8s.io/component-base v0.26.11 // indirect
141-
k8s.io/component-helpers v0.26.11 // indirect
142-
k8s.io/klog/v2 v2.100.1 // indirect
143-
k8s.io/kube-aggregator v0.26.4 // indirect
144-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
145-
k8s.io/kubectl v0.26.4 // indirect
146-
k8s.io/kubernetes v1.26.11 // indirect
147-
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect
139+
k8s.io/apiextensions-apiserver v0.29.6 // indirect
140+
k8s.io/apiserver v0.29.6 // indirect
141+
k8s.io/cli-runtime v0.29.6 // indirect
142+
k8s.io/component-base v0.29.6 // indirect
143+
k8s.io/component-helpers v0.29.6 // indirect
144+
k8s.io/klog/v2 v2.110.1 // indirect
145+
k8s.io/kube-aggregator v0.29.6 // indirect
146+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
147+
k8s.io/kubectl v0.29.6 // indirect
148+
k8s.io/kubernetes v1.29.6 // indirect
149+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
148150
oras.land/oras-go/v2 v2.3.0 // indirect
149151
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
150-
sigs.k8s.io/kustomize/api v0.12.1 // indirect
151-
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
152+
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
153+
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
152154
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
153155
sigs.k8s.io/yaml v1.4.0 // indirect
154156
)
155157

156158
replace (
157-
// https://github.com/argoproj/argo-cd/blob/v2.11.0/go.mod
158-
k8s.io/api => k8s.io/api v0.26.11
159-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.11
160-
k8s.io/apimachinery => k8s.io/apimachinery v0.26.11
161-
k8s.io/apiserver => k8s.io/apiserver v0.26.11
162-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.11
163-
k8s.io/client-go => k8s.io/client-go v0.26.11
164-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.11
165-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.11
166-
k8s.io/code-generator => k8s.io/code-generator v0.26.11
167-
k8s.io/component-base => k8s.io/component-base v0.26.11
168-
k8s.io/component-helpers => k8s.io/component-helpers v0.26.11
169-
k8s.io/controller-manager => k8s.io/controller-manager v0.26.11
170-
k8s.io/cri-api => k8s.io/cri-api v0.26.11
171-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.11
172-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.11
173-
k8s.io/kms => k8s.io/kms v0.26.11
174-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.11
175-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.11
176-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.11
177-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.11
178-
k8s.io/kubectl => k8s.io/kubectl v0.26.11
179-
k8s.io/kubelet => k8s.io/kubelet v0.26.11
180-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.11
181-
k8s.io/metrics => k8s.io/metrics v0.26.11
182-
k8s.io/mount-utils => k8s.io/mount-utils v0.26.11
183-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.11
184-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.11
185-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.11
186-
k8s.io/sample-controller => k8s.io/sample-controller v0.26.11
159+
// https://github.com/argoproj/argo-cd/blob/v2.12.0/go.mod
160+
k8s.io/api => k8s.io/api v0.29.6
161+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.6
162+
k8s.io/apimachinery => k8s.io/apimachinery v0.29.6
163+
k8s.io/apiserver => k8s.io/apiserver v0.29.6
164+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.6
165+
k8s.io/client-go => k8s.io/client-go v0.29.6
166+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.6
167+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.6
168+
k8s.io/code-generator => k8s.io/code-generator v0.29.6
169+
k8s.io/component-base => k8s.io/component-base v0.29.6
170+
k8s.io/component-helpers => k8s.io/component-helpers v0.29.6
171+
k8s.io/controller-manager => k8s.io/controller-manager v0.29.6
172+
k8s.io/cri-api => k8s.io/cri-api v0.29.6
173+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.6
174+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.6
175+
k8s.io/endpointslice => k8s.io/endpointslice v0.29.6
176+
k8s.io/kms => k8s.io/kms v0.29.6
177+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.6
178+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.6
179+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.6
180+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.6
181+
k8s.io/kubectl => k8s.io/kubectl v0.29.6
182+
k8s.io/kubelet => k8s.io/kubelet v0.29.6
183+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.6
184+
k8s.io/metrics => k8s.io/metrics v0.29.6
185+
k8s.io/mount-utils => k8s.io/mount-utils v0.29.6
186+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.6
187+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.6
188+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.6
189+
k8s.io/sample-controller => k8s.io/sample-controller v0.29.6
187190
)

0 commit comments

Comments
 (0)