github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 12:32:03 +00:00
Code Issues Projects Releases Wiki Activity

Tag dynamically created GCE PD disks.

Browse Source 
GCE disks don't have tags, we must encode the tags into Description field.
It's encoded as JSON, which is both human and machine readable:
description: '{"kubernetes.io/created-for/pv/name":"pv-gce-oxwts","kubernetes.io/created-for/pvc/name":"myclaim","kubernetes.io/created-for/pvc/namespace":"default"}'
This commit is contained in:
Jan Safranek 2016-01-27 15:16:05 +01:00
parent 63ec304e42
commit 23cd0913f7
3 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ limitations under the License.
package gce package gce
import ( import (
"encoding/json"
"fmt" "fmt"
"io" "io"
"net" "net"
@ -1617,12 +1618,36 @@ func (gce *GCECloud) GetZone() (cloudprovider.Zone, error) {
}, nil }, nil
} }
// Create a new Persistent Disk, with the specified name & size, in the specified zone. // encodeDiskTags encodes requested volume tags into JSON string, as GCE does
func (gce *GCECloud) CreateDisk(name string, zone string, sizeGb int64) error { // not support tags on GCE PDs and we use Description field as fallback.
diskToCreate := &compute.Disk{ func (gce *GCECloud) encodeDiskTags(tags map[string]string) (string, error) {
Name: name, if len(tags) == 0 {
SizeGb: sizeGb, // No tags -> empty JSON
return "", nil
} }
enc, err := json.Marshal(tags)
if err != nil {
return "", err
}
return string(enc), nil
}
// CreateDisk creates a new Persistent Disk, with the specified name & size, in
// the specified zone. It stores specified tags endoced in JSON in Description
// field.
func (gce *GCECloud) CreateDisk(name string, zone string, sizeGb int64, tags map[string]string) error {
tagsStr, err := gce.encodeDiskTags(tags)
if err != nil {
return err
}
diskToCreate := &compute.Disk{
Name: name,
SizeGb: sizeGb,
Description: tagsStr,
}
createOp, err := gce.service.Disks.Insert(gce.projectID, zone, diskToCreate).Do() createOp, err := gce.service.Disks.Insert(gce.projectID, zone, diskToCreate).Do()
if err != nil { if err != nil {
return err return err

2
pkg/volume/gce_pd/gce_util.go
View File

@ -146,7 +146,7 @@ func (gceutil *GCEDiskUtil) CreateVolume(c *gcePersistentDiskProvisioner) (volum
return "", 0, err return "", 0, err
} }
err = cloud.CreateDisk(name, zone.FailureDomain, int64(requestGB)) err = cloud.CreateDisk(name, zone.FailureDomain, int64(requestGB), *c.options.CloudTags)
if err != nil { if err != nil {
glog.V(2).Infof("Error creating GCE PD volume: %v", err) glog.V(2).Infof("Error creating GCE PD volume: %v", err)
return "", 0, err return "", 0, err

3
test/e2e/pd.go
View File

@ -314,7 +314,8 @@ func createPD() (string, error) {
return "", err return "", err
} }
err = gceCloud.CreateDisk(pdName, testContext.CloudConfig.Zone, 10 /* sizeGb */) tags := map[string]string{}
err = gceCloud.CreateDisk(pdName, testContext.CloudConfig.Zone, 10 /* sizeGb */, tags)
if err != nil { if err != nil {
return "", err return "", err
} }