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

Merge pull request #106660 from liggitt/smd-merge

Browse Source 
Revert sigs.k8s.io/structured-merge-diff/v4 to v4.1.2

Kubernetes-commit: aff056d8a197f6a404ad5e02210ca662d16c3dbe
This commit is contained in:
Kubernetes Publisher 2021-11-24 13:37:31 -08:00
parent d8df7de944
commit ff730d68ab
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-20211124232210-4c321cf829a0
k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a
k8s.io/client-go v0.0.0-20211124232522-ad95a77727e6
k8s.io/code-generator v0.0.0-20211124231748-1685c0469510
k8s.io/klog/v2 v2.30.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-20211124232210-4c321cf829a0
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a
k8s.io/client-go => k8s.io/client-go v0.0.0-20211124232522-ad95a77727e6
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20211124231748-1685c0469510
)

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-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.0.0-20211124232210-4c321cf829a0 h1:hTJnV20bAHUQZIzigjK3CvWqQuzeQP/C7AP72fzzEIo=
k8s.io/api v0.0.0-20211124232210-4c321cf829a0/go.mod h1:Iod80qmyxDiUr9X93OyKup/yGuYZGx8VK8nLuWpK9Yc=
k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a h1:IggksFfccO+DgJNByne5JOJ+jfqpcMZRsYkwYGZ6qkA=
k8s.io/apimachinery v0.0.0-20211124232001-ffb9472ec51a/go.mod h1:fFCTTBKvKcwTPFzjlcxp91uPFZr+JA0FubU4fLzzFYc=
k8s.io/client-go v0.0.0-20211124232522-ad95a77727e6 h1:bK1qYqtrsUEv1H6FoezselTNtfeZfYV9HxTN7J5ghLs=
k8s.io/client-go v0.0.0-20211124232522-ad95a77727e6/go.mod h1:OLO/3PqG5YcMPnn2OALBWiCvW3M/oEuV2hpW/SdUOQE=
k8s.io/code-generator v0.0.0-20211124231748-1685c0469510 h1:CclTIP6Dyimy8BFwH3oP3UU1+IAfmvDoAUG4FQa6q7s=
k8s.io/code-generator v0.0.0-20211124231748-1685c0469510/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/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=