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

Merge pull request #16 from justinsb/upup_image_url 

upup: Map GCE image-url to string consistently
This commit is contained in:
Mike Danese 2016-05-17 09:33:02 -07:00
parent 3703ecedc8 5a61c35052
commit 5aa64c72a6
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
upup/pkg/fi/cloudup/gcetasks/instance.go
View File

@ -59,7 +59,6 @@ func (e *Instance) Find(c *fi.Context) (*Instance, error) {
actual.Zone = fi.String(lastComponent(r.Zone))
actual.MachineType = fi.String(lastComponent(r.MachineType))
actual.CanIPForward = &r.CanIpForward
actual.Image = &r.Disks[0].Source
if r.Scheduling != nil {
actual.Preemptible = &r.Scheduling.Preemptible
@ -101,13 +100,13 @@ func (e *Instance) Find(c *fi.Context) (*Instance, error) {
return nil, fmt.Errorf("disk not found %q: %v", source, err)
}
return nil, fmt.Errorf("error querying for disk %q: %v", source, err)
} else {
imageURL, err := gce.ParseGoogleCloudURL(d.SourceImage)
if err != nil {
return nil, fmt.Errorf("unable to parse image URL: %q", d.SourceImage)
}
actual.Image = fi.String(imageURL.Project + "/" + imageURL.Name)
}
image, err := ShortenImageURL(cloud.Project, d.SourceImage)
if err != nil {
return nil, fmt.Errorf("error parsing source image URL: %v", err)
}
actual.Image = fi.String(image)
} else {
url, err := gce.ParseGoogleCloudURL(disk.Source)
if err != nil {
@ -344,12 +343,16 @@ func BuildImageURL(defaultProject, nameSpec string) string {
return fmt.Sprintf("https://www.googleapis.com/compute/v1/projects/%s/global/images/%s", project, name)
}
func ShortenImageURL(imageURL string) (string, error) {
func ShortenImageURL(defaultProject string, imageURL string) (string, error) {
u, err := gce.ParseGoogleCloudURL(imageURL)
if err != nil {
return "", err
}
return u.Project + "/" + u.Name, nil
if u.Project == defaultProject {
return u.Name, nil
} else {
return u.Project + "/" + u.Name, nil
}
}
func (_ *Instance) RenderTerraform(t *terraform.TerraformTarget, a, e, changes *Instance) error {

2
upup/pkg/fi/cloudup/gcetasks/instance_template.go
View File

@ -60,7 +60,7 @@ func (e *InstanceTemplate) Find(c *fi.Context) (*InstanceTemplate, error) {
actual.MachineType = fi.String(lastComponent(p.MachineType))
actual.CanIPForward = &p.CanIpForward
bootDiskImage, err := ShortenImageURL(p.Disks[0].InitializeParams.SourceImage)
bootDiskImage, err := ShortenImageURL(cloud.Project, p.Disks[0].InitializeParams.SourceImage)
if err != nil {
return nil, fmt.Errorf("error parsing source image URL: %v", err)
}