kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert sigs.k8s.io/structured-merge-diff/v4 to v4.1.2 

Kubernetes-commit: ed68909177eca588731bc153d2f69dd235e8fe10
This commit is contained in:
Jordan Liggitt 2021-11-24 10:32:24 -05:00 committed by Kubernetes Publisher
parent 0de9d439d7
commit 3b93a82ee9
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
go.mod
View File

@ -43,22 +43,23 @@ require (
google.golang.org/grpc v1.40.0 google.golang.org/grpc v1.40.0
gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/square/go-jose.v2 v2.2.2 gopkg.in/square/go-jose.v2 v2.2.2
k8s.io/api v0.0.0-20211119232148-8a6e2eec683b k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0-20211119222722-7149480564b7 k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0-20211118152516-10e087ca394e k8s.io/client-go v0.0.0
k8s.io/component-base v0.0.0-20211117193110-e5fae9a0afe4 k8s.io/component-base v0.0.0
k8s.io/klog/v2 v2.30.0 k8s.io/klog/v2 v2.30.0
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 sigs.k8s.io/structured-merge-diff/v4 v4.1.2
sigs.k8s.io/yaml v1.2.0 sigs.k8s.io/yaml v1.2.0
) )
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20211119232148-8a6e2eec683b k8s.io/api => ../api
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211119222722-7149480564b7 k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => k8s.io/client-go v0.0.0-20211118152516-10e087ca394e k8s.io/apiserver => ../apiserver
k8s.io/component-base => k8s.io/component-base v0.0.0-20211117193110-e5fae9a0afe4 k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base
) )

12
go.sum
View File

@ -953,14 +953,6 @@ 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-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.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/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-20211119232148-8a6e2eec683b h1:V9xishnJtsupZJW+KbmFxDs6HNWcuMsRZNJIEazc2Hg=
k8s.io/api v0.0.0-20211119232148-8a6e2eec683b/go.mod h1:R4Y6ysM80qAYquQocZB1+mCXim5iWc4VMe64gYgx5M0=
k8s.io/apimachinery v0.0.0-20211119222722-7149480564b7 h1:0bJGb1lVTMRfab17nff5g8XnDA2jE1wq36ZUOtdePmc=
k8s.io/apimachinery v0.0.0-20211119222722-7149480564b7/go.mod h1:SqloDTPqePPNhEp8K4qUgqpKc3tE+ymn05iIUbSAQ7g=
k8s.io/client-go v0.0.0-20211118152516-10e087ca394e h1:2XZu/EqcFXq8y3/qpIOyvRF/qT2tW0/dcC+6UNFo27k=
k8s.io/client-go v0.0.0-20211118152516-10e087ca394e/go.mod h1:Dt2EmvDFXAx2ndkVSUKFb4OBzjmzCjr9urmyhPiSgLQ=
k8s.io/component-base v0.0.0-20211117193110-e5fae9a0afe4 h1:cWP+9kL6lxnCsInY0W76P7MlxFlzy+It5lIOzixO86s=
k8s.io/component-base v0.0.0-20211117193110-e5fae9a0afe4/go.mod h1:8cmU0Bcye+aRkY1Vi0NEOBd5rJ9wx0bBpC94QCm1kNw=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
@ -979,7 +971,7 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25/go.mod h1:Mlj9PN
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s=
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs=
sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
sigs.k8s.io/structured-merge-diff/v4 v4.2.0 h1:kDvPBbnPk+qYmkHmSo8vKGp438IASWofnbbUKDE/bv0= sigs.k8s.io/structured-merge-diff/v4 v4.1.2 h1:Hr/htKFmJEbtMgS/UD0N+gtgctAqz81t3nu+sPzynno=
sigs.k8s.io/structured-merge-diff/v4 v4.2.0/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=