kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
parent 51e1a39933 7930c297c6
commit 2dffe54d32
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
go.mod
View File

@ -29,15 +29,15 @@ require (
github.com/stretchr/testify v1.8.0
golang.org/x/sys v0.3.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20221223023026-8ab18bcbebb1
k8s.io/apimachinery v0.0.0-20221223020506-cbd9e8b8f027
k8s.io/cli-runtime v0.0.0-20221223060146-41de1effc6c4
k8s.io/client-go v0.0.0-20221223031609-fa144945a15f
k8s.io/component-base v0.0.0-20221223033407-6b456deee75a
k8s.io/component-helpers v0.0.0-20221223034630-6c8accf5182e
k8s.io/api v0.0.0-20230112063057-8b5496b74fa0
k8s.io/apimachinery v0.0.0-20230112061400-6c076bd8b776
k8s.io/cli-runtime v0.0.0-20230112084045-aca141baed4d
k8s.io/client-go v0.0.0-20230112065157-816bb19ea7bb
k8s.io/component-base v0.0.0-20230112070501-6cc853a1632f
k8s.io/component-helpers v0.0.0-20230112070806-d1b24cfbb7ad
k8s.io/klog/v2 v2.60.1
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42
k8s.io/metrics v0.0.0-20221223055441-db7ed236a82b
k8s.io/metrics v0.0.0-20230112083503-29594fa8bb4e
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2
sigs.k8s.io/kustomize/kustomize/v4 v4.5.4
@ -94,16 +94,16 @@ require (
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
sigs.k8s.io/kustomize/api v0.11.4 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // 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/cli-runtime => k8s.io/cli-runtime v0.0.0-20221223060146-41de1effc6c4
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/component-base => k8s.io/component-base v0.0.0-20221223033407-6b456deee75a
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20221223034630-6c8accf5182e
k8s.io/metrics => k8s.io/metrics v0.0.0-20221223055441-db7ed236a82b
k8s.io/api => k8s.io/api v0.0.0-20230112063057-8b5496b74fa0
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230112061400-6c076bd8b776
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20230112084045-aca141baed4d
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
k8s.io/component-base => k8s.io/component-base v0.0.0-20230112070501-6cc853a1632f
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20230112070806-d1b24cfbb7ad
k8s.io/metrics => k8s.io/metrics v0.0.0-20230112083503-29594fa8bb4e
)

32
go.sum
View File

@ -763,18 +763,18 @@ 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/cli-runtime v0.0.0-20221223060146-41de1effc6c4 h1:qmyfv0oArea6ig0VTzeWWw73HSq4aDellxfBEYjw2Qc=
k8s.io/cli-runtime v0.0.0-20221223060146-41de1effc6c4/go.mod h1:ISasHN+sxg2+WsqPbd7mkvd015SrTHD70SE/uXLAK74=
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/component-base v0.0.0-20221223033407-6b456deee75a h1:1xNbne3xojeblnRyxVAc6PRkNeHY0AF2WwWtl08beZw=
k8s.io/component-base v0.0.0-20221223033407-6b456deee75a/go.mod h1:MvQJV808Jpwo2Ezk/+wPkMKMI8jtHIebBcKRWjuvaDo=
k8s.io/component-helpers v0.0.0-20221223034630-6c8accf5182e h1:UQmRjrlvtikX4zlBpwpniUiqtrGmKyUN83vRQfu1u1I=
k8s.io/component-helpers v0.0.0-20221223034630-6c8accf5182e/go.mod h1:PSDyPovjdXADljUpfIZC3irHj4CBQMRegAwm3Jpgbvc=
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/cli-runtime v0.0.0-20230112084045-aca141baed4d h1:FFfCivEgUDMxAR5FjC4fcUIp/m8QAuKmmRaNGXhEvrk=
k8s.io/cli-runtime v0.0.0-20230112084045-aca141baed4d/go.mod h1:0t1jjEGeV7Mm/2hgX7hBRaE7x9zTXdB3MFjR+UoEfkU=
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/component-base v0.0.0-20230112070501-6cc853a1632f h1:hCIuOhe3q0joqmDhnKYfujUNhXstH1iQDyvwyxPAnxA=
k8s.io/component-base v0.0.0-20230112070501-6cc853a1632f/go.mod h1:YAVHovIjzzlN0M4bYNTGAnHziDKl/Ju7N/qh7HP2FL4=
k8s.io/component-helpers v0.0.0-20230112070806-d1b24cfbb7ad h1:LGqyE7I7DoPkGsOtCk8+mgxgXhwjp0dCQs9o00/tObc=
k8s.io/component-helpers v0.0.0-20230112070806-d1b24cfbb7ad/go.mod h1:/B/pLhO7ZwdwK0TdZb6ushu8yG1Gk2/rrX/M1SF0ruQ=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
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=
@ -784,8 +784,8 @@ k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU=
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk=
k8s.io/metrics v0.0.0-20221223055441-db7ed236a82b h1:fR72+W61XF5Oz0Sn4H/BG2k0OpVBlbeVv+3YkeDI0yc=
k8s.io/metrics v0.0.0-20221223055441-db7ed236a82b/go.mod h1:BtE/vUjvhZ1Fo+Z8FPRSpBz9cU4VEGg4eg0ihfSrwz0=
k8s.io/metrics v0.0.0-20230112083503-29594fa8bb4e h1:KQ7rf+jcygj1qLaY2y00UVcQZRO2OgrYlFYyyB93SsY=
k8s.io/metrics v0.0.0-20230112083503-29594fa8bb4e/go.mod h1:3OJW97BAmoQ9GK/kJWoKP6X+DaHGYqjLnEx2aqDRIy0=
k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc=
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
@ -802,7 +802,7 @@ sigs.k8s.io/kustomize/kustomize/v4 v4.5.4/go.mod h1:Zo/Xc5FKD6sHl0lilbrieeGeZHVY
sigs.k8s.io/kustomize/kyaml v0.13.6 h1:eF+wsn4J7GOAXlvajv6OknSunxpcOBQQqsnPxObtkGs=
sigs.k8s.io/kustomize/kyaml v0.13.6/go.mod h1:yHP031rn1QX1lr/Xd934Ri/xdVNG8BE2ECa78Ht/kEg=
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=