refactoring for tracking via assets container registry

kubernetes · Aug 21, 2017 · 6071ce7 · 6071ce7
1 parent 7efb0f3
commit 6071ce7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/cmd/kops/update_cluster.go b/cmd/kops/update_cluster.go
@@ -109,7 +109,7 @@ func NewCmdUpdateCluster(f *util.Factory, out io.Writer) *cobra.Command {
 	cmd.Flags().StringVar(&options.SSHPublicKey, "ssh-public-key", options.SSHPublicKey, "SSH public key to use (deprecated: use kops create secret instead)")
 	cmd.Flags().StringVar(&options.OutDir, "out", options.OutDir, "Path to write any local output")
 	cmd.Flags().BoolVar(&options.CreateKubecfg, "create-kube-config", options.CreateKubecfg, "Will control automatically creating the kube config file on your local filesystem")
-	cmd.Flags().StringVar(&options.Phase, "phase", options.Phase, "Subset of tasks to run: " + strings.Join(cloudup.Phases.List(), ","))
+	cmd.Flags().StringVar(&options.Phase, "phase", options.Phase, "Subset of tasks to run: "+strings.Join(cloudup.Phases.List(), ","))
 	return cmd
 }
 
@@ -187,7 +187,7 @@ func RunUpdateCluster(f *util.Factory, clusterName string, out io.Writer, c *Upd
 		case string(cloudup.PhaseCluster):
 			phase = cloudup.PhaseCluster
 		default:
-			return fmt.Errorf("unknown phase %q, available phases: %s", c.Phase,strings.Join(cloudup.Phases.List(),","))
+			return fmt.Errorf("unknown phase %q, available phases: %s", c.Phase, strings.Join(cloudup.Phases.List(), ","))
 		}
 	}
 

diff --git a/docs/cli/kops_update_cluster.md b/docs/cli/kops_update_cluster.md
@@ -29,7 +29,7 @@ kops update cluster
       --create-kube-config      Will control automatically creating the kube config file on your local filesystem (default true)
       --model string            Models to apply (separate multiple models with commas) (default "config,proto,cloudup")
       --out string              Path to write any local output
-      --phase string            Subset of tasks to run
+      --phase string            Subset of tasks to run: assets,cluster,iam,network
       --ssh-public-key string   SSH public key to use (deprecated: use kops create secret instead)
       --target string           Target - direct, terraform, cloudformation (default "direct")
       --yes                     Actually create cloud resources

diff --git a/upup/pkg/fi/assettasks/copydockerimage.go b/upup/pkg/fi/assettasks/copydockerimage.go
@@ -135,7 +135,7 @@ func (_ *CopyDockerImage) Render(c *fi.Context, a, e, changes *CopyDockerImage)
 	}
 	sourceImage, err := api.findImage(source)
 	if err != nil {
-		return err
+		return fmt.Errorf("error finding image %q: %v", source, err)
 	}
 	if sourceImage == nil {
 		return fmt.Errorf("source image %q not found", source)