From bc9df922f08055acb87a722befce7dd5231569a5 Mon Sep 17 00:00:00 2001 From: chrislovecnm Date: Thu, 19 Oct 2017 13:13:16 -0600 Subject: [PATCH] refactored to return err --- nodeup/pkg/model/protokube.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/nodeup/pkg/model/protokube.go b/nodeup/pkg/model/protokube.go index 4a6be3ec41..e31ac4a046 100644 --- a/nodeup/pkg/model/protokube.go +++ b/nodeup/pkg/model/protokube.go @@ -98,7 +98,10 @@ func (t *ProtokubeBuilder) buildSystemdService() (*nodetasks.Service, error) { return nil, fmt.Errorf("unable to parse KubernetesVersion %q", t.Cluster.Spec.KubernetesVersion) } - protokubeFlags := t.ProtokubeFlags(*k8sVersion) + protokubeFlags, err := t.ProtokubeFlags(*k8sVersion) + if err != nil { + return nil, err + } protokubeFlagsArgs, err := flagbuilder.BuildFlags(protokubeFlags) if err != nil { return nil, err @@ -214,7 +217,7 @@ type ProtokubeFlags struct { } // ProtokubeFlags is responsible for building the command line flags for protokube -func (t *ProtokubeBuilder) ProtokubeFlags(k8sVersion semver.Version) *ProtokubeFlags { +func (t *ProtokubeBuilder) ProtokubeFlags(k8sVersion semver.Version) (*ProtokubeFlags, error) { // @todo: i think we should allow the user to override the source of the image, but for now // lets keep that for another PR and allow the version change imageVersion := t.Cluster.Spec.EtcdClusters[0].Version @@ -244,8 +247,7 @@ func (t *ProtokubeBuilder) ProtokubeFlags(k8sVersion semver.Version) *ProtokubeF assets := assets.NewAssetBuilder(t.Cluster.Spec.Assets) remapped, err := assets.RemapImage(image) if err != nil { - glog.Errorf("unable to remap container %q: %v", image, err) - glog.Errorf("using default %s", image) + return nil, fmt.Errorf("unable to remap container %q: %v", image, err) } else { image = remapped } @@ -319,7 +321,7 @@ func (t *ProtokubeBuilder) ProtokubeFlags(k8sVersion semver.Version) *ProtokubeF f.ApplyTaints = fi.Bool(true) } - return f + return f, nil } // ProtokubeEnvironmentVariables generates the environments variables for docker