From 0335f1c2cdf0977852b790fff465992470a91f70 Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Mon, 4 Apr 2016 18:36:02 -0700 Subject: [PATCH] Revert "rolling update will check whether the image is distinct or not, however the image with tag latest should be excluded" This reverts commit d27a30df2917b26991918d0658dfdc2fb580810e. --- pkg/kubectl/cmd/rollingupdate.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/kubectl/cmd/rollingupdate.go b/pkg/kubectl/cmd/rollingupdate.go index b6956e9cf9e..cdc8b44d86c 100644 --- a/pkg/kubectl/cmd/rollingupdate.go +++ b/pkg/kubectl/cmd/rollingupdate.go @@ -21,7 +21,6 @@ import ( "fmt" "io" "os" - "strings" "time" "github.com/golang/glog" @@ -249,7 +248,7 @@ func RunRollingUpdate(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, arg } fmt.Fprintf(out, "Found existing update in progress (%s), resuming.\n", newRc.Name) } else { - if oldRc.Spec.Template.Spec.Containers[0].Image == image && !strings.HasSuffix(image, ":latest") { + if oldRc.Spec.Template.Spec.Containers[0].Image == image { return cmdutil.UsageError(cmd, "Specified --image must be distinct from existing container image") } newRc, err = kubectl.CreateNewControllerFromCurrentController(client, codec, cmdNamespace, oldName, newName, image, container, deploymentKey)