From 5cf982aef159e525f851d736b745b03252486a81 Mon Sep 17 00:00:00 2001
From: Madhu Rajanna <madhupr007@gmail.com>
Date: Wed, 8 Nov 2023 12:40:38 +0100
Subject: [PATCH] cleanup: fix spellcheck errors

fixed spellcheck errors caught in
CI.

Signed-off-by: Madhu Rajanna <madhupr007@gmail.com>
(cherry picked from commit 304462c7cc3e1b06d399a4d231c03821e7342486)
---
 api/deploy/ocp/scc.go            |  2 +-
 e2e/utils.go                     |  2 +-
 internal/cephfs/fuserecovery.go  | 12 ++++++------
 internal/rbd/driver/driver.go    |  9 ++++++---
 internal/util/fscrypt/fscrypt.go |  2 +-
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/api/deploy/ocp/scc.go b/api/deploy/ocp/scc.go
index 9bd6aa3ecfd..b0f277da4b6 100644
--- a/api/deploy/ocp/scc.go
+++ b/api/deploy/ocp/scc.go
@@ -41,7 +41,7 @@ type SecurityContextConstraintsValues struct {
 }
 
 // SecurityContextConstraintsDefaults can be used for generating deployment
-// artifacts with defails values.
+// artifacts with details values.
 var SecurityContextConstraintsDefaults = SecurityContextConstraintsValues{
 	Namespace: "ceph-csi",
 	Deployer:  "",
diff --git a/e2e/utils.go b/e2e/utils.go
index 9273223a959..33b167f1b3d 100644
--- a/e2e/utils.go
+++ b/e2e/utils.go
@@ -1174,7 +1174,7 @@ func validatePVCSnapshot(
 				checkSumClone, chErrs[n] = calculateSHA512sum(f, &a, filePath, &opt)
 				framework.Logf("checksum value for the clone is %s with pod name %s", checkSumClone, name)
 				if chErrs[n] != nil {
-					framework.Logf("failed to calculte checksum for clone: %s", chErrs[n])
+					framework.Logf("failed to calculate checksum for clone: %s", chErrs[n])
 				}
 				if checkSumClone != checkSum {
 					framework.Logf(
diff --git a/internal/cephfs/fuserecovery.go b/internal/cephfs/fuserecovery.go
index ca66662a5f2..bcc4da87401 100644
--- a/internal/cephfs/fuserecovery.go
+++ b/internal/cephfs/fuserecovery.go
@@ -68,9 +68,9 @@ func (ns *NodeServer) getMountState(path string) (mountState, error) {
 	return msNotMounted, nil
 }
 
-func findMountinfo(mountpoint string, mis []mountutil.MountInfo) int {
-	for i := range mis {
-		if mis[i].MountPoint == mountpoint {
+func findMountinfo(mountpoint string, minfo []mountutil.MountInfo) int {
+	for i := range minfo {
+		if minfo[i].MountPoint == mountpoint {
 			return i
 		}
 	}
@@ -80,9 +80,9 @@ func findMountinfo(mountpoint string, mis []mountutil.MountInfo) int {
 
 // Ensures that given mountpoint is of specified fstype.
 // Returns true if fstype matches, or if no such mountpoint exists.
-func validateFsType(mountpoint, fsType string, mis []mountutil.MountInfo) bool {
-	if idx := findMountinfo(mountpoint, mis); idx > 0 {
-		mi := mis[idx]
+func validateFsType(mountpoint, fsType string, minfo []mountutil.MountInfo) bool {
+	if idx := findMountinfo(mountpoint, minfo); idx > 0 {
+		mi := minfo[idx]
 
 		if mi.FsType != fsType {
 			return false
diff --git a/internal/rbd/driver/driver.go b/internal/rbd/driver/driver.go
index 5ae7c45ac98..587997044d7 100644
--- a/internal/rbd/driver/driver.go
+++ b/internal/rbd/driver/driver.go
@@ -175,9 +175,12 @@ func (r *Driver) Run(conf *util.Config) {
 		r.cs = NewControllerServer(r.cd)
 		r.cs.ClusterName = conf.ClusterName
 		r.cs.SetMetadata = conf.SetMetadata
-		log.WarningLogMsg("replication service running on controller server is deprecated " +
-			"and replaced by CSI-Addons, see https://github.com/ceph/ceph-csi/issues/3314 for more details")
-		r.rs = NewReplicationServer(r.cs)
+	}
+
+	// configure CSI-Addons server and components
+	err = r.setupCSIAddonsServer(conf)
+	if err != nil {
+		log.FatalLogMsg(err.Error())
 	}
 
 	s := csicommon.NewNonBlockingGRPCServer()
diff --git a/internal/util/fscrypt/fscrypt.go b/internal/util/fscrypt/fscrypt.go
index 6f87b69d67d..3b1d46b97fe 100644
--- a/internal/util/fscrypt/fscrypt.go
+++ b/internal/util/fscrypt/fscrypt.go
@@ -337,7 +337,7 @@ func InitializeNode(ctx context.Context) error {
 	return nil
 }
 
-// FscryptUnlock unlocks possilby creating fresh fscrypt metadata
+// FscryptUnlock unlocks possibly creating fresh fscrypt metadata
 // iff a volume is encrypted. Otherwise return immediately Calling
 // this function requires that InitializeFscrypt ran once on this node.
 func Unlock(