Merge pull request #111915 from aojea/crd_recursion_bug_1_24

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

Kubernetes-commit: aeb26cde7aabff15c97db985cdd1748d76a966a3
This commit is contained in:
Kubernetes Publisher 2023-01-11 19:16:53 -08:00
commit 4a220df356
2 changed files with 19 additions and 19 deletions

18
go.mod
View File

@ -5,10 +5,10 @@ module k8s.io/sample-controller
go 1.19
require (
k8s.io/api v0.0.0-20221223023026-8ab18bcbebb1
k8s.io/apimachinery v0.0.0-20221223020506-cbd9e8b8f027
k8s.io/client-go v0.0.0-20221223031609-fa144945a15f
k8s.io/code-generator v0.0.0-20221223014908-d4cee2f9d54c
k8s.io/api v0.0.0-20230112063057-8b5496b74fa0
k8s.io/apimachinery v0.0.0-20230112061400-6c076bd8b776
k8s.io/client-go v0.0.0-20230112065157-816bb19ea7bb
k8s.io/code-generator v0.0.0-20230112060908-85650fea45eb
k8s.io/klog/v2 v2.60.1
)
@ -55,13 +55,13 @@ require (
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20221223023026-8ab18bcbebb1
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20221223020506-cbd9e8b8f027
k8s.io/client-go => k8s.io/client-go v0.0.0-20221223031609-fa144945a15f
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20221223014908-d4cee2f9d54c
k8s.io/api => k8s.io/api v0.0.0-20230112063057-8b5496b74fa0
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230112061400-6c076bd8b776
k8s.io/client-go => k8s.io/client-go v0.0.0-20230112065157-816bb19ea7bb
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230112060908-85650fea45eb
)

20
go.sum
View File

@ -498,14 +498,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.0.0-20221223023026-8ab18bcbebb1 h1:rB1L+670jti259NeEukySW9MZuwss6i1b3rK1HozfMU=
k8s.io/api v0.0.0-20221223023026-8ab18bcbebb1/go.mod h1:j/JmPHboCmhUG54q70HCl2UCxIJsFRnru8MGTwN7gA8=
k8s.io/apimachinery v0.0.0-20221223020506-cbd9e8b8f027 h1:Bc+HJD1swYIVc9GZokUpgLyRbAI+ZvDBgd3AoYe0LYU=
k8s.io/apimachinery v0.0.0-20221223020506-cbd9e8b8f027/go.mod h1:Gqx4z+eZpKhlP6RIfnQahu4vwmi5Hg7B/mVAGbkSW/E=
k8s.io/client-go v0.0.0-20221223031609-fa144945a15f h1:gX+3E+y1hkb6V+fuVz64VHE6NFqLF16PZDylszno6e4=
k8s.io/client-go v0.0.0-20221223031609-fa144945a15f/go.mod h1:glhpXq5Bxb3sNVa9dt8YTb1jW0cR8GjLOpsDridv6CY=
k8s.io/code-generator v0.0.0-20221223014908-d4cee2f9d54c h1:L7XqF1PsAOOzwEmaD0LIXchUK2S6/58q8LADKTEwxLA=
k8s.io/code-generator v0.0.0-20221223014908-d4cee2f9d54c/go.mod h1:ab/3d5NKQtQ/gykArrf8uSTa+gC0yD3SBVVjS9Z/yFo=
k8s.io/api v0.0.0-20230112063057-8b5496b74fa0 h1:djmyHPrrVNQsNsHlbzxfCTgEpfqXWROKJlzZ5U3DQwc=
k8s.io/api v0.0.0-20230112063057-8b5496b74fa0/go.mod h1:9n9op8lb/s9O7TOK4nUNS1TApSkiG64aYDemGbyGg0c=
k8s.io/apimachinery v0.0.0-20230112061400-6c076bd8b776 h1:erPF3QOKMPIikM39TzJlyVJYVpGdko6iRO9wDZ0RAWc=
k8s.io/apimachinery v0.0.0-20230112061400-6c076bd8b776/go.mod h1:WKP/nbpA6xR1TodchJym9COpVcn+V3cAaaNmXk6bwzA=
k8s.io/client-go v0.0.0-20230112065157-816bb19ea7bb h1:QtiLl+N7Sfh0LxLX0AgJsEn1mIcnbuOjfSqiVjE1DbA=
k8s.io/client-go v0.0.0-20230112065157-816bb19ea7bb/go.mod h1:wc5JHgKNRSxkNOSEfymx7N9xe/FdLP2OjmZLzMsQNBE=
k8s.io/code-generator v0.0.0-20230112060908-85650fea45eb h1:mvsPHSobtE2r7EJ7FuENadL+KgOGki54dbEb4vY2JIY=
k8s.io/code-generator v0.0.0-20230112060908-85650fea45eb/go.mod h1:50tPkNS7JuVi/jH1xHb2Wh25Td0zxjKiUU22mtMH69M=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 h1:TT1WdmqqXareKxZ/oNXEUSwKlLiHzPMyB0t8BaFeBYI=
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
@ -524,7 +524,7 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y=
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY=
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=