Skip to content

Commit

Permalink
cleanup kube dependencies for version replacing
Browse files Browse the repository at this point in the history
Signed-off-by: Iceber Gu <[email protected]>
  • Loading branch information
Iceber committed Aug 28, 2024
1 parent 77aa3e7 commit 63822d1
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 69 deletions.
33 changes: 2 additions & 31 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
45 changes: 9 additions & 36 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

0 comments on commit 63822d1

Please sign in to comment.