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

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

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

Kubernetes-commit: 487eef699dc8ad07106876e7fb045962606035ec
This commit is contained in:
Kubernetes Publisher 2022-01-14 23:06:15 -08:00
parent 2960ab5924
commit 735ad8a955
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-20220115132223-0b924f4f7b63
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20220115131919-1ea05acba7c0
k8s.io/client-go v0.0.0 k8s.io/client-go v0.0.0-20220115132708-74d341032456
k8s.io/code-generator v0.0.0 k8s.io/code-generator v0.0.0-20220115131611-b45d7156bcec
k8s.io/klog/v2 v2.9.0 k8s.io/klog/v2 v2.9.0
) )
replace ( replace (
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20220115132223-0b924f4f7b63
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220115131919-1ea05acba7c0
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20220115132708-74d341032456
k8s.io/code-generator => ../code-generator k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220115131611-b45d7156bcec
k8s.io/sample-controller => ../sample-controller
) )

8
go.sum
View File

@ -455,6 +455,14 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
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=
k8s.io/api v0.0.0-20220115132223-0b924f4f7b63 h1:ARkTMQaUQg/XAxZGClgPO8jLBGe+0vyHOzkv1klocn4=
k8s.io/api v0.0.0-20220115132223-0b924f4f7b63/go.mod h1:VZ3awwdNsOtdAUAYPvruiFtrH/OD4gT5qmZHaQmXgxY=
k8s.io/apimachinery v0.0.0-20220115131919-1ea05acba7c0 h1:SoF7jCfsIaGo2y+PiJGjFnRMeGh4zO4aGEYc0IVGAu4=
k8s.io/apimachinery v0.0.0-20220115131919-1ea05acba7c0/go.mod h1:ZvVLP5iLhwVFg2Yx9Gh5W0um0DUauExbRhe+2Z8I1EU=
k8s.io/client-go v0.0.0-20220115132708-74d341032456 h1:QmA6+1ojsdlZePNl5te9CK5w6EMf/ROSZcKQwAQ8zzk=
k8s.io/client-go v0.0.0-20220115132708-74d341032456/go.mod h1:NYI+N6XGfzp0WaUrQoLAImOjemBZsTuMwmU2XBA/VqQ=
k8s.io/code-generator v0.0.0-20220115131611-b45d7156bcec h1:vLh4rO4cR99d7zng6jng1DxYqUSzhXetFIKnCNEvLs8=
k8s.io/code-generator v0.0.0-20220115131611-b45d7156bcec/go.mod h1:iOZwYADSgFPNGWfqHFfg1V0TNJnl1t0WyZluQp4baqU=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw=
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=