Merge pull request #473 from upodroid/tolerations-preset

set tolerations using presets

Author: k8s-ci-robot

pkg/config/config.go

@@ -2941,7 +2941,7 @@ func validateDecoration(container v1.Container, config *prowapi.DecorationConfig
 func resolvePresets(name string, labels map[string]string, spec *v1.PodSpec, presets []Preset) error {
 	for _, preset := range presets {
 		if spec != nil {
-			if err := mergePreset(preset, labels, spec.Containers, &spec.Volumes); err != nil {
+			if err := mergePreset(preset, labels, spec); err != nil {
 				return fmt.Errorf("job %s failed to merge presets for podspec: %w", name, err)
 			}
 		}

pkg/config/jobs.go

@@ -24,6 +24,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/google/go-cmp/cmp"
 	pipelinev1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
 
 	v1 "k8s.io/api/core/v1"
@@ -45,9 +46,13 @@ type Preset struct {
 	Env          []v1.EnvVar       `json:"env"`
 	Volumes      []v1.Volume       `json:"volumes"`
 	VolumeMounts []v1.VolumeMount  `json:"volumeMounts"`
+	Tolerations  []v1.Toleration   `json:"tolerations,omitempty"`
 }
 
-func mergePreset(preset Preset, labels map[string]string, containers []v1.Container, volumes *[]v1.Volume) error {
+func mergePreset(preset Preset, labels map[string]string, podSpec *v1.PodSpec) error {
+	containers := podSpec.Containers
+	volumes := &podSpec.Volumes
+	tolerations := &podSpec.Tolerations
 	for l, v := range preset.Labels {
 		if v2, ok := labels[l]; !ok || v2 != v {
 			return nil
@@ -81,6 +86,15 @@ func mergePreset(preset Preset, labels map[string]string, containers []v1.Contai
 			containers[i].VolumeMounts = append(containers[i].VolumeMounts, vm1)
 		}
 	}
+
+	for _, t1 := range preset.Tolerations {
+		for _, t2 := range *tolerations {
+			if cmp.Equal(t1, t2) {
+				return fmt.Errorf("toleration duplicated in pod spec: %v", t1)
+			}
+		}
+		*tolerations = append(*tolerations, t1)
+	}
 	return nil
 }
 

pkg/config/jobs_test.go

@@ -401,10 +401,11 @@ func TestMergePreset(t *testing.T) {
 		pod       *coreapi.PodSpec
 		presets   []Preset
 
-		shouldError  bool
-		numEnv       int
-		numVol       int
-		numVolMounts int
+		shouldError    bool
+		numEnv         int
+		numVol         int
+		numVolMounts   int
+		numTolerations int
 	}{
 		{
 			name:      "one volume",
@@ -499,11 +500,13 @@ func TestMergePreset(t *testing.T) {
 					Env:          []coreapi.EnvVar{{Name: "baz"}},
 					VolumeMounts: []coreapi.VolumeMount{{Name: "baz"}},
 					Volumes:      []coreapi.Volume{{Name: "qux"}},
+					Tolerations:  []coreapi.Toleration{{Key: "foo", Operator: coreapi.TolerationOpEqual, Value: "bar", Effect: coreapi.TaintEffectNoSchedule}},
 				},
 			},
-			numEnv:       1,
-			numVol:       1,
-			numVolMounts: 1,
+			numEnv:         1,
+			numVol:         1,
+			numVolMounts:   1,
+			numTolerations: 1,
 		},
 		{
 			name:      "two vm",
@@ -588,6 +591,17 @@ func TestMergePreset(t *testing.T) {
 			},
 			shouldError: true,
 		},
+		{
+			name:      "duplicate tolerations",
+			jobLabels: map[string]string{"foo": "bar"},
+			pod:       &coreapi.PodSpec{Tolerations: []coreapi.Toleration{{Key: "kubernetes.io/arch", Operator: coreapi.TolerationOpEqual, Value: "arm64", Effect: coreapi.TaintEffectNoSchedule}}},
+			presets: []Preset{
+				{
+					Tolerations: []coreapi.Toleration{{Key: "kubernetes.io/arch", Operator: coreapi.TolerationOpEqual, Value: "arm64", Effect: coreapi.TaintEffectNoSchedule}},
+				},
+			},
+			shouldError: true,
+		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.name, func(t *testing.T) {
@@ -602,6 +616,9 @@ func TestMergePreset(t *testing.T) {
 			if len(tc.pod.Volumes) != tc.numVol {
 				t.Errorf("wrong number of volumes for podspec. Got %d, expected %d.", len(tc.pod.Volumes), tc.numVol)
 			}
+			if len(tc.pod.Tolerations) != tc.numTolerations {
+				t.Errorf("wrong number of tolerations for podspec. Got %d, expected %d.", len(tc.pod.Tolerations), tc.numTolerations)
+			}
 			for _, c := range tc.pod.Containers {
 				if len(c.VolumeMounts) != tc.numVolMounts {
 					t.Errorf("wrong number of volume mounts for podspec. Got %d, expected %d.", len(c.VolumeMounts), tc.numVolMounts)