Bugfix: PV should use capacity bytes returned by plugin, not PVC bytes

kubernetes-csi · Mar 2, 2018 · 4e969ba · 4e969ba
1 parent cc4e42b
commit 4e969ba
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -19,11 +19,13 @@ package controller
 import (
 	"context"
 	"fmt"
-	_ "k8s.io/apimachinery/pkg/util/json"
 	"net"
 	"strings"
 	"time"
 
+	"k8s.io/apimachinery/pkg/api/resource"
+	_ "k8s.io/apimachinery/pkg/util/json"
+
 	"github.com/golang/glog"
 
 	"github.com/kubernetes-incubator/external-storage/lib/controller"
@@ -242,6 +244,7 @@ func (p *csiProvisioner) Provision(options controller.VolumeOptions) (*v1.Persis
 	for k, v := range rep.Volume.Attributes {
 		volumeAttributes[k] = v
 	}
+	repBytesString := fmt.Sprintf("%v", rep.GetVolume().GetCapacityBytes())
 	pv := &v1.PersistentVolume{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: share,
@@ -250,7 +253,7 @@ func (p *csiProvisioner) Provision(options controller.VolumeOptions) (*v1.Persis
 			PersistentVolumeReclaimPolicy: options.PersistentVolumeReclaimPolicy,
 			AccessModes:                   options.PVC.Spec.AccessModes,
 			Capacity: v1.ResourceList{
-				v1.ResourceName(v1.ResourceStorage): options.PVC.Spec.Resources.Requests[v1.ResourceName(v1.ResourceStorage)],
+				v1.ResourceName(v1.ResourceStorage): resource.MustParse(repBytesString),
 			},
 			// TODO wait for CSI VolumeSource API
 			PersistentVolumeSource: v1.PersistentVolumeSource{