Merge pull request #3232 from KashifSaadat/cluster-upgrade-persist-custom-image

Automatic merge from submit-queue

Don't force ig image change on cluster upgrade if it is custom.

Fixes #3160

cmd/kops/upgrade_cluster.go

@@ -19,6 +19,7 @@ package main
 import (
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/blang/semver"
 	"github.com/golang/glog"
@@ -204,17 +205,21 @@ func (c *UpgradeClusterCmd) Run(args []string) error {
 			glog.Warningf("No matching images specified in channel; cannot prompt for upgrade")
 		} else {
 			for _, ig := range instanceGroups {
-				if ig.Spec.Image != image.Name {
+				if strings.Contains(ig.Spec.Image, "kope.io") {
-					target := ig
+					if ig.Spec.Image != image.Name {
-					actions = append(actions, &upgradeAction{
+						target := ig
-						Item:     "InstanceGroup/" + target.ObjectMeta.Name,
+						actions = append(actions, &upgradeAction{
-						Property: "Image",
+							Item:     "InstanceGroup/" + target.ObjectMeta.Name,
-						Old:      target.Spec.Image,
+							Property: "Image",
-						New:      image.Name,
+							Old:      target.Spec.Image,
-						apply: func() {
+							New:      image.Name,
-							target.Spec.Image = image.Name
+							apply: func() {
-						},
+								target.Spec.Image = image.Name
-					})
+							},
+						})
+					}
+				} else {
+					glog.Infof("Custom image (%s) has been provided for Instance Group %q; not updating image", ig.Spec.Image, ig.GetName())
 				}
 			}
 		}