github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32084 from jsafrane/create-zone-check

Browse Source 
Automatic merge from submit-queue

Do not allow creation of GCE PDs in unmanaged zones.

Such volumes then couldn't be deleted as `getDiskByNameUnknownZone` goes through managed zones only.

Fixes: #31948
@kubernetes/rh-storage 
@saad-ali, PTAL.
This commit is contained in:
Kubernetes Submit Queue 2016-09-11 11:01:30 -07:00 committed by GitHub
commit 0c63bd03fa
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/cloudprovider/providers/gce/gce.go
View File

@ -28,6 +28,8 @@ import (
"strings" "strings"
"time" "time"
"gopkg.in/gcfg.v1"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
apiservice "k8s.io/kubernetes/pkg/api/service" apiservice "k8s.io/kubernetes/pkg/api/service"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
@ -46,7 +48,6 @@ import (
container "google.golang.org/api/container/v1" container "google.golang.org/api/container/v1"
"google.golang.org/api/googleapi" "google.golang.org/api/googleapi"
"google.golang.org/cloud/compute/metadata" "google.golang.org/cloud/compute/metadata"
"gopkg.in/gcfg.v1"
) )
const ( const (
@ -2415,6 +2416,19 @@ func (gce *GCECloud) encodeDiskTags(tags map[string]string) (string, error) {
// the specified zone. It stores specified tags encoded in JSON in Description // the specified zone. It stores specified tags encoded in JSON in Description
// field. // field.
func (gce *GCECloud) CreateDisk(name string, diskType string, zone string, sizeGb int64, tags map[string]string) error { func (gce *GCECloud) CreateDisk(name string, diskType string, zone string, sizeGb int64, tags map[string]string) error {
// Do not allow creation of PDs in zones that are not managed. Such PDs
// then cannot be deleted by DeleteDisk.
isManaged := false
for _, managedZone := range gce.managedZones {
if zone == managedZone {
isManaged = true
break
}
}
if !isManaged {
return fmt.Errorf("kubernetes does not manage zone %q", zone)
}
tagsStr, err := gce.encodeDiskTags(tags) tagsStr, err := gce.encodeDiskTags(tags)
if err != nil { if err != nil {
return err return err
@ -2636,7 +2650,7 @@ func (gce *GCECloud) getDiskByNameUnknownZone(diskName string) (*gceDisk, error)
if found != nil { if found != nil {
return found, nil return found, nil
} }
return nil, fmt.Errorf("GCE persistent disk not found: %q", diskName) return nil, fmt.Errorf("GCE persistent disk %q not found in managed zones (%s)", diskName, strings.Join(gce.managedZones, ","))
} }
// GetGCERegion returns region of the gce zone. Zone names // GetGCERegion returns region of the gce zone. Zone names