Skip to content

K
k3s
Commit 9a5b4658 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #23516 from zhouhaibing089/imagecheck_fix

Auto commit by PR queue bot
parents ab20b884 d27a30df
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
pkg/kubectl/cmd/rollingupdate.go
View file @ 9a5b4658
...@@ -21,6 +21,7 @@ import ( ...@@ -21,6 +21,7 @@ import (
"fmt" "fmt"
"io" "io"
"os" "os"
"strings"
"time" "time"
"github.com/golang/glog" "github.com/golang/glog"
...@@ -246,7 +247,7 @@ func RunRollingUpdate(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, arg ...@@ -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) fmt.Fprintf(out, "Found existing update in progress (%s), resuming.\n", newRc.Name)
} else { } 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") 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) 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