Skip to content

Commit 24b845d

Browse files
committed
fix resources
1 parent 4ec1a35 commit 24b845d

1 file changed

Lines changed: 23 additions & 18 deletions

File tree

internal/controller/codeserver_controller.go

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -254,31 +254,36 @@ func (r *CodeServerReconciler) reconcileDeployment(ctx context.Context, codeServ
254254
})
255255
if codeServer.Spec.Resources.Limits != nil {
256256
cpu, ok := codeServer.Spec.Resources.Limits[corev1.ResourceCPU]
257-
if ok {
258-
resourceRequirements = resourceRequirements.WithLimits(corev1.ResourceList{
259-
corev1.ResourceCPU: cpu,
260-
})
257+
if !ok {
258+
cpu = resource.Quantity{}
261259
}
262-
memory, ok := codeServer.Spec.Resources.Limits[corev1.ResourceMemory]
263-
if ok {
264-
resourceRequirements = resourceRequirements.WithLimits(corev1.ResourceList{
265-
corev1.ResourceMemory: memory,
266-
})
260+
261+
mem, ok := codeServer.Spec.Resources.Limits[corev1.ResourceMemory]
262+
if !ok {
263+
mem = resource.Quantity{}
267264
}
265+
266+
resourceRequirements = resourceRequirements.WithLimits(corev1.ResourceList{
267+
corev1.ResourceCPU: cpu,
268+
corev1.ResourceMemory: mem,
269+
})
268270
}
271+
269272
if codeServer.Spec.Resources.Requests != nil {
270273
cpu, ok := codeServer.Spec.Resources.Requests[corev1.ResourceCPU]
271-
if ok {
272-
resourceRequirements = resourceRequirements.WithRequests(corev1.ResourceList{
273-
corev1.ResourceCPU: cpu,
274-
})
274+
if !ok {
275+
cpu = resource.Quantity{}
275276
}
276-
memory, ok := codeServer.Spec.Resources.Requests[corev1.ResourceMemory]
277-
if ok {
278-
resourceRequirements = resourceRequirements.WithRequests(corev1.ResourceList{
279-
corev1.ResourceMemory: memory,
280-
})
277+
278+
mem, ok := codeServer.Spec.Resources.Requests[corev1.ResourceMemory]
279+
if !ok {
280+
mem = resource.Quantity{}
281281
}
282+
283+
resourceRequirements = resourceRequirements.WithRequests(corev1.ResourceList{
284+
corev1.ResourceCPU: cpu,
285+
corev1.ResourceMemory: mem,
286+
})
282287
}
283288

284289
imagePullSecrets := make([]*corev1apply.LocalObjectReferenceApplyConfiguration, 0, len(codeServer.Spec.ImagePullSecrets))

0 commit comments

Comments
 (0)