diff --git a/go.mod b/go.mod index 507bbdb5c..0d291822e 100644 --- a/go.mod +++ b/go.mod @@ -198,6 +198,7 @@ require ( ) replace ( + // This replace block is from Argo CD v3.3.0 go.mod github.com/golang/protobuf => github.com/golang/protobuf v1.5.4 github.com/grpc-ecosystem/grpc-gateway => github.com/grpc-ecosystem/grpc-gateway v1.16.0 @@ -206,4 +207,38 @@ replace ( // Avoid CVE-2022-28948 gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1 + + // This replace block is from Argo CD v3.3.0 go.mod + k8s.io/api => k8s.io/api v0.34.0 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.34.0 + k8s.io/apimachinery => k8s.io/apimachinery v0.34.0 + k8s.io/apiserver => k8s.io/apiserver v0.34.0 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.34.0 + k8s.io/client-go => k8s.io/client-go v0.34.0 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.34.0 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.34.0 + k8s.io/code-generator => k8s.io/code-generator v0.34.0 + k8s.io/component-base => k8s.io/component-base v0.34.0 + k8s.io/component-helpers => k8s.io/component-helpers v0.34.0 + k8s.io/controller-manager => k8s.io/controller-manager v0.34.0 + k8s.io/cri-api => k8s.io/cri-api v0.34.0 + k8s.io/cri-client => k8s.io/cri-client v0.34.0 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.34.0 + k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.34.0 + k8s.io/endpointslice => k8s.io/endpointslice v0.34.0 + k8s.io/externaljwt => k8s.io/externaljwt v0.34.0 + k8s.io/kms => k8s.io/kms v0.34.0 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.34.0 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.34.0 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.34.0 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.34.0 + k8s.io/kubectl => k8s.io/kubectl v0.34.0 + k8s.io/kubelet => k8s.io/kubelet v0.34.0 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.34.0 + k8s.io/metrics => k8s.io/metrics v0.34.0 + k8s.io/mount-utils => k8s.io/mount-utils v0.34.0 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.34.0 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.34.0 + k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.34.0 + k8s.io/sample-controller => k8s.io/sample-controller v0.34.0 ) diff --git a/go.sum b/go.sum index 2c068443c..61a066f9c 100644 --- a/go.sum +++ b/go.sum @@ -654,20 +654,20 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.34.1 h1:jC+153630BMdlFukegoEL8E/yT7aLyQkIVuwhmwDgJM= -k8s.io/api v0.34.1/go.mod h1:SB80FxFtXn5/gwzCoN6QCtPD7Vbu5w2n1S0J5gFfTYk= -k8s.io/apiextensions-apiserver v0.34.1 h1:NNPBva8FNAPt1iSVwIE0FsdrVriRXMsaWFMqJbII2CI= -k8s.io/apiextensions-apiserver v0.34.1/go.mod h1:hP9Rld3zF5Ay2Of3BeEpLAToP+l4s5UlxiHfqRaRcMc= -k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4= -k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw= -k8s.io/apiserver v0.34.1 h1:U3JBGdgANK3dfFcyknWde1G6X1F4bg7PXuvlqt8lITA= -k8s.io/apiserver v0.34.1/go.mod h1:eOOc9nrVqlBI1AFCvVzsob0OxtPZUCPiUJL45JOTBG0= +k8s.io/api v0.34.0 h1:L+JtP2wDbEYPUeNGbeSa/5GwFtIA662EmT2YSLOkAVE= +k8s.io/api v0.34.0/go.mod h1:YzgkIzOOlhl9uwWCZNqpw6RJy9L2FK4dlJeayUoydug= +k8s.io/apiextensions-apiserver v0.34.0 h1:B3hiB32jV7BcyKcMU5fDaDxk882YrJ1KU+ZSkA9Qxoc= +k8s.io/apiextensions-apiserver v0.34.0/go.mod h1:hLI4GxE1BDBy9adJKxUxCEHBGZtGfIg98Q+JmTD7+g0= +k8s.io/apimachinery v0.34.0 h1:eR1WO5fo0HyoQZt1wdISpFDffnWOvFLOOeJ7MgIv4z0= +k8s.io/apimachinery v0.34.0/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw= +k8s.io/apiserver v0.34.0 h1:Z51fw1iGMqN7uJ1kEaynf2Aec1Y774PqU+FVWCFV3Jg= +k8s.io/apiserver v0.34.0/go.mod h1:52ti5YhxAvewmmpVRqlASvaqxt0gKJxvCeW7ZrwgazQ= k8s.io/cli-runtime v0.34.0 h1:N2/rUlJg6TMEBgtQ3SDRJwa8XyKUizwjlOknT1mB2Cw= k8s.io/cli-runtime v0.34.0/go.mod h1:t/skRecS73Piv+J+FmWIQA2N2/rDjdYSQzEE67LUUs8= -k8s.io/client-go v0.34.1 h1:ZUPJKgXsnKwVwmKKdPfw4tB58+7/Ik3CrjOEhsiZ7mY= -k8s.io/client-go v0.34.1/go.mod h1:kA8v0FP+tk6sZA0yKLRG67LWjqufAoSHA2xVGKw9Of8= -k8s.io/component-base v0.34.1 h1:v7xFgG+ONhytZNFpIz5/kecwD+sUhVE6HU7qQUiRM4A= -k8s.io/component-base v0.34.1/go.mod h1:mknCpLlTSKHzAQJJnnHVKqjxR7gBeHRv0rPXA7gdtQ0= +k8s.io/client-go v0.34.0 h1:YoWv5r7bsBfb0Hs2jh8SOvFbKzzxyNo0nSb0zC19KZo= +k8s.io/client-go v0.34.0/go.mod h1:ozgMnEKXkRjeMvBZdV1AijMHLTh3pbACPvK7zFR+QQY= +k8s.io/component-base v0.34.0 h1:bS8Ua3zlJzapklsB1dZgjEJuJEeHjj8yTu1gxE2zQX8= +k8s.io/component-base v0.34.0/go.mod h1:RSCqUdvIjjrEm81epPcjQ/DS+49fADvGSCkIP3IC6vg= k8s.io/component-helpers v0.34.0 h1:5T7P9XGMoUy1JDNKzHf0p/upYbeUf8ZaSf9jbx0QlIo= k8s.io/component-helpers v0.34.0/go.mod h1:kaOyl5tdtnymriYcVZg4uwDBe2d1wlIpXyDkt6sVnt4= k8s.io/controller-manager v0.34.0 h1:oCHoqS8dcFp7zDSu7HUvTpakq3isSxil3GprGGlJMsE=