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 #107569 from jiahuif-forks/automated-cherry-pick-of-#107565-upstream-release-1.21

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

Kubernetes-commit: 80b625cdfb1b5af2fb545187e9fab045ef71858b
This commit is contained in:
Kubernetes Publisher 2022-01-14 20:46:27 -08:00
parent c3e9f6dc1a
commit f858f0b7ec
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
require (
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/code-generator v0.0.0
k8s.io/api v0.0.0-20220115052846-e18a4d4fc464
k8s.io/apimachinery v0.0.0-20220115052204-78994e499d98
k8s.io/client-go v0.0.0-20220115054131-b3fbf6e0969c
k8s.io/code-generator v0.0.0-20220115051636-a8e5007e73e6
k8s.io/klog/v2 v2.9.0
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/sample-controller => ../sample-controller
k8s.io/api => k8s.io/api v0.0.0-20220115052846-e18a4d4fc464
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220115052204-78994e499d98
k8s.io/client-go => k8s.io/client-go v0.0.0-20220115054131-b3fbf6e0969c
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220115051636-a8e5007e73e6
)

8
go.sum
View File

@ -421,6 +421,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.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20220115052846-e18a4d4fc464 h1:zYUcImzLfRgIQsp4xwYBORc3oXjMyyPzmJN8cEf6+uA=
k8s.io/api v0.0.0-20220115052846-e18a4d4fc464/go.mod h1:1rXHa5F5YY7BxmZm5XoXjqq5GH54ggnxTlrxLwHlhU4=
k8s.io/apimachinery v0.0.0-20220115052204-78994e499d98 h1:mf2T8QRJGaH7h0qKnSq22AW9lUrPhWZoFILJQHjo/y8=
k8s.io/apimachinery v0.0.0-20220115052204-78994e499d98/go.mod h1:USs+ifLG6ZUgHGA/9lGxjdHzCB3hUO3fG1VBOwi0IHo=
k8s.io/client-go v0.0.0-20220115054131-b3fbf6e0969c h1:BQs6fqBVPlTbyWLEMvBZnu5xnreZSZ3g3YKbxQMG/QU=
k8s.io/client-go v0.0.0-20220115054131-b3fbf6e0969c/go.mod h1:HDCOYGDWxScC1nCYosGAtt/KJ4Z1oPvZO7vHxJqViqo=
k8s.io/code-generator v0.0.0-20220115051636-a8e5007e73e6 h1:GU+YDFveCRJZKjhwqNo8S51uPhiKuORpBFd5AmuJOIw=
k8s.io/code-generator v0.0.0-20220115051636-a8e5007e73e6/go.mod h1:FbZCzn44pBTAjY3tIvLIQcF2514rGUzMP1liffRr5jQ=
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/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=