Skip to content

Commit

Permalink
unify version
Browse files Browse the repository at this point in the history
Properly set version in Dockerfile, then use this version everywhere:

Log output
CSI interface return value
Prometheus metric
UserAgent to ECS, etc.
  • Loading branch information
huww98 committed Oct 24, 2023
1 parent 5547cd7 commit dc14424
Show file tree
Hide file tree
Showing 18 changed files with 52 additions and 74 deletions.
2 changes: 1 addition & 1 deletion build/multi-private/Dockerfile.multi
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG BUILDPLATFORM
ENV GOPATH=/go
ADD . /go/src/github.com/kubernetes-sigs/alibaba-cloud-csi-driver/
WORKDIR /go/src/github.com/kubernetes-sigs/alibaba-cloud-csi-driver
RUN env GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GOOS=linux CGO_ENABLED=0 go build -ldflags "-X main._BRANCH_='v1.0.0' -X main._VERSION_='v1.14.5' -X main._BUILDTIME_=`date '+%Y-%m-%d-%H:%M:%S'`" -o plugin.csi.alibabacloud.com && env GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GOOS=linux CGO_ENABLED=0 go build ./build/multi-private/csiplugin-connector.go
RUN env GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GOOS=linux CGO_ENABLED=0 go build -ldflags "-X github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/version.VERSION=${CSI_VERSION} -X github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/version.BUILDTIME=$(date -Iseconds)" -o plugin.csi.alibabacloud.com && env GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GOOS=linux CGO_ENABLED=0 go build ./build/multi-private/csiplugin-connector.go

FROM registry.cn-hangzhou.aliyuncs.com/acs/centos:7-update
LABEL maintainers="Alibaba Cloud Authors" description="Alibaba Cloud CSI Plugin"
Expand Down
2 changes: 1 addition & 1 deletion build/multi/Dockerfile.controller
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ENV GOPATH=/go
ADD . /go/src/github.com/kubernetes-sigs/alibaba-cloud-csi-driver/
WORKDIR /go/src/github.com/kubernetes-sigs/alibaba-cloud-csi-driver
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
RUN env GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GOOS=linux CGO_ENABLED=0 go build --mod=vendor -ldflags "-X main._BRANCH_='v1.0.0' -X main._VERSION_='v1.14.5' -X main._BUILDTIME_=`date '+%Y-%m-%d-%H:%M:%S'`" -o plugin.csi.alibabacloud.com
RUN env GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GOOS=linux CGO_ENABLED=0 go build --mod=vendor -ldflags "-X github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/version.VERSION=${CSI_VERSION} -X github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/version.BUILDTIME=$(date -Iseconds)" -o plugin.csi.alibabacloud.com

FROM registry.cn-hangzhou.aliyuncs.com/acs/alpine:3.16-base
LABEL maintainers="Alibaba Cloud Authors" description="Alibaba Cloud CSI Plugin"
Expand Down
3 changes: 2 additions & 1 deletion build/multi/Dockerfile.multi
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
FROM --platform=$BUILDPLATFORM golang:1.18 as build
ARG TARGETPLATFORM
ARG BUILDPLATFORM
ARG CSI_VERSION=unknown
ENV GOPATH=/go
ADD . /go/src/github.com/kubernetes-sigs/alibaba-cloud-csi-driver/
WORKDIR /go/src/github.com/kubernetes-sigs/alibaba-cloud-csi-driver
RUN env GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GOOS=linux CGO_ENABLED=0 go build --mod=vendor -ldflags "-X main._BRANCH_='v1.0.0' -X main._VERSION_='v1.14.5' -X main._BUILDTIME_=`date '+%Y-%m-%d-%H:%M:%S'`" -o plugin.csi.alibabacloud.com && env GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GOOS=linux CGO_ENABLED=0 go build --mod=vendor ./build/lib/csiplugin-connector.go
RUN env GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GOOS=linux CGO_ENABLED=0 go build --mod=vendor -ldflags "-X github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/version.VERSION=${CSI_VERSION} -X github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/version.BUILDTIME=$(date -Iseconds)" -o plugin.csi.alibabacloud.com && env GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GOOS=linux CGO_ENABLED=0 go build --mod=vendor ./build/lib/csiplugin-connector.go

