Enable tolerations support in elasticsearch config (#1296)

Signed-off-by: Kevin Earls <kearls@redhat.com>
jaegertracing · Nov 12, 2020 · 660a6ff · 660a6ff
1 parent 4b2f557
commit 660a6ff
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 3 deletions.
diff --git a/deploy/crds/jaegertracing.io_jaegers_crd.yaml b/deploy/crds/jaegertracing.io_jaegers_crd.yaml
@@ -7325,6 +7325,22 @@ spec:
                         storageClassName:
                           type: string
                       type: object
+                    tolerations:
+                      items:
+                        properties:
+                          effect:
+                            type: string
+                          key:
+                            type: string
+                          operator:
+                            type: string
+                          tolerationSeconds:
+                            format: int64
+                            type: integer
+                          value:
+                            type: string
+                        type: object
+                      type: array
                   type: object
                 esIndexCleaner:
                   properties:

diff --git a/pkg/apis/jaegertracing/v1/jaeger_types.go b/pkg/apis/jaegertracing/v1/jaeger_types.go
@@ -502,6 +502,10 @@ type ElasticsearchSpec struct {
 
 	// +optional
 	RedundancyPolicy esv1.RedundancyPolicyType `json:"redundancyPolicy,omitempty"`
+
+	// +optional
+	// +listType=atomic
+	Tolerations []v1.Toleration `json:"tolerations,omitempty"`
 }
 
 // JaegerCassandraCreateSchemaSpec holds the options related to the create-schema batch job

diff --git a/pkg/apis/jaegertracing/v1/zz_generated.deepcopy.go b/pkg/apis/jaegertracing/v1/zz_generated.deepcopy.go
diff --git a/pkg/apis/jaegertracing/v1/zz_generated.openapi.go b/pkg/apis/jaegertracing/v1/zz_generated.openapi.go
diff --git a/pkg/storage/elasticsearch.go b/pkg/storage/elasticsearch.go
@@ -168,8 +168,9 @@ func (ed *ElasticsearchDeployment) Elasticsearch() *esv1.Elasticsearch {
 			ManagementState:  esv1.ManagementStateManaged,
 			RedundancyPolicy: ed.Jaeger.Spec.Storage.Elasticsearch.RedundancyPolicy,
 			Spec: esv1.ElasticsearchNodeSpec{
-				Image:     ed.Jaeger.Spec.Storage.Elasticsearch.Image,
-				Resources: res,
+				Image:       ed.Jaeger.Spec.Storage.Elasticsearch.Image,
+				Resources:   res,
+				Tolerations: ed.Jaeger.Spec.Storage.Elasticsearch.Tolerations,
 			},
 			Nodes: getNodes(uuid, ed.Jaeger.Spec.Storage.Elasticsearch),
 		},

diff --git a/pkg/storage/elasticsearch/v1/types.go b/pkg/storage/elasticsearch/v1/types.go
@@ -105,6 +105,7 @@ type ElasticsearchNodeSpec struct {
 	Image        string                  `json:"image,omitempty"`
 	Resources    v1.ResourceRequirements `json:"resources"`
 	NodeSelector map[string]string       `json:"nodeSelector,omitempty"`
+	Tolerations  []v1.Toleration         `json:"tolerations,omitempty"`
 }
 
 type ElasticsearchRequiredAction string