[v1.38] Render resources specified in the EGW CR

api/v1/egressgateway_types.go

@@ -24,8 +24,8 @@ import (
 // EGWDeploymentContainer is a Egress Gateway Deployment container.
 type EGWDeploymentContainer struct {
 	// Name is an enum which identifies the EGW Deployment container by name.
-	// Supported values are: calico-egw
-	// +kubebuilder:validation:Enum=calico-egw
+	// Supported values are: egress-gateway
+	// +kubebuilder:validation:Enum=egress-gateway
 	Name string `json:"name"`
 
 	// Resources allows customization of limits and requests for compute resources such as cpu and memory.

pkg/crds/operator/operator.tigera.io_egressgateways.yaml

@@ -1158,9 +1158,9 @@ spec:
                             name:
                               description: |-
                                 Name is an enum which identifies the EGW Deployment container by name.
-                                Supported values are: calico-egw
+                                Supported values are: egress-gateway
                               enum:
-                              - calico-egw
+                              - egress-gateway
                               type: string
                             resources:
                               description: |-

pkg/render/egressgateway/egressgateway.go

@@ -156,6 +156,9 @@ func (c *component) egwDeployment() *appsv1.Deployment {
 		rcomp.ApplyDeploymentOverrides(&d, overrides)
 	}
 
+	// Add AWS specific resource requests/limits after applying overrides to avoid being overwritten
+	// if the user has specified their own.
+	c.addAWSResources(&d)
 	return &d
 }
 
@@ -215,7 +218,6 @@ func (c *component) egwContainer() *corev1.Container {
 		Image:           c.config.egwImage,
 		ImagePullPolicy: render.ImagePullPolicy(),
 		Env:             c.egwEnvVars(),
-		Resources:       c.getResources(),
 		VolumeMounts:    c.egwVolumeMounts(),
 		Ports:           c.egwPorts(),
 		Command:         []string{"/start-gateway.sh"},
@@ -409,16 +411,21 @@ func (c *component) getHTTPProbe() (string, string, string) {
 	return probeURLs, interval, timeout
 }
 
-func (c *component) getResources() corev1.ResourceRequirements {
-	recommendedQuantity := resource.NewQuantity(1, resource.DecimalSI)
+func (c *component) addAWSResources(d *appsv1.Deployment) {
 	egw := c.config.EgressGW
-	if egw.Spec.AWS != nil && *egw.Spec.AWS.NativeIP == operatorv1.NativeIPEnabled {
-		return corev1.ResourceRequirements{
-			Limits:   corev1.ResourceList{"projectcalico.org/aws-secondary-ipv4": *recommendedQuantity},
-			Requests: corev1.ResourceList{"projectcalico.org/aws-secondary-ipv4": *recommendedQuantity},
-		}
+	if egw.Spec.AWS == nil || *egw.Spec.AWS.NativeIP == operatorv1.NativeIPDisabled {
+		return
+	}
+	recommendedQuantity := resource.NewQuantity(1, resource.DecimalSI)
+	resourceRequirements := &d.Spec.Template.Spec.Containers[0].Resources
+	if resourceRequirements.Limits == nil {
+		resourceRequirements.Limits = corev1.ResourceList{}
+	}
+	if resourceRequirements.Requests == nil {
+		resourceRequirements.Requests = corev1.ResourceList{}
 	}
-	return corev1.ResourceRequirements{}
+	resourceRequirements.Limits["projectcalico.org/aws-secondary-ipv4"] = *recommendedQuantity
+	resourceRequirements.Requests["projectcalico.org/aws-secondary-ipv4"] = *recommendedQuantity
 }
 
 func (c *component) getIPPools() string {

pkg/render/egressgateway/egressgateway_test.go

@@ -259,12 +259,20 @@ var _ = Describe("Egress Gateway rendering tests", func() {
 	It("should have proper annotations and resources if aws is set", func() {
 		recommendedQuantity := resource.NewQuantity(1, resource.DecimalSI)
 		expectedResource := corev1.ResourceRequirements{
-			Limits:   corev1.ResourceList{"projectcalico.org/aws-secondary-ipv4": *recommendedQuantity},
-			Requests: corev1.ResourceList{"projectcalico.org/aws-secondary-ipv4": *recommendedQuantity},
+			Limits:   corev1.ResourceList{"projectcalico.org/aws-secondary-ipv4": *recommendedQuantity, "cpu": resource.MustParse("100m")},
+			Requests: corev1.ResourceList{"projectcalico.org/aws-secondary-ipv4": *recommendedQuantity, "cpu": resource.MustParse("100m")},
 		}
 
 		nativeIP := operatorv1.NativeIPEnabled
 		egw.Spec.AWS = &operatorv1.AWSEgressGateway{NativeIP: &nativeIP, ElasticIPs: []string{"1.2.3.4", "5.6.7.8"}}
+		deploymentContainer := operatorv1.EGWDeploymentContainer{
+			Name: "egress-gateway",
+			Resources: &corev1.ResourceRequirements{
+				Limits:   corev1.ResourceList{"cpu": resource.MustParse("100m")},
+				Requests: corev1.ResourceList{"cpu": resource.MustParse("100m")},
+			},
+		}
+		egw.Spec.Template.Spec.Containers = append(egw.Spec.Template.Spec.Containers, deploymentContainer)
 		component := egressgateway.EgressGateway(&egressgateway.Config{
 			PullSecrets:  nil,
 			Installation: installation,