diff --git a/internal/postgres/reconcile.go b/internal/postgres/reconcile.go index 5041140b0..81c6cc31f 100644 --- a/internal/postgres/reconcile.go +++ b/internal/postgres/reconcile.go @@ -8,7 +8,6 @@ import ( "context" corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/resource" "github.com/crunchydata/postgres-operator/internal/config" "github.com/crunchydata/postgres-operator/internal/feature" @@ -17,11 +16,6 @@ import ( "github.com/crunchydata/postgres-operator/pkg/apis/postgres-operator.crunchydata.com/v1beta1" ) -var ( - oneMillicore = resource.MustParse("1m") - oneMebibyte = resource.MustParse("1Mi") -) - // DataVolumeMount returns the name and mount path of the PostgreSQL data volume. func DataVolumeMount() corev1.VolumeMount { return corev1.VolumeMount{Name: "postgres-data", MountPath: dataMountPath} @@ -116,28 +110,24 @@ func InstancePod(ctx context.Context, ResourceFieldRef: &corev1.ResourceFieldSelector{ ContainerName: naming.ContainerDatabase, Resource: "limits.cpu", - Divisor: oneMillicore, }, }, { Path: "cpu_request", ResourceFieldRef: &corev1.ResourceFieldSelector{ ContainerName: naming.ContainerDatabase, Resource: "requests.cpu", - Divisor: oneMillicore, }, }, { Path: "mem_limit", ResourceFieldRef: &corev1.ResourceFieldSelector{ ContainerName: naming.ContainerDatabase, Resource: "limits.memory", - Divisor: oneMebibyte, }, }, { Path: "mem_request", ResourceFieldRef: &corev1.ResourceFieldSelector{ ContainerName: naming.ContainerDatabase, Resource: "requests.memory", - Divisor: oneMebibyte, }, }, { Path: "labels", diff --git a/internal/postgres/reconcile_test.go b/internal/postgres/reconcile_test.go index 61a85d5cd..e90cb3c75 100644 --- a/internal/postgres/reconcile_test.go +++ b/internal/postgres/reconcile_test.go @@ -351,22 +351,22 @@ volumes: - path: cpu_limit resourceFieldRef: containerName: database - divisor: 1m + divisor: "0" resource: limits.cpu - path: cpu_request resourceFieldRef: containerName: database - divisor: 1m + divisor: "0" resource: requests.cpu - path: mem_limit resourceFieldRef: containerName: database - divisor: 1Mi + divisor: "0" resource: limits.memory - path: mem_request resourceFieldRef: containerName: database - divisor: 1Mi + divisor: "0" resource: requests.memory - fieldRef: apiVersion: v1 @@ -442,22 +442,22 @@ volumes: - path: cpu_limit resourceFieldRef: containerName: database - divisor: 1m + divisor: "0" resource: limits.cpu - path: cpu_request resourceFieldRef: containerName: database - divisor: 1m + divisor: "0" resource: requests.cpu - path: mem_limit resourceFieldRef: containerName: database - divisor: 1Mi + divisor: "0" resource: limits.memory - path: mem_request resourceFieldRef: containerName: database - divisor: 1Mi + divisor: "0" resource: requests.memory - fieldRef: apiVersion: v1 @@ -666,22 +666,22 @@ volumes: - path: cpu_limit resourceFieldRef: containerName: database - divisor: 1m + divisor: "0" resource: limits.cpu - path: cpu_request resourceFieldRef: containerName: database - divisor: 1m + divisor: "0" resource: requests.cpu - path: mem_limit resourceFieldRef: containerName: database - divisor: 1Mi + divisor: "0" resource: limits.memory - path: mem_request resourceFieldRef: containerName: database - divisor: 1Mi + divisor: "0" resource: requests.memory - fieldRef: apiVersion: v1