github/sample-controller
github/sample-controller
3
0
Fork 0
mirror of https://github.com/kubernetes/sample-controller.git synced 2024-10-05 15:25:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #92661 from jpbetz/smd-bump-field-unsetting

Browse Source 
Bump to SMD PR#166 to pick up unsetting field changes and add integration tests

Kubernetes-commit: 49dced762da7bc9f74474e9f8f3efe198ff46767
This commit is contained in:
Kubernetes Publisher 2020-07-10 15:41:05 -07:00
parent 9a2e3dc43f
commit 78a9bef8d5
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Godeps/Godeps.json generated
View File

@ -440,19 +440,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "02047b7ecbbf"
"Rev": "67a68481e276"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "106aebdc1c0a"
"Rev": "9894919f2c6e"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "5ab99756f65d"
"Rev": "2cf22cd48886"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "850155609be4"
"Rev": "585bb4eea8d5"
},
{
"ImportPath": "k8s.io/gengo",
@ -476,7 +476,7 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/v3",
"Rev": "v3.0.0"
"Rev": "43c19bbb7fba"
},
{
"ImportPath": "sigs.k8s.io/yaml",

17
go.mod
View File

@ -5,17 +5,16 @@ module k8s.io/sample-controller
go 1.13
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-20200711010759-67a68481e276
k8s.io/apimachinery v0.0.0-20200711010416-9894919f2c6e
k8s.io/client-go v0.0.0-20200711011221-2cf22cd48886
k8s.io/code-generator v0.0.0-20200711010124-585bb4eea8d5
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-20200711010759-67a68481e276
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200711010416-9894919f2c6e
k8s.io/client-go => k8s.io/client-go v0.0.0-20200711011221-2cf22cd48886
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200711010124-585bb4eea8d5
)

4
go.sum
View File

@ -345,6 +345,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-20200711010759-67a68481e276/go.mod h1:x0ZnvSZqabCH9lfDzYQVDUpIhJCLTnfTXruGmRCMI+A=
k8s.io/apimachinery v0.0.0-20200711010416-9894919f2c6e/go.mod h1:o7dnTWWI581t2mphuLR3towX6xooze3sUXgNRWLd3Cw=
k8s.io/client-go v0.0.0-20200711011221-2cf22cd48886/go.mod h1:mJ5QM6XxIYuYeeaY6zDQpe7goQeLuOInhDAjeE7JxJg=
k8s.io/code-generator v0.0.0-20200711010124-585bb4eea8d5/go.mod h1:9w314dZncjv/zcv1Qvm7eXiAW3bh6BgMUrhZSSpdMgM=
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=