Skip to content

fix(gcp): disk tag with server #1077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 18, 2024
Merged

fix(gcp): disk tag with server #1077

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 8 additions & 23 deletions pkg/multicloud/google/instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,13 +576,20 @@ func (region *SRegion) _createVM(zone string, desc *cloudprovider.SManagedVMCrea
name = pinyinutils.Text2Pinyin(name)
return strings.ToLower(name)
}

labels := map[string]string{}
for k, v := range desc.Tags {
labels[encode.EncodeGoogleLabel(k)] = encode.EncodeGoogleLabel(v)
}

disks = append(disks, map[string]interface{}{
"boot": true,
"initializeParams": map[string]interface{}{
"diskName": nameConv(desc.SysDisk.Name),
"sourceImage": desc.ExternalImageId,
"diskSizeGb": desc.SysDisk.SizeGB,
"diskType": fmt.Sprintf("zones/%s/diskTypes/%s", zone, desc.SysDisk.StorageType),
"labels": labels,
},
"autoDelete": true,
})
Expand All @@ -596,6 +603,7 @@ func (region *SRegion) _createVM(zone string, desc *cloudprovider.SManagedVMCrea
"diskName": nameConv(disk.Name),
"diskSizeGb": disk.SizeGB,
"diskType": fmt.Sprintf("zones/%s/diskTypes/%s", zone, disk.StorageType),
"labels": labels,
},
"autoDelete": true,
})
Expand All @@ -617,11 +625,6 @@ func (region *SRegion) _createVM(zone string, desc *cloudprovider.SManagedVMCrea
"disks": disks,
}

labels := map[string]string{}
for k, v := range desc.Tags {
labels[encode.EncodeGoogleLabel(k)] = encode.EncodeGoogleLabel(v)
}

if len(labels) > 0 {
params["labels"] = labels
}
Expand Down Expand Up @@ -649,24 +652,6 @@ func (region *SRegion) _createVM(zone string, desc *cloudprovider.SManagedVMCrea
},
}
}
//if len(serviceAccounts) > 0 {
// params["serviceAccounts"] = []struct {
// Email string
// Scopes []string
// }{
// {
// Email: serviceAccounts[0],
// Scopes: []string{
// "https://www.googleapis.com/auth/devstorage.read_only",
// "https://www.googleapis.com/auth/logging.write",
// "https://www.googleapis.com/auth/monitoring.write",
// "https://www.googleapis.com/auth/servicecontrol",
// "https://www.googleapis.com/auth/service.management.readonly",
// "https://www.googleapis.com/auth/trace.append",
// },
// },
// }
//}
log.Debugf("create google instance params: %s", jsonutils.Marshal(params).String())
instance := &SInstance{}
resource := fmt.Sprintf("zones/%s/instances", zone)
Expand Down
Loading