kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactored to return err

This commit is contained in:
chrislovecnm 2017-10-19 13:13:16 -06:00
parent 4de78b0055
commit bc9df922f0
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nodeup/pkg/model/protokube.go
View File

@ -98,7 +98,10 @@ func (t *ProtokubeBuilder) buildSystemdService() (*nodetasks.Service, error) {
return nil, fmt.Errorf("unable to parse KubernetesVersion %q", t.Cluster.Spec.KubernetesVersion) 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) protokubeFlagsArgs, err := flagbuilder.BuildFlags(protokubeFlags)
if err != nil { if err != nil {
return nil, err return nil, err
@ -214,7 +217,7 @@ type ProtokubeFlags struct {
} }
// ProtokubeFlags is responsible for building the command line flags for protokube // 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 // @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 // lets keep that for another PR and allow the version change
imageVersion := t.Cluster.Spec.EtcdClusters[0].Version 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) assets := assets.NewAssetBuilder(t.Cluster.Spec.Assets)
remapped, err := assets.RemapImage(image) remapped, err := assets.RemapImage(image)
if err != nil { if err != nil {
glog.Errorf("unable to remap container %q: %v", image, err) return nil, fmt.Errorf("unable to remap container %q: %v", image, err)
glog.Errorf("using default %s", image)
} else { } else {
image = remapped image = remapped
} }
@ -319,7 +321,7 @@ func (t *ProtokubeBuilder) ProtokubeFlags(k8sVersion semver.Version) *ProtokubeF
f.ApplyTaints = fi.Bool(true) f.ApplyTaints = fi.Bool(true)
} }
return f return f, nil
} }
// ProtokubeEnvironmentVariables generates the environments variables for docker // ProtokubeEnvironmentVariables generates the environments variables for docker