Add KillMode=process (#186)

* minor fixes

Signed-off-by: Ashima-Ashima1 <Ashima.Ashima1@ibm.com>

* fix linter

Signed-off-by: Ashima-Ashima1 <Ashima.Ashima1@ibm.com>

---------

Signed-off-by: Ashima-Ashima1 <Ashima.Ashima1@ibm.com>

Author: ashimagarg27

cmd/main.go

@@ -18,7 +18,7 @@ import (
 	"strconv"
 	"strings"
 
-	csiConfig "github.com/IBM/ibm-object-csi-driver/config"
+	"github.com/IBM/ibm-object-csi-driver/config"
 	"github.com/IBM/ibm-object-csi-driver/pkg/driver"
 	"github.com/IBM/ibm-object-csi-driver/pkg/mounter"
 	mounterUtils "github.com/IBM/ibm-object-csi-driver/pkg/mounter/utils"
@@ -67,7 +67,7 @@ func getZapLogger() *zap.Logger {
 		zapcore.NewJSONEncoder(encoderCfg),
 		zapcore.Lock(os.Stdout),
 		atom,
-	), zap.AddCaller()).With(zap.String("name", "ibm-object-csi-driver")).With(zap.String("CSIDriverName", "IBM CSI Object Driver"))
+	), zap.AddCaller()).With(zap.String("name", config.CSIPluginGithubName)).With(zap.String("CSIDriverName", "IBM CSI Object Driver"))
 
 	atom.SetLevel(zap.InfoLevel)
 	return logger
@@ -107,7 +107,7 @@ func main() {
 }
 
 func serverSetup(options *Options, logger *zap.Logger) {
-	csiDriver, err := driver.Setups3Driver(options.ServerMode, csiConfig.CSIDriverName, csiConfig.VendorVersion, logger)
+	csiDriver, err := driver.Setups3Driver(options.ServerMode, config.CSIDriverName, config.VendorVersion, logger)
 	if err != nil {
 		logger.Fatal("Failed to setup s3 driver", zap.Error(err))
 		os.Exit(1)

config/driver-config.go

@@ -18,8 +18,6 @@
 package config
 
 const (
-
-	// CSIPluginGithubName ...
 	CSIPluginGithubName = "ibm-object-csi-driver"
 	CSIDriverName       = "cos.s3.csi.ibm.io"
 	VendorVersion       = "1.1.2"

cos-csi-mounter/install/cos-csi-mounter.service

@@ -8,6 +8,7 @@ Before=shutdown.target reboot.target halt.target
 [Service]
 Type=simple
 ExecStart=/usr/local/bin/cos-csi-mounter-server
+KillMode=process
 Restart=on-failure
 RestartSec=10
 StandardOutput=journal

cos-csi-mounter/server/server.go

@@ -11,20 +11,14 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/IBM/ibm-object-csi-driver/pkg/constants"
 	mounterUtils "github.com/IBM/ibm-object-csi-driver/pkg/mounter/utils"
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 )
 
-var (
-	logger     *zap.Logger
-	socketDir  = "/var/lib/coscsi-sock"
-	socketFile = "coscsi.sock"
-
-	s3fs   = "s3fs"
-	rclone = "rclone"
-)
+var logger *zap.Logger
 
 func init() {
 	_ = flag.Set("logtostderr", "true") // #nosec G104: Attempt to set flags for logging to stderr only on best-effort basis.Error cannot be usefully handled.
@@ -53,11 +47,11 @@ func setUpLogger() *zap.Logger {
 }
 
 func setupSocket() (net.Listener, error) {
-	socketPath := filepath.Join(socketDir, socketFile)
+	socketPath := filepath.Join(constants.SocketDir, constants.SocketFile)
 
 	// Ensure the socket directory exists
-	if err := os.MkdirAll(socketDir, 0750); err != nil {
-		logger.Fatal("Failed to create socket directory", zap.String("dir", socketDir), zap.Error(err))
+	if err := os.MkdirAll(constants.SocketDir, 0750); err != nil {
+		logger.Fatal("Failed to create socket directory", zap.String("dir", constants.SocketDir), zap.Error(err))
 		return nil, err
 	}
 
@@ -86,7 +80,7 @@ func handleSignals() {
 
 	go func() {
 		<-signals
-		socketPath := filepath.Join(socketDir, socketFile)
+		socketPath := filepath.Join(constants.SocketDir, constants.SocketFile)
 		if err := os.Remove(socketPath); err != nil {
 			// Handle it properly: log it, retry, return, etc.
 			logger.Warn("Failed to remove socket on exit", zap.String("path", socketPath), zap.Error(err))
@@ -143,7 +137,7 @@ func handleCosMount() gin.HandlerFunc {
 
 		logger.Info("New mount request with values:", zap.String("Bucket", request.Bucket), zap.String("Path", request.Path), zap.String("Mounter", request.Mounter), zap.Any("Args", request.Args))
 
-		if request.Mounter != s3fs && request.Mounter != rclone {
+		if request.Mounter != constants.S3FS && request.Mounter != constants.RClone {
 			logger.Error("invalid mounter", zap.Any("mounter", request.Mounter))
 			c.JSON(http.StatusBadRequest, gin.H{"error": "invalid mounter"})
 			return

cos-csi-mounter/server/utils.go

@@ -7,6 +7,8 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+
+	"github.com/IBM/ibm-object-csi-driver/pkg/constants"
 )
 
 // MountRequest ...
@@ -51,7 +53,7 @@ func pathValidator(targetPath string) error {
 
 func (req *MountRequest) ParseMounterArgs() ([]string, error) {
 	switch req.Mounter {
-	case s3fs:
+	case constants.S3FS:
 		var args S3FSArgs
 		if err := strictDecodeForUnknownFields(req.Args, &args); err != nil {
 			return nil, fmt.Errorf("invalid s3fs args decode error: %w", err)
@@ -61,7 +63,7 @@ func (req *MountRequest) ParseMounterArgs() ([]string, error) {
 		}
 		return args.PopulateArgsSlice(req.Bucket, req.Path)
 
-	case rclone:
+	case constants.RClone:
 		var args RCloneArgs
 		if err := strictDecodeForUnknownFields(req.Args, &args); err != nil {
 			return nil, fmt.Errorf("invalid rclone args decode error: %w", err)

pkg/constants/constants.go

@@ -24,4 +24,7 @@ const (
 
 	// NodeRegionLabel Region Label attached to node
 	NodeRegionLabel = "topology.kubernetes.io/region"
+
+	SocketDir  = "/var/lib/coscsi-sock"
+	SocketFile = "coscsi.sock"
 )