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

Merge pull request #99040 from apelisse/update-smd-1.19

Browse Source 
Update sigs.k8s.io/structured-merge-diff to v4.0.3

Kubernetes-commit: 3303966843e96f6c6a85d3492ab79f1499989eda
This commit is contained in:
Kubernetes Publisher 2021-03-25 01:57:29 -07:00
parent a36420259b
commit fbb37b1470
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Godeps/Godeps.json generated
View File

@ -444,15 +444,15 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "2d800ca79443"
"Rev": "83a267c7608c"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "4440c6847dae"
"Rev": "6d69a3e60ee7"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "e9b0f31f935b"
"Rev": "53d96299a20a"
},
{
"ImportPath": "k8s.io/code-generator",
@ -480,7 +480,7 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/v4",
"Rev": "v4.0.1"
"Rev": "v4.0.3"
},
{
"ImportPath": "sigs.k8s.io/yaml",

17
go.mod
View File

@ -5,17 +5,16 @@ module k8s.io/sample-controller
go 1.15
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-20210325111313-83a267c7608c
k8s.io/apimachinery v0.0.0-20210325110524-6d69a3e60ee7
k8s.io/client-go v0.0.0-20210325113035-53d96299a20a
k8s.io/code-generator v0.0.0-20210303091755-6539861c3c48
k8s.io/klog/v2 v2.2.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-20210325111313-83a267c7608c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210325110524-6d69a3e60ee7
k8s.io/client-go => k8s.io/client-go v0.0.0-20210325113035-53d96299a20a
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210303091755-6539861c3c48
)

4
go.sum
View File

@ -347,6 +347,10 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/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=
k8s.io/api v0.0.0-20210325111313-83a267c7608c/go.mod h1:1DpU1b3N0Yzraj30FrBPrxCDWfvjktX1dY26K1fpHLQ=
k8s.io/apimachinery v0.0.0-20210325110524-6d69a3e60ee7/go.mod h1:VEnBy6MjLOiOk/toGgJUL7R55GwMclsrEL3UnsHfn5Y=
k8s.io/client-go v0.0.0-20210325113035-53d96299a20a/go.mod h1:jF80L+0gFc/LFxW+CbF0qmk+PTY7fb31gEuT7CPnU68=
k8s.io/code-generator v0.0.0-20210303091755-6539861c3c48/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14 h1:t4L10Qfx/p7ASH3gXCdIUtPbbIuegCoUJf3TMSFekjw=
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=