setting up etcd to use asset builder for its container

nodeup/pkg/model/BUILD.bazel

@@ -35,6 +35,7 @@ go_library(
         "//pkg/apis/kops:go_default_library",
         "//pkg/apis/kops/util:go_default_library",
         "//pkg/apis/nodeup:go_default_library",
+        "//pkg/assets:go_default_library",
         "//pkg/dns:go_default_library",
         "//pkg/flagbuilder:go_default_library",
         "//pkg/k8scodecs:go_default_library",

nodeup/pkg/model/protokube.go

@@ -34,6 +34,7 @@ import (
 
 	"github.com/blang/semver"
 	"github.com/golang/glog"
+	"k8s.io/kops/pkg/assets"
 )
 
 // ProtokubeBuilder configures protokube
@@ -219,11 +220,23 @@ func (t *ProtokubeBuilder) ProtokubeFlags(k8sVersion semver.Version) *ProtokubeF
 	f := &ProtokubeFlags{
 		Channels:      t.NodeupConfig.Channels,
 		Containerized: fi.Bool(true),
-		EtcdImage:     s(fmt.Sprintf("gcr.io/google_containers/etcd:%s", imageVersion)),
 		LogLevel:      fi.Int32(4),
 		Master:        b(t.IsMaster),
 	}
 
+	// TODO this is dupicate code with etcd model
+	image := fmt.Sprintf("gcr.io/google_containers/etcd:%s", imageVersion)
+	assets := assets.NewAssetBuilder(nil)
+	remapped, err := assets.RemapImage(image)
+	if err != nil {
+		glog.Errorf("unable to remap container %q: %v", image, err)
+		glog.Errorf("using default %s", image)
+	} else {
+		image = remapped
+	}
+
+	f.EtcdImage = s(image)
+
 	// initialize rbac on Kubernetes >= 1.6 and master
 	if k8sVersion.Major == 1 && k8sVersion.Minor >= 6 {
 		f.InitializeRBAC = fi.Bool(true)

pkg/model/components/etcd.go

@@ -17,6 +17,8 @@ limitations under the License.
 package components
 
 import (
+	"fmt"
+
 	"k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/upup/pkg/fi/loader"
 )
@@ -32,13 +34,31 @@ var _ loader.OptionsBuilder = &EtcdOptionsBuilder{}
 func (b *EtcdOptionsBuilder) BuildOptions(o interface{}) error {
 	spec := o.(*kops.ClusterSpec)
 
+	imageVersion := ""
 	// @check the version are set and if not preset the defaults
 	for _, x := range spec.EtcdClusters {
 		// @TODO if nothing is set, set the defaults. At a late date once we have a way of detecting a 'new' cluster
 		// we can default all clusters to v3
 		if x.Version == "" {
 			x.Version = "2.2.1"
 		}
+
+		if imageVersion != "" {
+			if imageVersion != x.Version {
+				return fmt.Errorf("you cannot have two different versions of etcd %q and %q set", x.Version, imageVersion)
+			}
+		} else {
+			imageVersion = x.Version
+		}
+	}
+
+	// TODO we do not have a API place to put this.  Do we use version or get another
+	// TODO API value?
+	// TODO code is duplicated in nodeup
+	image := fmt.Sprintf("gcr.io/google_containers/etcd:%s", imageVersion)
+	image, err := b.Context.AssetBuilder.RemapImage(image)
+	if err != nil {
+		return fmt.Errorf("unable to remap container %q: %v", image, err)
 	}
 
 	return nil