Skip to content

Commit 5bbb52a

Browse files
Remove Divisor from Downward API resrouceFieldRefs
This means CPU and memory information will now be exposed using the default divisor for CPU and memory (with default being "1" for both). This means memory information will now be represented in bytes, as expected by pgMonitor and the CPK Metrics & Monitoring stack when consuming Downward API information. Issue: PGO-2604
1 parent 3947ce7 commit 5bbb52a

File tree

2 files changed

+12
-22
lines changed

2 files changed

+12
-22
lines changed

internal/postgres/reconcile.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"context"
99

1010
corev1 "k8s.io/api/core/v1"
11-
"k8s.io/apimachinery/pkg/api/resource"
1211

1312
"github.com/crunchydata/postgres-operator/internal/config"
1413
"github.com/crunchydata/postgres-operator/internal/feature"
@@ -17,11 +16,6 @@ import (
1716
"github.com/crunchydata/postgres-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1"
1817
)
1918

20-
var (
21-
oneMillicore = resource.MustParse("1m")
22-
oneMebibyte = resource.MustParse("1Mi")
23-
)
24-
2519
// DataVolumeMount returns the name and mount path of the PostgreSQL data volume.
2620
func DataVolumeMount() corev1.VolumeMount {
2721
return corev1.VolumeMount{Name: "postgres-data", MountPath: dataMountPath}
@@ -116,28 +110,24 @@ func InstancePod(ctx context.Context,
116110
ResourceFieldRef: &corev1.ResourceFieldSelector{
117111
ContainerName: naming.ContainerDatabase,
118112
Resource: "limits.cpu",
119-
Divisor: oneMillicore,
120113
},
121114
}, {
122115
Path: "cpu_request",
123116
ResourceFieldRef: &corev1.ResourceFieldSelector{
124117
ContainerName: naming.ContainerDatabase,
125118
Resource: "requests.cpu",
126-
Divisor: oneMillicore,
127119
},
128120
}, {
129121
Path: "mem_limit",
130122
ResourceFieldRef: &corev1.ResourceFieldSelector{
131123
ContainerName: naming.ContainerDatabase,
132124
Resource: "limits.memory",
133-
Divisor: oneMebibyte,
134125
},
135126
}, {
136127
Path: "mem_request",
137128
ResourceFieldRef: &corev1.ResourceFieldSelector{
138129
ContainerName: naming.ContainerDatabase,
139130
Resource: "requests.memory",
140-
Divisor: oneMebibyte,
141131
},
142132
}, {
143133
Path: "labels",

internal/postgres/reconcile_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -352,22 +352,22 @@ volumes:
352352
- path: cpu_limit
353353
resourceFieldRef:
354354
containerName: database
355-
divisor: 1m
355+
divisor: "0"
356356
resource: limits.cpu
357357
- path: cpu_request
358358
resourceFieldRef:
359359
containerName: database
360-
divisor: 1m
360+
divisor: "0"
361361
resource: requests.cpu
362362
- path: mem_limit
363363
resourceFieldRef:
364364
containerName: database
365-
divisor: 1Mi
365+
divisor: "0"
366366
resource: limits.memory
367367
- path: mem_request
368368
resourceFieldRef:
369369
containerName: database
370-
divisor: 1Mi
370+
divisor: "0"
371371
resource: requests.memory
372372
- fieldRef:
373373
apiVersion: v1
@@ -443,22 +443,22 @@ volumes:
443443
- path: cpu_limit
444444
resourceFieldRef:
445445
containerName: database
446-
divisor: 1m
446+
divisor: "0"
447447
resource: limits.cpu
448448
- path: cpu_request
449449
resourceFieldRef:
450450
containerName: database
451-
divisor: 1m
451+
divisor: "0"
452452
resource: requests.cpu
453453
- path: mem_limit
454454
resourceFieldRef:
455455
containerName: database
456-
divisor: 1Mi
456+
divisor: "0"
457457
resource: limits.memory
458458
- path: mem_request
459459
resourceFieldRef:
460460
containerName: database
461-
divisor: 1Mi
461+
divisor: "0"
462462
resource: requests.memory
463463
- fieldRef:
464464
apiVersion: v1
@@ -667,22 +667,22 @@ volumes:
667667
- path: cpu_limit
668668
resourceFieldRef:
669669
containerName: database
670-
divisor: 1m
670+
divisor: "0"
671671
resource: limits.cpu
672672
- path: cpu_request
673673
resourceFieldRef:
674674
containerName: database
675-
divisor: 1m
675+
divisor: "0"
676676
resource: requests.cpu
677677
- path: mem_limit
678678
resourceFieldRef:
679679
containerName: database
680-
divisor: 1Mi
680+
divisor: "0"
681681
resource: limits.memory
682682
- path: mem_request
683683
resourceFieldRef:
684684
containerName: database
685-
divisor: 1Mi
685+
divisor: "0"
686686
resource: requests.memory
687687
- fieldRef:
688688
apiVersion: v1

0 commit comments

Comments
 (0)