Compare commits

..

3 Commits

Author SHA1 Message Date
Kubernetes Publisher
88e33e90d6 Update dependencies to v0.21.9 tag 2022-01-19 22:20:46 +00:00
Kubernetes Publisher
f858f0b7ec Merge pull request #107569 from jiahuif-forks/automated-cherry-pick-of-#107565-upstream-release-1.21
Automated cherry pick of #107565: upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1

Kubernetes-commit: 80b625cdfb1b5af2fb545187e9fab045ef71858b
2022-01-15 06:34:16 +00:00
Jiahui Feng
c3e9f6dc1a generated: ./hack/update-vendor.sh
Kubernetes-commit: cea8bad2c6f0591527747a54c379eab3838b3cce
2022-01-14 10:31:44 -08:00
2 changed files with 18 additions and 18 deletions

16
go.mod
View File

@@ -5,16 +5,16 @@ module k8s.io/sample-controller
go 1.16
require (
k8s.io/api v0.21.8
k8s.io/apimachinery v0.21.8
k8s.io/client-go v0.21.8
k8s.io/code-generator v0.21.8
k8s.io/api v0.21.9
k8s.io/apimachinery v0.21.9
k8s.io/client-go v0.21.9
k8s.io/code-generator v0.21.9
k8s.io/klog/v2 v2.9.0
)
replace (
k8s.io/api => k8s.io/api v0.21.8
k8s.io/apimachinery => k8s.io/apimachinery v0.21.8
k8s.io/client-go => k8s.io/client-go v0.21.8
k8s.io/code-generator => k8s.io/code-generator v0.21.8
k8s.io/api => k8s.io/api v0.21.9
k8s.io/apimachinery => k8s.io/apimachinery v0.21.9
k8s.io/client-go => k8s.io/client-go v0.21.9
k8s.io/code-generator => k8s.io/code-generator v0.21.9
)

20
go.sum
View File

@@ -421,14 +421,14 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
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=
k8s.io/api v0.21.8 h1:wVK5Jr4RnUIpjejuFnslXminUMdxa31bxi6zaUOILI4=
k8s.io/api v0.21.8/go.mod h1:4A6eY7AJ+cAgEws3bGRIP2Wyia6VYmHbwIoQu83yyok=
k8s.io/apimachinery v0.21.8 h1:crvdCfg/ueRHOPWReO+DukFvtGBoxyJdV61xkO6RhJU=
k8s.io/apimachinery v0.21.8/go.mod h1:VdCLtKQwpSUQEWDaRsWR5ESDRqqhY2NeVzo9KCQ9uy0=
k8s.io/client-go v0.21.8 h1:okz2KT8eM2VrRRXQMqS205hulPOfGE112HdFFvwgy+E=
k8s.io/client-go v0.21.8/go.mod h1:FcrKJITUrWtQSX3SCmqswlETK8AcVDTTA5PxDPxNtcg=
k8s.io/code-generator v0.21.8 h1:ajS/EvClGPP9svtZbXFK5n2kdakaWHJZOcpzF8jh8MM=
k8s.io/code-generator v0.21.8/go.mod h1:py8RM46Y1+H0IWM1oO9pOGz60GhD9uW2SFlnXI5jZno=
k8s.io/api v0.21.9 h1:dgxM5d8/kLw0mz7JmyixJk3I84JT2B52Yz8p0lTMFes=
k8s.io/api v0.21.9/go.mod h1:jyTBdRcQnzZodHyJdeDEqVcxkaqJAgjrRx30EysE1Ik=
k8s.io/apimachinery v0.21.9 h1:8WffZaaNB2ft5wOiFPktkZRZQxMoTxwVrITC73SJ1V8=
k8s.io/apimachinery v0.21.9/go.mod h1:USs+ifLG6ZUgHGA/9lGxjdHzCB3hUO3fG1VBOwi0IHo=
k8s.io/client-go v0.21.9 h1:GexEazmr/ulHLNBKDE/pc2WTbZ0JLUJLv05Va9kE/B0=
k8s.io/client-go v0.21.9/go.mod h1:uMq9B14yobLb20bDZ1xVrXUpPbDCeWEjJfGeTt2n0/Q=
k8s.io/code-generator v0.21.9 h1:GKIYXkVo+zaFh6qvP3pZC2prdGMBNLr3UH1dUVvUYwA=
k8s.io/code-generator v0.21.9/go.mod h1:FbZCzn44pBTAjY3tIvLIQcF2514rGUzMP1liffRr5jQ=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw=
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
@@ -444,7 +444,7 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 h1:Hr/htKFmJEbtMgS/UD0N+gtgctAqz81t3nu+sPzynno=
sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y=
sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4=
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=