Merge pull request #44669 from humblec/gluster-metadata-pv

Automatic merge from submit-queue (batch tested with PRs 45081, 44669) Add more metadata about dynamically provisioned PVs using PV annotation This patch add below fields to Gluster dynamic pvs. "Description: "Gluster: dynamically provisioned PVs" "Creator": "heketi-dynamic" "Type": "file" Signed-off-by: Humble Chirammal <hchiramm@redhat.com>

Merge pull request #44669 from humblec/gluster-metadata-pv
ca520e34 · Kubernetes Submit Queue · GitHub · a8cd27ca · 1d17c0cc · ca520e34
Commit ca520e34 authored May 04, 2017 by Kubernetes Submit Queue Committed by GitHub May 04, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

glusterfs.go pkg/volume/glusterfs/glusterfs.go +7 -1

No files found.
--- a/pkg/volume/glusterfs/glusterfs.go
+++ b/pkg/volume/glusterfs/glusterfs.go
@@ -696,7 +696,13 @@ func (r *glusterfsVolumeProvisioner) Provision() (*v1.PersistentVolume, error) {
 	}

 	gidStr := strconv.FormatInt(int64(gid), 10)
-	pv.Annotations = map[string]string{volumehelper.VolumeGidAnnotationKey: gidStr}
+
+	pv.Annotations = map[string]string{
+		volumehelper.VolumeGidAnnotationKey: gidStr,
+		"kubernetes.io/createdby":           "heketi-dynamic-provisioner",
+		"gluster.org/type":                  "file",
+		"Description":                       "Gluster: Dynamically provisioned PV",
+	}

 	pv.Spec.Capacity = v1.ResourceList{
 		v1.ResourceName(v1.ResourceStorage): resource.MustParse(fmt.Sprintf("%dGi", sizeGB)),