Merge pull request #111914 from aojea/crd_recursion_bug_1_23

cherry pick pr #111557 to 1.23 :update smd to 4.2.3

Kubernetes-commit: 5f01bb40bcee9c5f16f08fe9a2fe5a39beb81101
This commit is contained in:
Kubernetes Publisher 2022-12-02 07:59:53 -08:00
commit 60c29757bf
2 changed files with 26 additions and 26 deletions

22
go.mod
View File

@ -5,18 +5,18 @@ module k8s.io/kube-controller-manager
go 1.16
require (
k8s.io/apimachinery v0.0.0-20221026235213-fb3228f40456
k8s.io/cloud-provider v0.0.0-20221027004628-744df3fdb1b5
k8s.io/controller-manager v0.0.0-20221027004428-8ef801cbef53
k8s.io/apimachinery v0.0.0-20221202174959-050f59113830
k8s.io/cloud-provider v0.0.0-20221202192750-75aab4682702
k8s.io/controller-manager v0.0.0-20221202192442-91d07e0a0851
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20221026235553-5794fb8999af
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221026235213-fb3228f40456
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20221027001817-3c3c4a99d1ed
k8s.io/client-go => k8s.io/client-go v0.0.0-20221027000126-d33f57bea097
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20221027004628-744df3fdb1b5
k8s.io/component-base => k8s.io/component-base v0.0.0-20221027000837-04bb955c2d1e
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20221027001019-a56118d43df0
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20221027004428-8ef801cbef53
k8s.io/api => k8s.io/api v0.0.0-20221202175609-115016874c21
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221202174959-050f59113830
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20221202182803-1c37dd09f414
k8s.io/client-go => k8s.io/client-go v0.0.0-20221202180432-3dd56d254dd3
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20221202192750-75aab4682702
k8s.io/component-base => k8s.io/component-base v0.0.0-20221202181707-625c8656ec5a
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20221202182022-93dfba24e066
k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20221202192442-91d07e0a0851
)

30
go.sum
View File

@ -856,19 +856,19 @@ 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-20221026235553-5794fb8999af h1:gbWuvkz2JtnIWs7zim6lJRCMX47t7ERRLLzYjqy+Guo=
k8s.io/api v0.0.0-20221026235553-5794fb8999af/go.mod h1:oQEqtBOgwQWR9jXJFMhMNTXK2780TEagG1ulBrNx0Ac=
k8s.io/apimachinery v0.0.0-20221026235213-fb3228f40456 h1:DhDbEgyHu7mH+lksYuKNgb9U3Yfv4PZ0SL83aBifICU=
k8s.io/apimachinery v0.0.0-20221026235213-fb3228f40456/go.mod h1:qd/bZ1ajQ8MklCd0DlIwLhjcs1kr7QurGOQUS59A7XE=
k8s.io/apiserver v0.0.0-20221027001817-3c3c4a99d1ed/go.mod h1:WeX2euK1HyiFyVDWfErZZHkd6VwIPAZQ1SOLeHIYqDs=
k8s.io/client-go v0.0.0-20221027000126-d33f57bea097/go.mod h1:P1bIKAmaTmkG2bg1j3Kj/BS0nmNGpmp9qsuThL1Hl0c=
k8s.io/cloud-provider v0.0.0-20221027004628-744df3fdb1b5 h1:xf3vtPNjA1+7nxiDG5bbLIl2uIvBf0C9AsMLEFqUlkg=
k8s.io/cloud-provider v0.0.0-20221027004628-744df3fdb1b5/go.mod h1:K9c5rwj0SjnNxRR3rSxFFg4LqBPt8QxHkgo216aLU1k=
k8s.io/component-base v0.0.0-20221027000837-04bb955c2d1e h1:nxD78UITUYYH0eHUjFpmrHhmrAiwWfD1HYIc6/8crsk=
k8s.io/component-base v0.0.0-20221027000837-04bb955c2d1e/go.mod h1:B9F263rZNUQPNQaLyHgX7CA4j8TsVtweEAHeh4jiEKQ=
k8s.io/component-helpers v0.0.0-20221027001019-a56118d43df0/go.mod h1:WCNWiVs3md8r13S0wShja9eY3Q/A8Ktg/wWl8iQBtMY=
k8s.io/controller-manager v0.0.0-20221027004428-8ef801cbef53 h1:m7STzlhXD4HE0BHPKoumzAzaztnTZvshYnSH+a7YIn8=
k8s.io/controller-manager v0.0.0-20221027004428-8ef801cbef53/go.mod h1:odH2cz7fChuhsTyC0fRIN7rN23kfPaDb9T4yFjwZQwc=
k8s.io/api v0.0.0-20221202175609-115016874c21 h1:OByngT6Ph8bP0YtJgaUPkgK+jJa4+MIQvWRJmS8CGVA=
k8s.io/api v0.0.0-20221202175609-115016874c21/go.mod h1:lzSwRDt7GokiQg5oIY4wJOwTdR0nA2Yx21KhaHpwRyo=
k8s.io/apimachinery v0.0.0-20221202174959-050f59113830 h1:xlqQwYSO0lgVkmPno5uUkpAs84CyS9geKwqr+ObN7AI=
k8s.io/apimachinery v0.0.0-20221202174959-050f59113830/go.mod h1:mbefzm1H5rPdyibAc8rmzLAbr/oG60tDHQFj0FTqrZU=
k8s.io/apiserver v0.0.0-20221202182803-1c37dd09f414/go.mod h1:m9RsL4vAazXywRJ1PZY9f5kfUUWl/DDePOzaFs0OJ48=
k8s.io/client-go v0.0.0-20221202180432-3dd56d254dd3/go.mod h1:LD5UilAS8EoNMNSpBiqGp3qNeKDvstWbphlG+k+nHsA=
k8s.io/cloud-provider v0.0.0-20221202192750-75aab4682702 h1:ocypG2Yco/zZOTEB5kca8s09YxIC8KGNcMpnK6h/DWg=
k8s.io/cloud-provider v0.0.0-20221202192750-75aab4682702/go.mod h1:a2slcvdWSE3+0bFvvIdJEzcCq4N4oP6z1+eMEpqqLZI=
k8s.io/component-base v0.0.0-20221202181707-625c8656ec5a h1:Fmtrdg1l0EIIM/BphcvNBJga3cCHoVwBMMZD/pkBYgw=
k8s.io/component-base v0.0.0-20221202181707-625c8656ec5a/go.mod h1:t5cbxtTGZQzbvMEeiqVWWK34x+NY9Mn7Ry4gy7jomPE=
k8s.io/component-helpers v0.0.0-20221202182022-93dfba24e066/go.mod h1:tV8gg9FRJZDGdq6joM2ZLGWPDM/6Yo2jJe5azCTa1GA=
k8s.io/controller-manager v0.0.0-20221202192442-91d07e0a0851 h1:23TkYMybBziF807XjBVUC6X9Ji73q+sQmwPpyi4GJro=
k8s.io/controller-manager v0.0.0-20221202192442-91d07e0a0851/go.mod h1:Xq9P06RYefDIrOUKQOY1oRGemOHSZZoZCB5u7Qtw4Lk=
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.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
@ -885,7 +885,7 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33/go.mod h1:soWkSN
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.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/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=