Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion internal/controller/provisioner/objects.go
Original file line number Diff line number Diff line change
Expand Up @@ -1019,6 +1019,7 @@ func (p *NginxProvisioner) buildNginxPodTemplateSpec(
},
}

var containerResources corev1.ResourceRequirements
if nProxyCfg != nil && nProxyCfg.Kubernetes != nil {
var podSpec *ngfAPIv1alpha2.PodSpec
var containerSpec *ngfAPIv1alpha2.ContainerSpec
Expand All @@ -1042,7 +1043,8 @@ func (p *NginxProvisioner) buildNginxPodTemplateSpec(
if containerSpec != nil {
container := spec.Spec.Containers[0]
if containerSpec.Resources != nil {
container.Resources = *containerSpec.Resources
containerResources = *containerSpec.Resources
container.Resources = containerResources
}
container.Lifecycle = containerSpec.Lifecycle
container.VolumeMounts = append(container.VolumeMounts, containerSpec.VolumeMounts...)
Expand Down Expand Up @@ -1174,6 +1176,7 @@ func (p *NginxProvisioner) buildNginxPodTemplateSpec(
Image: p.cfg.GatewayPodConfig.Image,
ImagePullPolicy: pullPolicy,
Command: command,
Resources: containerResources,
SecurityContext: &corev1.SecurityContext{
AllowPrivilegeEscalation: helpers.GetPointer(false),
Capabilities: &corev1.Capabilities{
Expand Down
16 changes: 15 additions & 1 deletion internal/controller/provisioner/objects_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1883,7 +1883,20 @@ func TestBuildNginxResourceObjects_InferenceExtension(t *testing.T) {
},
}

objects, err := provisioner.buildNginxResourceObjects("gw-nginx", gateway, &graph.EffectiveNginxProxy{})
npCfg := &graph.EffectiveNginxProxy{
Kubernetes: &ngfAPIv1alpha2.KubernetesSpec{
Deployment: &ngfAPIv1alpha2.DeploymentSpec{
Container: ngfAPIv1alpha2.ContainerSpec{
Resources: &corev1.ResourceRequirements{
Limits: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("500m"),
},
},
},
},
},
}
objects, err := provisioner.buildNginxResourceObjects("gw-nginx", gateway, npCfg)
g.Expect(err).ToNot(HaveOccurred())

// Find the deployment object
Expand All @@ -1907,4 +1920,5 @@ func TestBuildNginxResourceObjects_InferenceExtension(t *testing.T) {
g.Expect(containers).To(HaveLen(2))
g.Expect(containers[1].Name).To(Equal("endpoint-picker-shim"))
g.Expect(containers[1].Command).To(Equal(expectedCommands))
g.Expect(containers[1].Resources.Limits).To(HaveKeyWithValue(corev1.ResourceCPU, resource.MustParse("500m")))
}
Loading