github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix e2e_node for changes to /api/compute/v0.beta package

pull/6/head
Nick Sardo 2017-08-17 10:29:58 -07:00
parent c5f672a0d5
commit a0e95f9475
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e_node/runner/remote/run_remote.go
View File

@ -369,7 +369,7 @@ func getImageMetadata(input string) *compute.Metadata {
val := v val := v
metadataItems = append(metadataItems, &compute.MetadataItems{ metadataItems = append(metadataItems, &compute.MetadataItems{
Key: k, Key: k,
Value: val, Value: &val,
}) })
} }
ret := compute.Metadata{Items: metadataItems} ret := compute.Metadata{Items: metadataItems}
@ -540,10 +540,11 @@ func createInstance(imageConfig *internalGCEImage) (string, error) {
for _, accelerator := range imageConfig.resources.Accelerators { for _, accelerator := range imageConfig.resources.Accelerators {
if i.GuestAccelerators == nil { if i.GuestAccelerators == nil {
autoRestart := true
i.GuestAccelerators = []*compute.AcceleratorConfig{} i.GuestAccelerators = []*compute.AcceleratorConfig{}
i.Scheduling = &compute.Scheduling{ i.Scheduling = &compute.Scheduling{
OnHostMaintenance: "TERMINATE", OnHostMaintenance: "TERMINATE",
AutomaticRestart: true, AutomaticRestart: &autoRestart,
} }
} }
aType := fmt.Sprintf(acceleratorTypeResourceFormat, *project, *zone, accelerator.Type) aType := fmt.Sprintf(acceleratorTypeResourceFormat, *project, *zone, accelerator.Type)
@ -627,7 +628,7 @@ func isCloudInitUsed(metadata *compute.Metadata) bool {
return false return false
} }
for _, item := range metadata.Items { for _, item := range metadata.Items {
if item.Key == "user-data" && strings.HasPrefix(item.Value, "#cloud-config") { if item.Key == "user-data" && item.Value != nil && strings.HasPrefix(*item.Value, "#cloud-config") {
return true return true
} }
} }