Skip to content

Commit ef55b3d

Browse files
jackyalboliranmauda
authored andcommitted
Avoid updating cpu and memory in pvc template
Signed-off-by: jackyalbo <jacky.albo@gmail.com> (cherry picked from commit 9804adc) (cherry picked from commit 13c3016)
1 parent 38c682f commit ef55b3d

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

pkg/backingstore/backingstore.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,9 @@ const (
247247
// Dev ENV minimal resources
248248
devEnvMinCPUString string = "500m"
249249
devEnvMinMemoryString string = "500Mi"
250+
251+
// Default volume size for pv-pool backing store
252+
defaultVolumeSize = int64(20 * 1024 * 1024 * 1024) // 20Gi=20*1024^3
250253
)
251254

252255
// CmdCreatePVPool returns a CLI command

pkg/backingstore/reconciler.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,6 @@ func (r *Reconciler) ReadSystemInfo() error {
567567
))
568568
}
569569

570-
const defaultVolumeSize = int64(20 * 1024 * 1024 * 1024) // 20Gi=20*1024^3
571570
var volumeSize int64
572571
pvPool := r.BackingStore.Spec.PVPool
573572
if pvPool.VolumeResources != nil {
@@ -1387,7 +1386,14 @@ func (r *Reconciler) updatePvcTemplate() {
13871386
} else if r.NooBaa.Spec.PVPoolDefaultStorageClass != nil {
13881387
r.PvcAgentTemplate.Spec.StorageClassName = r.NooBaa.Spec.PVPoolDefaultStorageClass
13891388
}
1390-
r.PvcAgentTemplate.Spec.Resources = *r.BackingStore.Spec.PVPool.VolumeResources
1389+
var volumeSize resource.Quantity
1390+
pvPool := r.BackingStore.Spec.PVPool
1391+
if pvPool.VolumeResources != nil {
1392+
volumeSize = pvPool.VolumeResources.Requests[corev1.ResourceStorage]
1393+
} else {
1394+
volumeSize = *resource.NewQuantity(defaultVolumeSize, resource.BinarySI)
1395+
}
1396+
r.PvcAgentTemplate.Spec.Resources.Requests[corev1.ResourceStorage] = volumeSize
13911397
r.PvcAgentTemplate.Labels = map[string]string{
13921398
"app": "noobaa",
13931399
"pool": r.BackingStore.Name,

0 commit comments

Comments
 (0)