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

- fixing up the vetting errors found by the tests

This commit is contained in:
Rohith 2018-12-28 15:56:25 +00:00
parent d3badf6678
commit 684caa54e3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
upup/pkg/fi/cloudup/awstasks/launchconfiguration.go
View File

@ -459,7 +459,7 @@ func (t *LaunchConfiguration) buildRootDevice(cloud awsup.AWSCloud) (map[string]
if err != nil { if err != nil {
return nil, fmt.Errorf("unable to resolve image: %q: %v", image, err) return nil, fmt.Errorf("unable to resolve image: %q: %v", image, err)
} else if img == nil { } else if img == nil {
return nil, fmt.Errorf("unable to resolve image: %q: not found") return nil, fmt.Errorf("unable to resolve image: %q: not found", image)
} }
bm := make(map[string]*BlockDeviceMapping) bm := make(map[string]*BlockDeviceMapping)

4
upup/pkg/fi/cloudup/awstasks/launchtemplate.go
View File

@ -326,7 +326,7 @@ func (t *LaunchTemplate) findAllLaunchTemplatesVersions(c *fi.Context) ([]*ec2.L
cloud, ok := c.Cloud.(awsup.AWSCloud) cloud, ok := c.Cloud.(awsup.AWSCloud)
if !ok { if !ok {
return []*ec2.LaunchTemplateVersion{}, fmt.Errorf("invalid cloud provider: %v, expected: awsup.AWSCloud", c.Cloud, "awsup.AWSCloud)") return []*ec2.LaunchTemplateVersion{}, fmt.Errorf("invalid cloud provider: %v, expected: awsup.AWSCloud", c.Cloud)
} }
templates, err := t.findAllLaunchTemplates(c) templates, err := t.findAllLaunchTemplates(c)
@ -372,7 +372,7 @@ func (t *LaunchTemplate) buildRootDevice(cloud awsup.AWSCloud) (map[string]*Bloc
if err != nil { if err != nil {
return nil, fmt.Errorf("unable to resolve image: %q: %v", image, err) return nil, fmt.Errorf("unable to resolve image: %q: %v", image, err)
} else if img == nil { } else if img == nil {
return nil, fmt.Errorf("unable to resolve image: %q: not found") return nil, fmt.Errorf("unable to resolve image: %q: not found", image)
} }
bm := make(map[string]*BlockDeviceMapping) bm := make(map[string]*BlockDeviceMapping)