feat(sizing): adjust cpu and RAM request/limit for all deployments

k8s/components/gridsuite/kustomization.yaml

@@ -44,66 +44,101 @@ patches:
   target:
     kind: CronJob
     labelSelector: gridsuite.org/cronjob-with-database=true
-- path: patches/deployments-springboot-size-xxs.yaml
+- path: patches/cpu/deployments-springboot-cpu-xxs.yaml
   target:
     kind: Deployment
     labelSelector: app.kubernetes.io/component=gridsuite-springboot
-    annotationSelector: gridsuite.org/size=springboot-xxs
-- path: patches/deployments-springboot-size-xs.yaml
+    annotationSelector: gridsuite.org/cpu=cpu-xxs
+- path: patches/cpu/deployments-springboot-cpu-xs.yaml
   target:
     kind: Deployment
     labelSelector: app.kubernetes.io/component=gridsuite-springboot
-    annotationSelector: gridsuite.org/size=springboot-xs
-- path: patches/deployments-springboot-size-s.yaml
+    annotationSelector: gridsuite.org/cpu=cpu-xs
+- path: patches/cpu/deployments-springboot-cpu-s.yaml
   target:
     kind: Deployment
     labelSelector: app.kubernetes.io/component=gridsuite-springboot
-    annotationSelector: gridsuite.org/size=springboot-s
-- path: patches/deployments-springboot-size-m.yaml
+    annotationSelector: gridsuite.org/cpu=cpu-s
+- path: patches/cpu/deployments-springboot-cpu-m.yaml
   target:
     kind: Deployment
     labelSelector: app.kubernetes.io/component=gridsuite-springboot
-    annotationSelector: gridsuite.org/size=springboot-m
-- path: patches/deployments-springboot-size-l.yaml
+    annotationSelector: gridsuite.org/cpu=cpu-m
+- path: patches/cpu/deployments-springboot-cpu-l.yaml
   target:
     kind: Deployment
     labelSelector: app.kubernetes.io/component=gridsuite-springboot
-    annotationSelector: gridsuite.org/size=springboot-l
-- path: patches/deployments-springboot-size-l-forking.yaml
+    annotationSelector: gridsuite.org/cpu=cpu-l
+- path: patches/cpu/deployments-springboot-cpu-xl.yaml
   target:
     kind: Deployment
     labelSelector: app.kubernetes.io/component=gridsuite-springboot
-    annotationSelector: gridsuite.org/size=springboot-l-forking
-- path: patches/deployments-springboot-size-xl.yaml
+    annotationSelector: gridsuite.org/cpu=cpu-xl
+- path: patches/cpu/deployments-springboot-cpu-xxl.yaml
   target:
     kind: Deployment
     labelSelector: app.kubernetes.io/component=gridsuite-springboot
-    annotationSelector: gridsuite.org/size=springboot-xl
-- path: patches/deployments-springboot-size-xl-forking.yaml
+    annotationSelector: gridsuite.org/cpu=cpu-xxl
+- path: patches/memory/deployments-springboot-memory-xxs.yaml
   target:
     kind: Deployment
     labelSelector: app.kubernetes.io/component=gridsuite-springboot
-    annotationSelector: gridsuite.org/size=springboot-xl-forking
-- path: patches/deployments-springboot-size-xxl.yaml
+    annotationSelector: gridsuite.org/memory=memory-xxs
+- path: patches/memory/deployments-springboot-memory-xs.yaml
   target:
     kind: Deployment
     labelSelector: app.kubernetes.io/component=gridsuite-springboot
-    annotationSelector: gridsuite.org/size=springboot-xxl
-- path: patches/deployments-springboot-size-xxl-forking.yaml
+    annotationSelector: gridsuite.org/memory=memory-xs
+- path: patches/memory/deployments-springboot-memory-s.yaml
   target:
     kind: Deployment
     labelSelector: app.kubernetes.io/component=gridsuite-springboot
-    annotationSelector: gridsuite.org/size=springboot-xxl-forking
-- path: patches/deployments-springboot-size-security-analysis.yaml
+    annotationSelector: gridsuite.org/memory=memory-s
+- path: patches/memory/deployments-springboot-memory-m.yaml
   target:
     kind: Deployment
     labelSelector: app.kubernetes.io/component=gridsuite-springboot
-    annotationSelector: gridsuite.org/size=springboot-security-analysis
-- path: patches/deployments-springnative-size-xs.yaml
+    annotationSelector: gridsuite.org/memory=memory-m
+- path: patches/memory/deployments-springboot-memory-l.yaml
   target:
     kind: Deployment
     labelSelector: app.kubernetes.io/component=gridsuite-springboot
