Merge pull request #46 from jsanda/tolerations

make tolerations configurable
k8ssandra · May 14, 2021 · 6d01ad2 · 6d01ad2
2 parents 3a4ae76 + 17332d2
commit 6d01ad2
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 0 deletions.
diff --git a/api/v1alpha1/reaper_types.go b/api/v1alpha1/reaper_types.go
@@ -92,6 +92,9 @@ type ReaperSpec struct {
 	ImagePullPolicy string `json:"imagePullPolicy,omitempty"`
 
 	ServerConfig ServerConfig `json:"serverConfig,omitempty" yaml:"serverConfig,omitempty"`
+
+	// Tolerations applied to the Reaper pods
+	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
 }
 
 // ReaperStatus defines the observed state of Reaper

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/reaper.cassandra-reaper.io_reapers.yaml b/config/crd/bases/reaper.cassandra-reaper.io_reapers.yaml
@@ -93,6 +93,46 @@ spec:
                 storageType:
                   type: string
               type: object
+            tolerations:
+              description: Tolerations applied to the Reaper pods
+              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
         status:
           description: ReaperStatus defines the observed state of Reaper

diff --git a/pkg/reconcile/reconcilers.go b/pkg/reconcile/reconcilers.go
@@ -490,6 +490,7 @@ func newDeployment(reaper *api.Reaper, cassDcService string) *appsv1.Deployment
 							Env:            envVars,
 						},
 					},
+					Tolerations: reaper.Spec.Tolerations,
 				},
 			},
 		},

diff --git a/pkg/reconcile/reconcilers_test.go b/pkg/reconcile/reconcilers_test.go
@@ -111,6 +111,32 @@ func TestNewDeployment(t *testing.T) {
 	assert.Equal(t, probe, container.ReadinessProbe)
 }
 
+func TestTolerations(t *testing.T) {
+	image := "test/reaper:latest"
+	tolerations := []corev1.Toleration{
+		{
+			Key:      "key1",
+			Operator: corev1.TolerationOpEqual,
+			Value:    "value1",
+			Effect:   corev1.TaintEffectNoSchedule,
+		},
+		{
+			Key:      "key2",
+			Operator: corev1.TolerationOpEqual,
+			Value:    "value2",
+			Effect:   corev1.TaintEffectNoSchedule,
+		},
+	}
+
+	reaper := newReaperWithCassandraBackend()
+	reaper.Spec.Image = image
+	reaper.Spec.Tolerations = tolerations
+
+	deployment := newDeployment(reaper, "target-datacenter-service")
+
+	assert.ElementsMatch(t, tolerations, deployment.Spec.Template.Spec.Tolerations)
+}
+
 func newReaperWithCassandraBackend() *api.Reaper {
 	namespace := "service-test"
 	reaperName := "test-reaper"