Add the resources field to the eventing CRD

config/300-eventing.yaml

@@ -93,6 +93,45 @@ spec:
               description: The default broker type to use for the brokers Knative creates.
                 If no value is provided, ChannelBasedBroker will be used.
               type: string
+            resources:
+              description: A mapping of deployment name to resource requirements
+              type: array
+              items:
+                type: object
+                properties:
+                  container:
+                    description: The name of the container
+                    type: string
+                  requests:
+                    type: object
+                    properties:
+                      memory:
+                        type: string
+                        pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$
+                      cpu:
+                        type: string
+                        pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$
+                      storage:
+                        type: string
+                        pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$
+                      ephemeral-storage:
+                        type: string
+                        pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$
+                  limits:
+                    type: object
+                    properties:
+                      memory:
+                        type: string
+                        pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$
+                      cpu:
+                        type: string
+                        pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$
+                      storage:
+                        type: string
+                        pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$
+                      ephemeral-storage:
+                        type: string
+                        pattern: ^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$
           type: object
         status:
           properties:

docs/configuration.md

@@ -37,6 +37,7 @@ These are the configurable fields in each resource:
       * [default](#specregistrydefault)
       * [override](#specregistryoverride)
       * [imagePullSecrets](#specregistryimagepullsecrets)
+    * [resources](#specresources)
     * [defaultBrokerClass](#specdefaultbrokerclass)
 
 

pkg/apis/operator/v1alpha1/knativeeventing_types.go

@@ -47,6 +47,10 @@ type KnativeEventingSpec struct {
 	// +optional
 	Registry Registry `json:"registry,omitempty"`
 
+	// Override containers' resource requirements
+	// +optional
+	Resources []ResourceRequirementsOverride `json:"resources,omitempty"`
+
 	// The default broker type to use for the brokers Knative creates.
 	// If no value is provided, ChannelBasedBroker will be used.
 	// +optional

pkg/reconciler/knativeserving/common/resources.go → pkg/reconciler/common/resources.go

@@ -24,12 +24,12 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/client-go/kubernetes/scheme"
-	servingv1alpha1 "knative.dev/operator/pkg/apis/operator/v1alpha1"
+	"knative.dev/operator/pkg/apis/operator/v1alpha1"
 )
 
 // ResourceRequirementsTransform configures the resource requests for
 // all containers within all deployments in the manifest
-func ResourceRequirementsTransform(instance *servingv1alpha1.KnativeServing, log *zap.SugaredLogger) mf.Transformer {
+func ResourceRequirementsTransform(resources []v1alpha1.ResourceRequirementsOverride, log *zap.SugaredLogger) mf.Transformer {
 	return func(u *unstructured.Unstructured) error {
 		if u.GetKind() == "Deployment" {
 			deployment := &appsv1.Deployment{}
@@ -38,7 +38,7 @@ func ResourceRequirementsTransform(instance *servingv1alpha1.KnativeServing, log
 			}
 			containers := deployment.Spec.Template.Spec.Containers
 			for i := range containers {
-				if override := find(instance, containers[i].Name); override != nil {
+				if override := find(resources, containers[i].Name); override != nil {
 					merge(&override.Limits, &containers[i].Resources.Limits)
 					merge(&override.Requests, &containers[i].Resources.Requests)
 				}
@@ -63,8 +63,8 @@ func merge(src, tgt *v1.ResourceList) {
 	}
 }
 
-func find(instance *servingv1alpha1.KnativeServing, name string) *servingv1alpha1.ResourceRequirementsOverride {
-	for _, override := range instance.Spec.Resources {
+func find(resources []v1alpha1.ResourceRequirementsOverride, name string) *v1alpha1.ResourceRequirementsOverride {
+	for _, override := range resources {
 		if override.Container == name {
 			return &override
 		}

pkg/reconciler/knativeserving/common/resources_test.go → pkg/reconciler/common/resources_test.go

@@ -282,7 +282,7 @@ func TestResourceRequirementsTransform(t *testing.T) {
 			if err != nil {
 				t.Fatalf("Failed to create manifest: %v", err)
 			}
-			actual, err := manifest.Transform(ResourceRequirementsTransform(&test.Input, log))
+			actual, err := manifest.Transform(ResourceRequirementsTransform(test.Input.Spec.Resources, log))
 			if err != nil {
 				t.Fatalf("Failed to transform manifest: %v", err)
 			}

pkg/reconciler/knativeeventing/knativeeventing.go

@@ -149,6 +149,7 @@ func (r *Reconciler) transform(ctx context.Context, instance *eventingv1alpha1.K
 		mf.InjectNamespace(instance.GetNamespace()),
 		common.ImageTransform(&instance.Spec.Registry, logger),
 		common.ConfigMapTransform(instance.Spec.Config, logger),
+		common.ResourceRequirementsTransform(instance.Spec.Resources, logger),
 		kec.DefaultBrokerConfigMapTransform(instance, logger),
 	}
 	transforms := append(standard, platform...)

pkg/reconciler/knativeserving/knativeserving.go

@@ -151,10 +151,10 @@ func (r *Reconciler) transform(ctx context.Context, instance *servingv1alpha1.Kn
 		mf.InjectNamespace(instance.GetNamespace()),
 		common.ConfigMapTransform(instance.Spec.Config, logger),
 		common.ImageTransform(&instance.Spec.Registry, logger),
+		common.ResourceRequirementsTransform(instance.Spec.Resources, logger),
 		ksc.GatewayTransform(instance, logger),
 		ksc.CustomCertsTransform(instance, logger),
 		ksc.HighAvailabilityTransform(instance, logger),
-		ksc.ResourceRequirementsTransform(instance, logger),
 	}
 	transforms := append(standard, platform...)
 	return r.config.Transform(transforms...)