[DO NOT MERGE]: For verification of VolumeAttachment cleanup when a node is force deleted or recycled

Dockerfile

@@ -31,7 +31,7 @@ COPY --from=builder /app/civo-csi /app/civo-csi
 
 RUN chmod +x /app/civo-csi
 
-RUN apk add --update --no-cache findmnt blkid e2fsprogs e2fsprogs-extra
+RUN apk add --update --no-cache findmnt blkid e2fsprogs e2fsprogs-extra expect
 
 # Run the civo-csi binary
 ENTRYPOINT ["/app/civo-csi"]

deploy/install.yaml

@@ -398,6 +398,13 @@ spec:
               mountPath: /registration
         - name: civo-csi-plugin
           image: gcr.io/consummate-yew-302509/csi:latest
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - /bin/sh
+                  - -c
+                  - unbuffer /app/civo-csi pre-stop > /proc/1/fd/1
           env:
             - name: CIVO_API_KEY
               valueFrom:

main.go

@@ -3,12 +3,14 @@ package main
 import (
 	"context"
 	"flag"
+	"fmt"
 	"os"
 	"os/signal"
 	"strings"
 	"syscall"
 
 	"github.com/civo/civo-csi/pkg/driver"
+	"github.com/civo/civo-csi/pkg/driver/hook"
 
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
@@ -18,30 +20,17 @@ var (
 	versionInfo = flag.Bool("version", false, "Print the driver version")
 )
 
-func main() {
-	zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
-	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
-
-	flag.Parse()
-	if *versionInfo {
-		log.Info().Str("version", driver.Version).Msg("CSI driver")
-		return
-	}
-
-	apiURL := strings.TrimSpace(os.Getenv("CIVO_API_URL"))
-	apiKey := strings.TrimSpace(os.Getenv("CIVO_API_KEY"))
-	region := strings.TrimSpace(os.Getenv("CIVO_REGION"))
-	ns := strings.TrimSpace(os.Getenv("CIVO_NAMESPACE"))
-	clusterID := strings.TrimSpace(os.Getenv("CIVO_CLUSTER_ID"))
-
-	d, err := driver.NewDriver(apiURL, apiKey, region, ns, clusterID)
-	if err != nil {
-		log.Fatal().Err(err)
-	}
-
-	log.Info().Interface("d", d).Msg("Created a new driver")
+var (
+	apiURL    = strings.TrimSpace(os.Getenv("CIVO_API_URL"))
+	apiKey    = strings.TrimSpace(os.Getenv("CIVO_API_KEY"))
+	region    = strings.TrimSpace(os.Getenv("CIVO_REGION"))
+	ns        = strings.TrimSpace(os.Getenv("CIVO_NAMESPACE"))
+	clusterID = strings.TrimSpace(os.Getenv("CIVO_CLUSTER_ID"))
+	node      = strings.TrimSpace(os.Getenv("KUBE_NODE_NAME"))
+)
 
-	ctx, cancel := context.WithCancel(context.Background())
+func run(ctx context.Context) error {
+	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 
 	c := make(chan os.Signal, 1)
@@ -53,9 +42,43 @@ func main() {
 		cancel()
 	}()
 
+	flag.Parse()
+	if *versionInfo {
+		log.Info().Str("version", driver.Version).Msg("CSI driver")
+		return nil
+	}
+
+	if len(os.Args) > 1 {
+		hook, err := hook.NewHook(
+			hook.WithNodeName(node),
+		)
+		if err != nil {
+			return err
+		}
+		switch cmd := os.Args[1]; cmd {
+		case "pre-stop":
+			log.Info().Msg("Running the pre-stop hook for driver")
+			return hook.PreStop(ctx)
+		default:
+			return fmt.Errorf("not supported command: %q", cmd)
+		}
+	}
+
+	d, err := driver.NewDriver(apiURL, apiKey, region, ns, clusterID)
+	if err != nil {
+		return err
+	}
+	log.Info().Interface("d", d).Msg("Created a new driver")
+
 	log.Info().Msg("Running the driver")
+	return d.Run(ctx)
+}
+
+func main() {
+	zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
+	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
 
-	if err := d.Run(ctx); err != nil {
-		log.Fatal().Err(err)
+	if err := run(context.Background()); err != nil {
+		log.Fatal().Err(err).Msg("Application error occured")
 	}
 }