Move protokube image task to ProtokubeBuilder

More logically consistent, and allows us to be lazier about loading
it when not needed.

nodeup/pkg/model/protokube.go

@@ -55,6 +55,15 @@ func (t *ProtokubeBuilder) Build(c *fi.ModelBuilderContext) error {
 		return nil
 	}
 
+	if protokubeImage := t.NodeupConfig.ProtokubeImage; protokubeImage != nil {
+		c.AddTask(&nodetasks.LoadImageTask{
+			Name:    "protokube",
+			Sources: protokubeImage.Sources,
+			Hash:    protokubeImage.Hash,
+			Runtime: t.Cluster.Spec.ContainerRuntime,
+		})
+	}
+
 	if t.IsMaster {
 		kubeconfig, err := t.BuildPKIKubeconfig("kops")
 		if err != nil {

upup/pkg/fi/nodeup/command.go

@@ -301,13 +301,7 @@ func (c *NodeUpCommand) Run(out io.Writer) error {
 			Runtime: c.cluster.Spec.ContainerRuntime,
 		}
 	}
-	if c.config.ProtokubeImage != nil {
-		taskMap["LoadImage.protokube"] = &nodetasks.LoadImageTask{
-			Sources: c.config.ProtokubeImage.Sources,
-			Hash:    c.config.ProtokubeImage.Hash,
-			Runtime: c.cluster.Spec.ContainerRuntime,
-		}
-	}
+	// Protokube load image task is in ProtokubeBuilder
 
 	var cloud fi.Cloud
 	var keyStore fi.Keystore

upup/pkg/fi/nodeup/nodetasks/load_image.go

@@ -40,6 +40,7 @@ const (
 
 // LoadImageTask is responsible for downloading a docker image
 type LoadImageTask struct {
+	Name    string
 	Sources []string
 	Hash    string
 	Runtime string
@@ -64,6 +65,16 @@ func (t *LoadImageTask) GetDependencies(tasks map[string]fi.Task) []fi.Task {
 	return deps
 }
 
+var _ fi.HasName = &LoadImageTask{}
+
+func (t *LoadImageTask) GetName() *string {
+	return t.Name
+}
+
+func (t *LoadImageTask) SetName(name string) {
+	klog.Fatalf("SetName not supported for LoadImageTask")
+}
+
 func (t *LoadImageTask) String() string {
 	return fmt.Sprintf("LoadImageTask: %v", t.Sources)
 }