Allow users to set resources as part of podtemplate

tektoncd · Oct 29, 2020 · 8d12cd6 · 8d12cd6
1 parent 476b0e2
commit 8d12cd6
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 25 deletions.
diff --git a/docs/eventlisteners.md b/docs/eventlisteners.md
@@ -273,6 +273,8 @@ Right now the allowed values as part of `podSpec` are
 ServiceAccountName
 NodeSelector
 Tolerations
+Containers
+- Resources
 ```
 
 ### Logging
@@ -470,6 +472,14 @@ spec:
         template:
           spec:
             serviceAccountName: tekton-triggers-github-sa
+            containers:
+              - resources:
+                  requests:
+                    memory: "64Mi"
+                    cpu: "250m"
+                  limits:
+                    memory: "128Mi"
+                    cpu: "500m"
 ---
 apiVersion: triggers.tekton.dev/v1alpha1
 kind: TriggerBinding

diff --git a/examples/github/github-eventlistener-interceptor.yaml b/examples/github/github-eventlistener-interceptor.yaml
@@ -25,6 +25,14 @@ spec:
         template:
           spec:
             serviceAccountName: tekton-triggers-github-sa
+            containers:
+              - resources:
+                  requests:
+                    memory: "64Mi"
+                    cpu: "250m"
+                  limits:
+                    memory: "128Mi"
+                    cpu: "500m"
 ---
 apiVersion: triggers.tekton.dev/v1alpha1
 kind: TriggerBinding

diff --git a/pkg/apis/triggers/v1alpha1/event_listener_validation.go b/pkg/apis/triggers/v1alpha1/event_listener_validation.go
@@ -66,6 +66,7 @@ func validateKubernetesObject(orig *KubernetesResource) (errs *apis.FieldError)
 
 func containerFieldMask(in *corev1.Container) *corev1.Container {
 	out := new(corev1.Container)
+	out.Resources = in.Resources
 
 	// Disallowed fields
 	// This list clarifies which all container attributes are not allowed.
@@ -89,7 +90,6 @@ func containerFieldMask(in *corev1.Container) *corev1.Container {
 	out.TTY = false
 	out.VolumeDevices = nil
 	out.EnvFrom = nil
-	out.Resources = corev1.ResourceRequirements{}
 	out.Env = nil
 
 	return out

diff --git a/pkg/apis/triggers/v1alpha1/event_listener_validation_test.go b/pkg/apis/triggers/v1alpha1/event_listener_validation_test.go
@@ -23,6 +23,7 @@ import (
 	"github.com/tektoncd/triggers/pkg/apis/triggers/v1alpha1"
 	bldr "github.com/tektoncd/triggers/test/builder"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
 )
@@ -180,6 +181,18 @@ func Test_EventListenerValidate(t *testing.T) {
 										Effect:   "NoSchedule",
 									}},
 									NodeSelector: map[string]string{"beta.kubernetes.io/os": "linux"},
+									Containers: []corev1.Container{{
+										Resources: corev1.ResourceRequirements{
+											Limits: corev1.ResourceList{
+												corev1.ResourceCPU:    resource.Quantity{Format: resource.DecimalSI},
+												corev1.ResourceMemory: resource.Quantity{Format: resource.BinarySI},
+											},
+											Requests: corev1.ResourceList{
+												corev1.ResourceCPU:    resource.Quantity{Format: resource.DecimalSI},
+												corev1.ResourceMemory: resource.Quantity{Format: resource.BinarySI},
+											},
+										},
+									}},
 								},
 							},
 						}),

diff --git a/pkg/reconciler/v1alpha1/eventlistener/eventlistener.go b/pkg/reconciler/v1alpha1/eventlistener/eventlistener.go
@@ -265,6 +265,35 @@ func (r *Reconciler) reconcileDeployment(ctx context.Context, logger *zap.Sugare
 	if el.Spec.Replicas != nil {
 		replicas = el.Spec.Replicas
 	}
+	var (
+		tolerations                          []corev1.Toleration
+		nodeSelector, annotations, podlabels map[string]string
+		serviceAccountName                   string
+		resources                            corev1.ResourceRequirements
+	)
+	podlabels = mergeMaps(el.Labels, GenerateResourceLabels(el.Name))
+
+	// For backward compatibility with podTemplate, serviceAccountName field as part of eventlistener.
+	tolerations = el.Spec.PodTemplate.Tolerations
+	nodeSelector = el.Spec.PodTemplate.NodeSelector
+	serviceAccountName = el.Spec.ServiceAccountName
+
+	if el.Spec.Resources.KubernetesResource != nil {
+		if len(el.Spec.Resources.KubernetesResource.Template.Spec.Tolerations) != 0 {
+			tolerations = el.Spec.Resources.KubernetesResource.Template.Spec.Tolerations
+		}
+		if len(el.Spec.Resources.KubernetesResource.Template.Spec.NodeSelector) != 0 {
+			nodeSelector = el.Spec.Resources.KubernetesResource.Template.Spec.NodeSelector
+		}
+		if el.Spec.Resources.KubernetesResource.Template.Spec.ServiceAccountName != "" {
+			serviceAccountName = el.Spec.Resources.KubernetesResource.Template.Spec.ServiceAccountName
+		}
+		annotations = el.Spec.Resources.KubernetesResource.Template.Annotations
+		podlabels = mergeMaps(podlabels, el.Spec.Resources.KubernetesResource.Template.Labels)
+		if len(el.Spec.Resources.KubernetesResource.Template.Spec.Containers) != 0 {
+			resources = el.Spec.Resources.KubernetesResource.Template.Spec.Containers[0].Resources
+		}
+	}
 	container := corev1.Container{
 		Name:  "event-listener",
 		Image: *elImage,
@@ -294,6 +323,7 @@ func (r *Reconciler) reconcileDeployment(ctx context.Context, logger *zap.Sugare
 			PeriodSeconds:    int32(*PeriodSeconds),
 			FailureThreshold: int32(*FailureThreshold),
 		},
+		Resources: resources,
 		Args: []string{
 			"-el-name", el.Name,
 			"-el-namespace", el.Namespace,
@@ -312,31 +342,7 @@ func (r *Reconciler) reconcileDeployment(ctx context.Context, logger *zap.Sugare
 			},
 		}},
 	}
-	var (
-		tolerations                          []corev1.Toleration
-		nodeSelector, annotations, podlabels map[string]string
-		serviceAccountName                   string
-	)
-	podlabels = mergeMaps(el.Labels, GenerateResourceLabels(el.Name))
 
-	// For backward compatibility with podTemplate, serviceAccountName field as part of eventlistener.
-	tolerations = el.Spec.PodTemplate.Tolerations
-	nodeSelector = el.Spec.PodTemplate.NodeSelector
-	serviceAccountName = el.Spec.ServiceAccountName
-
-	if el.Spec.Resources.KubernetesResource != nil {
-		if len(el.Spec.Resources.KubernetesResource.Template.Spec.Tolerations) != 0 {
-			tolerations = el.Spec.Resources.KubernetesResource.Template.Spec.Tolerations
-		}
-		if len(el.Spec.Resources.KubernetesResource.Template.Spec.NodeSelector) != 0 {
-			nodeSelector = el.Spec.Resources.KubernetesResource.Template.Spec.NodeSelector
-		}
-		if el.Spec.Resources.KubernetesResource.Template.Spec.ServiceAccountName != "" {
-			serviceAccountName = el.Spec.Resources.KubernetesResource.Template.Spec.ServiceAccountName
-		}
-		annotations = el.Spec.Resources.KubernetesResource.Template.Annotations
-		podlabels = mergeMaps(podlabels, el.Spec.Resources.KubernetesResource.Template.Labels)
-	}
 	deployment := &appsv1.Deployment{
 		ObjectMeta: generateObjectMeta(el),
 		Spec: appsv1.DeploymentSpec{
@@ -433,6 +439,10 @@ func (r *Reconciler) reconcileDeployment(ctx context.Context, logger *zap.Sugare
 				existingDeployment.Spec.Template.Spec.Containers[0].Command = nil
 				updated = true
 			}
+			if !reflect.DeepEqual(existingDeployment.Spec.Template.Spec.Containers[0].Resources, container.Resources) {
+				existingDeployment.Spec.Template.Spec.Containers[0].Resources = container.Resources
+				updated = true
+			}
 			if len(existingDeployment.Spec.Template.Spec.Containers[0].VolumeMounts) == 0 {
 				existingDeployment.Spec.Template.Spec.Containers[0].VolumeMounts = container.VolumeMounts
 				updated = true

diff --git a/pkg/reconciler/v1alpha1/eventlistener/eventlistener_test.go b/pkg/reconciler/v1alpha1/eventlistener/eventlistener_test.go
@@ -32,6 +32,7 @@ import (
 	bldr "github.com/tektoncd/triggers/test/builder"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
@@ -377,6 +378,18 @@ func TestReconcile(t *testing.T) {
 					Spec: corev1.PodSpec{
 						NodeSelector:       map[string]string{"key": "value"},
 						ServiceAccountName: "k8sresource",
+						Containers: []corev1.Container{{
+							Resources: corev1.ResourceRequirements{
+								Limits: corev1.ResourceList{
+									corev1.ResourceCPU:    resource.Quantity{Format: resource.DecimalSI},
+									corev1.ResourceMemory: resource.Quantity{Format: resource.BinarySI},
+								},
+								Requests: corev1.ResourceList{
+									corev1.ResourceCPU:    resource.Quantity{Format: resource.DecimalSI},
+									corev1.ResourceMemory: resource.Quantity{Format: resource.BinarySI},
+								},
+							},
+						}},
 					},
 				},
 			},
@@ -435,6 +448,16 @@ func TestReconcile(t *testing.T) {
 	deploymentForKubernetesResource := makeDeployment(func(d *appsv1.Deployment) {
 		d.Spec.Template.Spec.ServiceAccountName = "k8sresource"
 		d.Spec.Template.Spec.NodeSelector = map[string]string{"key": "value"}
+		d.Spec.Template.Spec.Containers[0].Resources = corev1.ResourceRequirements{
+			Limits: corev1.ResourceList{
+				corev1.ResourceCPU:    resource.Quantity{Format: resource.DecimalSI},
+				corev1.ResourceMemory: resource.Quantity{Format: resource.BinarySI},
+			},
+			Requests: corev1.ResourceList{
+				corev1.ResourceCPU:    resource.Quantity{Format: resource.DecimalSI},
+				corev1.ResourceMemory: resource.Quantity{Format: resource.BinarySI},
+			},
+		}
 	})
 
 	deploymentForKubernetesResourceObjectMeta := makeDeployment(func(d *appsv1.Deployment) {