Commit 9a5b4658 authored by k8s-merge-robot's avatar k8s-merge-robot

Merge pull request #23516 from zhouhaibing089/imagecheck_fix

Auto commit by PR queue bot
parents ab20b884 d27a30df
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment