github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 05:21:58 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhouhaibing089 2016-03-26 10:53:40 +08:00 committed by haibzhou
parent e9b93249dc
commit d27a30df29
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubectl/cmd/rollingupdate.go
View File

@ -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
} }
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)