Prow config generator supports configuring annotations with requirement presets

prow/config/generate.go

@@ -714,7 +714,7 @@ func applyRequirements(job *config.JobBase, requirements []string, presetMap map
 	for _, req := range requirements {
 		presets = append(presets, presetMap[req])
 	}
-	resolveRequirements(job.Labels, job.Spec, presets)
+	resolveRequirements(job.Annotations, job.Labels, job.Spec, presets)
 }
 
 func applyModifiersPresubmit(presubmit *config.Presubmit, jobModifiers []string) {

prow/config/requirement.go

@@ -20,21 +20,25 @@ import (
 
 // RequirementPreset can be used to re-use settings across multiple jobs.
 type RequirementPreset struct {
+	Annotations  map[string]string `json:"annotations"`
 	Labels       map[string]string `json:"labels"`
 	Env          []v1.EnvVar       `json:"env"`
 	Volumes      []v1.Volume       `json:"volumes"`
 	VolumeMounts []v1.VolumeMount  `json:"volumeMounts"`
 }
 
-func resolveRequirements(labels map[string]string, spec *v1.PodSpec, requirements []RequirementPreset) {
+func resolveRequirements(annotations, labels map[string]string, spec *v1.PodSpec, requirements []RequirementPreset) {
 	if spec != nil {
 		for _, req := range requirements {
-			mergeRequirement(req, labels, spec.Containers, &spec.Volumes)
+			mergeRequirement(req, annotations, labels, spec.Containers, &spec.Volumes)
 		}
 	}
 }
 
-func mergeRequirement(req RequirementPreset, labels map[string]string, containers []v1.Container, volumes *[]v1.Volume) {
+func mergeRequirement(req RequirementPreset, annotations, labels map[string]string, containers []v1.Container, volumes *[]v1.Volume) {
+	for a, v := range req.Annotations {
+		annotations[a] = v
+	}
 	for l, v := range req.Labels {
 		labels[l] = v
 	}

prow/config/testdata/.global.yaml

@@ -88,3 +88,6 @@ requirement_presets:
   deploy:
     labels:
       preset-prow-deployer-service-account: "true"
+  desc:
+    annotations:
+      description: "This is an annotation for a job description"

prow/config/testdata/simple.yaml

@@ -32,6 +32,9 @@ jobs:
   - name: periodic-job
     types: [periodic]
     command: [run/nightly.sh]
+    annotations:
+      whatever-annotation-name: whatever-annotation-value
+    requirements: [desc]
 
 requirements: [gocache]