Merge pull request #111087 from HecarimV/fix-22071205

Fix: import the same package multiple times

Kubernetes-commit: d46399f788fbb8de586cd71c19d1e49bfae8659f
This commit is contained in:
Kubernetes Publisher 2022-07-12 08:32:21 -07:00
parent 2f582c2a40
commit 59fda2e669
2 changed files with 8 additions and 8 deletions

8
go.mod
View File

@ -24,8 +24,8 @@ require (
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
google.golang.org/protobuf v1.27.1
k8s.io/api v0.0.0-20220708012014-248dcdbd371c
k8s.io/apimachinery v0.0.0-20220708011808-2496976912ac
k8s.io/api v0.0.0-20220709052054-b9bd7327add9
k8s.io/apimachinery v0.0.0-20220708171815-9cb1f71d9bce
k8s.io/klog/v2 v2.70.1
k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
@ -61,6 +61,6 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20220708012014-248dcdbd371c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220708011808-2496976912ac
k8s.io/api => k8s.io/api v0.0.0-20220709052054-b9bd7327add9
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220708171815-9cb1f71d9bce
)

8
go.sum
View File

@ -479,10 +479,10 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20220708012014-248dcdbd371c h1:6cwsr6UfJTK1YmfK6hWsUppKzDnG1yhF7kbsEJRfyoE=
k8s.io/api v0.0.0-20220708012014-248dcdbd371c/go.mod h1:mmfyAS+Kv73qEU4CQBjaDXeua3Jy7szJ085eoQpJ+pI=
k8s.io/apimachinery v0.0.0-20220708011808-2496976912ac h1:jy/uO+IrKQ8UyxovVRiJkRqD7cJNq/XVo71FsOYPue8=
k8s.io/apimachinery v0.0.0-20220708011808-2496976912ac/go.mod h1:0qktsm8TIQ7Y3rLpUe4SLWy+3L6Su5aSoIQxgqO+4ks=
k8s.io/api v0.0.0-20220709052054-b9bd7327add9 h1:FEAp0lzAf22GNplJSRIT174/pN71JLVsgVQGdB5OPVo=
k8s.io/api v0.0.0-20220709052054-b9bd7327add9/go.mod h1:mu5fbjml8u+WuYagoAcCQ+yMPxydoFY51dJq/r0+XtY=
k8s.io/apimachinery v0.0.0-20220708171815-9cb1f71d9bce h1:tQ0EgeSrxtam8cATjAGxIMZtZnsajmhomx9dDa4sFDI=
k8s.io/apimachinery v0.0.0-20220708171815-9cb1f71d9bce/go.mod h1:0qktsm8TIQ7Y3rLpUe4SLWy+3L6Su5aSoIQxgqO+4ks=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ=
k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=