From 58c8747e16aeeb7b775680fe0acfc1a11496f8b6 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Tue, 28 Nov 2023 07:23:53 +0000 Subject: [PATCH] cleanup: go.mod cleanup cleanup cleanup cleanup cleanup cleanup cleanup fix fix fix fix --- go.mod | 18 ++---------------- vendor/modules.txt | 32 +++++++++----------------------- 2 files changed, 11 insertions(+), 39 deletions(-) diff --git a/go.mod b/go.mod index 025a8fca33d..673de3bd48c 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( k8s.io/klog/v2 v2.110.1 k8s.io/kubernetes v1.28.4 k8s.io/mount-utils v0.28.4 - k8s.io/pod-security-admission v0.0.0 + k8s.io/pod-security-admission v0.28.4 k8s.io/utils v0.0.0-20230726121419-3b25d923346b sigs.k8s.io/yaml v1.3.0 ) @@ -143,23 +143,13 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.28.4 k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.4 - k8s.io/apimachinery => k8s.io/apimachinery v0.28.4 - k8s.io/apiserver => k8s.io/apiserver v0.28.4 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.4 - k8s.io/client-go => k8s.io/client-go v0.28.4 k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.4 k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.4 - k8s.io/code-generator => k8s.io/code-generator v0.28.4 - k8s.io/component-base => k8s.io/component-base v0.28.4 - k8s.io/component-helpers => k8s.io/component-helpers v0.28.4 - k8s.io/controller-manager => k8s.io/controller-manager v0.28.4 - k8s.io/cri-api => k8s.io/cri-api v0.28.4 k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.4 k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.4 + k8s.io/endpointslice => k8s.io/endpointslice v0.28.4 k8s.io/gengo => k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 - k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1 k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.4 k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.4 k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.4 @@ -167,10 +157,6 @@ replace ( k8s.io/kubectl => k8s.io/kubectl v0.28.4 k8s.io/kubelet => k8s.io/kubelet v0.28.4 k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.4 - k8s.io/metrics => k8s.io/metrics v0.28.4 k8s.io/mount-utils => k8s.io/mount-utils v0.0.0-20231116185301-00b898b94b20 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.4 k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.4 - k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.4 - k8s.io/sample-controller => k8s.io/sample-controller v0.28.4 ) diff --git a/vendor/modules.txt b/vendor/modules.txt index 8deb55aca9b..b576d9e0f9e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -655,7 +655,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.28.4 => k8s.io/api v0.28.4 +# k8s.io/api v0.28.4 ## explicit; go 1.20 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -716,7 +716,7 @@ k8s.io/api/storage/v1beta1 k8s.io/apiextensions-apiserver/pkg/apis/apiextensions k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1 k8s.io/apiextensions-apiserver/pkg/features -# k8s.io/apimachinery v0.28.4 => k8s.io/apimachinery v0.28.4 +# k8s.io/apimachinery v0.28.4 ## explicit; go 1.20 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -778,7 +778,7 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.28.4 => k8s.io/apiserver v0.28.4 +# k8s.io/apiserver v0.28.4 ## explicit; go 1.20 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/cel @@ -923,7 +923,7 @@ k8s.io/apiserver/plugin/pkg/audit/truncate k8s.io/apiserver/plugin/pkg/audit/webhook k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook -# k8s.io/client-go v0.28.4 => k8s.io/client-go v0.28.4 +# k8s.io/client-go v0.28.4 ## explicit; go 1.20 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -1203,7 +1203,7 @@ k8s.io/cloud-provider/controllers/service/config k8s.io/cloud-provider/controllers/service/config/v1alpha1 k8s.io/cloud-provider/names k8s.io/cloud-provider/options -# k8s.io/component-base v0.28.4 => k8s.io/component-base v0.28.4 +# k8s.io/component-base v0.28.4 ## explicit; go 1.20 k8s.io/component-base/cli/flag k8s.io/component-base/config @@ -1225,12 +1225,12 @@ k8s.io/component-base/metrics/testutil k8s.io/component-base/tracing k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version -# k8s.io/component-helpers v0.28.4 => k8s.io/component-helpers v0.28.4 +# k8s.io/component-helpers v0.28.4 ## explicit; go 1.20 k8s.io/component-helpers/scheduling/corev1 k8s.io/component-helpers/scheduling/corev1/nodeaffinity k8s.io/component-helpers/storage/volume -# k8s.io/controller-manager v0.28.4 => k8s.io/controller-manager v0.28.4 +# k8s.io/controller-manager v0.28.4 ## explicit; go 1.20 k8s.io/controller-manager/config k8s.io/controller-manager/config/v1 @@ -1351,7 +1351,7 @@ k8s.io/kubernetes/test/utils/kubeconfig # k8s.io/mount-utils v0.28.4 => k8s.io/mount-utils v0.0.0-20231116185301-00b898b94b20 ## explicit; go 1.21 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.0.0 => k8s.io/pod-security-admission v0.28.4 +# k8s.io/pod-security-admission v0.28.4 ## explicit; go 1.20 k8s.io/pod-security-admission/api k8s.io/pod-security-admission/policy @@ -1395,23 +1395,13 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.3.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# k8s.io/api => k8s.io/api v0.28.4 # k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.4 -# k8s.io/apimachinery => k8s.io/apimachinery v0.28.4 -# k8s.io/apiserver => k8s.io/apiserver v0.28.4 -# k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.4 -# k8s.io/client-go => k8s.io/client-go v0.28.4 # k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.4 # k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.4 -# k8s.io/code-generator => k8s.io/code-generator v0.28.4 -# k8s.io/component-base => k8s.io/component-base v0.28.4 -# k8s.io/component-helpers => k8s.io/component-helpers v0.28.4 -# k8s.io/controller-manager => k8s.io/controller-manager v0.28.4 -# k8s.io/cri-api => k8s.io/cri-api v0.28.4 # k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.4 # k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.4 +# k8s.io/endpointslice => k8s.io/endpointslice v0.28.4 # k8s.io/gengo => k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 -# k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1 # k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.4 # k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.4 # k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.4 @@ -1419,9 +1409,5 @@ sigs.k8s.io/yaml # k8s.io/kubectl => k8s.io/kubectl v0.28.4 # k8s.io/kubelet => k8s.io/kubelet v0.28.4 # k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.4 -# k8s.io/metrics => k8s.io/metrics v0.28.4 # k8s.io/mount-utils => k8s.io/mount-utils v0.0.0-20231116185301-00b898b94b20 -# k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.4 # k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.4 -# k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.4 -# k8s.io/sample-controller => k8s.io/sample-controller v0.28.4