-    annotationSelector: gridsuite.org/size=springnative-xs
+    annotationSelector: gridsuite.org/memory=memory-l
+- path: patches/memory/deployments-springboot-memory-xl.yaml
+  target:
+    kind: Deployment
+    labelSelector: app.kubernetes.io/component=gridsuite-springboot
+    annotationSelector: gridsuite.org/memory=memory-xl
+- path: patches/memory/deployments-springboot-memory-xxl.yaml
+  target:
+    kind: Deployment
+    labelSelector: app.kubernetes.io/component=gridsuite-springboot
+    annotationSelector: gridsuite.org/memory=memory-xxl
+- path: patches/memory/deployments-springboot-memory-xxxl.yaml
+  target:
+    kind: Deployment
+    labelSelector: app.kubernetes.io/component=gridsuite-springboot
+    annotationSelector: gridsuite.org/memory=memory-xxxl
+- path: patches/memory/deployments-springboot-memory-m-forking.yaml
+  target:
+    kind: Deployment
+    labelSelector: app.kubernetes.io/component=gridsuite-springboot
+    annotationSelector: gridsuite.org/memory=memory-m-forking
+- path: patches/memory/deployments-springboot-memory-l-forking.yaml
+  target:
+    kind: Deployment
+    labelSelector: app.kubernetes.io/component=gridsuite-springboot
+    annotationSelector: gridsuite.org/memory=memory-l-forking
+- path: patches/memory/deployments-springboot-memory-xl-forking.yaml
+  target:
+    kind: Deployment
+    labelSelector: app.kubernetes.io/component=gridsuite-springboot
+    annotationSelector: gridsuite.org/memory=memory-xl-forking
+- path: patches/memory/deployments-springboot-memory-xxl-forking.yaml
+  target:
+    kind: Deployment
+    labelSelector: app.kubernetes.io/component=gridsuite-springboot
+    annotationSelector: gridsuite.org/memory=memory-xxl-forking
 - path: patches/deployments-springboot-elasticsearch-config.yaml
   target:
     kind: Deployment

k8s/components/gridsuite/patches/deployments-springnative-size-xs.yaml → k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-l.yaml

@@ -2,13 +2,15 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: not-important
+  annotations:
+    gridsuite.org/cpu: cpu-l
 spec:
   template:
     spec:
       containers:
         - name: main
           resources:
             requests:
-              memory: "256Mi"
+              cpu: "2000m"
             limits:
-              memory: "256Mi"
+              cpu: "4000m"

k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-m.yaml

@@ -0,0 +1,16 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: not-important
+  annotations:
+    gridsuite.org/cpu: cpu-m
+spec:
+  template:
+    spec:
+      containers:
+        - name: main
+          resources:
+            requests:
+              cpu: "1500m"
+            limits:
+              cpu: "3000m"

k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-s.yaml

@@ -0,0 +1,16 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: not-important
+  annotations:
+    gridsuite.org/cpu: cpu-s
+spec:
+  template:
+    spec:
+      containers:
+        - name: main
+          resources:
+            requests:
+              cpu: "1000m"
+            limits:
+              cpu: "2000m"

k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-xl.yaml

@@ -0,0 +1,16 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: not-important
+  annotations:
+    gridsuite.org/cpu: cpu-xl
+spec:
+  template:
+    spec:
+      containers:
+        - name: main
+          resources:
+            requests:
+              cpu: "2500m"
+            limits:
+              cpu: "5000m"

k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-xs.yaml

@@ -0,0 +1,16 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: not-important
+  annotations:
+    gridsuite.org/cpu: cpu-xs
+spec:
+  template:
+    spec:
+      containers:
+        - name: main
+          resources:
+            requests:
+              cpu: "500m"
+            limits:
+              cpu: "1000m"

k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-xxl.yaml

@@ -0,0 +1,16 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: not-important
+  annotations:
+    gridsuite.org/cpu: cpu-xxl
+spec:
+  template:
+    spec:
+      containers:
+        - name: main
+          resources:
+            requests:
+              cpu: "3500m"
+            limits:
+              cpu: "7000m"

k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-xxs.yaml

@@ -0,0 +1,16 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: not-important
+  annotations:
+    gridsuite.org/cpu: cpu-xxs
+spec:
+  template:
+    spec:
+      containers:
+        - name: main
+          resources:
+            requests:
+              cpu: "100m"
+            limits:
+              cpu: "500m"

k8s/components/gridsuite/patches/deployments-apache-gridapp.yaml

@@ -5,6 +5,13 @@ metadata:
 spec:
   template:
     spec:
+      containers:
+        - name: main
+          resources:
+            requests:
+              cpu: "500m"
+            limits:
+              cpu: "1000m"
       volumes:
         - name: gridapps-env-configmap-volume
           configMap:

k8s/components/gridsuite/patches/deployments-apache.yaml

@@ -16,9 +16,11 @@ spec:
           runAsUser: 1001
         resources:
           requests:
+            cpu: "100m"
             memory: "128Mi"
             ephemeral-storage: 12Mi
           limits:
+            cpu: "500m"
             memory: "128Mi"
             ephemeral-storage: 64Mi
         startupProbe:

k8s/components/gridsuite/patches/memory/deployments-springboot-memory-l-forking.yaml

@@ -0,0 +1,19 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: not-important
+  annotations:
+    gridsuite.org/memory: memory-l-forking
+spec:
+  template:
+    spec:
+      containers:
+        - name: main
+          env:
+          - name: JAVA_TOOL_OPTIONS
+            value: "-Xmx1229m"
+          resources:
+            requests:
+              memory: "2458Mi"
+            limits:
+              memory: "2458Mi"

k8s/components/gridsuite/patches/deployments-springboot-size-m.yaml → k8s/components/gridsuite/patches/memory/deployments-springboot-memory-l.yaml

@@ -2,16 +2,18 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: not-important
+  annotations:
+    gridsuite.org/memory: memory-l
 spec:
   template:
     spec:
       containers:
         - name: main
           env:
           - name: JAVA_TOOL_OPTIONS
-            value: "-Xmx576m"
+            value: "-Xmx1229m"
           resources:
             requests:
-              memory: "1.25Gi"
+              memory: "1638Mi"
             limits:
-              memory: "1.25Gi"
+              memory: "1638Mi"