Compare commits

...

3 Commits

Author SHA1 Message Date
Kubernetes Publisher
8a8889c3da Update dependencies to v0.22.6 tag 2022-01-19 22:21:35 +00:00
Kubernetes Publisher
735ad8a955 Merge pull request #107568 from jiahuif-forks/automated-cherry-pick-of-#107565-upstream-release-1.22
Automated cherry pick of #107565: upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1

Kubernetes-commit: 487eef699dc8ad07106876e7fb045962606035ec
2022-01-15 13:47:44 +00:00
Jiahui Feng
2960ab5924 generated: ./hack/update-vendor.sh
Kubernetes-commit: e0550f5f956b7fac6033bb58c678f733d972c97d
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.0.0-20211213212539-d5ade40cd9be
k8s.io/apimachinery v0.0.0-20211213212003-47f99e79eb05
k8s.io/client-go v0.0.0-20211213213826-ea750b152e20
k8s.io/code-generator v0.0.0-20211213211512-7b37ed0d1025
k8s.io/api v0.22.6
k8s.io/apimachinery v0.22.6
k8s.io/client-go v0.22.6
k8s.io/code-generator v0.22.6
k8s.io/klog/v2 v2.9.0
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20211213212539-d5ade40cd9be
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211213212003-47f99e79eb05
k8s.io/client-go => k8s.io/client-go v0.0.0-20211213213826-ea750b152e20
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211213211512-7b37ed0d1025
k8s.io/api => k8s.io/api v0.22.6
k8s.io/apimachinery => k8s.io/apimachinery v0.22.6
k8s.io/client-go => k8s.io/client-go v0.22.6
k8s.io/code-generator => k8s.io/code-generator v0.22.6
)

20
go.sum
View File

@@ -455,14 +455,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.0.0-20211213212539-d5ade40cd9be h1:rGRc4cWqJfb/URjMeBwh7TTIBo7PFfeyQc7JnMUr2kU=
k8s.io/api v0.0.0-20211213212539-d5ade40cd9be/go.mod h1:gr992K7E98YJ478akVvIIyHNcTk98jjjd3Kx5AFX2o8=
k8s.io/apimachinery v0.0.0-20211213212003-47f99e79eb05 h1:T5k4aJVbdpgeGkkGsqU/vbE3IrAXTD2jcbk3PK0+ypQ=
k8s.io/apimachinery v0.0.0-20211213212003-47f99e79eb05/go.mod h1:xziclGKwuuJ2RM5/rSFQSYAj0zdbci3DH8kj+WvyN0U=
k8s.io/client-go v0.0.0-20211213213826-ea750b152e20 h1:58cmi8sdNcNa/vXeX/P1JbH2/TdimvzzApG5fuKmrLM=
k8s.io/client-go v0.0.0-20211213213826-ea750b152e20/go.mod h1:IPN3qJ5FtjRWufUvNNE+C17R+AgRr1B+3i5YJ67OvlE=
k8s.io/code-generator v0.0.0-20211213211512-7b37ed0d1025 h1:3+kKfFT79J9DExiVrQ6/WfLyfZCFgCRbvt+leGMz5ek=
k8s.io/code-generator v0.0.0-20211213211512-7b37ed0d1025/go.mod h1:sbdWCOVob+KaQ5O7xs8PNNaCTpbWVqNgA6EPwLOmRNk=
k8s.io/api v0.22.6 h1:acjE5ABt0KpsBI9QCtLqaQEPSF94jOtE/LoFxSYasSE=
k8s.io/api v0.22.6/go.mod h1:q1F7IfaNrbi/83ebLy3YFQYLjPSNyunZ/IXQxMmbwCg=
k8s.io/apimachinery v0.22.6 h1:z7vxNRkFX0NToA+8D17kzLZ/T4t+DqwzUlqqbqRepRs=
k8s.io/apimachinery v0.22.6/go.mod h1:ZvVLP5iLhwVFg2Yx9Gh5W0um0DUauExbRhe+2Z8I1EU=
k8s.io/client-go v0.22.6 h1:ugAXeC312xeGXsn7zTRz+btgtLBnW3qYhtUUpVQL7YE=
k8s.io/client-go v0.22.6/go.mod h1:TffU4AV2idZGeP+g3kdFZP+oHVHWPL1JYFySOALriw0=
k8s.io/code-generator v0.22.6 h1:nskDbd+etRmWhB/WoaevaFIJfL+lDt5HI7wAIvA4CcQ=
k8s.io/code-generator v0.22.6/go.mod h1:iOZwYADSgFPNGWfqHFfg1V0TNJnl1t0WyZluQp4baqU=
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=
@@ -478,7 +478,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=