Compare commits

..

3 Commits

Author SHA1 Message Date
Kubernetes Publisher
e302516ee4 Update dependencies to v0.23.3-rc.0 tag 2022-01-19 22:22:26 +00:00
Kubernetes Publisher
5e43b30045 Merge pull request #107567 from jiahuif-forks/automated-cherry-pick-of-#107565-upstream-release-1.23
Automated cherry pick of #107565: upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1

Kubernetes-commit: 3426f6ceaf92ad40de9f381c20d054c8fef10c03
2022-01-15 06:35:54 +00:00
Jiahui Feng
daf4f12605 generated: ./hack/update-vendor.sh
Kubernetes-commit: 89d8be52ef47c6a5d000a515b41f05567378a97b
2022-01-14 10:58:50 -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.23.2-rc.0
k8s.io/apimachinery v0.23.2-rc.0
k8s.io/client-go v0.23.2-rc.0
k8s.io/code-generator v0.23.2-rc.0
k8s.io/api v0.23.3-rc.0
k8s.io/apimachinery v0.23.3-rc.0
k8s.io/client-go v0.23.3-rc.0
k8s.io/code-generator v0.23.3-rc.0
k8s.io/klog/v2 v2.30.0
)
replace (
k8s.io/api => k8s.io/api v0.23.2-rc.0
k8s.io/apimachinery => k8s.io/apimachinery v0.23.2-rc.0
k8s.io/client-go => k8s.io/client-go v0.23.2-rc.0
k8s.io/code-generator => k8s.io/code-generator v0.23.2-rc.0
k8s.io/api => k8s.io/api v0.23.3-rc.0
k8s.io/apimachinery => k8s.io/apimachinery v0.23.3-rc.0
k8s.io/client-go => k8s.io/client-go v0.23.3-rc.0
k8s.io/code-generator => k8s.io/code-generator v0.23.3-rc.0
)

20
go.sum
View File

@@ -614,14 +614,14 @@ 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.23.2-rc.0 h1:jdFF3d8bEXMXFhXME8UUiNMnbEhYgzGJ2P2eVFSV4Xc=
k8s.io/api v0.23.2-rc.0/go.mod h1:sV6+vzS9qChS4Dq4Jbm1JA7ikOGBeKxj84J0BPdvqTw=
k8s.io/apimachinery v0.23.2-rc.0 h1:MnclcThycinuHAhHBk1dAqEOYi85WlXeAbz2tfGjvWM=
k8s.io/apimachinery v0.23.2-rc.0/go.mod h1:SADt2Kl8/sttJ62RRsi9MIV4o8f5S3coArm0Iu3fBno=
k8s.io/client-go v0.23.2-rc.0 h1:awCUzZU5CoClSNf1+YlXCmRu41DnCxe8pCPoMHC+hgU=
k8s.io/client-go v0.23.2-rc.0/go.mod h1:PxGW01PY/nwjpNjR+wdZaIBnB2TXwWifWr+FXnx3n5Q=
k8s.io/code-generator v0.23.2-rc.0 h1:sG0zykJJ8CvByPs/chc8DThmILi607fnNfW+0YTaOZs=
k8s.io/code-generator v0.23.2-rc.0/go.mod h1:V7yn6VNTCWW8GqodYCESVo95fuiEg713S8B7WacWZDA=
k8s.io/api v0.23.3-rc.0 h1:CyEw2qNWSGGKrZ9+ajF65sBox+mgdIQ9tm/LpX0QBb0=
k8s.io/api v0.23.3-rc.0/go.mod h1:vNXJoF3je8Bk4Pypjkl/tUnHwCPy7cShgJb7PrvHI/0=
k8s.io/apimachinery v0.23.3-rc.0 h1:UQ73jaNcwtwjmJagssPbWbNYgHH5Nt/C8ijlS1Gvu/A=
k8s.io/apimachinery v0.23.3-rc.0/go.mod h1:zDqeV0AK62LbCI0CI7KbWCAYdLg+E+8UXJ0rIz5gmS8=
k8s.io/client-go v0.23.3-rc.0 h1:Tp+YxXz3WShhIcJa+2Vq8uHjlEgpBSzoMJ9hNXx3pwM=
k8s.io/client-go v0.23.3-rc.0/go.mod h1:8EOoTHG+TQoa3lwCadOIwcELmthj0Uz9JbhqgywP6ik=
k8s.io/code-generator v0.23.3-rc.0 h1:QNtqk2XzGwpgV3Qbpi+YxPceNYD0DG/nQTkZ2hesu1c=
k8s.io/code-generator v0.23.3-rc.0/go.mod h1:S0Q1JVA+kSzTI1oUvbKAxZY/DYbA/ZUb4Uknog12ETk=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c h1:GohjlNKauSai7gN4wsJkeZ3WAJx4Sh+oT/b5IYn5suA=
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=
@@ -639,7 +639,7 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
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/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=