diff --git a/k8s/components/gridsuite/kustomization.yaml b/k8s/components/gridsuite/kustomization.yaml index de4d85c1..c2a079ef 100644 --- a/k8s/components/gridsuite/kustomization.yaml +++ b/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 diff --git a/k8s/components/gridsuite/patches/deployments-springnative-size-xs.yaml b/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-l.yaml similarity index 67% rename from k8s/components/gridsuite/patches/deployments-springnative-size-xs.yaml rename to k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-l.yaml index a80f042b..9f832815 100644 --- a/k8s/components/gridsuite/patches/deployments-springnative-size-xs.yaml +++ b/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-l.yaml @@ -2,6 +2,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: not-important + annotations: + gridsuite.org/cpu: cpu-l spec: template: spec: @@ -9,6 +11,6 @@ spec: - name: main resources: requests: - memory: "256Mi" + cpu: "2000m" limits: - memory: "256Mi" + cpu: "4000m" \ No newline at end of file diff --git a/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-m.yaml b/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-m.yaml new file mode 100644 index 00000000..68b8a620 --- /dev/null +++ b/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" \ No newline at end of file diff --git a/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-s.yaml b/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-s.yaml new file mode 100644 index 00000000..a675f841 --- /dev/null +++ b/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" \ No newline at end of file diff --git a/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-xl.yaml b/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-xl.yaml new file mode 100644 index 00000000..007239db --- /dev/null +++ b/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" \ No newline at end of file diff --git a/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-xs.yaml b/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-xs.yaml new file mode 100644 index 00000000..c3515c90 --- /dev/null +++ b/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" \ No newline at end of file diff --git a/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-xxl.yaml b/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-xxl.yaml new file mode 100644 index 00000000..a1a9154e --- /dev/null +++ b/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" \ No newline at end of file diff --git a/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-xxs.yaml b/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-xxs.yaml new file mode 100644 index 00000000..54c62ae1 --- /dev/null +++ b/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" \ No newline at end of file diff --git a/k8s/components/gridsuite/patches/deployments-apache-gridapp.yaml b/k8s/components/gridsuite/patches/deployments-apache-gridapp.yaml index d680a8ad..1853c632 100644 --- a/k8s/components/gridsuite/patches/deployments-apache-gridapp.yaml +++ b/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: diff --git a/k8s/components/gridsuite/patches/deployments-apache.yaml b/k8s/components/gridsuite/patches/deployments-apache.yaml index 275a4df1..af879315 100644 --- a/k8s/components/gridsuite/patches/deployments-apache.yaml +++ b/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: diff --git a/k8s/components/gridsuite/patches/deployments-springboot-size-security-analysis.yaml b/k8s/components/gridsuite/patches/deployments-springboot-size-security-analysis.yaml deleted file mode 100644 index 8273dd93..00000000 --- a/k8s/components/gridsuite/patches/deployments-springboot-size-security-analysis.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: not-important -spec: - template: - spec: - containers: - - name: main - env: - - name: JAVA_TOOL_OPTIONS - value: "-Xmx4g" - resources: - requests: - memory: "7.5Gi" - limits: - memory: "7.5Gi" diff --git a/k8s/components/gridsuite/patches/deployments-springboot-size-xl-forking.yaml b/k8s/components/gridsuite/patches/deployments-springboot-size-xl-forking.yaml deleted file mode 100644 index 2cd8daeb..00000000 --- a/k8s/components/gridsuite/patches/deployments-springboot-size-xl-forking.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: not-important -spec: - template: - spec: - containers: - - name: main - env: - - name: JAVA_TOOL_OPTIONS - value: "-Xmx1086m" - resources: - requests: - memory: "2432Mi" - limits: - memory: "2432Mi" \ No newline at end of file diff --git a/k8s/components/gridsuite/patches/deployments-springboot-size-xs.yaml b/k8s/components/gridsuite/patches/deployments-springboot-size-xs.yaml deleted file mode 100644 index 7f5d28eb..00000000 --- a/k8s/components/gridsuite/patches/deployments-springboot-size-xs.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: not-important -spec: - template: - spec: - containers: - - name: main - env: - - name: JAVA_TOOL_OPTIONS - value: "-Xmx186m" - resources: - requests: - memory: "768Mi" - limits: - memory: "768Mi" diff --git a/k8s/components/gridsuite/patches/deployments-springboot-size-xxl.yaml b/k8s/components/gridsuite/patches/deployments-springboot-size-xxl.yaml deleted file mode 100644 index b43a2c9e..00000000 --- a/k8s/components/gridsuite/patches/deployments-springboot-size-xxl.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: not-important -spec: - template: - spec: - containers: - - name: main - env: - - name: JAVA_TOOL_OPTIONS - value: "-Xmx1408m" - resources: - requests: - memory: "2.5Gi" - limits: - memory: "2.5Gi" diff --git a/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-l-forking.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-l-forking.yaml new file mode 100644 index 00000000..ffc04509 --- /dev/null +++ b/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" diff --git a/k8s/components/gridsuite/patches/deployments-springboot-size-m.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-l.yaml similarity index 63% rename from k8s/components/gridsuite/patches/deployments-springboot-size-m.yaml rename to k8s/components/gridsuite/patches/memory/deployments-springboot-memory-l.yaml index a99a7daf..20cc50e1 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-size-m.yaml +++ b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-l.yaml @@ -2,6 +2,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: not-important + annotations: + gridsuite.org/memory: memory-l spec: template: spec: @@ -9,9 +11,9 @@ spec: - name: main env: - name: JAVA_TOOL_OPTIONS - value: "-Xmx576m" + value: "-Xmx1229m" resources: requests: - memory: "1.25Gi" + memory: "1638Mi" limits: - memory: "1.25Gi" + memory: "1638Mi" diff --git a/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-m-forking.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-m-forking.yaml new file mode 100644 index 00000000..db0aeaa1 --- /dev/null +++ b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-m-forking.yaml @@ -0,0 +1,19 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: not-important + annotations: + gridsuite.org/memory: memory-m-forking +spec: + template: + spec: + containers: + - name: main + env: + - name: JAVA_TOOL_OPTIONS + value: "-Xmx922m" + resources: + requests: + memory: "1843Mi" + limits: + memory: "1843Mi" diff --git a/k8s/components/gridsuite/patches/deployments-springboot-size-s.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-m.yaml similarity index 79% rename from k8s/components/gridsuite/patches/deployments-springboot-size-s.yaml rename to k8s/components/gridsuite/patches/memory/deployments-springboot-memory-m.yaml index f5907d6a..ffbc756a 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-size-s.yaml +++ b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-m.yaml @@ -2,6 +2,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: not-important + annotations: + gridsuite.org/memory: memory-m spec: template: spec: @@ -9,7 +11,7 @@ spec: - name: main env: - name: JAVA_TOOL_OPTIONS - value: "-Xmx384m" + value: "-Xmx768m" resources: requests: memory: "1Gi" diff --git a/k8s/components/gridsuite/patches/deployments-springboot-size-xxs.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-s.yaml similarity index 79% rename from k8s/components/gridsuite/patches/deployments-springboot-size-xxs.yaml rename to k8s/components/gridsuite/patches/memory/deployments-springboot-memory-s.yaml index 0d5d96b9..53edcdb8 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-size-xxs.yaml +++ b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-s.yaml @@ -2,6 +2,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: not-important + annotations: + gridsuite.org/memory: memory-s spec: template: spec: @@ -9,7 +11,7 @@ spec: - name: main env: - name: JAVA_TOOL_OPTIONS - value: "-Xmx128m" + value: "-Xmx384m" resources: requests: memory: "512Mi" diff --git a/k8s/components/gridsuite/patches/deployments-springboot-size-xxl-forking.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xl-forking.yaml similarity index 77% rename from k8s/components/gridsuite/patches/deployments-springboot-size-xxl-forking.yaml rename to k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xl-forking.yaml index e078b700..a16e7ec3 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-size-xxl-forking.yaml +++ b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xl-forking.yaml @@ -2,6 +2,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: not-important + annotations: + gridsuite.org/memory: memory-xl-forking spec: template: spec: @@ -9,7 +11,7 @@ spec: - name: main env: - name: JAVA_TOOL_OPTIONS - value: "-Xmx1408m" + value: "-Xmx1536m" resources: requests: memory: "3Gi" diff --git a/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xl.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xl.yaml new file mode 100644 index 00000000..709ffd5f --- /dev/null +++ b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xl.yaml @@ -0,0 +1,19 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: not-important + annotations: + gridsuite.org/memory: memory-xl +spec: + template: + spec: + containers: + - name: main + env: + - name: JAVA_TOOL_OPTIONS + value: "-Xmx1382m" + resources: + requests: + memory: "1843Mi" + limits: + memory: "1843Mi" diff --git a/k8s/components/gridsuite/patches/deployments-springboot-size-l-forking.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xs.yaml similarity index 63% rename from k8s/components/gridsuite/patches/deployments-springboot-size-l-forking.yaml rename to k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xs.yaml index 1e8d3713..083f25f3 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-size-l-forking.yaml +++ b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xs.yaml @@ -2,6 +2,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: not-important + annotations: + gridsuite.org/memory: memory-xs spec: template: spec: @@ -9,9 +11,9 @@ spec: - name: main env: - name: JAVA_TOOL_OPTIONS - value: "-Xmx768m" + value: "-Xmx308m" resources: requests: - memory: "1.75Gi" + memory: "410Mi" limits: - memory: "1.75Gi" + memory: "410Mi" diff --git a/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xxl-forking.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xxl-forking.yaml new file mode 100644 index 00000000..573bfe1b --- /dev/null +++ b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xxl-forking.yaml @@ -0,0 +1,19 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: not-important + annotations: + gridsuite.org/memory: memory-xxl-forking +spec: + template: + spec: + containers: + - name: main + env: + - name: JAVA_TOOL_OPTIONS + value: "-Xmx2304m" + resources: + requests: + memory: "4608Mi" + limits: + memory: "4608Mi" diff --git a/k8s/components/gridsuite/patches/deployments-springboot-size-xl.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xxl.yaml similarity index 78% rename from k8s/components/gridsuite/patches/deployments-springboot-size-xl.yaml rename to k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xxl.yaml index c944a86e..3a989310 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-size-xl.yaml +++ b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xxl.yaml @@ -2,6 +2,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: not-important + annotations: + gridsuite.org/memory: memory-xxl spec: template: spec: @@ -9,7 +11,7 @@ spec: - name: main env: - name: JAVA_TOOL_OPTIONS - value: "-Xmx1086m" + value: "-Xmx1536m" resources: requests: memory: "2Gi" diff --git a/k8s/components/gridsuite/patches/deployments-springboot-size-l.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xxs.yaml similarity index 63% rename from k8s/components/gridsuite/patches/deployments-springboot-size-l.yaml rename to k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xxs.yaml index 0360bc8b..fa1fff8e 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-size-l.yaml +++ b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xxs.yaml @@ -2,6 +2,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: not-important + annotations: + gridsuite.org/memory: memory-xxs spec: template: spec: @@ -9,9 +11,9 @@ spec: - name: main env: - name: JAVA_TOOL_OPTIONS - value: "-Xmx768m" + value: "-Xmx98m" resources: requests: - memory: "1.5Gi" + memory: "130Mi" limits: - memory: "1.5Gi" + memory: "130Mi" diff --git a/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xxxl.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xxxl.yaml new file mode 100644 index 00000000..b0f58ab6 --- /dev/null +++ b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xxxl.yaml @@ -0,0 +1,19 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: not-important + annotations: + gridsuite.org/memory: memory-xxxl +spec: + template: + spec: + containers: + - name: main + env: + - name: JAVA_TOOL_OPTIONS + value: "-Xmx1920m" + resources: + requests: + memory: "2560Mi" + limits: + memory: "2560Mi" diff --git a/k8s/resources/common/actions-server-deployment.yaml b/k8s/resources/common/actions-server-deployment.yaml index 54177aa7..388d318e 100644 --- a/k8s/resources/common/actions-server-deployment.yaml +++ b/k8s/resources/common/actions-server-deployment.yaml @@ -9,7 +9,8 @@ metadata: gridsuite.org/springboot-with-database: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/size: springboot-m + gridsuite.org/cpu: cpu-s + gridsuite.org/memory: memory-m spec: selector: matchLabels: diff --git a/k8s/resources/common/case-server-deployment.yaml b/k8s/resources/common/case-server-deployment.yaml index cdc58b49..827e352b 100644 --- a/k8s/resources/common/case-server-deployment.yaml +++ b/k8s/resources/common/case-server-deployment.yaml @@ -11,7 +11,8 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" gridsuite.org/springboot-with-s3: "true" annotations: - gridsuite.org/size: springboot-xs + gridsuite.org/cpu: cpu-xs + gridsuite.org/memory: memory-s spec: selector: matchLabels: diff --git a/k8s/resources/common/config-notification-server-deployment.yaml b/k8s/resources/common/config-notification-server-deployment.yaml index 2bf8a7c1..8847bfd9 100644 --- a/k8s/resources/common/config-notification-server-deployment.yaml +++ b/k8s/resources/common/config-notification-server-deployment.yaml @@ -8,7 +8,8 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/size: springboot-xxs + gridsuite.org/cpu: cpu-xxs + gridsuite.org/memory: memory-xs spec: selector: matchLabels: diff --git a/k8s/resources/common/config-server-deployment.yaml b/k8s/resources/common/config-server-deployment.yaml index 09ef5493..17148664 100644 --- a/k8s/resources/common/config-server-deployment.yaml +++ b/k8s/resources/common/config-server-deployment.yaml @@ -9,7 +9,8 @@ metadata: gridsuite.org/springboot-with-database: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/size: springboot-xxs + gridsuite.org/cpu: cpu-xxs + gridsuite.org/memory: memory-xs spec: selector: matchLabels: diff --git a/k8s/resources/common/filter-server-deployment.yaml b/k8s/resources/common/filter-server-deployment.yaml index 36144bcb..3c087d8c 100644 --- a/k8s/resources/common/filter-server-deployment.yaml +++ b/k8s/resources/common/filter-server-deployment.yaml @@ -9,7 +9,8 @@ metadata: gridsuite.org/springboot-with-database: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/size: springboot-m + gridsuite.org/cpu: cpu-xs + gridsuite.org/memory: memory-m spec: selector: matchLabels: diff --git a/k8s/resources/common/gateway-deployment.yaml b/k8s/resources/common/gateway-deployment.yaml index f3c5455d..d9a87943 100644 --- a/k8s/resources/common/gateway-deployment.yaml +++ b/k8s/resources/common/gateway-deployment.yaml @@ -7,7 +7,8 @@ metadata: version: "1" app.kubernetes.io/component: gridsuite-springboot annotations: - gridsuite.org/size: springboot-xxs + gridsuite.org/cpu: cpu-xs + gridsuite.org/memory: memory-xs spec: selector: matchLabels: diff --git a/k8s/resources/common/loadflow-server-deployment.yaml b/k8s/resources/common/loadflow-server-deployment.yaml index a5a840c1..01510528 100644 --- a/k8s/resources/common/loadflow-server-deployment.yaml +++ b/k8s/resources/common/loadflow-server-deployment.yaml @@ -9,7 +9,8 @@ metadata: gridsuite.org/springboot-with-database: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/size: springboot-xxl-forking + gridsuite.org/cpu: cpu-xl + gridsuite.org/memory: memory-xxl-forking spec: selector: matchLabels: diff --git a/k8s/resources/common/network-conversion-server-deployment.yaml b/k8s/resources/common/network-conversion-server-deployment.yaml index 69747df1..66ffe0db 100644 --- a/k8s/resources/common/network-conversion-server-deployment.yaml +++ b/k8s/resources/common/network-conversion-server-deployment.yaml @@ -10,7 +10,8 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" gridsuite.org/springboot-with-large-storage: "true" annotations: - gridsuite.org/size: springboot-xxl + gridsuite.org/cpu: cpu-xl + gridsuite.org/memory: memory-xxl spec: selector: matchLabels: diff --git a/k8s/resources/common/network-store-server-deployment.yaml b/k8s/resources/common/network-store-server-deployment.yaml index 877b1292..b35f9d73 100644 --- a/k8s/resources/common/network-store-server-deployment.yaml +++ b/k8s/resources/common/network-store-server-deployment.yaml @@ -8,7 +8,8 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-database: "true" annotations: - gridsuite.org/size: springboot-xxl + gridsuite.org/cpu: cpu-xxl + gridsuite.org/memory: memory-xxl spec: selector: matchLabels: diff --git a/k8s/resources/common/report-server-deployment.yaml b/k8s/resources/common/report-server-deployment.yaml index aa19bf5b..adf04d4e 100644 --- a/k8s/resources/common/report-server-deployment.yaml +++ b/k8s/resources/common/report-server-deployment.yaml @@ -8,7 +8,8 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-database: "true" annotations: - gridsuite.org/size: springboot-s + gridsuite.org/cpu: cpu-xs + gridsuite.org/memory: memory-xxl spec: selector: matchLabels: diff --git a/k8s/resources/common/study-config-server-deployment.yaml b/k8s/resources/common/study-config-server-deployment.yaml index fd327afa..de2c4703 100644 --- a/k8s/resources/common/study-config-server-deployment.yaml +++ b/k8s/resources/common/study-config-server-deployment.yaml @@ -8,7 +8,8 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-database: "true" annotations: - gridsuite.org/size: springboot-xxs + gridsuite.org/cpu: cpu-xxs + gridsuite.org/memory: memory-xs spec: selector: matchLabels: diff --git a/k8s/resources/common/user-admin-server-deployment.yaml b/k8s/resources/common/user-admin-server-deployment.yaml index 14575f09..6221a927 100644 --- a/k8s/resources/common/user-admin-server-deployment.yaml +++ b/k8s/resources/common/user-admin-server-deployment.yaml @@ -9,7 +9,8 @@ metadata: gridsuite.org/springboot-with-database: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/size: springboot-xxs + gridsuite.org/cpu: cpu-xs + gridsuite.org/memory: memory-xs spec: selector: matchLabels: diff --git a/k8s/resources/common/user-identity-oidc-replication-server-deployment.yaml b/k8s/resources/common/user-identity-oidc-replication-server-deployment.yaml index a8419ced..7c1e1bb7 100644 --- a/k8s/resources/common/user-identity-oidc-replication-server-deployment.yaml +++ b/k8s/resources/common/user-identity-oidc-replication-server-deployment.yaml @@ -8,7 +8,8 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-database: "true" annotations: - gridsuite.org/size: springboot-xs + gridsuite.org/cpu: cpu-xxs + gridsuite.org/memory: memory-xs spec: selector: matchLabels: diff --git a/k8s/resources/dynamic-mapping/dynamic-mapping-server-deployment.yaml b/k8s/resources/dynamic-mapping/dynamic-mapping-server-deployment.yaml index 9c213420..1381dede 100644 --- a/k8s/resources/dynamic-mapping/dynamic-mapping-server-deployment.yaml +++ b/k8s/resources/dynamic-mapping/dynamic-mapping-server-deployment.yaml @@ -8,7 +8,8 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-database: "true" annotations: - gridsuite.org/size: springboot-m # should be m or s ? + gridsuite.org/cpu: cpu-xs + gridsuite.org/memory: memory-m spec: selector: matchLabels: diff --git a/k8s/resources/study/case-import-server-deployment.yaml b/k8s/resources/study/case-import-server-deployment.yaml index f600fec8..185d0de5 100644 --- a/k8s/resources/study/case-import-server-deployment.yaml +++ b/k8s/resources/study/case-import-server-deployment.yaml @@ -7,7 +7,8 @@ metadata: version: "1" app.kubernetes.io/component: gridsuite-springboot annotations: - gridsuite.org/size: springboot-xxs + gridsuite.org/cpu: cpu-xxs + gridsuite.org/memory: memory-xs spec: selector: matchLabels: diff --git a/k8s/resources/study/cgmes-gl-server-deployment.yaml b/k8s/resources/study/cgmes-gl-server-deployment.yaml index d578665d..d184f07a 100644 --- a/k8s/resources/study/cgmes-gl-server-deployment.yaml +++ b/k8s/resources/study/cgmes-gl-server-deployment.yaml @@ -7,7 +7,8 @@ metadata: version: "1" app.kubernetes.io/component: gridsuite-springboot annotations: - gridsuite.org/size: springboot-xxs + gridsuite.org/cpu: cpu-xxs + gridsuite.org/memory: memory-xs spec: selector: matchLabels: diff --git a/k8s/resources/study/directory-notification-server-deployment.yaml b/k8s/resources/study/directory-notification-server-deployment.yaml index 1bbceee1..3ed1d041 100644 --- a/k8s/resources/study/directory-notification-server-deployment.yaml +++ b/k8s/resources/study/directory-notification-server-deployment.yaml @@ -8,7 +8,8 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/size: springboot-xxs + gridsuite.org/cpu: cpu-xxs + gridsuite.org/memory: memory-xs spec: selector: matchLabels: diff --git a/k8s/resources/study/directory-server-deployment.yaml b/k8s/resources/study/directory-server-deployment.yaml index e1121611..15ece048 100644 --- a/k8s/resources/study/directory-server-deployment.yaml +++ b/k8s/resources/study/directory-server-deployment.yaml @@ -10,7 +10,8 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" gridsuite.org/springboot-with-elasticsearch: "true" annotations: - gridsuite.org/size: springnative-xs + gridsuite.org/cpu: cpu-xxs + gridsuite.org/memory: memory-xs spec: selector: matchLabels: diff --git a/k8s/resources/study/dynamic-margin-calculation-server-deployment.yaml b/k8s/resources/study/dynamic-margin-calculation-server-deployment.yaml index 3d7ae364..087c5338 100644 --- a/k8s/resources/study/dynamic-margin-calculation-server-deployment.yaml +++ b/k8s/resources/study/dynamic-margin-calculation-server-deployment.yaml @@ -9,7 +9,8 @@ metadata: gridsuite.org/springboot-with-database: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/size: springboot-l-forking + gridsuite.org/cpu: cpu-l + gridsuite.org/memory: memory-m-forking spec: selector: matchLabels: diff --git a/k8s/resources/study/dynamic-security-analysis-server-deployment.yaml b/k8s/resources/study/dynamic-security-analysis-server-deployment.yaml index 38a56a0e..5dfd5bd8 100644 --- a/k8s/resources/study/dynamic-security-analysis-server-deployment.yaml +++ b/k8s/resources/study/dynamic-security-analysis-server-deployment.yaml @@ -10,7 +10,8 @@ metadata: gridsuite.org/springboot-with-s3: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/size: springboot-l-forking + gridsuite.org/cpu: cpu-xs + gridsuite.org/memory: memory-m-forking spec: selector: matchLabels: diff --git a/k8s/resources/study/dynamic-simulation-server-deployment.yaml b/k8s/resources/study/dynamic-simulation-server-deployment.yaml index 58ec516f..fad6231a 100644 --- a/k8s/resources/study/dynamic-simulation-server-deployment.yaml +++ b/k8s/resources/study/dynamic-simulation-server-deployment.yaml @@ -10,7 +10,8 @@ metadata: gridsuite.org/springboot-with-s3: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/size: springboot-l-forking + gridsuite.org/cpu: cpu-xs + gridsuite.org/memory: memory-m-forking spec: selector: matchLabels: diff --git a/k8s/resources/study/explore-server-deployment.yaml b/k8s/resources/study/explore-server-deployment.yaml index 112d9995..bfa8de2d 100644 --- a/k8s/resources/study/explore-server-deployment.yaml +++ b/k8s/resources/study/explore-server-deployment.yaml @@ -8,7 +8,8 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/size: springboot-s + gridsuite.org/cpu: cpu-xxs + gridsuite.org/memory: memory-m spec: selector: matchLabels: diff --git a/k8s/resources/study/geo-data-server-deployment.yaml b/k8s/resources/study/geo-data-server-deployment.yaml index 52b7028a..8c53f0f3 100644 --- a/k8s/resources/study/geo-data-server-deployment.yaml +++ b/k8s/resources/study/geo-data-server-deployment.yaml @@ -8,7 +8,8 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-database: "true" annotations: - gridsuite.org/size: springboot-m + gridsuite.org/cpu: cpu-s + gridsuite.org/memory: memory-l spec: selector: matchLabels: diff --git a/k8s/resources/study/network-map-server-deployment.yaml b/k8s/resources/study/network-map-server-deployment.yaml index 9410ecf6..a973c5bf 100644 --- a/k8s/resources/study/network-map-server-deployment.yaml +++ b/k8s/resources/study/network-map-server-deployment.yaml @@ -7,7 +7,8 @@ metadata: version: "1" app.kubernetes.io/component: gridsuite-springboot annotations: - gridsuite.org/size: springboot-l + gridsuite.org/cpu: cpu-m + gridsuite.org/memory: memory-xxl spec: selector: matchLabels: diff --git a/k8s/resources/study/network-modification-server-deployment.yaml b/k8s/resources/study/network-modification-server-deployment.yaml index e6fa17cf..dce5c7bd 100644 --- a/k8s/resources/study/network-modification-server-deployment.yaml +++ b/k8s/resources/study/network-modification-server-deployment.yaml @@ -10,7 +10,8 @@ metadata: gridsuite.org/springboot-with-elasticsearch: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/size: springboot-xxl + gridsuite.org/cpu: cpu-l + gridsuite.org/memory: memory-xxxl spec: selector: matchLabels: diff --git a/k8s/resources/study/odre-server-deployment.yaml b/k8s/resources/study/odre-server-deployment.yaml index 1d2c881d..a5d8b25b 100644 --- a/k8s/resources/study/odre-server-deployment.yaml +++ b/k8s/resources/study/odre-server-deployment.yaml @@ -7,7 +7,8 @@ metadata: version: "1" app.kubernetes.io/component: gridsuite-springboot annotations: - gridsuite.org/size: springboot-l + gridsuite.org/cpu: cpu-xxs + gridsuite.org/memory: memory-l spec: selector: matchLabels: diff --git a/k8s/resources/study/security-analysis-server-deployment.yaml b/k8s/resources/study/security-analysis-server-deployment.yaml index 36d4387f..5dc0aaf7 100644 --- a/k8s/resources/study/security-analysis-server-deployment.yaml +++ b/k8s/resources/study/security-analysis-server-deployment.yaml @@ -8,8 +8,6 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-database: "true" gridsuite.org/springboot-with-rabbitmq: "true" - annotations: - gridsuite.org/size: springboot-security-analysis spec: selector: matchLabels: @@ -22,6 +20,16 @@ spec: containers: - name: main image: docker.io/gridsuite/security-analysis-server:latest + env: + - name: JAVA_TOOL_OPTIONS + value: "-Xmx5760m" + resources: + requests: + cpu: "16000m" + memory: "7680Mi" + limits: + cpu: "16000m" + memory: "7680Mi" volumeMounts: - mountPath: /config/specific name: security-analysis-server-configmap-specific-volume diff --git a/k8s/resources/study/sensitivity-analysis-server-deployment.yaml b/k8s/resources/study/sensitivity-analysis-server-deployment.yaml index baf0d324..aef3dea9 100644 --- a/k8s/resources/study/sensitivity-analysis-server-deployment.yaml +++ b/k8s/resources/study/sensitivity-analysis-server-deployment.yaml @@ -9,7 +9,8 @@ metadata: gridsuite.org/springboot-with-database: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/size: springboot-xxl-forking + gridsuite.org/cpu: cpu-xl + gridsuite.org/memory: memory-xl-forking spec: selector: matchLabels: diff --git a/k8s/resources/study/shortcircuit-server-deployment.yaml b/k8s/resources/study/shortcircuit-server-deployment.yaml index 27666089..e2604cca 100644 --- a/k8s/resources/study/shortcircuit-server-deployment.yaml +++ b/k8s/resources/study/shortcircuit-server-deployment.yaml @@ -10,7 +10,8 @@ metadata: gridsuite.org/springboot-with-s3: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/size: springboot-xl-forking + gridsuite.org/cpu: cpu-s + gridsuite.org/memory: memory-l-forking spec: selector: matchLabels: diff --git a/k8s/resources/study/single-line-diagram-server-deployment.yaml b/k8s/resources/study/single-line-diagram-server-deployment.yaml index 108c5e3a..f94b7b25 100644 --- a/k8s/resources/study/single-line-diagram-server-deployment.yaml +++ b/k8s/resources/study/single-line-diagram-server-deployment.yaml @@ -8,7 +8,8 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-database: "true" annotations: - gridsuite.org/size: springboot-m + gridsuite.org/cpu: cpu-m + gridsuite.org/memory: memory-xl spec: selector: matchLabels: diff --git a/k8s/resources/study/study-notification-server-deployment.yaml b/k8s/resources/study/study-notification-server-deployment.yaml index 0146d323..56135e5d 100644 --- a/k8s/resources/study/study-notification-server-deployment.yaml +++ b/k8s/resources/study/study-notification-server-deployment.yaml @@ -8,7 +8,8 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/size: springboot-xxs + gridsuite.org/cpu: cpu-xxs + gridsuite.org/memory: memory-m spec: selector: matchLabels: diff --git a/k8s/resources/study/study-server-deployment.yaml b/k8s/resources/study/study-server-deployment.yaml index 291ec3d8..2ab98268 100644 --- a/k8s/resources/study/study-server-deployment.yaml +++ b/k8s/resources/study/study-server-deployment.yaml @@ -10,7 +10,8 @@ metadata: gridsuite.org/springboot-with-elasticsearch: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/size: springboot-m + gridsuite.org/cpu: cpu-xs + gridsuite.org/memory: memory-xs spec: selector: matchLabels: diff --git a/k8s/resources/study/timeseries-server-deployment.yaml b/k8s/resources/study/timeseries-server-deployment.yaml index 57e1381d..fa05759c 100644 --- a/k8s/resources/study/timeseries-server-deployment.yaml +++ b/k8s/resources/study/timeseries-server-deployment.yaml @@ -8,7 +8,8 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-database: "true" annotations: - gridsuite.org/size: springboot-m + gridsuite.org/cpu: cpu-xs + gridsuite.org/memory: memory-m spec: selector: matchLabels: diff --git a/k8s/resources/study/voltage-init-server-deployment.yaml b/k8s/resources/study/voltage-init-server-deployment.yaml index edcbc25d..eae7027f 100644 --- a/k8s/resources/study/voltage-init-server-deployment.yaml +++ b/k8s/resources/study/voltage-init-server-deployment.yaml @@ -10,7 +10,8 @@ metadata: gridsuite.org/springboot-with-s3: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/size: springboot-xxl-forking + gridsuite.org/cpu: cpu-l + gridsuite.org/memory: memory-xl-forking spec: selector: matchLabels: