From 45aaff999392a1b861b075c724115ed2ba4c7de3 Mon Sep 17 00:00:00 2001
From: Joe Beda <joe.github@bedafamily.com>
Date: Wed, 20 Aug 2014 10:48:17 -0700
Subject: [PATCH] Add template update to rollingUpdate

---
 cmd/kubecfg/kubecfg.go |  6 ++++--
 pkg/kubecfg/kubecfg.go | 12 +++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/cmd/kubecfg/kubecfg.go b/cmd/kubecfg/kubecfg.go
index f93f18e1e7..63793a6806 100644
--- a/cmd/kubecfg/kubecfg.go
+++ b/cmd/kubecfg/kubecfg.go
@@ -55,6 +55,7 @@ var (
 	www           = flag.String("www", "", "If -proxy is true, use this directory to serve static files")
 	templateFile  = flag.String("template_file", "", "If present, load this file as a golang template and use it for output printing")
 	templateStr   = flag.String("template", "", "If present, parse this string as a golang template and use it for output printing")
+	imageName     = flag.String("image", "", "Image used when updating a replicationController")
 )
 
 var parser = kubecfg.NewParser(map[string]interface{}{
@@ -72,7 +73,8 @@ func usage() {
 
   Manage replication controllers:
   kubecfg [OPTIONS] stop|rm|rollingupdate <controller>
-  kubecfg [OPTIONS] run <image> <replicas> <controller>
+  kubecfg [OPTIONS] [-u <time>] [-image image] rollingupdate <controller>
+  kubecfg [OPTIONS] [-p <port spec>] run <image> <replicas> <controller>
   kubecfg [OPTIONS] resize <controller> <replicas>
 
   Options:
@@ -337,7 +339,7 @@ func executeControllerRequest(method string, c *client.Client) bool {
 	case "rm":
 		err = kubecfg.DeleteController(parseController(), c)
 	case "rollingupdate":
-		err = kubecfg.Update(parseController(), c, *updatePeriod)
+		err = kubecfg.Update(parseController(), c, *updatePeriod, *imageName)
 	case "run":
 		if len(flag.Args()) != 4 {
 			glog.Fatal("usage: kubecfg [OPTIONS] run <image> <replicas> <controller>")
diff --git a/pkg/kubecfg/kubecfg.go b/pkg/kubecfg/kubecfg.go
index dce07c30b7..3dffc12b26 100644
--- a/pkg/kubecfg/kubecfg.go
+++ b/pkg/kubecfg/kubecfg.go
@@ -78,11 +78,21 @@ func LoadAuthInfo(path string, r io.Reader) (*client.AuthInfo, error) {
 // 'name' points to a replication controller.
 // 'client' is used for updating pods.
 // 'updatePeriod' is the time between pod updates.
-func Update(name string, client client.Interface, updatePeriod time.Duration) error {
+// 'imageName' is the new image to update to the template
+func Update(name string, client client.Interface, updatePeriod time.Duration, imageName string) error {
 	controller, err := client.GetReplicationController(name)
 	if err != nil {
 		return err
 	}
+
+	if len(imageName) != 0 {
+		controller.DesiredState.PodTemplate.DesiredState.Manifest.Containers[0].Image = imageName
+		controller, err = client.UpdateReplicationController(controller)
+		if err != nil {
+			return err
+		}
+	}
+
 	s := labels.Set(controller.DesiredState.ReplicaSelector).AsSelector()
 
 	podList, err := client.ListPods(s)