Skip to content

Commit 2b2bcb3

Browse files
committed
chore(deps): Sync with argo-cd and argocd-operator
Signed-off-by: Oliver Gondža <ogondza@gmail.com>
1 parent cefbaff commit 2b2bcb3

2 files changed

Lines changed: 31 additions & 12 deletions

File tree

go.mod

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ require (
198198
)
199199

200200
replace (
201+
// This replace block is from Argo CD v3.3.0 go.mod
201202
github.com/golang/protobuf => github.com/golang/protobuf v1.5.4
202203
github.com/grpc-ecosystem/grpc-gateway => github.com/grpc-ecosystem/grpc-gateway v1.16.0
203204

@@ -207,19 +208,37 @@ replace (
207208
// Avoid CVE-2022-28948
208209
gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1
209210

211+
// This replace block is from Argo CD v3.3.0 go.mod
212+
k8s.io/api => k8s.io/api v0.34.0
213+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.34.0
214+
k8s.io/apimachinery => k8s.io/apimachinery v0.34.0
215+
k8s.io/apiserver => k8s.io/apiserver v0.34.0
216+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.34.0
217+
k8s.io/client-go => k8s.io/client-go v0.34.0
210218
k8s.io/cloud-provider => k8s.io/cloud-provider v0.34.0
211219
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.34.0
220+
k8s.io/code-generator => k8s.io/code-generator v0.34.0
221+
k8s.io/component-base => k8s.io/component-base v0.34.0
222+
k8s.io/component-helpers => k8s.io/component-helpers v0.34.0
223+
k8s.io/controller-manager => k8s.io/controller-manager v0.34.0
212224
k8s.io/cri-api => k8s.io/cri-api v0.34.0
213225
k8s.io/cri-client => k8s.io/cri-client v0.34.0
214226
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.34.0
215227
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.34.0
216228
k8s.io/endpointslice => k8s.io/endpointslice v0.34.0
217229
k8s.io/externaljwt => k8s.io/externaljwt v0.34.0
230+
k8s.io/kms => k8s.io/kms v0.34.0
231+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.34.0
218232
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.34.0
219233
k8s.io/kube-proxy => k8s.io/kube-proxy v0.34.0
220234
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.34.0
235+
k8s.io/kubectl => k8s.io/kubectl v0.34.0
221236
k8s.io/kubelet => k8s.io/kubelet v0.34.0
237+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.34.0
238+
k8s.io/metrics => k8s.io/metrics v0.34.0
222239
k8s.io/mount-utils => k8s.io/mount-utils v0.34.0
223240
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.34.0
224241
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.34.0
242+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.34.0
243+
k8s.io/sample-controller => k8s.io/sample-controller v0.34.0
225244
)

go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -654,20 +654,20 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
654654
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
655655
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
656656
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
657-
k8s.io/api v0.34.1 h1:jC+153630BMdlFukegoEL8E/yT7aLyQkIVuwhmwDgJM=
658-
k8s.io/api v0.34.1/go.mod h1:SB80FxFtXn5/gwzCoN6QCtPD7Vbu5w2n1S0J5gFfTYk=
659-
k8s.io/apiextensions-apiserver v0.34.1 h1:NNPBva8FNAPt1iSVwIE0FsdrVriRXMsaWFMqJbII2CI=
660-
k8s.io/apiextensions-apiserver v0.34.1/go.mod h1:hP9Rld3zF5Ay2Of3BeEpLAToP+l4s5UlxiHfqRaRcMc=
661-
k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4=
662-
k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
663-
k8s.io/apiserver v0.34.1 h1:U3JBGdgANK3dfFcyknWde1G6X1F4bg7PXuvlqt8lITA=
664-
k8s.io/apiserver v0.34.1/go.mod h1:eOOc9nrVqlBI1AFCvVzsob0OxtPZUCPiUJL45JOTBG0=
657+
k8s.io/api v0.34.0 h1:L+JtP2wDbEYPUeNGbeSa/5GwFtIA662EmT2YSLOkAVE=
658+
k8s.io/api v0.34.0/go.mod h1:YzgkIzOOlhl9uwWCZNqpw6RJy9L2FK4dlJeayUoydug=
659+
k8s.io/apiextensions-apiserver v0.34.0 h1:B3hiB32jV7BcyKcMU5fDaDxk882YrJ1KU+ZSkA9Qxoc=
660+
k8s.io/apiextensions-apiserver v0.34.0/go.mod h1:hLI4GxE1BDBy9adJKxUxCEHBGZtGfIg98Q+JmTD7+g0=
661+
k8s.io/apimachinery v0.34.0 h1:eR1WO5fo0HyoQZt1wdISpFDffnWOvFLOOeJ7MgIv4z0=
662+
k8s.io/apimachinery v0.34.0/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw=
663+
k8s.io/apiserver v0.34.0 h1:Z51fw1iGMqN7uJ1kEaynf2Aec1Y774PqU+FVWCFV3Jg=
664+
k8s.io/apiserver v0.34.0/go.mod h1:52ti5YhxAvewmmpVRqlASvaqxt0gKJxvCeW7ZrwgazQ=
665665
k8s.io/cli-runtime v0.34.0 h1:N2/rUlJg6TMEBgtQ3SDRJwa8XyKUizwjlOknT1mB2Cw=
666666
k8s.io/cli-runtime v0.34.0/go.mod h1:t/skRecS73Piv+J+FmWIQA2N2/rDjdYSQzEE67LUUs8=
667-
k8s.io/client-go v0.34.1 h1:ZUPJKgXsnKwVwmKKdPfw4tB58+7/Ik3CrjOEhsiZ7mY=
668-
k8s.io/client-go v0.34.1/go.mod h1:kA8v0FP+tk6sZA0yKLRG67LWjqufAoSHA2xVGKw9Of8=
669-
k8s.io/component-base v0.34.1 h1:v7xFgG+ONhytZNFpIz5/kecwD+sUhVE6HU7qQUiRM4A=
670-
k8s.io/component-base v0.34.1/go.mod h1:mknCpLlTSKHzAQJJnnHVKqjxR7gBeHRv0rPXA7gdtQ0=
667+
k8s.io/client-go v0.34.0 h1:YoWv5r7bsBfb0Hs2jh8SOvFbKzzxyNo0nSb0zC19KZo=
668+
k8s.io/client-go v0.34.0/go.mod h1:ozgMnEKXkRjeMvBZdV1AijMHLTh3pbACPvK7zFR+QQY=
669+
k8s.io/component-base v0.34.0 h1:bS8Ua3zlJzapklsB1dZgjEJuJEeHjj8yTu1gxE2zQX8=
670+
k8s.io/component-base v0.34.0/go.mod h1:RSCqUdvIjjrEm81epPcjQ/DS+49fADvGSCkIP3IC6vg=
671671
k8s.io/component-helpers v0.34.0 h1:5T7P9XGMoUy1JDNKzHf0p/upYbeUf8ZaSf9jbx0QlIo=
672672
k8s.io/component-helpers v0.34.0/go.mod h1:kaOyl5tdtnymriYcVZg4uwDBe2d1wlIpXyDkt6sVnt4=
673673
k8s.io/controller-manager v0.34.0 h1:oCHoqS8dcFp7zDSu7HUvTpakq3isSxil3GprGGlJMsE=

0 commit comments

Comments
 (0)