FROM registry.eu-west-1.aliyuncs.com/acs/alinux:3-update
LABEL maintainers="Alibaba Cloud Authors" description="Alibaba Cloud CSI Plugin"
Expand Down
3 changes: 2 additions & 1 deletion build/multi/Dockerfile.multi.asi
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM --platform=$BUILDPLATFORM golang:1.18 as build
ARG TARGETPLATFORM
ARG BUILDPLATFORM
ARG CSI_VERSION=unknown
ENV GOPROXY=https://goproxy.cn/,http://gomodule-repository.aone.alibaba-inc.com,https://mirrors.aliyun.com/goproxy/,direct \
GOPRIVATE="gitlab.alibaba-inc.com" \
GO111MODULE=on \
Expand All @@ -14,7 +15,7 @@ RUN git config --global url."git@gitlab.alibaba-inc.com:".insteadOf "https://git
RUN --mount=type=ssh go get gitlab.alibaba-inc.com/idaas/go-cloud-token-isolate-consumer@v0.0.6-nok8s-nokeepalive
RUN --mount=type=ssh go mod tidy
RUN --mount=type=ssh go mod vendor
RUN env GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') go build --mod=vendor -ldflags "-X main._BRANCH_='v1.0.0' -X main._VERSION_='v1.14.5' -X main._BUILDTIME_=`date '+%Y-%m-%d-%H:%M:%S'`" -o plugin.csi.alibabacloud.com && env GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GOOS=linux CGO_ENABLED=0 go build --mod=vendor ./build/lib/csiplugin-connector.go
RUN env GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') go build --mod=vendor -ldflags "-X github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/version._VERSION_=${CSI_VERSION} -X github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/version._BUILDTIME_=`date '+%Y-%m-%d-%H:%M:%S'`" -o plugin.csi.alibabacloud.com && env GOARCH=$(echo $TARGETPLATFORM | cut -f2 -d '/') GOOS=linux CGO_ENABLED=0 go build --mod=vendor ./build/lib/csiplugin-connector.go

FROM registry.eu-west-1.aliyuncs.com/acs/alinux:3-update
LABEL maintainers="Alibaba Cloud Authors" description="Alibaba Cloud CSI Plugin"
Expand Down
28 changes: 3 additions & 25 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ import (
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/oss"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/pov"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/utils"
"github.com/prometheus/common/version"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/version"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
)
Expand All @@ -55,13 +55,6 @@ func init() {
flag.Set("logtostderr", "true")
}

func setPrometheusVersion() {
version.Version = VERSION
version.Revision = REVISION
version.Branch = BRANCH
version.BuildDate = BUILDTIME
}

