Merge pull request #82455 from AdheipSingh/patch-1

Update comment for syncHandler

Kubernetes-commit: ad0274fb6e506fb573cc3237ada871ea6dfc66fe
This commit is contained in:
Kubernetes Publisher 2019-10-16 22:25:06 -07:00
commit ab9e95689d
4 changed files with 13 additions and 13 deletions

6
Godeps/Godeps.json generated
View File

@ -368,15 +368,15 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "fbf594f18f80"
"Rev": "816a9b7df678"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "86f2f1b9c076"
"Rev": "b1267f8c42b4"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "bd505ee787b2"
"Rev": "14c42cd304d9"
},
{
"ImportPath": "k8s.io/code-generator",

View File

@ -284,7 +284,7 @@ func (c *Controller) syncHandler(key string) error {
}
// If the Deployment is not controlled by this Foo resource, we should log
// a warning to the event recorder and ret
// a warning to the event recorder and return error msg.
if !metav1.IsControlledBy(deployment, foo) {
msg := fmt.Sprintf(MessageResourceExists, deployment.Name)
c.recorder.Event(foo, corev1.EventTypeWarning, ErrResourceExists, msg)

12
go.mod
View File

@ -5,9 +5,9 @@ module k8s.io/sample-controller
go 1.12
require (
k8s.io/api v0.0.0-20191010143144-fbf594f18f80
k8s.io/apimachinery v0.0.0-20191016060620-86f2f1b9c076
k8s.io/client-go v0.0.0-20191014070654-bd505ee787b2
k8s.io/api v0.0.0-20191016225839-816a9b7df678
k8s.io/apimachinery v0.0.0-20191016225534-b1267f8c42b4
k8s.io/client-go v0.0.0-20191016230210-14c42cd304d9
k8s.io/code-generator v0.0.0-20191003035328-700b1226c0bd
k8s.io/klog v1.0.0
)
@ -20,8 +20,8 @@ replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d
k8s.io/api => k8s.io/api v0.0.0-20191010143144-fbf594f18f80
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191016060620-86f2f1b9c076
k8s.io/client-go => k8s.io/client-go v0.0.0-20191014070654-bd505ee787b2
k8s.io/api => k8s.io/api v0.0.0-20191016225839-816a9b7df678
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191016225534-b1267f8c42b4
k8s.io/client-go => k8s.io/client-go v0.0.0-20191016230210-14c42cd304d9
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191003035328-700b1226c0bd
)

6
go.sum
View File

@ -200,9 +200,9 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20191010143144-fbf594f18f80/go.mod h1:X3kixOyiuC4u4LU6y2BxLg5tsvw+hrMhstfga7LZ4Gw=
k8s.io/apimachinery v0.0.0-20191016060620-86f2f1b9c076/go.mod h1:92mWDd8Ji2sw2157KIgino5wCxffA8KSvhW2oY4ypdw=
k8s.io/client-go v0.0.0-20191014070654-bd505ee787b2/go.mod h1:ltlqKktkJqApstv/eMdrdx6j1zT39NpwqlWAH747iSM=
k8s.io/api v0.0.0-20191016225839-816a9b7df678/go.mod h1:LZQaT8MvVpl7Bg2lYFcQm7+Mpdxq8p1NFl3yh+5DCwY=
k8s.io/apimachinery v0.0.0-20191016225534-b1267f8c42b4/go.mod h1:92mWDd8Ji2sw2157KIgino5wCxffA8KSvhW2oY4ypdw=
k8s.io/client-go v0.0.0-20191016230210-14c42cd304d9/go.mod h1:ct8FBj9BiF4WYNmJoE+SiuhAgSrFs9cyTE7icW+iVr4=
k8s.io/code-generator v0.0.0-20191003035328-700b1226c0bd/go.mod h1:HC9p4y3SBN+txSs8x57qmNPXFZ/CxdCHiDTNnocCSEw=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=