Merge pull request #2604 from lsst-sqre/u/rra/resource-limits

Specify Kubernetes memory limits in powers of two

applications/sherlock/values-base.yaml

@@ -1,7 +1,7 @@
 resources:
   requests:
     cpu: 2.0
-    memory: "2G"
+    memory: "2Gi"
   limits:
     cpu: 4.0
-    memory: "4G"
+    memory: "4Gi"

applications/sherlock/values-idfdev.yaml

@@ -1,9 +1,9 @@
 resources:
   requests:
     cpu: 2.0
-    memory: "2G"
+    memory: "2Gi"
   limits:
     cpu: 4.0
-    memory: "4G"
+    memory: "4Gi"
 
 publishUrl: "https://status.lsst.codes/api/data-dev"

applications/sherlock/values-idfint.yaml

@@ -1,8 +1,8 @@
 resources:
   requests:
     cpu: 2.0
-    memory: "2G"
+    memory: "2Gi"
   limits:
     cpu: 4.0
-    memory: "4G"
+    memory: "4Gi"
 publishUrl: "https://status.lsst.codes/api/data-int"

applications/sherlock/values-idfprod.yaml

@@ -1,8 +1,8 @@
 resources:
   requests:
     cpu: 2.0
-    memory: "2G"
+    memory: "2Gi"
   limits:
     cpu: 4.0
-    memory: "4G"
+    memory: "4Gi"
 publishUrl: "https://status.lsst.codes/api/data"

applications/sherlock/values-roe.yaml

@@ -1,7 +1,7 @@
 resources:
   requests:
     cpu: 2.0
-    memory: "2G"
+    memory: "2Gi"
   limits:
     cpu: 4.0
-    memory: "4G"
+    memory: "4Gi"

applications/sherlock/values-summit.yaml

@@ -1,7 +1,7 @@
 resources:
   requests:
     cpu: 2.0
-    memory: "2G"
+    memory: "2Gi"
   limits:
     cpu: 4.0
-    memory: "4G"
+    memory: "4Gi"

applications/sherlock/values-tucson-teststand.yaml

@@ -1,7 +1,7 @@
 resources:
   requests:
     cpu: 2.0
-    memory: "2G"
+    memory: "2Gi"
   limits:
     cpu: 4.0
-    memory: "4G"
+    memory: "4Gi"

charts/cadc-tap/README.md

@@ -52,7 +52,7 @@ IVOA TAP service
 | nodeSelector | object | `{}` | Node selector rules for the TAP pod |
 | podAnnotations | object | `{}` | Annotations for the TAP pod |
 | replicaCount | int | `1` | Number of pods to start |
-| resources | object | `{"limits":{"cpu":8,"memory":"32G"},"requests":{"cpu":2,"memory":"2G"}}` | Resource limits and requests for the TAP pod |
+| resources | object | `{"limits":{"cpu":8,"memory":"32Gi"},"requests":{"cpu":2,"memory":"2Gi"}}` | Resource limits and requests for the TAP pod |
 | tapSchema.affinity | object | `{}` | Affinity rules for the TAP schema database pod |
 | tapSchema.image.pullPolicy | string | `"IfNotPresent"` | Pull policy for the TAP schema image |
 | tapSchema.image.repository | string | `"lsstsqre/tap-schema-mock"` | TAP schema image to ue. This must be overridden by each environment with the TAP schema for that environment. |
@@ -68,6 +68,6 @@ IVOA TAP service
 | uws.image.tag | string | Version of QServ TAP image | Tag of UWS database image to use |
 | uws.nodeSelector | object | `{}` | Node selection rules for the UWS database pod |
 | uws.podAnnotations | object | `{}` | Annotations for the UWS databse pod |
-| uws.resources | object | `{"limits":{"cpu":2,"memory":"4G"},"requests":{"cpu":0.25,"memory":"1G"}}` | Resource limits and requests for the UWS database pod |
+| uws.resources | object | `{"limits":{"cpu":2,"memory":"4Gi"},"requests":{"cpu":0.25,"memory":"1Gi"}}` | Resource limits and requests for the UWS database pod |
 | uws.tolerations | list | `[]` | Tolerations for the UWS database pod |
 | vaultSecretsPath | string | None, must be set | Path to the Vault secret (`secret/k8s_operator/<host>/tap`, for example) |

charts/cadc-tap/values.yaml

@@ -29,10 +29,10 @@ ingress:
 resources:
   requests:
     cpu: 2.0
-    memory: "2G"
+    memory: "2Gi"
   limits:
     cpu: 8.0
-    memory: "32G"
+    memory: "32Gi"
 
 # -- Annotations for the TAP pod
 podAnnotations: {}
@@ -198,10 +198,10 @@ uws:
   resources:
     requests:
       cpu: 0.25
-      memory: "1G"
+      memory: "1Gi"
     limits:
       cpu: 2.0
-      memory: "4G"
+      memory: "4Gi"
 
   # -- Annotations for the UWS databse pod
   podAnnotations: {}

environments/values-minikube.yaml

@@ -16,4 +16,3 @@ applications:
   mobu: true
   postgres: true
   squareone: true
-  tap: true