github/sample-controller
github/sample-controller
3
0
Fork 0
mirror of https://github.com/kubernetes/sample-controller.git synced 2025-01-19 16:12:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #106661 from liggitt/automated-cherry-pick-of-#106660-upstream-release-1.23

Browse Source 
Automated cherry pick of #106660: Revert sigs.k8s.io/structured-merge-diff/v4 to v4.1.2

Kubernetes-commit: 724289524084f6edbbe53e31d2c6e636343fdebb
This commit is contained in:
Kubernetes Publisher 2021-12-01 18:49:32 -08:00
parent 4f5033a5b2
commit b1f957b124
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
go.mod
View File

@ -5,17 +5,16 @@ module k8s.io/sample-controller
go 1.16 go 1.16
require ( require (
k8s.io/api v0.0.0 k8s.io/api v0.0.0-20211203090506-2893881082f7
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20211203085806-1d209c836ad2
k8s.io/client-go v0.0.0 k8s.io/client-go v0.0.0-20211203092021-f3c25ef2e88a
k8s.io/code-generator v0.0.0 k8s.io/code-generator v0.0.0-20211203085103-5266a1f1e9a2
k8s.io/klog/v2 v2.30.0 k8s.io/klog/v2 v2.30.0
) )
replace ( replace (
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20211203090506-2893881082f7
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211203085806-1d209c836ad2
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20211203092021-f3c25ef2e88a
k8s.io/code-generator => ../code-generator k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211203085103-5266a1f1e9a2
k8s.io/sample-controller => ../sample-controller
) )

8
go.sum
View File

@ -614,6 +614,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-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.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/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-20211203090506-2893881082f7 h1:uOyVSOPIZ3n17DT7fbpRIWa8tnwXcq81Q6Ri7ITzYsA=
k8s.io/api v0.0.0-20211203090506-2893881082f7/go.mod h1:sSZUBf47O72sm2TBpsmNK7PMBvL3qWQRzlPt0Uly0Q0=
k8s.io/apimachinery v0.0.0-20211203085806-1d209c836ad2 h1:KQpp3OaTtqoEEgfEX55D5+FQ5aqOb1/YcDoY5eCsAbU=
k8s.io/apimachinery v0.0.0-20211203085806-1d209c836ad2/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc=
k8s.io/client-go v0.0.0-20211203092021-f3c25ef2e88a h1:OcIV9l1/feY5c6seA9lCaC5ydk65AuJbhgMzL71KdMs=
k8s.io/client-go v0.0.0-20211203092021-f3c25ef2e88a/go.mod h1:A0Qu03G2szmnUgufFw7h1fDqvdn87Y2zjNQBD/zL3yE=
k8s.io/code-generator v0.0.0-20211203085103-5266a1f1e9a2 h1:hzm5i8HyrTmPMkhiweHpG2ES0GLeC4V0FM7KAham2O0=
k8s.io/code-generator v0.0.0-20211203085103-5266a1f1e9a2/go.mod h1:vQvOhDXhuzqiVfM/YHp+dmg10WDZCchJVObc9MvowsE=
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c h1:GohjlNKauSai7gN4wsJkeZ3WAJx4Sh+oT/b5IYn5suA= 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/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.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=