github/sample-controller
github/sample-controller
3
0
Fork 0
mirror of https://github.com/kubernetes/sample-controller.git synced 2025-03-01 06:30:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #107567 from jiahuif-forks/automated-cherry-pick-of-#107565-upstream-release-1.23

Browse Source 
Automated cherry pick of #107565: upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1

Kubernetes-commit: 3426f6ceaf92ad40de9f381c20d054c8fef10c03
This commit is contained in:
Kubernetes Publisher 2022-01-14 20:32:16 -08:00
parent daf4f12605
commit 5e43b30045
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-20220115053135-041d3961b32a
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20220115052442-91f688f9e79b
k8s.io/client-go v0.0.0 k8s.io/client-go v0.0.0-20220115055430-857d6f1290cb
k8s.io/code-generator v0.0.0 k8s.io/code-generator v0.0.0-20220115051811-293ba3b8da1f
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-20220115053135-041d3961b32a
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220115052442-91f688f9e79b
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20220115055430-857d6f1290cb
k8s.io/code-generator => ../code-generator k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220115051811-293ba3b8da1f
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-20220115053135-041d3961b32a h1:qMFYRoetYNi+UlzPwQ8awyHErC6L1jy9vHoSYbRaJ1w=
k8s.io/api v0.0.0-20220115053135-041d3961b32a/go.mod h1:QPHbvCbJa8i7XqwifOsti9gUWe8bORsOpFvi3DNfa1w=
k8s.io/apimachinery v0.0.0-20220115052442-91f688f9e79b h1:FuYOQnw86QdxkdnbWG0qVV5E1ThtGNkvTH0nR0NelFs=
k8s.io/apimachinery v0.0.0-20220115052442-91f688f9e79b/go.mod h1:zDqeV0AK62LbCI0CI7KbWCAYdLg+E+8UXJ0rIz5gmS8=
k8s.io/client-go v0.0.0-20220115055430-857d6f1290cb h1:UggqXCpkuZFMNwc1sVfb52Li1QsqpaCa6NZ63zANndA=
k8s.io/client-go v0.0.0-20220115055430-857d6f1290cb/go.mod h1:uS5ctICPNIyPD9wuFlOAQKMjA7deau43xi/HTZam3ro=
k8s.io/code-generator v0.0.0-20220115051811-293ba3b8da1f h1:mWsnwEz7nOs5I6TJbZitM7lfJWZXZ+jGz/40jOgHnY4=
k8s.io/code-generator v0.0.0-20220115051811-293ba3b8da1f/go.mod h1:S0Q1JVA+kSzTI1oUvbKAxZY/DYbA/ZUb4Uknog12ETk=
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=