Added compile time vendorVersion injection

Author: davidz627

Dockerfile

@@ -12,10 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+
 FROM golang:1.10.1-alpine3.7 as builder
 WORKDIR /go/src/sigs.k8s.io/gcp-compute-persistent-disk-csi-driver
 ADD . .
-RUN CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-extldflags "-static"' -o bin/gce-pd-csi-driver ./cmd/
+ARG TAG
+RUN CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-X main.vendorVersion='"${TAG:-latest}"' -extldflags "-static"' -o bin/gce-pd-csi-driver ./cmd/
 
 # Start from Google Debian base
 FROM gcr.io/google-containers/debian-base-amd64:0.3

Makefile

@@ -17,21 +17,23 @@ STAGINGVERSION=latest
 
 PRODIMAGE=gcr.io/google-containers/volume-csi/compute-persistent-disk-csi-driver
 PRODVERSION=v0.2.0.alpha
+
 all: gce-pd-driver
 
 gce-pd-driver:
 	mkdir -p bin
-	go build -o bin/gce-pd-csi-driver ./cmd/
+	go build -ldflags "-X main.vendorVersion=${STAGINGVERSION}" -o bin/gce-pd-csi-driver ./cmd/
 	go test -c sigs.k8s.io/gcp-compute-persistent-disk-csi-driver/test/e2e -o bin/e2e.test
 
-build-container: gce-pd-driver
-	docker build -t $(STAGINGIMAGE):$(STAGINGVERSION) .
+build-container:
+# TODO CHANGE PRODVERSION TO STAGINGVERSION AFTER TESTING
+	docker build --build-arg TAG=$(STAGINGVERSION) -t $(STAGINGIMAGE):$(STAGINGVERSION) .
 
 push-container: build-container
 	gcloud docker -- push $(STAGINGIMAGE):$(STAGINGVERSION)
 
-prod-build-container: gce-pd-driver
-	docker build -t $(PRODIMAGE):$(PRODVERSION)
+prod-build-container:
+	docker build --build-arg TAG=$(PRODVERSION) -t $(PRODIMAGE):$(PRODVERSION)
 
 prod-push-container: prod-build-container
 	gcloud docker -- push $(PRODIMAGE):$(PRODVERSION)

cmd/main.go

