rolling update will check whether the image is distinct or not, however the image with tag latest should be excluded

This commit is contained in:
zhouhaibing089 2016-03-26 10:53:40 +08:00 committed by haibzhou
parent e9b93249dc
commit d27a30df29

View File

@ -21,6 +21,7 @@ import (
"fmt"
"io"
"os"
"strings"
"time"
"github.com/golang/glog"
@ -246,7 +247,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 {
if oldRc.Spec.Template.Spec.Containers[0].Image == image && !strings.HasSuffix(image, ":latest") {
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)