mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 14:37:00 +00:00
Set the project when creating/destroying pd disks.
This commit is contained in:
parent
c4d040c720
commit
3a2e20307f
@ -193,7 +193,7 @@ func createPD() (string, error) {
|
||||
|
||||
zone := testContext.CloudConfig.Zone
|
||||
// TODO: make this hit the compute API directly instread of shelling out to gcloud.
|
||||
err := exec.Command("gcloud", "compute", "disks", "create", "--zone="+zone, "--size=10GB", pdName).Run()
|
||||
err := exec.Command("gcloud", "compute", "--project="+testContext.CloudConfig.ProjectID, "disks", "create", "--zone="+zone, "--size=10GB", pdName).Run()
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
@ -214,7 +214,7 @@ func deletePD(pdName string) error {
|
||||
zone := testContext.CloudConfig.Zone
|
||||
|
||||
// TODO: make this hit the compute API directly.
|
||||
return exec.Command("gcloud", "compute", "disks", "delete", "--zone="+zone, pdName).Run()
|
||||
return exec.Command("gcloud", "compute", "--project="+testContext.CloudConfig.ProjectID, "disks", "delete", "--zone="+zone, pdName).Run()
|
||||
} else {
|
||||
volumes, ok := testContext.CloudConfig.Provider.(aws_cloud.Volumes)
|
||||
if !ok {
|
||||
@ -231,7 +231,7 @@ func detachPD(hostName, pdName string) error {
|
||||
zone := testContext.CloudConfig.Zone
|
||||
|
||||
// TODO: make this hit the compute API directly.
|
||||
return exec.Command("gcloud", "compute", "instances", "detach-disk", "--zone="+zone, "--disk="+pdName, instanceName).Run()
|
||||
return exec.Command("gcloud", "compute", "--project="+testContext.CloudConfig.ProjectID, "detach-disk", "--zone="+zone, "--disk="+pdName, instanceName).Run()
|
||||
} else {
|
||||
volumes, ok := testContext.CloudConfig.Provider.(aws_cloud.Volumes)
|
||||
if !ok {
|
||||
|
Loading…
Reference in New Issue
Block a user