From c280cf35c26a9b24525a695630cd15d1481b193d Mon Sep 17 00:00:00 2001 From: chrislovecnm Date: Sat, 22 Jul 2017 21:11:45 -0600 Subject: [PATCH] refactoring for tracking via assets container registry --- cmd/kops/update_cluster.go | 4 ++-- docs/cli/kops_update_cluster.md | 2 +- upup/pkg/fi/assettasks/copydockerimage.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/kops/update_cluster.go b/cmd/kops/update_cluster.go index d69fbf356e0dd..d1895b4381d25 100644 --- 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 index a9119e3396866..9316cb2f51ae3 100644 --- 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,auth,cluster,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 index e39bbfe631a16..0d574f117d895 100644 --- 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)