Merge pull request #75 from nbalacha/tolerations

feat: move tolerations into LVMCluster.Spec
openshift · Jan 17, 2022 · 56de5eb · 56de5eb
2 parents b2aa645 + e6d1bc2
commit 56de5eb
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 56 deletions.
diff --git a/api/v1alpha1/lvmcluster_types.go b/api/v1alpha1/lvmcluster_types.go
@@ -28,6 +28,9 @@ import (
 type LVMClusterSpec struct {
 	// Important: Run "make" to regenerate code after modifying this file
 
+	// Tolerations to apply to nodes to act on
+	// +optional
+	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
 	// DeviceClasses are a rules that assign local storage devices to volumegroups that are used for creating lvm based PVs
 	// +Optional
 	DeviceClasses []DeviceClass `json:"deviceClasses,omitempty"`
@@ -50,10 +53,6 @@ type DeviceClass struct {
 	// +optional
 	NodeSelector *corev1.NodeSelector `json:"nodeSelector,omitempty"`
 
-	// Tolerations to apply to nodes to act on
-	// +optional
-	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
-
 	// TODO: add support for various LVM settings
 	// // Config for this deviceClass, lvm settings are a field here
 	// // +optional

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/lvm.topolvm.io_lvmclusters.yaml b/config/crd/bases/lvm.topolvm.io_lvmclusters.yaml
@@ -138,48 +138,46 @@ spec:
                       required:
                       - nodeSelectorTerms
                       type: object
-                    tolerations:
-                      description: Tolerations to apply to nodes to act on
-                      items:
-                        description: The pod this Toleration is attached to tolerates
-                          any taint that matches the triple <key,value,effect> using
-                          the matching operator <operator>.
-                        properties:
-                          effect:
-                            description: Effect indicates the taint effect to match.
-                              Empty means match all taint effects. When specified,
-                              allowed values are NoSchedule, PreferNoSchedule and
-                              NoExecute.
-                            type: string
-                          key:
-                            description: Key is the taint key that the toleration
-                              applies to. Empty means match all taint keys. If the
-                              key is empty, operator must be Exists; this combination
-                              means to match all values and all keys.
-                            type: string
-                          operator:
-                            description: Operator represents a key's relationship
-                              to the value. Valid operators are Exists and Equal.
-                              Defaults to Equal. Exists is equivalent to wildcard
-                              for value, so that a pod can tolerate all taints of
-                              a particular category.
-                            type: string
-                          tolerationSeconds:
-                            description: TolerationSeconds represents the period of
-                              time the toleration (which must be of effect NoExecute,
-                              otherwise this field is ignored) tolerates the taint.
-                              By default, it is not set, which means tolerate the
-                              taint forever (do not evict). Zero and negative values
-                              will be treated as 0 (evict immediately) by the system.
-                            format: int64
-                            type: integer
-                          value:
-                            description: Value is the taint value the toleration matches
-                              to. If the operator is Exists, the value should be empty,
-                              otherwise just a regular string.
-                            type: string
-                        type: object
-                      type: array
+                  type: object
+                type: array
+              tolerations:
+                description: Tolerations to apply to nodes to act on
+                items:
+                  description: The pod this Toleration is attached to tolerates any
+                    taint that matches the triple <key,value,effect> using the matching
+                    operator <operator>.
+                  properties:
+                    effect:
+                      description: Effect indicates the taint effect to match. Empty
+                        means match all taint effects. When specified, allowed values
+                        are NoSchedule, PreferNoSchedule and NoExecute.
+                      type: string
+                    key:
+                      description: Key is the taint key that the toleration applies
+                        to. Empty means match all taint keys. If the key is empty,
+                        operator must be Exists; this combination means to match all
+                        values and all keys.
+                      type: string
+                    operator:
+                      description: Operator represents a key's relationship to the
+                        value. Valid operators are Exists and Equal. Defaults to Equal.
+                        Exists is equivalent to wildcard for value, so that a pod
+                        can tolerate all taints of a particular category.
+                      type: string
+                    tolerationSeconds:
+                      description: TolerationSeconds represents the period of time
+                        the toleration (which must be of effect NoExecute, otherwise
+                        this field is ignored) tolerates the taint. By default, it
+                        is not set, which means tolerate the taint forever (do not
+                        evict). Zero and negative values will be treated as 0 (evict
+                        immediately) by the system.
+                      format: int64
+                      type: integer
+                    value:
+                      description: Value is the taint value the toleration matches
+                        to. If the operator is Exists, the value should be empty,
+                        otherwise just a regular string.
+                      type: string
                   type: object
                 type: array
             type: object

diff --git a/controllers/topolvm_node.go b/controllers/topolvm_node.go
@@ -169,7 +169,7 @@ func getNodeDaemonSet(lvmCluster *lvmv1alpha1.LVMCluster, namespace string) *app
 	// Affinity and tolerations
 	nodeSelector, tolerations := extractNodeSelectorAndTolerations(lvmCluster)
 
-	topolvmNodeTolerations := []corev1.Toleration{{Operator: corev1.TolerationOpExists}}
+	topolvmNodeTolerations := []corev1.Toleration{}
 	if tolerations != nil {
 		topolvmNodeTolerations = tolerations
 	}

diff --git a/controllers/utils.go b/controllers/utils.go
@@ -25,11 +25,13 @@ import (
 // extractNodeSelectorAndTolerations combines and extracts scheduling parameters from the multiple deviceClass entries in an lvmCluster
 func extractNodeSelectorAndTolerations(lvmCluster *lvmv1alpha1.LVMCluster) (*corev1.NodeSelector, []corev1.Toleration) {
 	var nodeSelector *corev1.NodeSelector
-	var tolerations []corev1.Toleration
+
+	tolerations := lvmCluster.Spec.Tolerations
+
 	terms := make([]corev1.NodeSelectorTerm, 0)
 	matchAllNodes := false
 	for _, deviceClass := range lvmCluster.Spec.DeviceClasses {
-		tolerations = append(tolerations, deviceClass.Tolerations...)
+
 		if deviceClass.NodeSelector != nil {
 			terms = append(terms, deviceClass.NodeSelector.NodeSelectorTerms...)
 		} else {