kubernetes
/
kube-controller-manager
mirror of https://github.com/kubernetes/kube-controller-manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #93901 from jpbetz/atomic-structs 

Treat LabelSelectors as atomic by Server Side Apply to fix #92913

Kubernetes-commit: 90c9f7b3e198e82a756a68ffeac978a00d606e55
This commit is contained in:
Kubernetes Publisher 2020-10-03 15:53:05 -07:00
parent 27d8748ad2
commit f0dde58895
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Godeps/Godeps.json generated
View File

@ -544,19 +544,19 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "52bf62410745"
"Rev": "18112a7b933b"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "714f1137f89b"
"Rev": "10b38829b621"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "cba7285b7f29"
"Rev": "758467711e07"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "c985e940ef8f"
"Rev": "609bde980a40"
},
{
"ImportPath": "k8s.io/gengo",
@ -568,7 +568,7 @@
},
{
"ImportPath": "k8s.io/kube-openapi",
"Rev": "6aeccd4b50c6"
"Rev": "8b5066479488"
},
{
"ImportPath": "k8s.io/utils",
@ -580,7 +580,7 @@
},
{
"ImportPath": "sigs.k8s.io/structured-merge-diff/v4",
"Rev": "v4.0.1"
"Rev": "b3cf1e8ff931"
},
{
"ImportPath": "sigs.k8s.io/yaml",

13
go.mod
View File

@ -5,14 +5,13 @@ module k8s.io/kube-controller-manager
go 1.15
require (
k8s.io/apimachinery v0.0.0
k8s.io/component-base v0.0.0
k8s.io/apimachinery v0.0.0-20201003235655-10b38829b621
k8s.io/component-base v0.0.0-20201004000625-609bde980a40
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/client-go => ../client-go
k8s.io/component-base => ../component-base
k8s.io/kube-controller-manager => ../kube-controller-manager
k8s.io/api => k8s.io/api v0.0.0-20201003235837-18112a7b933b
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201003235655-10b38829b621
k8s.io/client-go => k8s.io/client-go v0.0.0-20201004000108-758467711e07
k8s.io/component-base => k8s.io/component-base v0.0.0-20201004000625-609bde980a40
)

4
go.sum
View File

@ -349,6 +349,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-20201003235837-18112a7b933b/go.mod h1:aE9OxkIvJAf55JfJy/0UlrF0nZT2ZDhmsWnNzhbAySI=
k8s.io/apimachinery v0.0.0-20201003235655-10b38829b621/go.mod h1:6s3VNb000AUbBIxR7q3WHlbBwfpEGqIJsCG5gIX+0LI=
k8s.io/client-go v0.0.0-20201004000108-758467711e07/go.mod h1:zltjMDhkwCKG2AvwcACaWC+fwiTEB0qElpbFMvxx+/g=
k8s.io/component-base v0.0.0-20201004000625-609bde980a40/go.mod h1:WUOeHeahPXuwTMTTZxsAJUyXuIRVbvgNTCVvlzwewJU=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=