@@ -30,23 +30,28 @@ func init() {
 }
 
 var (
-	endpoint   = flag.String("endpoint", "unix://tmp/csi.sock", "CSI endpoint")
-	driverName = flag.String("drivername", "com.google.csi.gcepd", "name of the driver")
-	nodeID     = flag.String("nodeid", "", "node id")
+	endpoint      = flag.String("endpoint", "unix://tmp/csi.sock", "CSI endpoint")
+	driverName    = flag.String("drivername", "com.google.csi.gcepd", "name of the driver")
+	nodeID        = flag.String("nodeid", "", "node id")
+	vendorVersion string
 )
 
 func main() {
 	flag.Parse()
-
 	handle()
 	os.Exit(0)
 }
 
 func handle() {
+	if vendorVersion == "" {
+		glog.Fatalf("vendorVersion must be set at compile time")
+	}
+	glog.Infof("Driver vendor version %v", vendorVersion)
+
 	gceDriver := driver.GetGCEDriver()
 
 	//Initialize GCE Driver (Move setup to main?)
-	cloudProvider, err := gce.CreateCloudProvider(gceDriver.GetVendorVersion())
+	cloudProvider, err := gce.CreateCloudProvider(vendorVersion)
 	if err != nil {
 		glog.Fatalf("Failed to get cloud provider: %v", err)
 	}
@@ -56,7 +61,7 @@ func handle() {
 		glog.Fatalf("Failed to get mounter: %v", err)
 	}
 
-	err = gceDriver.SetupGCEDriver(cloudProvider, mounter, *driverName, *nodeID)
+	err = gceDriver.SetupGCEDriver(cloudProvider, mounter, *driverName, *nodeID, vendorVersion)
 	if err != nil {
 		glog.Fatalf("Failed to initialize GCE CSI Driver: %v", err)
 	}

pkg/gce-cloud-provider/gce.go

@@ -81,7 +81,6 @@ func createCloudServiceWithDefaultServiceAccount(vendorVersion string) (*compute
 	if err != nil {
 		return nil, err
 	}
-	// TODO(dyzz) parameterize version number
 	service.UserAgent = fmt.Sprintf("GCE CSI Driver/%s (%s %s)", vendorVersion, runtime.GOOS, runtime.GOARCH)
 	return service, nil
 }

pkg/gce-pd-csi-driver/gce-pd-driver.go

@@ -39,21 +39,11 @@ type GCEDriver struct {
 	nscap []*csi.NodeServiceCapability
 }
 
-const (
-	vendorVersion = "v0.3.0-alpha"
-)
-
 func GetGCEDriver() *GCEDriver {
-	return &GCEDriver{
-		vendorVersion: vendorVersion,
-	}
-}
-
-func (gceDriver *GCEDriver) GetVendorVersion() string {
-	return gceDriver.vendorVersion
+	return &GCEDriver{}
 }
 
-func (gceDriver *GCEDriver) SetupGCEDriver(cloudProvider gce.GCECompute, mounter mountmanager.Mounter, name, nodeID string) error {
+func (gceDriver *GCEDriver) SetupGCEDriver(cloudProvider gce.GCECompute, mounter mountmanager.Mounter, name, nodeID, vendorVersion string) error {
 	if name == "" {
 		return fmt.Errorf("Driver name missing")
 	}
@@ -63,6 +53,7 @@ func (gceDriver *GCEDriver) SetupGCEDriver(cloudProvider gce.GCECompute, mounter
 
 	gceDriver.name = name
 	gceDriver.nodeID = nodeID
+	gceDriver.vendorVersion = vendorVersion
 
 	// Adding Capabilities
 	vcam := []csi.VolumeCapability_AccessMode_Mode{

test/e2e/gce_pd_e2e_test.go

@@ -78,10 +78,11 @@ var _ = BeforeSuite(func() {
 	// TODO(dyzz): better defaults
 	driverName := "testdriver"
 	nodeID = "gce-pd-csi-e2e"
+	vendorVersion := "testVendor"
 
 	// TODO(dyzz): Start a driver
 	gceDriver := driver.GetGCEDriver()
-	gceCloud, err = gce.CreateCloudProvider(gceDriver.GetVendorVersion())
+	gceCloud, err = gce.CreateCloudProvider(vendorVersion)
 
 	Expect(err).To(BeNil(), "Failed to get cloud provider: %v", err)
 
@@ -91,7 +92,7 @@ var _ = BeforeSuite(func() {
 	Expect(err).To(BeNil(), "Failed to get mounter %v", err)
 
 	//Initialize GCE Driver
-	err = gceDriver.SetupGCEDriver(gceCloud, mounter, driverName, nodeID)
+	err = gceDriver.SetupGCEDriver(gceCloud, mounter, driverName, nodeID, vendorVersion)
 	Expect(err).To(BeNil(), "Failed to initialize GCE CSI Driver: %v", err)
 
 	go func() {

test/sanity/sanity_test.go

@@ -31,6 +31,7 @@ func TestSanity(t *testing.T) {
 	nodeID := "io.kubernetes.storage.mock"
 	project := "test-project"
 	zone := "test-zone"
+	vendorVersion := "test-version"
 	// TODO(dyzz): Only one of these can be correct, the way endpoint is defined in GCE driver is INCORRECT
 	endpoint := "unix://tmp/csi.sock"
 	csiSanityEndpoint := "unix:/tmp/csi.sock"
@@ -50,7 +51,7 @@ func TestSanity(t *testing.T) {
 	}
 
 	//Initialize GCE Driver
-	err = gceDriver.SetupGCEDriver(cloudProvider, mounter, driverName, nodeID)
+	err = gceDriver.SetupGCEDriver(cloudProvider, mounter, driverName, nodeID, vendorVersion)
 	if err != nil {
 		t.Fatalf("Failed to initialize GCE CSI Driver: %v", err)
 	}