Merge pull request #50 from civo/provision-volumes-as-cluster-type

provision volumes using the volume type of the cluster

Author: dippydocus

go.mod

@@ -4,7 +4,7 @@ go 1.24.1
 
 require (
 	github.com/BurntSushi/toml v0.3.1
-	github.com/civo/civogo v0.3.92
+	github.com/civo/civogo v0.6.3
 	github.com/container-storage-interface/spec v1.6.0
 	github.com/golang/protobuf v1.5.4
 	github.com/joho/godotenv v1.4.0

go.sum

@@ -14,6 +14,8 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/civo/civogo v0.3.92 h1:fiA9nsyvEU9vVwA8ssIDSGt6gsWs6meqgaKrimAEaI0=
 github.com/civo/civogo v0.3.92/go.mod h1:7UCYX+qeeJbrG55E1huv+0ySxcHTqq/26FcHLVelQJM=
+github.com/civo/civogo v0.6.3 h1:AgTJa2C8Q6q+vFfsaa41vVZBQXVOiUdb/JbWpNuDlc8=
+github.com/civo/civogo v0.6.3/go.mod h1:LaEbkszc+9nXSh4YNG0sYXFGYqdQFmXXzQg0gESs2hc=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=

main.go

@@ -39,6 +39,13 @@ func main() {
 
 	log.Info().Interface("d", d).Msg("Created a new driver")
 
+	log.Debug().Msg("Determining volumeType of cluster")
+	cluster, err := d.CivoClient.GetKubernetesCluster(d.ClusterID)
+	if err != nil {
+		log.Fatal().Err(err)
+	}
+	d.ClusterVolumeType = cluster.VolumeType
+
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 

pkg/driver/controller_server.go

@@ -135,6 +135,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 		Namespace:     d.Namespace,
 		ClusterID:     d.ClusterID,
 		SizeGigabytes: int(desiredSize),
+		VolumeType:    d.ClusterVolumeType,
 		// SnapshotID: snapshotID, // TODO: Uncomment after client implementation is complete.
 	}
 	log.Debug().Msg("Creating volume in Civo API")

pkg/driver/driver.go

@@ -35,12 +35,13 @@ type Driver struct {
 	DiskHotPlugger DiskHotPlugger
 	controller     bool
 	SocketFilename string
-	NodeInstanceID string
-	Region         string
-	Namespace      string
-	ClusterID      string
-	TestMode       bool
-	grpcServer     *grpc.Server
+	// NodeInstanceID string
+	Region            string
+	Namespace         string
+	ClusterID         string
+	TestMode          bool
+	grpcServer        *grpc.Server
+	ClusterVolumeType string
 }
 
 // NewDriver returns a CSI driver that implements gRPC endpoints for CSI
@@ -94,7 +95,7 @@ func NewTestDriver(fc *civogo.FakeClient) (*Driver, error) {
 
 	d.DiskHotPlugger = &FakeDiskHotPlugger{}
 	d.TestMode = true // Just stops so much logging out of failures, as they are often expected during the tests
-
+	d.ClusterVolumeType = "standard"
 	zerolog.SetGlobalLevel(zerolog.PanicLevel)
 
 	return d, err