From de16b0f5e9aa9e132609302fa72d0b9f9d5cac2d Mon Sep 17 00:00:00 2001 From: Serguei Bezverkhi Date: Thu, 15 Feb 2018 08:51:23 -0500 Subject: [PATCH] Refactor rbdplugin for CSI 0.2.0 spec --- Gopkg.lock | 154 ++---------------------------------- Gopkg.toml | 2 +- Makefile | 6 +- pkg/rbd/controllerserver.go | 4 +- pkg/rbd/rbd.go | 2 +- 5 files changed, 12 insertions(+), 156 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 88fd48088..8b92f56da 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1,65 +1,11 @@ # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. -[[projects]] - name = "github.com/PuerkitoBio/purell" - packages = ["."] - revision = "0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4" - version = "v1.1.0" - [[projects]] branch = "master" - name = "github.com/PuerkitoBio/urlesc" - packages = ["."] - revision = "de5bf2ad457846296e2031421a34e2568e304e35" - -[[projects]] name = "github.com/container-storage-interface/spec" packages = ["lib/go/csi"] - revision = "9e88e4bfabeca1b8e4810555815f112159292ada" - version = "v0.1.0" - -[[projects]] - name = "github.com/emicklei/go-restful" - packages = [".","log"] - revision = "5741799b275a3c4a5a9623a993576d7545cf7b5c" - version = "v2.4.0" - -[[projects]] - name = "github.com/ghodss/yaml" - packages = ["."] - revision = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7" - version = "v1.0.0" - -[[projects]] - branch = "master" - name = "github.com/go-openapi/jsonpointer" - packages = ["."] - revision = "779f45308c19820f1a69e9a4cd965f496e0da10f" - -[[projects]] - branch = "master" - name = "github.com/go-openapi/jsonreference" - packages = ["."] - revision = "36d33bfe519efae5632669801b180bf1a245da3b" - -[[projects]] - branch = "master" - name = "github.com/go-openapi/spec" - packages = ["."] - revision = "fa03337d7da5735229ee8f5e9d5d0b996014b7f8" - -[[projects]] - branch = "master" - name = "github.com/go-openapi/swag" - packages = ["."] - revision = "84f4bee7c0a6db40e3166044c7983c1c32125429" - -[[projects]] - name = "github.com/gogo/protobuf" - packages = ["proto","sortkeys"] - revision = "342cbe0a04158f6dcb03ca0079991a51a4248c02" - version = "v0.5" + revision = "7ab01a90da87f9fef3ee1de0494962fdefaf7db7" [[projects]] branch = "master" @@ -73,53 +19,11 @@ packages = ["proto","ptypes","ptypes/any","ptypes/duration","ptypes/timestamp"] revision = "1e59b77b52bf8e4b449a57e6f79f21226d571845" -[[projects]] - branch = "master" - name = "github.com/google/btree" - packages = ["."] - revision = "316fb6d3f031ae8f4d457c6c5186b9e3ded70435" - -[[projects]] - branch = "master" - name = "github.com/google/gofuzz" - packages = ["."] - revision = "24818f796faf91cd76ec7bddd72458fbced7a6c1" - -[[projects]] - name = "github.com/googleapis/gnostic" - packages = ["OpenAPIv2","compiler","extensions"] - revision = "ee43cbb60db7bd22502942cccbc39059117352ab" - version = "v0.1.0" - -[[projects]] - branch = "master" - name = "github.com/gregjones/httpcache" - packages = [".","diskcache"] - revision = "2bcd89a1743fd4b373f7370ce8ddc14dfbd18229" - -[[projects]] - name = "github.com/json-iterator/go" - packages = ["."] - revision = "f7279a603edee96fe7764d3de9c6ff8cf9970994" - version = "1.0.4" - -[[projects]] - branch = "master" - name = "github.com/juju/ratelimit" - packages = ["."] - revision = "59fac5042749a5afb9af70e813da1dd5474f0167" - [[projects]] branch = "master" name = "github.com/kubernetes-csi/drivers" packages = ["pkg/csi-common"] - revision = "822ddbb41799f02d17e9662d0e34530f7e8061dd" - -[[projects]] - branch = "master" - name = "github.com/mailru/easyjson" - packages = ["buffer","jlexer","jwriter"] - revision = "32fa128f234d041f196a9f3e0fea5ac9772c08e1" + revision = "d1ab787ad5510df08a3a98a091a41adeae4647b4" [[projects]] name = "github.com/pborman/uuid" @@ -127,24 +31,6 @@ revision = "e790cca94e6cc75c7064b1332e63811d4aae1a53" version = "v1.1" -[[projects]] - branch = "master" - name = "github.com/petar/GoLLRB" - packages = ["llrb"] - revision = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4" - -[[projects]] - name = "github.com/peterbourgon/diskv" - packages = ["."] - revision = "5f041e8faa004a95c88a202771f4cc3e991971e6" - version = "v2.0.1" - -[[projects]] - name = "github.com/spf13/pflag" - packages = ["."] - revision = "e57e3eeb33f795204c1ca35f56c44f83227c6e66" - version = "v1.0.0" - [[projects]] branch = "master" name = "golang.org/x/net" @@ -160,7 +46,7 @@ [[projects]] branch = "master" name = "golang.org/x/text" - packages = ["collate","collate/build","internal/colltab","internal/gen","internal/tag","internal/triegen","internal/ucd","language","secure/bidirule","transform","unicode/bidi","unicode/cldr","unicode/norm","unicode/rangetable","width"] + packages = ["collate","collate/build","internal/colltab","internal/gen","internal/tag","internal/triegen","internal/ucd","language","secure/bidirule","transform","unicode/bidi","unicode/cldr","unicode/norm","unicode/rangetable"] revision = "e19ae1496984b1c655b8044a65c0300a3c878dd3" [[projects]] @@ -175,42 +61,12 @@ revision = "f3955b8e9e244dd4dd4bc4f7b7a23a8445400a76" version = "v1.9.0" -[[projects]] - name = "gopkg.in/inf.v0" - packages = ["."] - revision = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4" - version = "v0.9.0" - -[[projects]] - branch = "v2" - name = "gopkg.in/yaml.v2" - packages = ["."] - revision = "d670f9405373e636a5a2765eea47fac0c9bc91a4" - -[[projects]] - branch = "master" - name = "k8s.io/api" - packages = ["admissionregistration/v1alpha1","admissionregistration/v1beta1","apps/v1","apps/v1beta1","apps/v1beta2","authentication/v1","authentication/v1beta1","authorization/v1","authorization/v1beta1","autoscaling/v1","autoscaling/v2beta1","batch/v1","batch/v1beta1","batch/v2alpha1","certificates/v1beta1","core/v1","events/v1beta1","extensions/v1beta1","networking/v1","policy/v1beta1","rbac/v1","rbac/v1alpha1","rbac/v1beta1","scheduling/v1alpha1","settings/v1alpha1","storage/v1","storage/v1alpha1","storage/v1beta1"] - revision = "57d7f151236665c12202a51c21bc939eb5d5ba91" - [[projects]] branch = "release-1.9" name = "k8s.io/apimachinery" - packages = ["pkg/api/errors","pkg/api/meta","pkg/api/resource","pkg/apis/meta/v1","pkg/apis/meta/v1/unstructured","pkg/apis/meta/v1alpha1","pkg/conversion","pkg/conversion/queryparams","pkg/fields","pkg/labels","pkg/runtime","pkg/runtime/schema","pkg/runtime/serializer","pkg/runtime/serializer/json","pkg/runtime/serializer/protobuf","pkg/runtime/serializer/recognizer","pkg/runtime/serializer/streaming","pkg/runtime/serializer/versioning","pkg/selection","pkg/types","pkg/util/clock","pkg/util/errors","pkg/util/framer","pkg/util/intstr","pkg/util/json","pkg/util/net","pkg/util/runtime","pkg/util/sets","pkg/util/validation","pkg/util/validation/field","pkg/util/wait","pkg/util/yaml","pkg/version","pkg/watch","third_party/forked/golang/reflect"] + packages = ["pkg/util/runtime","pkg/util/sets","pkg/util/wait"] revision = "68f9c3a1feb3140df59c67ced62d3a5df8e6c9c2" -[[projects]] - name = "k8s.io/client-go" - packages = ["discovery","kubernetes","kubernetes/scheme","kubernetes/typed/admissionregistration/v1alpha1","kubernetes/typed/admissionregistration/v1beta1","kubernetes/typed/apps/v1","kubernetes/typed/apps/v1beta1","kubernetes/typed/apps/v1beta2","kubernetes/typed/authentication/v1","kubernetes/typed/authentication/v1beta1","kubernetes/typed/authorization/v1","kubernetes/typed/authorization/v1beta1","kubernetes/typed/autoscaling/v1","kubernetes/typed/autoscaling/v2beta1","kubernetes/typed/batch/v1","kubernetes/typed/batch/v1beta1","kubernetes/typed/batch/v2alpha1","kubernetes/typed/certificates/v1beta1","kubernetes/typed/core/v1","kubernetes/typed/events/v1beta1","kubernetes/typed/extensions/v1beta1","kubernetes/typed/networking/v1","kubernetes/typed/policy/v1beta1","kubernetes/typed/rbac/v1","kubernetes/typed/rbac/v1alpha1","kubernetes/typed/rbac/v1beta1","kubernetes/typed/scheduling/v1alpha1","kubernetes/typed/settings/v1alpha1","kubernetes/typed/storage/v1","kubernetes/typed/storage/v1alpha1","kubernetes/typed/storage/v1beta1","pkg/version","rest","rest/watch","tools/clientcmd/api","tools/metrics","tools/reference","transport","util/cert","util/flowcontrol","util/integer"] - revision = "78700dec6369ba22221b72770783300f143df150" - version = "v6.0.0" - -[[projects]] - branch = "master" - name = "k8s.io/kube-openapi" - packages = ["pkg/common"] - revision = "a07b7bbb58e7fdc5144f8d7046331d29fc9ad3b3" - [[projects]] name = "k8s.io/kubernetes" packages = ["pkg/util/io","pkg/util/keymutex","pkg/util/mount","pkg/util/nsenter"] @@ -226,6 +82,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "b1c8bd120bec9cbdabfe8c0971602ed9a8dc3da6bde54c8f27805bb79be80b58" + inputs-digest = "8908f89154f277d98fd83b22edf73652d4c4e37bbd827bf11d9605c58ae3fd0e" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index d8c3660c2..2ef13999d 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -1,5 +1,5 @@ [[constraint]] - version = "v0.1" + branch = "master" name = "github.com/container-storage-interface/spec" [[constraint]] diff --git a/Makefile b/Makefile index 8b0d9e9ea..895554795 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ .PHONY: all rbdplugin -IMAGE_NAME=csi_images/rbdplugin -IMAGE_VERSION=latest +IMAGE_NAME=quay.io/cephcsi/rbdplugin +IMAGE_VERSION=v0.2.0 all: rbdplugin @@ -25,7 +25,7 @@ test: rbdplugin: if [ ! -d ./vendor ]; then dep ensure; fi - CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-extldflags "-static"' -i -o _output/rbdplugin ./rbd + CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-extldflags "-static"' -o _output/rbdplugin ./rbd container: rbdplugin cp _output/rbdplugin deploy/docker diff --git a/pkg/rbd/controllerserver.go b/pkg/rbd/controllerserver.go index 4dca244d6..3073c3e5a 100644 --- a/pkg/rbd/controllerserver.go +++ b/pkg/rbd/controllerserver.go @@ -84,9 +84,9 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol } return &csi.CreateVolumeResponse{ - VolumeInfo: &csi.VolumeInfo{ + Volume: &csi.Volume{ Id: volumeID, - CapacityBytes: uint64(volSizeBytes), + CapacityBytes: int64(volSizeBytes), Attributes: req.GetParameters(), }, }, nil diff --git a/pkg/rbd/rbd.go b/pkg/rbd/rbd.go index b8329d8f5..3ecf40141 100644 --- a/pkg/rbd/rbd.go +++ b/pkg/rbd/rbd.go @@ -42,7 +42,7 @@ type rbd struct { var ( rbdDriver *rbd version = csi.Version{ - Minor: 1, + Minor: 2, } )