Compare commits

..

3 Commits

Author SHA1 Message Date
Kubernetes Publisher
0419705bc1 Update dependencies to v0.23.15 tag 2022-12-08 21:07:04 +00:00
Kubernetes Publisher
b264647f94 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
2022-12-02 18:56:24 +00:00
Antonio Ojea
f8010b96eb update structured-merge-diff to 4.2.3
Co-authored-by: silenceper <silenceper@gmail.com>

Kubernetes-commit: 93dedd539c4d0ad70166a0036b67964c333a692c
2022-08-18 16:41:10 +02: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.14
k8s.io/apimachinery v0.23.14
k8s.io/client-go v0.23.14
k8s.io/code-generator v0.23.14
k8s.io/api v0.23.15
k8s.io/apimachinery v0.23.15
k8s.io/client-go v0.23.15
k8s.io/code-generator v0.23.15
k8s.io/klog/v2 v2.30.0
)
replace (
k8s.io/api => k8s.io/api v0.23.14
k8s.io/apimachinery => k8s.io/apimachinery v0.23.14
k8s.io/client-go => k8s.io/client-go v0.23.14
k8s.io/code-generator => k8s.io/code-generator v0.23.14
k8s.io/api => k8s.io/api v0.23.15
k8s.io/apimachinery => k8s.io/apimachinery v0.23.15
k8s.io/client-go => k8s.io/client-go v0.23.15
k8s.io/code-generator => k8s.io/code-generator v0.23.15
)

20
go.sum
View File

@@ -617,14 +617,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.14 h1:1gRN0u72YpSEsnnyM5P16XNbRztFefV8pU+mb8aC4Io=
k8s.io/api v0.23.14/go.mod h1:sWeFZzeE9lLU75pogeht6lIcAP+wkqzTlM8V/REymxs=
k8s.io/apimachinery v0.23.14 h1:UNkDdlj663kkbFiayTMRr37YIE4b7LtIm9gFnVlpfqA=
k8s.io/apimachinery v0.23.14/go.mod h1:qd/bZ1ajQ8MklCd0DlIwLhjcs1kr7QurGOQUS59A7XE=
k8s.io/client-go v0.23.14 h1:nwrCHBj6hXHehOg3lSwGZYo+T/acwfIL6tMWkT2u+mQ=
k8s.io/client-go v0.23.14/go.mod h1:nKdHtC7qNAkMP0seRU49pdP9tK0lobkM2n5Ljg4r+VI=
k8s.io/code-generator v0.23.14 h1:bB7R7Tu2eWlVbITtXuMyX+v2TUHlOwlb09XFKnZbxBQ=
k8s.io/code-generator v0.23.14/go.mod h1:3pOEhV/pmJcwFtt3zfwaArTMflocYMgjYIgM0zUIjAs=
k8s.io/api v0.23.15 h1:czl3QbP3Jb3J/gR5seTTKafYA5YQhkZLerQQUBhkpBk=
k8s.io/api v0.23.15/go.mod h1:hxtVWhlKGalIP4YXHxg8nzDlRd1ciyIkgEKTlvXjSMs=
k8s.io/apimachinery v0.23.15 h1:IyYaHIVN2OL1QKXXye0IWNI/EpOBicMVRkj34rIdyPk=
k8s.io/apimachinery v0.23.15/go.mod h1:mbefzm1H5rPdyibAc8rmzLAbr/oG60tDHQFj0FTqrZU=
k8s.io/client-go v0.23.15 h1:raIR9U0gmZwX2kkwR4PtLghcNfYTiB9QYdodlycmT1s=
k8s.io/client-go v0.23.15/go.mod h1:ar8V/vcyQD28dkxGURvv2JTteCUL9PMW5DZXpNrJBTY=
k8s.io/code-generator v0.23.15 h1:qbmuMWkbFZrP+4d8uD2SD3aCW9lq/9rGu/6JtY9QbX4=
k8s.io/code-generator v0.23.15/go.mod h1:saIBS4+guYkA7QIxLvLe5d9C+LX9oZ44fN6By/Rd11M=
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=
@@ -642,7 +642,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=