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
2 changed files with 11 additions and 11 deletions

10
go.mod
View File

@@ -30,16 +30,16 @@ require (
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
google.golang.org/protobuf v1.27.1
k8s.io/api v0.0.0-20221026235553-5794fb8999af
k8s.io/apimachinery v0.0.0-20221026235213-fb3228f40456
k8s.io/api v0.0.0-20221202175609-115016874c21
k8s.io/apimachinery v0.0.0-20221202174959-050f59113830
k8s.io/klog/v2 v2.30.0
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
k8s.io/utils v0.0.0-20211116205334-6203023598ed
sigs.k8s.io/structured-merge-diff/v4 v4.2.1
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
sigs.k8s.io/yaml v1.2.0
)
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/api => k8s.io/api v0.0.0-20221202175609-115016874c21
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221202174959-050f59113830
)

12
go.sum
View File

@@ -613,10 +613,10 @@ 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/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/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=
@@ -633,7 +633,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.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=