diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 33f0aed6..0e3cd593 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -368,19 +368,19 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "fb749d2f1064" + "Rev": "21721929cffa" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "461753078381" + "Rev": "344bcc0201c9" }, { "ImportPath": "k8s.io/client-go", - "Rev": "67a413f31aea" + "Rev": "6f3bc4ba9215" }, { "ImportPath": "k8s.io/code-generator", - "Rev": "732c9ca86353" + "Rev": "ebc0eb3a5c23" }, { "ImportPath": "k8s.io/gengo", diff --git a/controller_test.go b/controller_test.go index b24d87ed..c6f103da 100644 --- a/controller_test.go +++ b/controller_test.go @@ -175,8 +175,8 @@ func checkAction(expected, actual core.Action, t *testing.T) { } switch a := actual.(type) { - case core.CreateAction: - e, _ := expected.(core.CreateAction) + case core.CreateActionImpl: + e, _ := expected.(core.CreateActionImpl) expObject := e.GetObject() object := a.GetObject() @@ -184,8 +184,8 @@ func checkAction(expected, actual core.Action, t *testing.T) { t.Errorf("Action %s %s has wrong object\nDiff:\n %s", a.GetVerb(), a.GetResource().Resource, diff.ObjectGoPrintSideBySide(expObject, object)) } - case core.UpdateAction: - e, _ := expected.(core.UpdateAction) + case core.UpdateActionImpl: + e, _ := expected.(core.UpdateActionImpl) expObject := e.GetObject() object := a.GetObject() @@ -193,8 +193,8 @@ func checkAction(expected, actual core.Action, t *testing.T) { t.Errorf("Action %s %s has wrong object\nDiff:\n %s", a.GetVerb(), a.GetResource().Resource, diff.ObjectGoPrintSideBySide(expObject, object)) } - case core.PatchAction: - e, _ := expected.(core.PatchAction) + case core.PatchActionImpl: + e, _ := expected.(core.PatchActionImpl) expPatch := e.GetPatch() patch := a.GetPatch() @@ -202,6 +202,9 @@ func checkAction(expected, actual core.Action, t *testing.T) { t.Errorf("Action %s %s has wrong patch\nDiff:\n %s", a.GetVerb(), a.GetResource().Resource, diff.ObjectGoPrintSideBySide(expPatch, patch)) } + default: + t.Errorf("Uncaptured Action %s %s, you should explicitly add a case to capture it", + actual.GetVerb(), actual.GetResource().Resource) } } diff --git a/go.mod b/go.mod index e716777e..690f9ad8 100644 --- a/go.mod +++ b/go.mod @@ -5,10 +5,10 @@ module k8s.io/sample-controller go 1.12 require ( - k8s.io/api v0.0.0-20190905160310-fb749d2f1064 - k8s.io/apimachinery v0.0.0-20190831074630-461753078381 - k8s.io/client-go v0.0.0-20190906195228-67a413f31aea - k8s.io/code-generator v0.0.0-20190831074504-732c9ca86353 + k8s.io/api v0.0.0-20190913080256-21721929cffa + k8s.io/apimachinery v0.0.0-20190913075813-344bcc0201c9 + k8s.io/client-go v0.0.0-20190913080825-6f3bc4ba9215 + k8s.io/code-generator v0.0.0-20190912042602-ebc0eb3a5c23 k8s.io/klog v0.4.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-20190905160310-fb749d2f1064 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190831074630-461753078381 - k8s.io/client-go => k8s.io/client-go v0.0.0-20190906195228-67a413f31aea - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190831074504-732c9ca86353 + k8s.io/api => k8s.io/api v0.0.0-20190913080256-21721929cffa + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190913075813-344bcc0201c9 + k8s.io/client-go => k8s.io/client-go v0.0.0-20190913080825-6f3bc4ba9215 + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190912042602-ebc0eb3a5c23 ) diff --git a/go.sum b/go.sum index 011ce120..216b714b 100644 --- a/go.sum +++ b/go.sum @@ -198,10 +198,10 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/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-20190905160310-fb749d2f1064/go.mod h1:u09ZxrpPFcoUNEQM2GsqT/KpglKAtXdEcK+tSMilQ3Q= -k8s.io/apimachinery v0.0.0-20190831074630-461753078381/go.mod h1:nL6pwRT8NgfF8TT68DBI8uEePRt89cSvoXUVqbkWHq4= -k8s.io/client-go v0.0.0-20190906195228-67a413f31aea/go.mod h1:xIjk2+YAazaE3BA0+nCwEMFulHzcgsrvtlVWwDkcMhI= -k8s.io/code-generator v0.0.0-20190831074504-732c9ca86353/go.mod h1:V5BD6M4CyaN5m+VthcclXWsVcT1Hu+glwa1bi3MIsyE= +k8s.io/api v0.0.0-20190913080256-21721929cffa/go.mod h1:jESdJL4e7Q+sDnEXOZ1ysc1WBxR4I34RbRh5QqGT9kQ= +k8s.io/apimachinery v0.0.0-20190913075813-344bcc0201c9/go.mod h1:nL6pwRT8NgfF8TT68DBI8uEePRt89cSvoXUVqbkWHq4= +k8s.io/client-go v0.0.0-20190913080825-6f3bc4ba9215/go.mod h1:ddfKnJLw9jMVEyLoHvuRM6Hf+31OewExnmZ1rlmrTaM= +k8s.io/code-generator v0.0.0-20190912042602-ebc0eb3a5c23/go.mod h1:V5BD6M4CyaN5m+VthcclXWsVcT1Hu+glwa1bi3MIsyE= 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= k8s.io/gengo v0.0.0-20190822140433-26a664648505 h1:ZY6yclUKVbZ+SdWnkfY+Je5vrMpKOxmGeKRbsXVmqYM=