build: update Go 1.23

api/go.mod

@@ -1,6 +1,6 @@
 module github.com/ceph/ceph-csi/api
 
-go 1.22.5
+go 1.23.0
 
 require (
 	github.com/ghodss/yaml v1.0.0

build.env

@@ -19,14 +19,14 @@ BASE_IMAGE=quay.io/ceph/ceph:v19
 CEPH_VERSION=squid
 
 # standard Golang options
-GOLANG_VERSION=1.22.5
+GOLANG_VERSION=1.23.4
 GO111MODULE=on
 
 # commitlint version
 COMMITLINT_VERSION=latest
 
 # static checks and linters
-GOLANGCI_VERSION=v1.57.2
+GOLANGCI_VERSION=v1.62.2
 
 # external snapshotter version
 # Refer: https://github.com/kubernetes-csi/external-snapshotter/releases

e2e/cephfs.go

@@ -218,7 +218,7 @@ var _ = Describe(cephfsType, func() {
 
 		err = createSubvolumegroup(f, fileSystemName, subvolumegroup)
 		if err != nil {
-			framework.Failf("%v", err)
+			framework.Failf("failed to create subvolumegroup %s: %v", subvolumegroup, err)
 		}
 	})
 
@@ -261,7 +261,7 @@ var _ = Describe(cephfsType, func() {
 
 		err = deleteSubvolumegroup(f, fileSystemName, subvolumegroup)
 		if err != nil {
-			framework.Failf("%v", err)
+			framework.Failf("failed to delete subvolumegroup %s: %v", subvolumegroup, err)
 		}
 
 		if deployCephFS {
@@ -768,7 +768,7 @@ var _ = Describe(cephfsType, func() {
 				for i := range deplPods {
 					err = ensureStatSucceeds(deplPods[i].Name)
 					if err != nil {
-						framework.Failf(err.Error())
+						framework.Failf("ensureStatSucceeds failed for pod %q: %v", deplPods[i].Name, err.Error())
 					}
 				}
 				// Kill ceph-fuse in cephfs-csi node plugin Pods.
@@ -797,12 +797,12 @@ var _ = Describe(cephfsType, func() {
 				// the pod with hopefully mounts working again.
 				err = deletePod(pod2Name, depl.Namespace, c, deployTimeout)
 				if err != nil {
-					framework.Failf(err.Error())
+					framework.Failf("failed to delete pod %s: %v", pod2Name, err.Error())
 				}
 				// Wait for the second Pod to be recreated.
 				err = waitForDeploymentComplete(c, depl.Name, depl.Namespace, deployTimeout)
 				if err != nil {
-					framework.Failf(err.Error())
+					framework.Failf("timeout waiting for deployment %s: %v", depl.Name, err.Error())
 				}
 				// List Deployment's pods again to get name of the new pod.
 				deplPods, err = listPods(f, depl.Namespace, &metav1.ListOptions{
@@ -828,7 +828,7 @@ var _ = Describe(cephfsType, func() {
 				// Verify Pod pod2Name has its ceph-fuse mount working again.
 				err = ensureStatSucceeds(pod2Name)
 				if err != nil {
-					framework.Failf(err.Error())
+					framework.Failf("ensureStatSucceeds failed for pod %q: %v", pod2Name, err.Error())
 				}
 
 				// Delete created resources.
@@ -967,11 +967,11 @@ var _ = Describe(cephfsType, func() {
 
 				err = createSubvolumegroup(f, fileSystemName, subvolgrp1)
 				if err != nil {
-					framework.Failf("%v", err)
+					framework.Failf("failed to create subvolumegroup %s: %v", subvolgrp1, err)
 				}
 				err = createSubvolumegroup(f, fileSystemName, subvolgrp2)
 				if err != nil {
-					framework.Failf("%v", err)
+					framework.Failf("failed to create subvolumegroup %s: %v", subvolgrp2, err)
 				}
 				err = createCustomConfigMap(f.ClientSet, cephFSDirPath, clusterInfo)
 				if err != nil {
@@ -1019,11 +1019,11 @@ var _ = Describe(cephfsType, func() {
 				}
 				err = deleteSubvolumegroup(f, fileSystemName, subvolgrp1)
 				if err != nil {
-					framework.Failf("%v", err)
+					framework.Failf("failed to delete subvolumegroup %s: %v", subvolgrp1, err)
 				}
 				err = deleteSubvolumegroup(f, fileSystemName, subvolgrp2)
 				if err != nil {
-					framework.Failf("%v", err)
+					framework.Failf("failed to delete subvolumegroup %s: %v", subvolgrp2, err)
 				}
 				err = deleteConfigMap(cephFSDirPath)
 				if err != nil {
@@ -1076,14 +1076,15 @@ var _ = Describe(cephfsType, func() {
 				}
 
 				filePath := app.Spec.Containers[0].VolumeMounts[0].MountPath + "/test"
+				cmd := "echo 'Hello World' >" + filePath
 				_, stdErr := execCommandInPodAndAllowFail(
 					f,
-					"echo 'Hello World' >"+filePath,
+					cmd,
 					app.Namespace,
 					&opt)
 				readOnlyErr := fmt.Sprintf("cannot create %s: Read-only file system", filePath)
 				if !strings.Contains(stdErr, readOnlyErr) {
-					framework.Failf(stdErr)
+					framework.Failf("failed to execute command %s: %v", cmd, stdErr)
 				}
 
 				// delete PVC and app
@@ -2406,14 +2407,15 @@ var _ = Describe(cephfsType, func() {
 				}
 
 				filePath := app.Spec.Containers[0].VolumeMounts[0].MountPath + "/test"
+				cmd := "echo 'Hello World' > " + filePath
 				_, stdErr := execCommandInPodAndAllowFail(
 					f,
-					"echo 'Hello World' > "+filePath,
+					cmd,
 					app.Namespace,
 					&opt)
 				readOnlyErr := fmt.Sprintf("cannot create %s: Read-only file system", filePath)
 				if !strings.Contains(stdErr, readOnlyErr) {
-					framework.Failf(stdErr)
+					framework.Failf("failed to execute command %s: %v", cmd, stdErr)
 				}
 
 				// delete cloned ROX pvc and app

e2e/nfs.go

@@ -279,7 +279,7 @@ var _ = Describe("nfs", func() {
 
 		err = createSubvolumegroup(f, fileSystemName, subvolumegroup)
 		if err != nil {
-			framework.Failf("%v", err)
+			framework.Failf("failed to create subvolumegroup %s: %v", subvolumegroup, err)
 		}
 	})
 
@@ -320,7 +320,7 @@ var _ = Describe("nfs", func() {
 		}
 		err = deleteSubvolumegroup(f, fileSystemName, subvolumegroup)
 		if err != nil {
-			framework.Failf("%v", err)
+			framework.Failf("failed to delete subvolumegroup %s: %v", subvolumegroup, err)
 		}
 
 		if deployNFS {
@@ -607,14 +607,15 @@ var _ = Describe("nfs", func() {
 				}
 
 				filePath := app.Spec.Containers[0].VolumeMounts[0].MountPath + "/test"
+				cmd := "echo 'Hello World' > " + filePath
 				_, stdErr := execCommandInPodAndAllowFail(
 					f,
-					"echo 'Hello World' > "+filePath,
+					cmd,
 					app.Namespace,
 					&opt)
 				readOnlyErr := fmt.Sprintf("cannot create %s: Read-only file system", filePath)
 				if !strings.Contains(stdErr, readOnlyErr) {
-					framework.Failf(stdErr)
+					framework.Failf("failed to execute command %s: %v", cmd, stdErr)
 				}
 
 				// delete PVC and app

e2e/rbd.go

@@ -1665,7 +1665,7 @@ var _ = Describe("RBD", func() {
 					}
 					readOnlyErr := fmt.Sprintf("cannot create %s: Read-only file system", filePath)
 					if !strings.Contains(stdErr, readOnlyErr) {
-						framework.Failf(stdErr)
+						framework.Failf("failed to execute command %s: %v", cmd, stdErr)
 					}
 				}
 
@@ -1798,7 +1798,7 @@ var _ = Describe("RBD", func() {
 					}
 					readOnlyErr := fmt.Sprintf("'%s': Operation not permitted", devPath)
 					if !strings.Contains(stdErr, readOnlyErr) {
-						framework.Failf(stdErr)
+						framework.Failf("failed to execute command %s: %v", cmd, stdErr)
 					}
 				}
 				err = deletePVCAndDeploymentApp(f, pvcClone, appClone)
@@ -3350,14 +3350,15 @@ var _ = Describe("RBD", func() {
 					}
 
 					filePath := appClone.Spec.Containers[0].VolumeMounts[0].MountPath + "/test"
+					cmd := "echo 'Hello World' > " + filePath
 					_, stdErr := execCommandInPodAndAllowFail(
 						f,
-						"echo 'Hello World' > "+filePath,
+						cmd,
 						appClone.Namespace,
 						&opt)
 					readOnlyErr := fmt.Sprintf("cannot create %s: Read-only file system", filePath)
 					if !strings.Contains(stdErr, readOnlyErr) {
-						framework.Failf(stdErr)
+						framework.Failf("failed to execute command %s: %v", cmd, stdErr)
 					}
 				}
 
@@ -3464,14 +3465,15 @@ var _ = Describe("RBD", func() {
 					}
 
 					filePath := appClone.Spec.Containers[0].VolumeMounts[0].MountPath + "/test"
+					cmd := "echo 'Hello World' > " + filePath
 					_, stdErr := execCommandInPodAndAllowFail(
 						f,
-						"echo 'Hello World' > "+filePath,
+						cmd,
 						appClone.Namespace,
 						&opt)
 					readOnlyErr := fmt.Sprintf("cannot create %s: Read-only file system", filePath)
 					if !strings.Contains(stdErr, readOnlyErr) {
-						framework.Failf(stdErr)
+						framework.Failf("failed to execute command %s: %v", cmd, stdErr)
 					}
 				}
 
@@ -4126,14 +4128,15 @@ var _ = Describe("RBD", func() {
 				}
 
 				filePath := app.Spec.Containers[0].VolumeMounts[0].MountPath + "/test"
+				cmd := "echo 'Hello World' > " + filePath
 				_, stdErr := execCommandInPodAndAllowFail(
 					f,
-					"echo 'Hello World' > "+filePath,
+					cmd,
 					app.Namespace,
 					&opt)
 				readOnlyErr := fmt.Sprintf("cannot create %s: Read-only file system", filePath)
 				if !strings.Contains(stdErr, readOnlyErr) {
-					framework.Failf(stdErr)
+					framework.Failf("failed to execute command %s: %v", cmd, stdErr)
 				}
 
 				// delete PVC and app

e2e/rbd_helper.go

@@ -36,7 +36,7 @@ import (
 	"k8s.io/kubernetes/test/e2e/framework"
 )
 
-//nolint:gomnd // numbers specify Kernel versions.
+//nolint:mnd // numbers specify Kernel versions.
 var nbdResizeSupport = []util.KernelVersion{
 	{
 		Version:      5,
@@ -48,7 +48,7 @@ var nbdResizeSupport = []util.KernelVersion{
 	}, // standard 5.3+ versions
 }
 
-//nolint:gomnd // numbers specify Kernel versions.
+//nolint:mnd // numbers specify Kernel versions.
 var fastDiffSupport = []util.KernelVersion{
 	{
 		Version:      5,
@@ -60,7 +60,7 @@ var fastDiffSupport = []util.KernelVersion{
 	}, // standard 5.3+ versions
 }
 
-//nolint:gomnd // numbers specify Kernel versions.
+//nolint:mnd // numbers specify Kernel versions.
 var deepFlattenSupport = []util.KernelVersion{
 	{
 		Version:      5,
@@ -75,7 +75,7 @@ var deepFlattenSupport = []util.KernelVersion{
 // To use `io-timeout=0` we need
 // www.mail-archive.com/[email protected]/msg38060.html
 //
-//nolint:gomnd // numbers specify Kernel versions.
+//nolint:mnd // numbers specify Kernel versions.
 var nbdZeroIOtimeoutSupport = []util.KernelVersion{
 	{
 		Version:      5,
@@ -1071,7 +1071,7 @@ func waitToRemoveImagesFromTrash(f *framework.Framework, poolName string, t int)
 			return true, nil
 		}
 		errReason = fmt.Errorf("found %d images found in trash. Image details %v", len(imagesInTrash), imagesInTrash)
-		framework.Logf(errReason.Error())
+		framework.Logf("%v", errReason.Error())
 
 		return false, nil
 	})

e2e/utils.go

@@ -251,7 +251,7 @@ func validateOmapCount(f *framework.Framework, count int, driver, pool, mode str
 					framework.Logf("additional debug info: rados ls command output: %s, stdErr: %s", stdOut, stdErr)
 				}
 			}
-			framework.Failf("%v", saveErr)
+			framework.Fail(saveErr.Error())
 		}
 	}
 }
@@ -1580,10 +1580,17 @@ func k8sVersionGreaterEquals(c kubernetes.Interface, major, minor int) bool {
 		// return value.
 	}
 
-	maj := strconv.Itoa(major)
-	min := strconv.Itoa(minor)
+	vMajor, err := strconv.Atoi(v.Major)
+	if err != nil {
+		framework.Failf("failed to convert Kubernetes major version %q to int: %v", v.Major, err)
+	}
+
+	vMinor, err := strconv.Atoi(v.Minor)
+	if err != nil {
+		framework.Failf("failed to convert Kubernetes minor version %q to int: %v", v.Minor, err)
+	}
 
-	return (v.Major > maj) || (v.Major == maj && v.Minor >= min)
+	return (vMajor > major) || (vMajor == major && vMinor >= minor)
 }
 
 // waitForJobCompletion polls the status of the given job and waits until the

go.mod

@@ -1,6 +1,6 @@
 module github.com/ceph/ceph-csi
 
-go 1.22.7
+go 1.23.0
 
 require (
 	github.com/IBM/keyprotect-go-client v0.15.1

internal/cephfs/driver.go

@@ -109,7 +109,7 @@ func (fs *Driver) Run(conf *util.Config) {
 	if conf.IsNodeServer && k8s.RunsOnKubernetes() {
 		nodeLabels, err = k8s.GetNodeLabels(conf.NodeID)
 		if err != nil {
-			log.FatalLogMsg(err.Error())
+			log.FatalLogMsg("%v", err.Error())
 		}
 	}
 
@@ -159,7 +159,7 @@ func (fs *Driver) Run(conf *util.Config) {
 	if conf.IsNodeServer {
 		topology, err = util.GetTopologyFromDomainLabels(conf.DomainLabels, conf.NodeID, conf.DriverName)
 		if err != nil {
-			log.FatalLogMsg(err.Error())
+			log.FatalLogMsg("%v", err.Error())
 		}
 		fs.ns = NewNodeServer(
 			fs.cd, conf.Vtype,
@@ -176,7 +176,7 @@ func (fs *Driver) Run(conf *util.Config) {
 	if !conf.IsControllerServer && !conf.IsNodeServer {
 		topology, err = util.GetTopologyFromDomainLabels(conf.DomainLabels, conf.NodeID, conf.DriverName)
 		if err != nil {
-			log.FatalLogMsg(err.Error())
+			log.FatalLogMsg("%v", err.Error())
 		}
 		fs.ns = NewNodeServer(
 			fs.cd, conf.Vtype,
@@ -189,7 +189,7 @@ func (fs *Driver) Run(conf *util.Config) {
 	// configure CSI-Addons server and components
 	err = fs.setupCSIAddonsServer(conf)
 	if err != nil {
-		log.FatalLogMsg(err.Error())
+		log.FatalLogMsg("%v", err.Error())
 	}
 
 	server := csicommon.NewNonBlockingGRPCServer()

internal/cephfs/mounter/volumemounter.go

@@ -31,7 +31,7 @@ import (
 var (
 	availableMounters []string
 
-	//nolint:gomnd // numbers specify Kernel versions.
+	//nolint:mnd // numbers specify Kernel versions.
 	quotaSupport = []util.KernelVersion{
 		{
 			Version:      4,

internal/cephfs/nodeserver.go

@@ -436,7 +436,7 @@ func getBackingSnapshotRoot(
 	if err != nil {
 		log.ErrorLog(ctx, "failed to open %s when searching for snapshot root: %v", snapshotsBase, err)
 
-		return "", status.Errorf(codes.Internal, err.Error())
+		return "", status.Error(codes.Internal, err.Error())
 	}
 	defer dir.Close()
 
@@ -446,7 +446,7 @@ func getBackingSnapshotRoot(
 	if err != nil {
 		log.ErrorLog(ctx, "failed to read %s when searching for snapshot root: %v", snapshotsBase, err)
 
-		return "", status.Errorf(codes.Internal, err.Error())
+		return "", status.Error(codes.Internal, err.Error())
 	}
 
 	var (