Merge pull request #35 from sbezverk/csi_0.2.0_breaking_changes

CSI 0.2.0 breaking changes

Gopkg.toml

@@ -46,12 +46,12 @@
 
 [[constraint]]
   name = "k8s.io/apimachinery"
-  branch = "release-1.8"
+  branch = "release-1.9"
 
 [[constraint]]
   name = "k8s.io/client-go"
-  branch = "master"
+  version = "v6.0.0"
 
 [[constraint]]
   name = "k8s.io/api"
-  branch = "master"
+  branch = "release-1.9"

Makefile

@@ -13,19 +13,7 @@
 # limitations under the License.
 
 IMAGE = k8scsi/csi-provisioner
-
-VERSION :=
-TAG := $(shell git describe --abbrev=0 --tags HEAD 2>/dev/null)
-COMMIT := $(shell git rev-parse HEAD)
-ifeq ($(TAG),)
-    VERSION := latest
-else
-    ifeq ($(COMMIT), $(shell git rev-list -n1 $(TAG)))
-        VERSION := $(TAG)
-    else
-        VERSION := $(TAG)-$(COMMIT)
-    endif
-endif
+VERSION = v0.2.0
 
 container: build quick-container
 .PHONY: container

pkg/controller/controller.go

@@ -61,7 +61,7 @@ var _ controller.Provisioner = &csiProvisioner{}
 var (
 	csiVersion = csi.Version{
 		Major: 0,
-		Minor: 1,
+		Minor: 2,
 		Patch: 0,
 	}
 	accessMode = &csi.VolumeCapability_AccessMode{
@@ -219,8 +219,8 @@ func (p *csiProvisioner) Provision(options controller.VolumeOptions) (*v1.Persis
 			},
 		},
 		CapacityRange: &csi.CapacityRange{
-			RequiredBytes: uint64(volSizeBytes),
-			LimitBytes:    uint64(volSizeBytes),
+			RequiredBytes: int64(volSizeBytes),
+			LimitBytes:    int64(volSizeBytes),
 		},
 	}
 	ctx, cancel := context.WithTimeout(context.Background(), p.timeout)
@@ -230,14 +230,14 @@ func (p *csiProvisioner) Provision(options controller.VolumeOptions) (*v1.Persis
 	if err != nil {
 		return nil, err
 	}
-	if rep.VolumeInfo != nil {
-		glog.V(3).Infof("create volume rep: %+v", *rep.VolumeInfo)
+	if rep.Volume != nil {
+		glog.V(3).Infof("create volume rep: %+v", *rep.Volume)
 	}
 
 	annotations := map[string]string{provisionerIDAnn: p.identity}
-	attributesString, err := json.Marshal(rep.VolumeInfo.Attributes)
+	attributesString, err := json.Marshal(rep.Volume.Attributes)
 	if err != nil {
-		glog.V(2).Infof("fail parsing volume attributes: %+v", rep.VolumeInfo.Attributes)
+		glog.V(2).Infof("fail parsing volume attributes: %+v", rep.Volume.Attributes)
 	} else {
 		annotations[volumeAttributesAnnotation] = string(attributesString)
 	}
@@ -256,7 +256,7 @@ func (p *csiProvisioner) Provision(options controller.VolumeOptions) (*v1.Persis
 			PersistentVolumeSource: v1.PersistentVolumeSource{
 				CSI: &v1.CSIPersistentVolumeSource{
 					Driver:       p.driverName,
-					VolumeHandle: p.volumeIdToHandle(rep.VolumeInfo.Id),
+					VolumeHandle: p.volumeIdToHandle(rep.Volume.Id),
 				},
 			},
 		},