Skip to content

Commit fd1a4e4

Browse files
author
lamai93
committed
Quick fix for container resources.
1 parent 0304299 commit fd1a4e4

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

pkg/deployment/reconcile/plan_builder.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,10 @@ func podNeedsRotation(log zerolog.Logger, p v1.Pod, apiObject metav1.Object, spe
351351
}
352352

353353
// Check resource requirements
354-
if resourcesRequireRotation(spec.GetServerGroupSpec(group).Resources, k8sutil.GetArangoDBContainerFromPod(&p).Resources) {
354+
if resourcesRequireRotation(
355+
k8sutil.FilterStorageResourceRequirement(spec.GetServerGroupSpec(group).Resources),
356+
k8sutil.GetArangoDBContainerFromPod(&p).Resources) {
355357
return true, "Resource Requirements changed"
356-
357358
}
358359

359360
return false, ""

pkg/util/k8sutil/pods.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -263,8 +263,8 @@ func arangodInitContainer(name, id, engine, alpineImage string, requireUUID bool
263263
return c
264264
}
265265

266-
// filterStorageResourceRequirement filters resource requirements for Storage.
267-
func filterStorageResourceRequirement(resources v1.ResourceRequirements) v1.ResourceRequirements {
266+
// FilterStorageResourceRequirement filters resource requirements for Storage.
267+
func FilterStorageResourceRequirement(resources v1.ResourceRequirements) v1.ResourceRequirements {
268268

269269
filterStorage := func(list v1.ResourceList) v1.ResourceList {
270270
newlist := make(v1.ResourceList)
@@ -299,7 +299,7 @@ func arangodContainer(image string, imagePullPolicy v1.PullPolicy, args []string
299299
Protocol: v1.ProtocolTCP,
300300
},
301301
},
302-
Resources: filterStorageResourceRequirement(resources), // Storage is handled via pvcs
302+
Resources: FilterStorageResourceRequirement(resources), // Storage is handled via pvcs
303303
VolumeMounts: arangodVolumeMounts(),
304304
}
305305
for k, v := range env {
@@ -335,7 +335,7 @@ func arangosyncContainer(image string, imagePullPolicy v1.PullPolicy, args []str
335335
Protocol: v1.ProtocolTCP,
336336
},
337337
},
338-
Resources: filterStorageResourceRequirement(resources), // Storage is handled via pvcs
338+
Resources: FilterStorageResourceRequirement(resources), // Storage is handled via pvcs
339339
}
340340
for k, v := range env {
341341
c.Env = append(c.Env, v.CreateEnvVar(k))

0 commit comments

Comments
 (0)