Skip to content

Commit 867e83c

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 c7842e7 commit 867e83c

File tree

2 files changed

+12
-16
lines changed

2 files changed

+12
-16
lines changed

internal/postgres/reconcile.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,28 +116,24 @@ func InstancePod(ctx context.Context,
116116
ResourceFieldRef: &corev1.ResourceFieldSelector{
117117
ContainerName: naming.ContainerDatabase,
118118
Resource: "limits.cpu",
119-
Divisor: oneMillicore,
120119
},
121120
}, {
122121
Path: "cpu_request",
123122
ResourceFieldRef: &corev1.ResourceFieldSelector{
124123
ContainerName: naming.ContainerDatabase,
125124
Resource: "requests.cpu",
126-
Divisor: oneMillicore,
127125
},
128126
}, {
129127
Path: "mem_limit",
130128
ResourceFieldRef: &corev1.ResourceFieldSelector{
131129
ContainerName: naming.ContainerDatabase,
132130
Resource: "limits.memory",
133-
Divisor: oneMebibyte,
134131
},
135132
}, {
136133
Path: "mem_request",
137134
ResourceFieldRef: &corev1.ResourceFieldSelector{
138135
ContainerName: naming.ContainerDatabase,
139136
Resource: "requests.memory",
140-
Divisor: oneMebibyte,
141137
},
142138
}, {
143139
Path: "labels",

internal/postgres/reconcile_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -351,22 +351,22 @@ volumes:
351351
- path: cpu_limit
352352
resourceFieldRef:
353353
containerName: database
354-
divisor: 1m
354+
divisor: "0"
355355
resource: limits.cpu
356356
- path: cpu_request
357357
resourceFieldRef:
358358
containerName: database
359-
divisor: 1m
359+
divisor: "0"
360360
resource: requests.cpu
361361
- path: mem_limit
362362
resourceFieldRef:
363363
containerName: database
364-
divisor: 1Mi
364+
divisor: "0"
365365
resource: limits.memory
366366
- path: mem_request
367367
resourceFieldRef:
368368
containerName: database
369-
divisor: 1Mi
369+
divisor: "0"
370370
resource: requests.memory
371371
- fieldRef:
372372
apiVersion: v1
@@ -442,22 +442,22 @@ volumes:
442442
- path: cpu_limit
443443
resourceFieldRef:
444444
containerName: database
445-
divisor: 1m
445+
divisor: "0"
446446
resource: limits.cpu
447447
- path: cpu_request
448448
resourceFieldRef:
449449
containerName: database
450-
divisor: 1m
450+
divisor: "0"
451451
resource: requests.cpu
452452
- path: mem_limit
453453
resourceFieldRef:
454454
containerName: database
455-
divisor: 1Mi
455+
divisor: "0"
456456
resource: limits.memory
457457
- path: mem_request
458458
resourceFieldRef:
459459
containerName: database
460-
divisor: 1Mi
460+
divisor: "0"
461461
resource: requests.memory
462462
- fieldRef:
463463
apiVersion: v1
@@ -666,22 +666,22 @@ volumes:
666666
- path: cpu_limit
667667
resourceFieldRef:
668668
containerName: database
669-
divisor: 1m
669+
divisor: "0"
670670
resource: limits.cpu
671671
- path: cpu_request
672672
resourceFieldRef:
673673
containerName: database
674-
divisor: 1m
674+
divisor: "0"
675675
resource: requests.cpu
676676
- path: mem_limit
677677
resourceFieldRef:
678678
containerName: database
679-
divisor: 1Mi
679+
divisor: "0"
680680
resource: limits.memory
681681
- path: mem_request
682682
resourceFieldRef:
683683
containerName: database
684-
divisor: 1Mi
684+
divisor: "0"
685685
resource: requests.memory
686686
- fieldRef:
687687
apiVersion: v1

0 commit comments

Comments
 (0)