Bugfix logsearchapi toleration (#1272)

* Add tolerations and affinity for log, db and prom * Bugfix bind logsearch api affinity and toleration instead of DB Co-authored-by: Vladislav Orlov <vladislav.orlov@itglobal.com>
minio · Sep 1, 2022 · 128123f · 128123f
1 parent d4a893d
commit 128123f
Show file tree

Hide file tree

Showing 8 changed files with 104 additions and 17 deletions.
diff --git a/helm/operator/templates/minio.min.io_tenants.yaml b/helm/operator/templates/minio.min.io_tenants.yaml
@@ -2238,6 +2238,22 @@ spec:
                     type: string
                   storageClassName:
                     type: string
+                  tolerations:
+                    items:
+                      properties:
+                        effect:
+                          type: string
+                        key:
+                          type: string
+                        operator:
+                          type: string
+                        tolerationSeconds:
+                          format: int64
+                          type: integer
+                        value:
+                          type: string
+                      type: object
+                    type: array
                   topologySpreadConstraints:
                     items:
                       properties:
@@ -7260,6 +7276,22 @@ spec:
                     type: string
                   storageClassName:
                     type: string
+                  tolerations:
+                    items:
+                      properties:
+                        effect:
+                          type: string
+                        key:
+                          type: string
+                        operator:
+                          type: string
+                        tolerationSeconds:
+                          format: int64
+                          type: integer
+                        value:
+                          type: string
+                      type: object
+                    type: array
                   topologySpreadConstraints:
                     items:
                       properties:

diff --git a/helm/tenant/templates/tenant.yaml b/helm/tenant/templates/tenant.yaml
@@ -211,10 +211,14 @@ spec:
     nodeSelector:
       {{- toYaml . | nindent 4 }}
     {{- end }}
+    {{- with (dig "prometheus" "affinity" (dict) .) }}
     affinity:
-      nodeAffinity: { }
-      podAffinity: { }
-      podAntiAffinity: { }
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with (dig "prometheus" "tolerations" (list) .) }}
+    tolerations:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
     {{- with (dig "resources" (dict) .) }}
     resources:
       {{- toYaml . | nindent 4 }}
@@ -243,11 +247,14 @@ spec:
     nodeSelector:
       {{ toYaml . | nindent 4 }}
     {{- end }}
+    {{- with (dig "log" "affinity" (dict) .) }}
     affinity:
-      nodeAffinity: { }
-      podAffinity: { }
-      podAntiAffinity: { }
-    tolerations: [ ]
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- with (dig "log" "tolerations" (list) .) }}
+    tolerations:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
     {{- with (dig "annotations" (dict) .) }}
     annotations:
       {{ toYaml . | nindent 4 }}
@@ -288,12 +295,14 @@ spec:
       nodeSelector:
         {{ toYaml . | nindent 4 }}
       {{- end }}
+      {{- with (dig "log" "db" "affinity" (dict) .) }}
       affinity:
-        nodeAffinity: { }
-        podAffinity: { }
-        podAntiAffinity: { }
-      tolerations: [ ]
-
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with (dig "log" "db" "tolerations" (list) .) }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with (dig "annotations" (dict) .) }}
       annotations:
         {{ toYaml . | nindent 4 }}

diff --git a/helm/tenant/values.yaml b/helm/tenant/values.yaml
@@ -225,6 +225,7 @@ tenant:
     annotations: { }
     labels: { }
     nodeSelector: { }
+    tolerations: [ ]
     affinity:
       nodeAffinity: { }
       podAffinity: { }

diff --git a/pkg/apis/minio.min.io/v2/types.go b/pkg/apis/minio.min.io/v2/types.go
@@ -843,6 +843,11 @@ type PrometheusConfig struct {
 	Affinity *corev1.Affinity `json:"affinity,omitempty"`
 	// *Optional* +
 	//
+	// Specify one or more https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/[Kubernetes tolerations] to apply to the Prometheus pods.
+	// +optional
+	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
+	// *Optional* +
+	//
 	// Specify one or more https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/[Kubernetes Topology Spread Constraints] to apply to pods deployed in the MinIO pool.
 	// +optional
 	TopologySpreadConstraints []corev1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`

diff --git a/pkg/apis/minio.min.io/v2/zz_generated.deepcopy.go b/pkg/apis/minio.min.io/v2/zz_generated.deepcopy.go
diff --git a/pkg/resources/deployments/log-search-api.go b/pkg/resources/deployments/log-search-api.go
@@ -181,15 +181,15 @@ func NewForLogSearchAPI(t *miniov2.Tenant) *appsv1.Deployment {
 
 	if t.Spec.Log.Db != nil {
 		// attach affinity clauses
-		if t.Spec.Log.Db.Affinity != nil {
-			apiPod.Spec.Affinity = t.Spec.Log.Db.Affinity
+		if t.Spec.Log.Affinity != nil {
+			apiPod.Spec.Affinity = t.Spec.Log.Affinity
 		}
 		// attach node selector clauses
-		apiPod.Spec.NodeSelector = t.Spec.Log.Db.NodeSelector
+		apiPod.Spec.NodeSelector = t.Spec.Log.NodeSelector
 		// attach tolerations
-		apiPod.Spec.Tolerations = t.Spec.Log.Db.Tolerations
+		apiPod.Spec.Tolerations = t.Spec.Log.Tolerations
 		// attach topology spread constraints
-		apiPod.Spec.TopologySpreadConstraints = t.Spec.Log.Db.TopologySpreadConstraints
+		apiPod.Spec.TopologySpreadConstraints = t.Spec.Log.TopologySpreadConstraints
 	}
 
 	d := &appsv1.Deployment{

diff --git a/pkg/resources/statefulsets/prometheus.go b/pkg/resources/statefulsets/prometheus.go
@@ -257,6 +257,7 @@ func NewForPrometheus(t *miniov2.Tenant, serviceName string) *appsv1.StatefulSet
 					SchedulerName:             t.Scheduler.Name,
 					NodeSelector:              t.Spec.Prometheus.NodeSelector,
 					Affinity:                  t.Spec.Prometheus.Affinity,
+					Tolerations:               t.Spec.Prometheus.Tolerations,
 					TopologySpreadConstraints: t.Spec.Prometheus.TopologySpreadConstraints,
 					InitContainers:            initContainers,
 					SecurityContext:           securityContext,

diff --git a/resources/base/crds/minio.min.io_tenants.yaml b/resources/base/crds/minio.min.io_tenants.yaml
@@ -2238,6 +2238,22 @@ spec:
                     type: string
                   storageClassName:
                     type: string
+                  tolerations:
+                    items:
+                      properties:
+                        effect:
+                          type: string
+                        key:
+                          type: string
+                        operator:
+                          type: string
+                        tolerationSeconds:
+                          format: int64
+                          type: integer
+                        value:
+                          type: string
+                      type: object
+                    type: array
                   topologySpreadConstraints:
                     items:
                       properties:
@@ -7260,6 +7276,22 @@ spec:
                     type: string
                   storageClassName:
                     type: string
+                  tolerations:
+                    items:
+                      properties:
+                        effect:
+                          type: string
+                        key:
+                          type: string
+                        operator:
+                          type: string
+                        tolerationSeconds:
+                          format: int64
+                          type: integer
+                        value:
+                          type: string
+                      type: object
+                    type: array
                   topologySpreadConstraints:
                     items:
                       properties: