From 63822d1e7da30a265d36ce7a0c0ec4827d796806 Mon Sep 17 00:00:00 2001 From: Iceber Gu Date: Wed, 28 Aug 2024 10:07:15 +0800 Subject: [PATCH] cleanup kube dependencies for version replacing Signed-off-by: Iceber Gu --- go.mod | 33 ++------------------------------- go.sum | 4 ++-- vendor/modules.txt | 45 +++++++++------------------------------------ 3 files changed, 13 insertions(+), 69 deletions(-) diff --git a/go.mod b/go.mod index 900e8255f..c51cc8392 100644 --- a/go.mod +++ b/go.mod @@ -34,7 +34,7 @@ require ( k8s.io/code-generator v0.31.0 k8s.io/component-base v0.31.0 k8s.io/klog/v2 v2.130.1 - k8s.io/kube-aggregator v0.0.0 + k8s.io/kube-aggregator v0.31.0 k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 k8s.io/kube-state-metrics/v2 v2.13.0 k8s.io/kubernetes v1.31.0 @@ -163,33 +163,4 @@ require ( sigs.k8s.io/yaml v1.4.0 // indirect ) -replace ( - github.com/clusterpedia-io/api => ./staging/src/github.com/clusterpedia-io/api - k8s.io/api => k8s.io/api v0.31.0 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.0 - k8s.io/apimachinery => k8s.io/apimachinery v0.31.0 - k8s.io/apiserver => k8s.io/apiserver v0.31.0 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.0 - k8s.io/client-go => k8s.io/client-go v0.31.0 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.0 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.0 - k8s.io/code-generator => k8s.io/code-generator v0.31.0 - k8s.io/component-base => k8s.io/component-base v0.31.0 - k8s.io/component-helpers => k8s.io/component-helpers v0.31.0 - k8s.io/controller-manager => k8s.io/controller-manager v0.31.0 - k8s.io/cri-api => k8s.io/cri-api v0.31.0 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.0 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.0 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.0 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.0 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.0 - k8s.io/kubectl => k8s.io/kubectl v0.31.0 - k8s.io/kubelet => k8s.io/kubelet v0.31.0 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.0 - k8s.io/metrics => k8s.io/metrics v0.31.0 - k8s.io/mount-utils => k8s.io/mount-utils v0.31.0 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.0 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.0 - k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.0 - k8s.io/sample-controller => k8s.io/sample-controller v0.31.0 -) +replace github.com/clusterpedia-io/api => ./staging/src/github.com/clusterpedia-io/api diff --git a/go.sum b/go.sum index 92740bff8..34739582d 100644 --- a/go.sum +++ b/go.sum @@ -578,8 +578,8 @@ k8s.io/kube-state-metrics/v2 v2.13.0 h1:g5OV0cwrDKvyrQApYxI7Ny+vFUgU3X6MYrnIzdCA k8s.io/kube-state-metrics/v2 v2.13.0/go.mod h1:sGt/NFkZkA4hqb4cVd/xG2G17dzZ72TQXqSpHn8rF/U= k8s.io/kubernetes v1.31.0 h1:sYAB12TTWexXKp4RxqJMm/7EC+P0mNOgn4Xdj5eu7HM= k8s.io/kubernetes v1.31.0/go.mod h1:UTpGn7nxrUrPWw5hNIYTAjodcWIvLakgHpLtfrr6GC8= -k8s.io/sample-controller v0.31.0 h1:dkeo/KFMMlEPwfCoXH8SBdOSMPXNGT0NTjYja/bU7gA= -k8s.io/sample-controller v0.31.0/go.mod h1:bWyBkTeQ1mv/bmlF9gthWNPUSZNzZE90Y2uLgy7pT0A= +k8s.io/sample-controller v0.30.3 h1:oZTxERF8U3gANT2H5VxpkW32asgmW0IYGyUv9Opspvs= +k8s.io/sample-controller v0.30.3/go.mod h1:yhy/cWCzevQLa2+7Gvj0J9+xzmNExypunffSNANBy7o= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY= diff --git a/vendor/modules.txt b/vendor/modules.txt index f6a9bb09f..63a3e83fe 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -693,7 +693,7 @@ gorm.io/gorm/logger gorm.io/gorm/migrator gorm.io/gorm/schema gorm.io/gorm/utils -# k8s.io/api v0.31.0 => k8s.io/api v0.31.0 +# k8s.io/api v0.31.0 ## explicit; go 1.22.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -753,7 +753,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apiextensions-apiserver v0.31.0 => k8s.io/apiextensions-apiserver v0.31.0 +# k8s.io/apiextensions-apiserver v0.31.0 ## explicit; go 1.22.0 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -767,7 +767,7 @@ k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1 k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1 k8s.io/apiextensions-apiserver/pkg/features -# k8s.io/apimachinery v0.31.0 => k8s.io/apimachinery v0.31.0 +# k8s.io/apimachinery v0.31.0 ## explicit; go 1.22.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -833,7 +833,7 @@ k8s.io/apimachinery/pkg/version k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.31.0 => k8s.io/apiserver v0.31.0 +# k8s.io/apiserver v0.31.0 ## explicit; go 1.22.0 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -984,7 +984,7 @@ k8s.io/apiserver/plugin/pkg/audit/webhook k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics -# k8s.io/client-go v0.31.0 => k8s.io/client-go v0.31.0 +# k8s.io/client-go v0.31.0 ## explicit; go 1.22.0 k8s.io/client-go/applyconfigurations k8s.io/client-go/applyconfigurations/admissionregistration/v1 @@ -1317,7 +1317,7 @@ k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/watchlist k8s.io/client-go/util/workqueue -# k8s.io/code-generator v0.31.0 => k8s.io/code-generator v0.31.0 +# k8s.io/code-generator v0.31.0 ## explicit; go 1.22.0 k8s.io/code-generator k8s.io/code-generator/cmd/applyconfiguration-gen @@ -1353,7 +1353,7 @@ k8s.io/code-generator/cmd/register-gen/generators k8s.io/code-generator/pkg/namer k8s.io/code-generator/pkg/util k8s.io/code-generator/third_party/forked/golang/reflect -# k8s.io/component-base v0.31.0 => k8s.io/component-base v0.31.0 +# k8s.io/component-base v0.31.0 ## explicit; go 1.22.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -1404,7 +1404,7 @@ k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2 k8s.io/kms/pkg/service k8s.io/kms/pkg/util -# k8s.io/kube-aggregator v0.0.0 => k8s.io/kube-aggregator v0.31.0 +# k8s.io/kube-aggregator v0.31.0 ## explicit; go 1.22.0 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -1579,7 +1579,7 @@ k8s.io/kubernetes/pkg/printers/internalversion k8s.io/kubernetes/pkg/printers/storage k8s.io/kubernetes/pkg/util/node k8s.io/kubernetes/pkg/util/parsers -# k8s.io/sample-controller v0.30.3 => k8s.io/sample-controller v0.31.0 +# k8s.io/sample-controller v0.30.3 ## explicit; go 1.22.0 k8s.io/sample-controller/pkg/apis/samplecontroller k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1 @@ -1641,30 +1641,3 @@ sigs.k8s.io/structured-merge-diff/v4/value sigs.k8s.io/yaml sigs.k8s.io/yaml/goyaml.v2 # github.com/clusterpedia-io/api => ./staging/src/github.com/clusterpedia-io/api -# k8s.io/api => k8s.io/api v0.31.0 -# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.0 -# k8s.io/apimachinery => k8s.io/apimachinery v0.31.0 -# k8s.io/apiserver => k8s.io/apiserver v0.31.0 -# k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.0 -# k8s.io/client-go => k8s.io/client-go v0.31.0 -# k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.0 -# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.0 -# k8s.io/code-generator => k8s.io/code-generator v0.31.0 -# k8s.io/component-base => k8s.io/component-base v0.31.0 -# k8s.io/component-helpers => k8s.io/component-helpers v0.31.0 -# k8s.io/controller-manager => k8s.io/controller-manager v0.31.0 -# k8s.io/cri-api => k8s.io/cri-api v0.31.0 -# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.0 -# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.0 -# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.0 -# k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.0 -# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.0 -# k8s.io/kubectl => k8s.io/kubectl v0.31.0 -# k8s.io/kubelet => k8s.io/kubelet v0.31.0 -# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.0 -# k8s.io/metrics => k8s.io/metrics v0.31.0 -# k8s.io/mount-utils => k8s.io/mount-utils v0.31.0 -# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.0 -# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.0 -# k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.0 -# k8s.io/sample-controller => k8s.io/sample-controller v0.31.0