Add support for affinity and tolerations (#361)

Signed-off-by: Gary Brown <[email protected]>

pkg/apis/jaegertracing/v1/jaeger_types.go

@@ -90,6 +90,8 @@ type JaegerCommonSpec struct {
 	VolumeMounts []v1.VolumeMount        `json:"volumeMounts"`
 	Annotations  map[string]string       `json:"annotations,omitempty"`
 	Resources    v1.ResourceRequirements `json:"resources,omitempty"`
+	Affinity     *v1.Affinity            `json:"affinity,omitempty"`
+	Tolerations  []v1.Toleration         `json:"tolerations,omitempty"`
 }
 
 // JaegerQuerySpec defines the options to be used when deploying the query

pkg/deployment/agent.go

@@ -140,6 +140,8 @@ func (a *Agent) Get() *appsv1.DaemonSet {
 						},
 						Resources: commonSpec.Resources,
 					}},
+					Affinity:    commonSpec.Affinity,
+					Tolerations: commonSpec.Tolerations,
 				},
 			},
 		},

pkg/deployment/all-in-one.go

@@ -166,6 +166,8 @@ func (a *AllInOne) Get() *appsv1.Deployment {
 					}},
 					Volumes:            commonSpec.Volumes,
 					ServiceAccountName: account.JaegerServiceAccountFor(a.jaeger),
+					Affinity:           commonSpec.Affinity,
+					Tolerations:        commonSpec.Tolerations,
 				},
 			},
 		},

pkg/deployment/collector.go

@@ -161,6 +161,8 @@ func (c *Collector) Get() *appsv1.Deployment {
 					}},
 					Volumes:            commonSpec.Volumes,
 					ServiceAccountName: account.JaegerServiceAccountFor(c.jaeger),
+					Affinity:           commonSpec.Affinity,
+					Tolerations:        commonSpec.Tolerations,
 				},
 			},
 		},

pkg/deployment/ingester.go

@@ -146,6 +146,8 @@ func (i *Ingester) Get() *appsv1.Deployment {
 					}},
 					Volumes:            commonSpec.Volumes,
 					ServiceAccountName: account.JaegerServiceAccountFor(i.jaeger),
+					Affinity:           commonSpec.Affinity,
+					Tolerations:        commonSpec.Tolerations,
 				},
 			},
 		},

pkg/deployment/query.go

@@ -146,6 +146,8 @@ func (q *Query) Get() *appsv1.Deployment {
 					}},
 					Volumes:            commonSpec.Volumes,
 					ServiceAccountName: account.JaegerServiceAccountFor(q.jaeger),
+					Affinity:           commonSpec.Affinity,
+					Tolerations:        commonSpec.Tolerations,
 				},
 			},
 		},

pkg/util/util.go

@@ -48,6 +48,8 @@ func Merge(commonSpecs []v1.JaegerCommonSpec) *v1.JaegerCommonSpec {
 	var volumeMounts []corev1.VolumeMount
 	var volumes []corev1.Volume
 	resources := &corev1.ResourceRequirements{}
+	var affinity *corev1.Affinity
+	var tolerations []corev1.Toleration
 
 	for _, commonSpec := range commonSpecs {
 		// Merge annotations
@@ -62,13 +64,22 @@ func Merge(commonSpecs []v1.JaegerCommonSpec) *v1.JaegerCommonSpec {
 
 		// Merge resources
 		mergeResources(resources, commonSpec.Resources)
+
+		// Set the affinity based on the most specific definition available
+		if affinity == nil {
+			affinity = commonSpec.Affinity
+		}
+
+		tolerations = append(tolerations, commonSpec.Tolerations...)
 	}
 
 	return &v1.JaegerCommonSpec{
 		Annotations:  annotations,
 		VolumeMounts: removeDuplicatedVolumeMounts(volumeMounts),
 		Volumes:      removeDuplicatedVolumes(volumes),
 		Resources:    *resources,
+		Affinity:     affinity,
+		Tolerations:  tolerations,
 	}
 }
 

pkg/util/util_test.go

@@ -166,6 +166,58 @@ func TestMergeResourceRequests(t *testing.T) {
 	assert.Equal(t, *resource.NewQuantity(123, resource.DecimalSI), merged.Resources.Requests[corev1.ResourceRequestsEphemeralStorage])
 }
 
+func TestAffinityDefault(t *testing.T) {
+	generalSpec := v1.JaegerCommonSpec{}
+	specificSpec := v1.JaegerCommonSpec{}
+
+	merged := Merge([]v1.JaegerCommonSpec{specificSpec, generalSpec})
+
+	assert.Nil(t, merged.Affinity)
+}
+
+func TestAffinityOverride(t *testing.T) {
+	generalSpec := v1.JaegerCommonSpec{
+		Affinity: &corev1.Affinity{
+			NodeAffinity: &corev1.NodeAffinity{},
+		},
+	}
+	specificSpec := v1.JaegerCommonSpec{
+		Affinity: &corev1.Affinity{
+			PodAffinity: &corev1.PodAffinity{},
+		},
+	}
+
+	merged := Merge([]v1.JaegerCommonSpec{specificSpec, generalSpec})
+
+	assert.NotNil(t, merged.Affinity)
+	assert.NotNil(t, merged.Affinity.PodAffinity)
+	assert.Nil(t, merged.Affinity.NodeAffinity)
+}
+
+func TestMergeTolerations(t *testing.T) {
+	generalSpec := v1.JaegerCommonSpec{
+		Tolerations: []corev1.Toleration{{
+			Key: "toleration1",
+		}},
+	}
+	specificSpec := v1.JaegerCommonSpec{
+		Tolerations: []corev1.Toleration{{
+			Key: "toleration1",
+		}, {
+			Key: "toleration2",
+		}},
+	}
+
+	merged := Merge([]v1.JaegerCommonSpec{specificSpec, generalSpec})
+
+	// Keys do not need to be unique, so should be aggregation of all tolerations
+	// See https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ for more details
+	assert.Len(t, merged.Tolerations, 3)
+	assert.Equal(t, "toleration1", merged.Tolerations[0].Key)
+	assert.Equal(t, "toleration2", merged.Tolerations[1].Key)
+	assert.Equal(t, "toleration1", merged.Tolerations[2].Key)
+}
+
 func TestGetEsHostname(t *testing.T) {
 	tests := []struct {
 		underTest map[string]string