csi: adding toleration to schedule CSI pods

when PVC is scheduled on master node csi pods fail to run on master nodes Signed-off-by: rchikatw <[email protected]>
red-hat-storage · Nov 15, 2023 · 9b642c4 · 9b642c4
1 parent 1969a71
commit 9b642c4
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 0 deletions.
diff --git a/pkg/csi/cephfsdaemonset.go b/pkg/csi/cephfsdaemonset.go
@@ -20,6 +20,7 @@ import (
 	"fmt"
 
 	"github.com/red-hat-storage/ocs-client-operator/pkg/templates"
+	"github.com/red-hat-storage/ocs-client-operator/pkg/utils"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/api/core/v1"
@@ -262,6 +263,9 @@ func GetCephFSDaemonSet(namespace string) *appsv1.DaemonSet {
 							},
 						},
 					},
+					Tolerations: []corev1.Toleration{
+						utils.GetTolerationForCSIPods(),
+					},
 				},
 			},
 		},

diff --git a/pkg/csi/rbddaemonset.go b/pkg/csi/rbddaemonset.go
@@ -36,6 +36,7 @@ import (
 	"fmt"
 
 	"github.com/red-hat-storage/ocs-client-operator/pkg/templates"
+	"github.com/red-hat-storage/ocs-client-operator/pkg/utils"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/api/core/v1"
@@ -390,6 +391,9 @@ func GetRBDDaemonSet(namespace string) *appsv1.DaemonSet {
 							},
 						},
 					},
+					Tolerations: []corev1.Toleration{
+						utils.GetTolerationForCSIPods(),
+					},
 				},
 			},
 		},

diff --git a/pkg/utils/k8sutils.go b/pkg/utils/k8sutils.go
@@ -36,6 +36,8 @@ const StorageClientNamespaceEnvVar = "STORAGE_CLIENT_NAMESPACE"
 
 const StatusReporterImageEnvVar = "STATUS_REPORTER_IMAGE"
 
+const CSIDaemonSetsTolerateAllNodes = "CSI_DaemonSets_Tolerate_All_Nodes"
+
 // GetOperatorNamespace returns the namespace where the operator is deployed.
 func GetOperatorNamespace() string {
 	return os.Getenv(OperatorNamespaceEnvVar)

diff --git a/pkg/utils/placements.go b/pkg/utils/placements.go
@@ -0,0 +1,27 @@
+package utils
+
+import (
+	"log"
+	"os"
+	"strconv"
+
+	corev1 "k8s.io/api/core/v1"
+)
+
+func GetTolerationForCSIPods() corev1.Toleration {
+	enableCSIPodSchedulingOnMaster, err := strconv.ParseBool(os.Getenv(CSIDaemonSetsTolerateAllNodes))
+	if err != nil {
+		log.Fatal(err)
+	}
+	if enableCSIPodSchedulingOnMaster {
+		toleration := corev1.Toleration{
+			Key:      "node-role.kubernetes.io/master",
+			Operator: corev1.TolerationOpExists,
+			Value:    "true",
+			Effect:   corev1.TaintEffectNoSchedule,
+		}
+		return toleration
+
+	}
+	return corev1.Toleration{}
+}