const (
// MBSIZE MB size
MBSIZE = 1024 * 1024
Expand Down Expand Up @@ -99,21 +92,6 @@ const (
ExtenderAgent = "agent"
)

// BRANCH is CSI Driver Branch
var BRANCH = ""

// VERSION is CSI Driver Version
var VERSION = ""

// COMMITID is CSI Driver CommitID
var COMMITID = ""

// BUILDTIME is CSI Driver Buildtime
var BUILDTIME = ""

// REVISION is CSI Driver Revision
var REVISION = ""

var (
endpoint = flag.String("endpoint", "unix://tmp/csi.sock", "CSI endpoint")
nodeID = flag.String("nodeid", "", "node id")
Expand Down Expand Up @@ -165,7 +143,7 @@ func main() {
// log.AddHook(rotateHook(logAttribute))

csilog.Log.Infof("Multi CSI Driver Name: %s, nodeID: %s, endPoints: %s", *driver, *nodeID, *endpoint)
csilog.Log.Infof("CSI Driver Branch: %s, Version: %s, Build time: %s\n", BRANCH, VERSION, BUILDTIME)
csilog.Log.Infof("CSI Driver, Version: %s, Build time: %s", version.VERSION, version.BUILDTIME)

multiDriverNames := *driver
driverNames := strings.Split(multiDriverNames, ",")
Expand Down Expand Up @@ -306,7 +284,7 @@ func main() {
}

enableMetric := os.Getenv("ENABLE_METRIC")
setPrometheusVersion()
version.SetPrometheusVersion()
if enableMetric == "false" {
metricConfig.enableMetric = false
}
Expand Down
9 changes: 3 additions & 6 deletions pkg/cpfs/cpfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
csicommon "github.com/kubernetes-csi/drivers/pkg/csi-common"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/common"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/utils"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/version"
log "github.com/sirupsen/logrus"
)

Expand All @@ -30,10 +31,6 @@ const (
InstanceID = "instance-id"
)

var (
version = "1.0.0"
)

// CPFS the CPFS object
type CPFS struct {
driver *csicommon.CSIDriver
Expand All @@ -48,15 +45,15 @@ type CPFS struct {

// NewDriver create a cpfs driver object
func NewDriver(nodeID, endpoint string) *CPFS {
log.Infof("Driver: %v version: %v", driverName, version)
log.Infof("Driver: %v version: %v", driverName, version.VERSION)

d := &CPFS{}
d.endpoint = endpoint
if nodeID == "" {
nodeID = utils.RetryGetMetaData(InstanceID)
log.Infof("Use node id : %s", nodeID)
}
csiDriver := csicommon.NewCSIDriver(driverName, version, nodeID)
csiDriver := csicommon.NewCSIDriver(driverName, version.VERSION, nodeID)
csiDriver.AddVolumeCapabilityAccessModes([]csi.VolumeCapability_AccessMode_Mode{csi.VolumeCapability_AccessMode_MULTI_NODE_MULTI_WRITER})
csiDriver.AddControllerServiceCapabilities([]csi.ControllerServiceCapability_RPC_Type{
csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME,
Expand Down
6 changes: 3 additions & 3 deletions pkg/dbfs/dbfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/log"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/options"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/utils"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/version"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
Expand All @@ -27,7 +28,6 @@ const (
)

var (
version = "1.0.0"
// GlobalConfigVar Global Config
GlobalConfigVar GlobalConfig
)
Expand Down Expand Up @@ -59,15 +59,15 @@ type DBFS struct {

// NewDriver create the identity/node/controller server and dbfs driver
func NewDriver(nodeID, endpoint string) *DBFS {
log.Log.Infof("Driver: %v version: %v", driverName, version)
log.Log.Infof("Driver: %v version: %v", driverName, version.VERSION)

d := &DBFS{}
d.endpoint = endpoint
if nodeID == "" {
nodeID = utils.RetryGetMetaData(InstanceID)
log.Log.Infof("DBFS Use node id : %s", nodeID)
}
csiDriver := csicommon.NewCSIDriver(driverName, version, nodeID)
csiDriver := csicommon.NewCSIDriver(driverName, version.VERSION, nodeID)
csiDriver.AddVolumeCapabilityAccessModes([]csi.VolumeCapability_AccessMode_Mode{csi.VolumeCapability_AccessMode_MULTI_NODE_MULTI_WRITER})
csiDriver.AddControllerServiceCapabilities([]csi.ControllerServiceCapability_RPC_Type{
csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME,
Expand Down
7 changes: 2 additions & 5 deletions pkg/dbfs/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/cloud"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/log"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/utils"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/version"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
Expand All @@ -47,12 +48,8 @@ const (
)

var (
// VERSION should be updated by hand at each release
VERSION = "v1.14.8"
// GITCOMMIT will be overwritten automatically by the build system
GITCOMMIT = "HEAD"
// KubernetesAlicloudIdentity is the system identity for ecs client request
KubernetesAlicloudIdentity = fmt.Sprintf("Kubernetes.Alicloud/CsiProvision.Nas-%s", VERSION)
KubernetesAlicloudIdentity = fmt.Sprintf("Kubernetes.Alicloud/CsiProvision.Nas-%s", version.VERSION)
)

func (ns *nodeServer) DoDBFSMount(req *csi.NodeStageVolumeRequest, mountPoint string, volumeID string) error {
Expand Down
6 changes: 3 additions & 3 deletions pkg/disk/disk.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/log"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/options"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/utils"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/version"
crd "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand All @@ -43,7 +44,6 @@ import (
// PluginFolder defines the location of diskplugin
const (
driverName = "diskplugin.csi.alibabacloud.com"
csiVersion = "1.0.0"
TopologyZoneKey = "topology." + driverName + "/zone"
TopologyMultiZonePrefix = TopologyZoneKey + "-"
)
Expand Down Expand Up @@ -111,7 +111,7 @@ func NewDriver(m metadata.MetadataProvider, endpoint string, runAsController boo
// Config Global vars
cfg := GlobalConfigSet(m)

csiDriver := csicommon.NewCSIDriver(driverName, csiVersion, GlobalConfigVar.NodeID)
csiDriver := csicommon.NewCSIDriver(driverName, version.VERSION, GlobalConfigVar.NodeID)
tmpdisk.driver = csiDriver
tmpdisk.driver.AddControllerServiceCapabilities([]csi.ControllerServiceCapability_RPC_Type{
csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME,
Expand Down Expand Up @@ -150,7 +150,7 @@ func NewDriver(m metadata.MetadataProvider, endpoint string, runAsController boo

// Run start a new NodeServer
func (disk *DISK) Run() {
log.Log.Infof("Starting csi-plugin Driver: %v version: %v", driverName, csiVersion)
log.Log.Infof("Starting csi-plugin Driver: %v version: %v", driverName, version.VERSION)
common.RunCSIServer(disk.endpoint, disk.idServer, disk.controllerServer, disk.nodeServer)
}

Expand Down
7 changes: 2 additions & 5 deletions pkg/disk/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ import (
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/common"
proto "github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/disk/proto"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/utils"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/version"
perrors "github.com/pkg/errors"
log "github.com/sirupsen/logrus"
"google.golang.org/grpc/codes"
Expand All @@ -64,12 +65,8 @@ import (
)

var (
// VERSION should be updated by hand at each release
VERSION = "v1.14.6"
// GITCOMMIT will be overwritten automatically by the build system
GITCOMMIT = "HEAD"
// KubernetesAlicloudIdentity is the system identity for ecs client request
KubernetesAlicloudIdentity = fmt.Sprintf("Kubernetes.Alicloud/CsiProvision.Disk-%s", VERSION)
KubernetesAlicloudIdentity = fmt.Sprintf("Kubernetes.Alicloud/CsiProvision.Disk-%s", version.VERSION)
// AvailableDiskTypes ...
AvailableDiskTypes = []string{DiskCommon, DiskESSD, DiskEfficiency, DiskSSD, DiskSharedSSD, DiskSharedEfficiency, DiskPPerf, DiskSPerf, DiskESSDAuto}
// CustomDiskTypes ...
Expand Down
6 changes: 3 additions & 3 deletions pkg/ens/ens.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/common"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/options"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/utils"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/version"
log "github.com/sirupsen/logrus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
Expand All @@ -19,7 +20,6 @@ import (

const (
driverName = "ensplugin.csi.alibabacloud.com"
csiVersion = "1.0.0"
ensInstanceIDLabelKey = "alibabacloud.com/ens-instance-id"
clusterProfileKey = "ack-cluster-profile"
clusterIdKey = "clusterid"
Expand Down Expand Up @@ -70,7 +70,7 @@ func NewDriver(nodeID, endpoint string) *ENS {

NewGlobalConfig()

csiDriver := csicommon.NewCSIDriver(driverName, csiVersion, GlobalConfigVar.InstanceID)
csiDriver := csicommon.NewCSIDriver(driverName, version.VERSION, GlobalConfigVar.InstanceID)
tmpENS.driver = csiDriver

tmpENS.driver.AddControllerServiceCapabilities([]csi.ControllerServiceCapability_RPC_Type{
Expand All @@ -91,7 +91,7 @@ func NewDriver(nodeID, endpoint string) *ENS {
}

func (ens *ENS) Run() {
log.Infof("Run: start csi-plugin driver: %s, version %s", driverName, csiVersion)
log.Infof("Run: start csi-plugin driver: %s, version %s", driverName, version.VERSION)
common.RunCSIServer(ens.endpoint, ens.idServer, ens.controllerServer, ens.nodeServer)
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/local/local.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/local/types"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/options"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/utils"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/version"
log "github.com/sirupsen/logrus"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
Expand All @@ -50,7 +51,6 @@ const (
defaultDriverName = "localplugin.csi.alibabacloud.com"
localDriverName = "localplugin.csi.alibabacloud.com"
yodaDriverName = "yodaplugin.csi.alibabacloud.com"
csiVersion = "1.0.0"
)

const (
Expand Down Expand Up @@ -171,7 +171,7 @@ func NewDriver(nodeID, endpoint string) *Local {
// GlobalConfig Set
GlobalConfigSet("", nodeID, driverName)

csiDriver := csicommon.NewCSIDriver(driverName, csiVersion, nodeID)
csiDriver := csicommon.NewCSIDriver(driverName, version.VERSION, nodeID)
tmplvm.driver = csiDriver
tmplvm.driver.AddControllerServiceCapabilities([]csi.ControllerServiceCapability_RPC_Type{
csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME,
Expand Down
4 changes: 2 additions & 2 deletions pkg/lvm/lvm.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
csicommon "github.com/kubernetes-csi/drivers/pkg/csi-common"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/common"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/utils"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/version"
log "github.com/sirupsen/logrus"
)

Expand All @@ -38,7 +39,6 @@ type LVM struct {

const (
driverName = "lvmplugin.csi.alibabacloud.com"
csiVersion = "1.0.0"
)

// Init checks for the persistent volume file and loads all found volumes
Expand All @@ -56,7 +56,7 @@ func NewDriver(nodeID, endpoint string) *LVM {
nodeID, _ = utils.GetMetaData(InstanceID)
log.Infof("Use node id : %s", nodeID)
}
csiDriver := csicommon.NewCSIDriver(driverName, csiVersion, nodeID)
csiDriver := csicommon.NewCSIDriver(driverName, version.VERSION, nodeID)
tmplvm.driver = csiDriver
tmplvm.driver.AddControllerServiceCapabilities([]csi.ControllerServiceCapability_RPC_Type{
csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME,
Expand Down
4 changes: 2 additions & 2 deletions pkg/mem/mem.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/common"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/options"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/utils"
"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/version"
log "github.com/sirupsen/logrus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
Expand All @@ -46,7 +47,6 @@ type MEM struct {

const (
driverName = "memplugin.csi.alibabacloud.com"
csiVersion = "1.0.0"
)

// Init checks for the persistent volume file and loads all found volumes
Expand All @@ -65,7 +65,7 @@ func NewDriver(nodeID, endpoint string) *MEM {
log.Infof("Use node id : %s", nodeID)
}
GlobalConfigSet("", nodeID, driverName)
csiDriver := csicommon.NewCSIDriver(driverName, csiVersion, nodeID)
csiDriver := csicommon.NewCSIDriver(driverName, version.VERSION, nodeID)
tmpmem.driver = csiDriver
tmpmem.driver.AddControllerServiceCapabilities([]csi.ControllerServiceCapability_RPC_Type{
csi.ControllerServiceCapability_RPC_CREATE_DELETE_VOLUME,
Expand Down
Loading

0 comments on commit dc14424

Please sign in to comment.