From 27aa84442305fcdd77c8d4489c26be221e2d9053 Mon Sep 17 00:00:00 2001 From: Joris Mancini Date: Wed, 29 Oct 2025 11:14:42 +0100 Subject: [PATCH 1/6] feat(k8s): add CPU requests/limits with 8 template-based patches - Create 8 CPU patch templates (cpu-minimal to cpu-security-analysis) - Add gridsuite.org/cpu annotations to 34 SpringBoot deployments - Update kustomization.yaml with CPU patch selectors This separates CPU from memory configuration for better flexibility. --- k8s/components/gridsuite/kustomization.yaml | 40 +++++++++++++++++++ .../deployments-springboot-cpu-large.yaml | 16 ++++++++ ...eployments-springboot-cpu-medium-plus.yaml | 16 ++++++++ .../deployments-springboot-cpu-medium.yaml | 16 ++++++++ .../deployments-springboot-cpu-minimal.yaml | 16 ++++++++ ...ents-springboot-cpu-security-analysis.yaml | 16 ++++++++ .../deployments-springboot-cpu-small.yaml | 16 ++++++++ .../deployments-springboot-cpu-xlarge.yaml | 16 ++++++++ .../deployments-springboot-cpu-xxlarge.yaml | 16 ++++++++ .../common/actions-server-deployment.yaml | 1 + .../common/case-server-deployment.yaml | 1 + ...config-notification-server-deployment.yaml | 1 + .../common/config-server-deployment.yaml | 1 + .../common/filter-server-deployment.yaml | 1 + k8s/resources/common/gateway-deployment.yaml | 1 + .../common/loadflow-server-deployment.yaml | 1 + .../network-conversion-server-deployment.yaml | 1 + .../network-store-server-deployment.yaml | 1 + .../common/report-server-deployment.yaml | 1 + .../study-config-server-deployment.yaml | 1 + .../common/user-admin-server-deployment.yaml | 1 + ...ty-oidc-replication-server-deployment.yaml | 1 + .../dynamic-mapping-server-deployment.yaml | 1 + .../study/case-import-server-deployment.yaml | 1 + .../study/cgmes-gl-server-deployment.yaml | 1 + ...ectory-notification-server-deployment.yaml | 1 + .../study/directory-server-deployment.yaml | 1 + ...-margin-calculation-server-deployment.yaml | 1 + ...c-security-analysis-server-deployment.yaml | 1 + .../dynamic-simulation-server-deployment.yaml | 1 + .../study/explore-server-deployment.yaml | 1 + .../study/geo-data-server-deployment.yaml | 1 + .../study/network-map-server-deployment.yaml | 1 + ...etwork-modification-server-deployment.yaml | 1 + .../study/odre-server-deployment.yaml | 1 + .../security-analysis-server-deployment.yaml | 1 + ...ensitivity-analysis-server-deployment.yaml | 1 + .../study/shortcircuit-server-deployment.yaml | 1 + ...single-line-diagram-server-deployment.yaml | 1 + .../study-notification-server-deployment.yaml | 1 + .../study/study-server-deployment.yaml | 1 + .../study/timeseries-server-deployment.yaml | 1 + .../study/voltage-init-server-deployment.yaml | 1 + 43 files changed, 202 insertions(+) create mode 100644 k8s/components/gridsuite/patches/deployments-springboot-cpu-large.yaml create mode 100644 k8s/components/gridsuite/patches/deployments-springboot-cpu-medium-plus.yaml create mode 100644 k8s/components/gridsuite/patches/deployments-springboot-cpu-medium.yaml create mode 100644 k8s/components/gridsuite/patches/deployments-springboot-cpu-minimal.yaml create mode 100644 k8s/components/gridsuite/patches/deployments-springboot-cpu-security-analysis.yaml create mode 100644 k8s/components/gridsuite/patches/deployments-springboot-cpu-small.yaml create mode 100644 k8s/components/gridsuite/patches/deployments-springboot-cpu-xlarge.yaml create mode 100644 k8s/components/gridsuite/patches/deployments-springboot-cpu-xxlarge.yaml diff --git a/k8s/components/gridsuite/kustomization.yaml b/k8s/components/gridsuite/kustomization.yaml index de4d85c1..c60559ba 100644 --- a/k8s/components/gridsuite/kustomization.yaml +++ b/k8s/components/gridsuite/kustomization.yaml @@ -104,6 +104,46 @@ patches: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot annotationSelector: gridsuite.org/size=springnative-xs +- path: patches/deployments-springboot-cpu-minimal.yaml + target: + kind: Deployment + labelSelector: app.kubernetes.io/component=gridsuite-springboot + annotationSelector: gridsuite.org/cpu=cpu-minimal +- path: patches/deployments-springboot-cpu-small.yaml + target: + kind: Deployment + labelSelector: app.kubernetes.io/component=gridsuite-springboot + annotationSelector: gridsuite.org/cpu=cpu-small +- path: patches/deployments-springboot-cpu-medium.yaml + target: + kind: Deployment + labelSelector: app.kubernetes.io/component=gridsuite-springboot + annotationSelector: gridsuite.org/cpu=cpu-medium +- path: patches/deployments-springboot-cpu-medium-plus.yaml + target: + kind: Deployment + labelSelector: app.kubernetes.io/component=gridsuite-springboot + annotationSelector: gridsuite.org/cpu=cpu-medium-plus +- path: patches/deployments-springboot-cpu-large.yaml + target: + kind: Deployment + labelSelector: app.kubernetes.io/component=gridsuite-springboot + annotationSelector: gridsuite.org/cpu=cpu-large +- path: patches/deployments-springboot-cpu-xlarge.yaml + target: + kind: Deployment + labelSelector: app.kubernetes.io/component=gridsuite-springboot + annotationSelector: gridsuite.org/cpu=cpu-xlarge +- path: patches/deployments-springboot-cpu-xxlarge.yaml + target: + kind: Deployment + labelSelector: app.kubernetes.io/component=gridsuite-springboot + annotationSelector: gridsuite.org/cpu=cpu-xxlarge +- path: patches/deployments-springboot-cpu-security-analysis.yaml + target: + kind: Deployment + labelSelector: app.kubernetes.io/component=gridsuite-springboot + annotationSelector: gridsuite.org/cpu=cpu-security-analysis - path: patches/deployments-springboot-elasticsearch-config.yaml target: kind: Deployment diff --git a/k8s/components/gridsuite/patches/deployments-springboot-cpu-large.yaml b/k8s/components/gridsuite/patches/deployments-springboot-cpu-large.yaml new file mode 100644 index 00000000..db1a7085 --- /dev/null +++ b/k8s/components/gridsuite/patches/deployments-springboot-cpu-large.yaml @@ -0,0 +1,16 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: not-important + annotations: + gridsuite.org/cpu: cpu-large +spec: + template: + spec: + containers: + - name: main + resources: + requests: + cpu: "2000m" + limits: + cpu: "4000m" \ No newline at end of file diff --git a/k8s/components/gridsuite/patches/deployments-springboot-cpu-medium-plus.yaml b/k8s/components/gridsuite/patches/deployments-springboot-cpu-medium-plus.yaml new file mode 100644 index 00000000..86bcb6ad --- /dev/null +++ b/k8s/components/gridsuite/patches/deployments-springboot-cpu-medium-plus.yaml @@ -0,0 +1,16 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: not-important + annotations: + gridsuite.org/cpu: cpu-medium-plus +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/deployments-springboot-cpu-medium.yaml b/k8s/components/gridsuite/patches/deployments-springboot-cpu-medium.yaml new file mode 100644 index 00000000..8f89f714 --- /dev/null +++ b/k8s/components/gridsuite/patches/deployments-springboot-cpu-medium.yaml @@ -0,0 +1,16 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: not-important + annotations: + gridsuite.org/cpu: cpu-medium +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/deployments-springboot-cpu-minimal.yaml b/k8s/components/gridsuite/patches/deployments-springboot-cpu-minimal.yaml new file mode 100644 index 00000000..51bf5146 --- /dev/null +++ b/k8s/components/gridsuite/patches/deployments-springboot-cpu-minimal.yaml @@ -0,0 +1,16 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: not-important + annotations: + gridsuite.org/cpu: cpu-minimal +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-springboot-cpu-security-analysis.yaml b/k8s/components/gridsuite/patches/deployments-springboot-cpu-security-analysis.yaml new file mode 100644 index 00000000..4dd76200 --- /dev/null +++ b/k8s/components/gridsuite/patches/deployments-springboot-cpu-security-analysis.yaml @@ -0,0 +1,16 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: not-important + annotations: + gridsuite.org/cpu: cpu-security-analysis +spec: + template: + spec: + containers: + - name: main + resources: + requests: + cpu: "16000m" + limits: + cpu: "16000m" \ No newline at end of file diff --git a/k8s/components/gridsuite/patches/deployments-springboot-cpu-small.yaml b/k8s/components/gridsuite/patches/deployments-springboot-cpu-small.yaml new file mode 100644 index 00000000..8ff1916c --- /dev/null +++ b/k8s/components/gridsuite/patches/deployments-springboot-cpu-small.yaml @@ -0,0 +1,16 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: not-important + annotations: + gridsuite.org/cpu: cpu-small +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/deployments-springboot-cpu-xlarge.yaml b/k8s/components/gridsuite/patches/deployments-springboot-cpu-xlarge.yaml new file mode 100644 index 00000000..9fe29ef7 --- /dev/null +++ b/k8s/components/gridsuite/patches/deployments-springboot-cpu-xlarge.yaml @@ -0,0 +1,16 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: not-important + annotations: + gridsuite.org/cpu: cpu-xlarge +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/deployments-springboot-cpu-xxlarge.yaml b/k8s/components/gridsuite/patches/deployments-springboot-cpu-xxlarge.yaml new file mode 100644 index 00000000..70b28dc4 --- /dev/null +++ b/k8s/components/gridsuite/patches/deployments-springboot-cpu-xxlarge.yaml @@ -0,0 +1,16 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: not-important + annotations: + gridsuite.org/cpu: cpu-xxlarge +spec: + template: + spec: + containers: + - name: main + resources: + requests: + cpu: "3500m" + limits: + cpu: "7000m" \ No newline at end of file diff --git a/k8s/resources/common/actions-server-deployment.yaml b/k8s/resources/common/actions-server-deployment.yaml index 54177aa7..b0ace3e3 100644 --- a/k8s/resources/common/actions-server-deployment.yaml +++ b/k8s/resources/common/actions-server-deployment.yaml @@ -10,6 +10,7 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" annotations: gridsuite.org/size: springboot-m + gridsuite.org/cpu: cpu-medium spec: selector: matchLabels: diff --git a/k8s/resources/common/case-server-deployment.yaml b/k8s/resources/common/case-server-deployment.yaml index cdc58b49..147c7de1 100644 --- a/k8s/resources/common/case-server-deployment.yaml +++ b/k8s/resources/common/case-server-deployment.yaml @@ -12,6 +12,7 @@ metadata: gridsuite.org/springboot-with-s3: "true" annotations: gridsuite.org/size: springboot-xs + gridsuite.org/cpu: cpu-small 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..5d50131e 100644 --- a/k8s/resources/common/config-notification-server-deployment.yaml +++ b/k8s/resources/common/config-notification-server-deployment.yaml @@ -9,6 +9,7 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" annotations: gridsuite.org/size: springboot-xxs + gridsuite.org/cpu: cpu-minimal spec: selector: matchLabels: diff --git a/k8s/resources/common/config-server-deployment.yaml b/k8s/resources/common/config-server-deployment.yaml index 09ef5493..c2b6b423 100644 --- a/k8s/resources/common/config-server-deployment.yaml +++ b/k8s/resources/common/config-server-deployment.yaml @@ -10,6 +10,7 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" annotations: gridsuite.org/size: springboot-xxs + gridsuite.org/cpu: cpu-minimal spec: selector: matchLabels: diff --git a/k8s/resources/common/filter-server-deployment.yaml b/k8s/resources/common/filter-server-deployment.yaml index 36144bcb..298437ce 100644 --- a/k8s/resources/common/filter-server-deployment.yaml +++ b/k8s/resources/common/filter-server-deployment.yaml @@ -10,6 +10,7 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" annotations: gridsuite.org/size: springboot-m + gridsuite.org/cpu: cpu-small spec: selector: matchLabels: diff --git a/k8s/resources/common/gateway-deployment.yaml b/k8s/resources/common/gateway-deployment.yaml index f3c5455d..72e2d69f 100644 --- a/k8s/resources/common/gateway-deployment.yaml +++ b/k8s/resources/common/gateway-deployment.yaml @@ -8,6 +8,7 @@ metadata: app.kubernetes.io/component: gridsuite-springboot annotations: gridsuite.org/size: springboot-xxs + gridsuite.org/cpu: cpu-small spec: selector: matchLabels: diff --git a/k8s/resources/common/loadflow-server-deployment.yaml b/k8s/resources/common/loadflow-server-deployment.yaml index a5a840c1..9f691311 100644 --- a/k8s/resources/common/loadflow-server-deployment.yaml +++ b/k8s/resources/common/loadflow-server-deployment.yaml @@ -10,6 +10,7 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" annotations: gridsuite.org/size: springboot-xxl-forking + gridsuite.org/cpu: cpu-xlarge 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..8e68c5d8 100644 --- a/k8s/resources/common/network-conversion-server-deployment.yaml +++ b/k8s/resources/common/network-conversion-server-deployment.yaml @@ -11,6 +11,7 @@ metadata: gridsuite.org/springboot-with-large-storage: "true" annotations: gridsuite.org/size: springboot-xxl + gridsuite.org/cpu: cpu-xlarge 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..517b09c2 100644 --- a/k8s/resources/common/network-store-server-deployment.yaml +++ b/k8s/resources/common/network-store-server-deployment.yaml @@ -9,6 +9,7 @@ metadata: gridsuite.org/springboot-with-database: "true" annotations: gridsuite.org/size: springboot-xxl + gridsuite.org/cpu: cpu-xxlarge spec: selector: matchLabels: diff --git a/k8s/resources/common/report-server-deployment.yaml b/k8s/resources/common/report-server-deployment.yaml index aa19bf5b..d19d53e4 100644 --- a/k8s/resources/common/report-server-deployment.yaml +++ b/k8s/resources/common/report-server-deployment.yaml @@ -9,6 +9,7 @@ metadata: gridsuite.org/springboot-with-database: "true" annotations: gridsuite.org/size: springboot-s + gridsuite.org/cpu: cpu-small 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..01823f08 100644 --- a/k8s/resources/common/study-config-server-deployment.yaml +++ b/k8s/resources/common/study-config-server-deployment.yaml @@ -9,6 +9,7 @@ metadata: gridsuite.org/springboot-with-database: "true" annotations: gridsuite.org/size: springboot-xxs + gridsuite.org/cpu: cpu-minimal 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..f37e545c 100644 --- a/k8s/resources/common/user-admin-server-deployment.yaml +++ b/k8s/resources/common/user-admin-server-deployment.yaml @@ -10,6 +10,7 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" annotations: gridsuite.org/size: springboot-xxs + gridsuite.org/cpu: cpu-small 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..dee7b86c 100644 --- a/k8s/resources/common/user-identity-oidc-replication-server-deployment.yaml +++ b/k8s/resources/common/user-identity-oidc-replication-server-deployment.yaml @@ -9,6 +9,7 @@ metadata: gridsuite.org/springboot-with-database: "true" annotations: gridsuite.org/size: springboot-xs + gridsuite.org/cpu: cpu-minimal 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..f461a398 100644 --- a/k8s/resources/dynamic-mapping/dynamic-mapping-server-deployment.yaml +++ b/k8s/resources/dynamic-mapping/dynamic-mapping-server-deployment.yaml @@ -9,6 +9,7 @@ metadata: gridsuite.org/springboot-with-database: "true" annotations: gridsuite.org/size: springboot-m # should be m or s ? + gridsuite.org/cpu: cpu-small 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..1e2b343b 100644 --- a/k8s/resources/study/case-import-server-deployment.yaml +++ b/k8s/resources/study/case-import-server-deployment.yaml @@ -8,6 +8,7 @@ metadata: app.kubernetes.io/component: gridsuite-springboot annotations: gridsuite.org/size: springboot-xxs + gridsuite.org/cpu: cpu-minimal 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..cfdd06b0 100644 --- a/k8s/resources/study/cgmes-gl-server-deployment.yaml +++ b/k8s/resources/study/cgmes-gl-server-deployment.yaml @@ -8,6 +8,7 @@ metadata: app.kubernetes.io/component: gridsuite-springboot annotations: gridsuite.org/size: springboot-xxs + gridsuite.org/cpu: cpu-minimal 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..77cf1a7d 100644 --- a/k8s/resources/study/directory-notification-server-deployment.yaml +++ b/k8s/resources/study/directory-notification-server-deployment.yaml @@ -9,6 +9,7 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" annotations: gridsuite.org/size: springboot-xxs + gridsuite.org/cpu: cpu-minimal spec: selector: matchLabels: diff --git a/k8s/resources/study/directory-server-deployment.yaml b/k8s/resources/study/directory-server-deployment.yaml index e1121611..2b75df02 100644 --- a/k8s/resources/study/directory-server-deployment.yaml +++ b/k8s/resources/study/directory-server-deployment.yaml @@ -11,6 +11,7 @@ metadata: gridsuite.org/springboot-with-elasticsearch: "true" annotations: gridsuite.org/size: springnative-xs + gridsuite.org/cpu: cpu-minimal 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..7e79c0bc 100644 --- a/k8s/resources/study/dynamic-margin-calculation-server-deployment.yaml +++ b/k8s/resources/study/dynamic-margin-calculation-server-deployment.yaml @@ -10,6 +10,7 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" annotations: gridsuite.org/size: springboot-l-forking + gridsuite.org/cpu: cpu-large 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..566c6002 100644 --- a/k8s/resources/study/dynamic-security-analysis-server-deployment.yaml +++ b/k8s/resources/study/dynamic-security-analysis-server-deployment.yaml @@ -11,6 +11,7 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" annotations: gridsuite.org/size: springboot-l-forking + gridsuite.org/cpu: cpu-small 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..633e1a67 100644 --- a/k8s/resources/study/dynamic-simulation-server-deployment.yaml +++ b/k8s/resources/study/dynamic-simulation-server-deployment.yaml @@ -11,6 +11,7 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" annotations: gridsuite.org/size: springboot-l-forking + gridsuite.org/cpu: cpu-small spec: selector: matchLabels: diff --git a/k8s/resources/study/explore-server-deployment.yaml b/k8s/resources/study/explore-server-deployment.yaml index 112d9995..87d58304 100644 --- a/k8s/resources/study/explore-server-deployment.yaml +++ b/k8s/resources/study/explore-server-deployment.yaml @@ -9,6 +9,7 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" annotations: gridsuite.org/size: springboot-s + gridsuite.org/cpu: cpu-minimal 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..89209843 100644 --- a/k8s/resources/study/geo-data-server-deployment.yaml +++ b/k8s/resources/study/geo-data-server-deployment.yaml @@ -9,6 +9,7 @@ metadata: gridsuite.org/springboot-with-database: "true" annotations: gridsuite.org/size: springboot-m + gridsuite.org/cpu: cpu-medium 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..386452b0 100644 --- a/k8s/resources/study/network-map-server-deployment.yaml +++ b/k8s/resources/study/network-map-server-deployment.yaml @@ -8,6 +8,7 @@ metadata: app.kubernetes.io/component: gridsuite-springboot annotations: gridsuite.org/size: springboot-l + gridsuite.org/cpu: cpu-medium-plus 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..6fde76cb 100644 --- a/k8s/resources/study/network-modification-server-deployment.yaml +++ b/k8s/resources/study/network-modification-server-deployment.yaml @@ -11,6 +11,7 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" annotations: gridsuite.org/size: springboot-xxl + gridsuite.org/cpu: cpu-large spec: selector: matchLabels: diff --git a/k8s/resources/study/odre-server-deployment.yaml b/k8s/resources/study/odre-server-deployment.yaml index 1d2c881d..88246eb0 100644 --- a/k8s/resources/study/odre-server-deployment.yaml +++ b/k8s/resources/study/odre-server-deployment.yaml @@ -8,6 +8,7 @@ metadata: app.kubernetes.io/component: gridsuite-springboot annotations: gridsuite.org/size: springboot-l + gridsuite.org/cpu: cpu-minimal 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..ee01f402 100644 --- a/k8s/resources/study/security-analysis-server-deployment.yaml +++ b/k8s/resources/study/security-analysis-server-deployment.yaml @@ -10,6 +10,7 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" annotations: gridsuite.org/size: springboot-security-analysis + gridsuite.org/cpu: cpu-security-analysis spec: selector: matchLabels: diff --git a/k8s/resources/study/sensitivity-analysis-server-deployment.yaml b/k8s/resources/study/sensitivity-analysis-server-deployment.yaml index baf0d324..9491af17 100644 --- a/k8s/resources/study/sensitivity-analysis-server-deployment.yaml +++ b/k8s/resources/study/sensitivity-analysis-server-deployment.yaml @@ -10,6 +10,7 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" annotations: gridsuite.org/size: springboot-xxl-forking + gridsuite.org/cpu: cpu-xlarge spec: selector: matchLabels: diff --git a/k8s/resources/study/shortcircuit-server-deployment.yaml b/k8s/resources/study/shortcircuit-server-deployment.yaml index 27666089..3b2afb92 100644 --- a/k8s/resources/study/shortcircuit-server-deployment.yaml +++ b/k8s/resources/study/shortcircuit-server-deployment.yaml @@ -11,6 +11,7 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" annotations: gridsuite.org/size: springboot-xl-forking + gridsuite.org/cpu: cpu-medium 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..3812209d 100644 --- a/k8s/resources/study/single-line-diagram-server-deployment.yaml +++ b/k8s/resources/study/single-line-diagram-server-deployment.yaml @@ -9,6 +9,7 @@ metadata: gridsuite.org/springboot-with-database: "true" annotations: gridsuite.org/size: springboot-m + gridsuite.org/cpu: cpu-medium-plus 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..f8d25de0 100644 --- a/k8s/resources/study/study-notification-server-deployment.yaml +++ b/k8s/resources/study/study-notification-server-deployment.yaml @@ -9,6 +9,7 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" annotations: gridsuite.org/size: springboot-xxs + gridsuite.org/cpu: cpu-minimal spec: selector: matchLabels: diff --git a/k8s/resources/study/study-server-deployment.yaml b/k8s/resources/study/study-server-deployment.yaml index 291ec3d8..e811cd62 100644 --- a/k8s/resources/study/study-server-deployment.yaml +++ b/k8s/resources/study/study-server-deployment.yaml @@ -11,6 +11,7 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" annotations: gridsuite.org/size: springboot-m + gridsuite.org/cpu: cpu-small spec: selector: matchLabels: diff --git a/k8s/resources/study/timeseries-server-deployment.yaml b/k8s/resources/study/timeseries-server-deployment.yaml index 57e1381d..1d6a77cc 100644 --- a/k8s/resources/study/timeseries-server-deployment.yaml +++ b/k8s/resources/study/timeseries-server-deployment.yaml @@ -9,6 +9,7 @@ metadata: gridsuite.org/springboot-with-database: "true" annotations: gridsuite.org/size: springboot-m + gridsuite.org/cpu: cpu-small 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..d568c770 100644 --- a/k8s/resources/study/voltage-init-server-deployment.yaml +++ b/k8s/resources/study/voltage-init-server-deployment.yaml @@ -11,6 +11,7 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" annotations: gridsuite.org/size: springboot-xxl-forking + gridsuite.org/cpu: cpu-large spec: selector: matchLabels: From b674a1893552ca907ab4bfb609cee23bd763ea18 Mon Sep 17 00:00:00 2001 From: Joris Mancini Date: Wed, 29 Oct 2025 11:26:48 +0100 Subject: [PATCH 2/6] feat(k8s): add memory templates and remove old size-based config - Create 13 memory templates (9 standard + 4 forking) * Standard templates use 75% Xmx ratio * Forking templates use 50% Xmx ratio for external process headroom - Add gridsuite.org/memory annotations to 34 deployments - Remove deprecated gridsuite.org/size annotations from all deployments - Delete 12 old size-based template files - Remove old size patch references from kustomization.yaml Total memory: 50.76 GiB for all services (1 pod each) --- k8s/components/gridsuite/kustomization.yaml | 85 ++++++++++--------- ...ployments-springboot-memory-l-forking.yaml | 19 +++++ ...l => deployments-springboot-memory-l.yaml} | 8 +- ...ployments-springboot-memory-m-forking.yaml | 19 +++++ ...l => deployments-springboot-memory-m.yaml} | 4 +- ...l => deployments-springboot-memory-s.yaml} | 4 +- ...eployments-springboot-memory-security.yaml | 19 +++++ ...oyments-springboot-memory-xl-forking.yaml} | 4 +- .../deployments-springboot-memory-xl.yaml | 19 +++++ ... => deployments-springboot-memory-xs.yaml} | 8 +- ...oyments-springboot-memory-xxl-forking.yaml | 19 +++++ ...=> deployments-springboot-memory-xxl.yaml} | 4 +- ...=> deployments-springboot-memory-xxs.yaml} | 8 +- .../deployments-springboot-memory-xxxl.yaml | 19 +++++ ...nts-springboot-size-security-analysis.yaml | 17 ---- ...eployments-springboot-size-xl-forking.yaml | 17 ---- .../deployments-springboot-size-xs.yaml | 17 ---- .../deployments-springboot-size-xxl.yaml | 17 ---- .../deployments-springnative-size-xs.yaml | 14 --- .../common/actions-server-deployment.yaml | 2 +- .../common/case-server-deployment.yaml | 2 +- ...config-notification-server-deployment.yaml | 2 +- .../common/config-server-deployment.yaml | 2 +- .../common/filter-server-deployment.yaml | 2 +- k8s/resources/common/gateway-deployment.yaml | 2 +- .../common/loadflow-server-deployment.yaml | 2 +- .../network-conversion-server-deployment.yaml | 2 +- .../network-store-server-deployment.yaml | 2 +- .../common/report-server-deployment.yaml | 2 +- .../study-config-server-deployment.yaml | 2 +- .../common/user-admin-server-deployment.yaml | 2 +- ...ty-oidc-replication-server-deployment.yaml | 2 +- .../dynamic-mapping-server-deployment.yaml | 2 +- .../study/case-import-server-deployment.yaml | 2 +- .../study/cgmes-gl-server-deployment.yaml | 2 +- ...ectory-notification-server-deployment.yaml | 2 +- .../study/directory-server-deployment.yaml | 2 +- ...-margin-calculation-server-deployment.yaml | 2 +- ...c-security-analysis-server-deployment.yaml | 2 +- .../dynamic-simulation-server-deployment.yaml | 2 +- .../study/explore-server-deployment.yaml | 2 +- .../study/geo-data-server-deployment.yaml | 2 +- .../study/network-map-server-deployment.yaml | 2 +- ...etwork-modification-server-deployment.yaml | 2 +- .../study/odre-server-deployment.yaml | 2 +- .../security-analysis-server-deployment.yaml | 2 +- ...ensitivity-analysis-server-deployment.yaml | 2 +- .../study/shortcircuit-server-deployment.yaml | 2 +- ...single-line-diagram-server-deployment.yaml | 2 +- .../study-notification-server-deployment.yaml | 2 +- .../study/study-server-deployment.yaml | 2 +- .../study/timeseries-server-deployment.yaml | 2 +- .../study/voltage-init-server-deployment.yaml | 2 +- 53 files changed, 220 insertions(+), 169 deletions(-) create mode 100644 k8s/components/gridsuite/patches/deployments-springboot-memory-l-forking.yaml rename k8s/components/gridsuite/patches/{deployments-springboot-size-m.yaml => deployments-springboot-memory-l.yaml} (63%) create mode 100644 k8s/components/gridsuite/patches/deployments-springboot-memory-m-forking.yaml rename k8s/components/gridsuite/patches/{deployments-springboot-size-s.yaml => deployments-springboot-memory-m.yaml} (79%) rename k8s/components/gridsuite/patches/{deployments-springboot-size-xxs.yaml => deployments-springboot-memory-s.yaml} (79%) create mode 100644 k8s/components/gridsuite/patches/deployments-springboot-memory-security.yaml rename k8s/components/gridsuite/patches/{deployments-springboot-size-xxl-forking.yaml => deployments-springboot-memory-xl-forking.yaml} (77%) create mode 100644 k8s/components/gridsuite/patches/deployments-springboot-memory-xl.yaml rename k8s/components/gridsuite/patches/{deployments-springboot-size-l-forking.yaml => deployments-springboot-memory-xs.yaml} (63%) create mode 100644 k8s/components/gridsuite/patches/deployments-springboot-memory-xxl-forking.yaml rename k8s/components/gridsuite/patches/{deployments-springboot-size-xl.yaml => deployments-springboot-memory-xxl.yaml} (78%) rename k8s/components/gridsuite/patches/{deployments-springboot-size-l.yaml => deployments-springboot-memory-xxs.yaml} (63%) create mode 100644 k8s/components/gridsuite/patches/deployments-springboot-memory-xxxl.yaml delete mode 100644 k8s/components/gridsuite/patches/deployments-springboot-size-security-analysis.yaml delete mode 100644 k8s/components/gridsuite/patches/deployments-springboot-size-xl-forking.yaml delete mode 100644 k8s/components/gridsuite/patches/deployments-springboot-size-xs.yaml delete mode 100644 k8s/components/gridsuite/patches/deployments-springboot-size-xxl.yaml delete mode 100644 k8s/components/gridsuite/patches/deployments-springnative-size-xs.yaml diff --git a/k8s/components/gridsuite/kustomization.yaml b/k8s/components/gridsuite/kustomization.yaml index c60559ba..a44139f8 100644 --- a/k8s/components/gridsuite/kustomization.yaml +++ b/k8s/components/gridsuite/kustomization.yaml @@ -44,106 +44,111 @@ patches: target: kind: CronJob labelSelector: gridsuite.org/cronjob-with-database=true -- path: patches/deployments-springboot-size-xxs.yaml +- path: patches/deployments-springboot-cpu-minimal.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-minimal +- path: patches/deployments-springboot-cpu-small.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-small +- path: patches/deployments-springboot-cpu-medium.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-medium +- path: patches/deployments-springboot-cpu-medium-plus.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-medium-plus +- path: patches/deployments-springboot-cpu-large.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-large +- path: patches/deployments-springboot-cpu-xlarge.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-xlarge +- path: patches/deployments-springboot-cpu-xxlarge.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-xxlarge +- path: patches/deployments-springboot-cpu-security-analysis.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/cpu=cpu-security-analysis +- path: patches/deployments-springboot-memory-xxs.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-xxs +- path: patches/deployments-springboot-memory-xs.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-xs +- path: patches/deployments-springboot-memory-s.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-s +- path: patches/deployments-springboot-memory-m.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot - annotationSelector: gridsuite.org/size=springnative-xs -- path: patches/deployments-springboot-cpu-minimal.yaml + annotationSelector: gridsuite.org/memory=memory-m +- path: patches/deployments-springboot-memory-l.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot - annotationSelector: gridsuite.org/cpu=cpu-minimal -- path: patches/deployments-springboot-cpu-small.yaml + annotationSelector: gridsuite.org/memory=memory-l +- path: patches/deployments-springboot-memory-xl.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot - annotationSelector: gridsuite.org/cpu=cpu-small -- path: patches/deployments-springboot-cpu-medium.yaml + annotationSelector: gridsuite.org/memory=memory-xl +- path: patches/deployments-springboot-memory-xxl.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot - annotationSelector: gridsuite.org/cpu=cpu-medium -- path: patches/deployments-springboot-cpu-medium-plus.yaml + annotationSelector: gridsuite.org/memory=memory-xxl +- path: patches/deployments-springboot-memory-xxxl.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot - annotationSelector: gridsuite.org/cpu=cpu-medium-plus -- path: patches/deployments-springboot-cpu-large.yaml + annotationSelector: gridsuite.org/memory=memory-xxxl +- path: patches/deployments-springboot-memory-security.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot - annotationSelector: gridsuite.org/cpu=cpu-large -- path: patches/deployments-springboot-cpu-xlarge.yaml + annotationSelector: gridsuite.org/memory=memory-security +- path: patches/deployments-springboot-memory-m-forking.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot - annotationSelector: gridsuite.org/cpu=cpu-xlarge -- path: patches/deployments-springboot-cpu-xxlarge.yaml + annotationSelector: gridsuite.org/memory=memory-m-forking +- path: patches/deployments-springboot-memory-l-forking.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot - annotationSelector: gridsuite.org/cpu=cpu-xxlarge -- path: patches/deployments-springboot-cpu-security-analysis.yaml + annotationSelector: gridsuite.org/memory=memory-l-forking +- path: patches/deployments-springboot-memory-xl-forking.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot - annotationSelector: gridsuite.org/cpu=cpu-security-analysis + annotationSelector: gridsuite.org/memory=memory-xl-forking +- path: patches/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-springboot-memory-l-forking.yaml b/k8s/components/gridsuite/patches/deployments-springboot-memory-l-forking.yaml new file mode 100644 index 00000000..ffc04509 --- /dev/null +++ b/k8s/components/gridsuite/patches/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/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/deployments-springboot-memory-l.yaml index a99a7daf..20cc50e1 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-size-m.yaml +++ b/k8s/components/gridsuite/patches/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/deployments-springboot-memory-m-forking.yaml b/k8s/components/gridsuite/patches/deployments-springboot-memory-m-forking.yaml new file mode 100644 index 00000000..db0aeaa1 --- /dev/null +++ b/k8s/components/gridsuite/patches/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/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/deployments-springboot-memory-m.yaml index f5907d6a..ffbc756a 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-size-s.yaml +++ b/k8s/components/gridsuite/patches/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/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/deployments-springboot-memory-s.yaml index 0d5d96b9..53edcdb8 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-size-xxs.yaml +++ b/k8s/components/gridsuite/patches/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-memory-security.yaml b/k8s/components/gridsuite/patches/deployments-springboot-memory-security.yaml new file mode 100644 index 00000000..3e70f1e1 --- /dev/null +++ b/k8s/components/gridsuite/patches/deployments-springboot-memory-security.yaml @@ -0,0 +1,19 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: not-important + annotations: + gridsuite.org/memory: memory-security +spec: + template: + spec: + containers: + - name: main + env: + - name: JAVA_TOOL_OPTIONS + value: "-Xmx5760m" + resources: + requests: + memory: "7680Mi" + limits: + memory: "7680Mi" diff --git a/k8s/components/gridsuite/patches/deployments-springboot-size-xxl-forking.yaml b/k8s/components/gridsuite/patches/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/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/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/deployments-springboot-memory-xl.yaml b/k8s/components/gridsuite/patches/deployments-springboot-memory-xl.yaml new file mode 100644 index 00000000..709ffd5f --- /dev/null +++ b/k8s/components/gridsuite/patches/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/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/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/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/deployments-springboot-memory-xxl-forking.yaml b/k8s/components/gridsuite/patches/deployments-springboot-memory-xxl-forking.yaml new file mode 100644 index 00000000..573bfe1b --- /dev/null +++ b/k8s/components/gridsuite/patches/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/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/deployments-springboot-memory-xxl.yaml index c944a86e..3a989310 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-size-xl.yaml +++ b/k8s/components/gridsuite/patches/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/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/deployments-springboot-memory-xxs.yaml index 0360bc8b..fa1fff8e 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-size-l.yaml +++ b/k8s/components/gridsuite/patches/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/deployments-springboot-memory-xxxl.yaml b/k8s/components/gridsuite/patches/deployments-springboot-memory-xxxl.yaml new file mode 100644 index 00000000..b0f58ab6 --- /dev/null +++ b/k8s/components/gridsuite/patches/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/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/deployments-springnative-size-xs.yaml b/k8s/components/gridsuite/patches/deployments-springnative-size-xs.yaml deleted file mode 100644 index a80f042b..00000000 --- a/k8s/components/gridsuite/patches/deployments-springnative-size-xs.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: not-important -spec: - template: - spec: - containers: - - name: main - resources: - requests: - memory: "256Mi" - limits: - memory: "256Mi" diff --git a/k8s/resources/common/actions-server-deployment.yaml b/k8s/resources/common/actions-server-deployment.yaml index b0ace3e3..2f9a41dd 100644 --- a/k8s/resources/common/actions-server-deployment.yaml +++ b/k8s/resources/common/actions-server-deployment.yaml @@ -9,8 +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-medium + 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 147c7de1..57c3ca99 100644 --- a/k8s/resources/common/case-server-deployment.yaml +++ b/k8s/resources/common/case-server-deployment.yaml @@ -11,8 +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-small + 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 5d50131e..2f5d6f56 100644 --- a/k8s/resources/common/config-notification-server-deployment.yaml +++ b/k8s/resources/common/config-notification-server-deployment.yaml @@ -8,8 +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-minimal + 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 c2b6b423..1b251629 100644 --- a/k8s/resources/common/config-server-deployment.yaml +++ b/k8s/resources/common/config-server-deployment.yaml @@ -9,8 +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-minimal + 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 298437ce..d8fc98eb 100644 --- a/k8s/resources/common/filter-server-deployment.yaml +++ b/k8s/resources/common/filter-server-deployment.yaml @@ -9,8 +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-small + 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 72e2d69f..9b6f0e32 100644 --- a/k8s/resources/common/gateway-deployment.yaml +++ b/k8s/resources/common/gateway-deployment.yaml @@ -7,8 +7,8 @@ metadata: version: "1" app.kubernetes.io/component: gridsuite-springboot annotations: - gridsuite.org/size: springboot-xxs gridsuite.org/cpu: cpu-small + 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 9f691311..9b0d7c79 100644 --- a/k8s/resources/common/loadflow-server-deployment.yaml +++ b/k8s/resources/common/loadflow-server-deployment.yaml @@ -9,8 +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-xlarge + 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 8e68c5d8..44370b03 100644 --- a/k8s/resources/common/network-conversion-server-deployment.yaml +++ b/k8s/resources/common/network-conversion-server-deployment.yaml @@ -10,8 +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-xlarge + 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 517b09c2..a7d5e4d5 100644 --- a/k8s/resources/common/network-store-server-deployment.yaml +++ b/k8s/resources/common/network-store-server-deployment.yaml @@ -8,8 +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-xxlarge + 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 d19d53e4..e2f9bc8e 100644 --- a/k8s/resources/common/report-server-deployment.yaml +++ b/k8s/resources/common/report-server-deployment.yaml @@ -8,8 +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-small + 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 01823f08..e949ab64 100644 --- a/k8s/resources/common/study-config-server-deployment.yaml +++ b/k8s/resources/common/study-config-server-deployment.yaml @@ -8,8 +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-minimal + 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 f37e545c..abc0ed11 100644 --- a/k8s/resources/common/user-admin-server-deployment.yaml +++ b/k8s/resources/common/user-admin-server-deployment.yaml @@ -9,8 +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-small + 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 dee7b86c..81b89e56 100644 --- a/k8s/resources/common/user-identity-oidc-replication-server-deployment.yaml +++ b/k8s/resources/common/user-identity-oidc-replication-server-deployment.yaml @@ -8,8 +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-minimal + 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 f461a398..9b6a525c 100644 --- a/k8s/resources/dynamic-mapping/dynamic-mapping-server-deployment.yaml +++ b/k8s/resources/dynamic-mapping/dynamic-mapping-server-deployment.yaml @@ -8,8 +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-small + 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 1e2b343b..e525a2e1 100644 --- a/k8s/resources/study/case-import-server-deployment.yaml +++ b/k8s/resources/study/case-import-server-deployment.yaml @@ -7,8 +7,8 @@ metadata: version: "1" app.kubernetes.io/component: gridsuite-springboot annotations: - gridsuite.org/size: springboot-xxs gridsuite.org/cpu: cpu-minimal + 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 cfdd06b0..73d49db5 100644 --- a/k8s/resources/study/cgmes-gl-server-deployment.yaml +++ b/k8s/resources/study/cgmes-gl-server-deployment.yaml @@ -7,8 +7,8 @@ metadata: version: "1" app.kubernetes.io/component: gridsuite-springboot annotations: - gridsuite.org/size: springboot-xxs gridsuite.org/cpu: cpu-minimal + 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 77cf1a7d..3f2cb76d 100644 --- a/k8s/resources/study/directory-notification-server-deployment.yaml +++ b/k8s/resources/study/directory-notification-server-deployment.yaml @@ -8,8 +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-minimal + 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 2b75df02..1b43b6d5 100644 --- a/k8s/resources/study/directory-server-deployment.yaml +++ b/k8s/resources/study/directory-server-deployment.yaml @@ -10,8 +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-minimal + 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 7e79c0bc..5348bda2 100644 --- a/k8s/resources/study/dynamic-margin-calculation-server-deployment.yaml +++ b/k8s/resources/study/dynamic-margin-calculation-server-deployment.yaml @@ -9,8 +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-large + 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 566c6002..fb7b17ac 100644 --- a/k8s/resources/study/dynamic-security-analysis-server-deployment.yaml +++ b/k8s/resources/study/dynamic-security-analysis-server-deployment.yaml @@ -10,8 +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-small + 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 633e1a67..1c0a6241 100644 --- a/k8s/resources/study/dynamic-simulation-server-deployment.yaml +++ b/k8s/resources/study/dynamic-simulation-server-deployment.yaml @@ -10,8 +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-small + 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 87d58304..5f52698d 100644 --- a/k8s/resources/study/explore-server-deployment.yaml +++ b/k8s/resources/study/explore-server-deployment.yaml @@ -8,8 +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-minimal + 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 89209843..4a278c0f 100644 --- a/k8s/resources/study/geo-data-server-deployment.yaml +++ b/k8s/resources/study/geo-data-server-deployment.yaml @@ -8,8 +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-medium + 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 386452b0..ef79c539 100644 --- a/k8s/resources/study/network-map-server-deployment.yaml +++ b/k8s/resources/study/network-map-server-deployment.yaml @@ -7,8 +7,8 @@ metadata: version: "1" app.kubernetes.io/component: gridsuite-springboot annotations: - gridsuite.org/size: springboot-l gridsuite.org/cpu: cpu-medium-plus + 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 6fde76cb..d8649bbe 100644 --- a/k8s/resources/study/network-modification-server-deployment.yaml +++ b/k8s/resources/study/network-modification-server-deployment.yaml @@ -10,8 +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-large + 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 88246eb0..49ff6dd7 100644 --- a/k8s/resources/study/odre-server-deployment.yaml +++ b/k8s/resources/study/odre-server-deployment.yaml @@ -7,8 +7,8 @@ metadata: version: "1" app.kubernetes.io/component: gridsuite-springboot annotations: - gridsuite.org/size: springboot-l gridsuite.org/cpu: cpu-minimal + 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 ee01f402..3f21dc4f 100644 --- a/k8s/resources/study/security-analysis-server-deployment.yaml +++ b/k8s/resources/study/security-analysis-server-deployment.yaml @@ -9,8 +9,8 @@ metadata: gridsuite.org/springboot-with-database: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/size: springboot-security-analysis gridsuite.org/cpu: cpu-security-analysis + gridsuite.org/memory: memory-security spec: selector: matchLabels: diff --git a/k8s/resources/study/sensitivity-analysis-server-deployment.yaml b/k8s/resources/study/sensitivity-analysis-server-deployment.yaml index 9491af17..b8973f6c 100644 --- a/k8s/resources/study/sensitivity-analysis-server-deployment.yaml +++ b/k8s/resources/study/sensitivity-analysis-server-deployment.yaml @@ -9,8 +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-xlarge + 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 3b2afb92..5d34052b 100644 --- a/k8s/resources/study/shortcircuit-server-deployment.yaml +++ b/k8s/resources/study/shortcircuit-server-deployment.yaml @@ -10,8 +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-medium + 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 3812209d..f52dd6a3 100644 --- a/k8s/resources/study/single-line-diagram-server-deployment.yaml +++ b/k8s/resources/study/single-line-diagram-server-deployment.yaml @@ -8,8 +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-medium-plus + 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 f8d25de0..24c54ff6 100644 --- a/k8s/resources/study/study-notification-server-deployment.yaml +++ b/k8s/resources/study/study-notification-server-deployment.yaml @@ -8,8 +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-minimal + 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 e811cd62..0651655c 100644 --- a/k8s/resources/study/study-server-deployment.yaml +++ b/k8s/resources/study/study-server-deployment.yaml @@ -10,8 +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-small + 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 1d6a77cc..73f8c061 100644 --- a/k8s/resources/study/timeseries-server-deployment.yaml +++ b/k8s/resources/study/timeseries-server-deployment.yaml @@ -8,8 +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-small + 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 d568c770..09e4d007 100644 --- a/k8s/resources/study/voltage-init-server-deployment.yaml +++ b/k8s/resources/study/voltage-init-server-deployment.yaml @@ -10,8 +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-large + gridsuite.org/memory: memory-xl-forking spec: selector: matchLabels: From 26e38dab448ab332d8c5b3597540e364cae4933d Mon Sep 17 00:00:00 2001 From: Joris Mancini Date: Wed, 29 Oct 2025 11:41:52 +0100 Subject: [PATCH 3/6] feat(k8s): add CPU requests/limits to Apache deployments - Add CPU 100m/500m to apps-metadata-server and default-backend - Add CPU 500m/1000m to grid*-apps (gridadmin, griddyna, gridexplore, gridstudy) - Update deployments-apache.yaml and deployments-apache-gridapp.yaml patches --- .../gridsuite/patches/deployments-apache-gridapp.yaml | 7 +++++++ k8s/components/gridsuite/patches/deployments-apache.yaml | 2 ++ 2 files changed, 9 insertions(+) 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: From ae545c1883cdc94d35e83d7000d776b50f6cf3fd Mon Sep 17 00:00:00 2001 From: Joris Mancini Date: Wed, 29 Oct 2025 11:53:04 +0100 Subject: [PATCH 4/6] refactor(k8s): harmonize CPU template naming MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Rename CPU templates to match memory naming convention (s, m, l, xl, xxl) - Update kustomization.yaml with new CPU patch names - Update all deployment annotations to use new CPU names 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- k8s/components/gridsuite/kustomization.yaml | 28 +++++++++---------- ...yaml => deployments-springboot-cpu-l.yaml} | 2 +- ...yaml => deployments-springboot-cpu-m.yaml} | 2 +- ...yaml => deployments-springboot-cpu-s.yaml} | 2 +- ...aml => deployments-springboot-cpu-xl.yaml} | 2 +- ...aml => deployments-springboot-cpu-xs.yaml} | 2 +- ...ml => deployments-springboot-cpu-xxl.yaml} | 2 +- ...ml => deployments-springboot-cpu-xxs.yaml} | 2 +- .../common/actions-server-deployment.yaml | 2 +- .../common/case-server-deployment.yaml | 2 +- ...config-notification-server-deployment.yaml | 2 +- .../common/config-server-deployment.yaml | 2 +- .../common/filter-server-deployment.yaml | 2 +- k8s/resources/common/gateway-deployment.yaml | 2 +- .../common/loadflow-server-deployment.yaml | 2 +- .../network-conversion-server-deployment.yaml | 2 +- .../network-store-server-deployment.yaml | 2 +- .../common/report-server-deployment.yaml | 2 +- .../study-config-server-deployment.yaml | 2 +- .../common/user-admin-server-deployment.yaml | 2 +- ...ty-oidc-replication-server-deployment.yaml | 2 +- .../dynamic-mapping-server-deployment.yaml | 2 +- .../study/case-import-server-deployment.yaml | 2 +- .../study/cgmes-gl-server-deployment.yaml | 2 +- ...ectory-notification-server-deployment.yaml | 2 +- .../study/directory-server-deployment.yaml | 2 +- ...-margin-calculation-server-deployment.yaml | 2 +- ...c-security-analysis-server-deployment.yaml | 2 +- .../dynamic-simulation-server-deployment.yaml | 2 +- .../study/explore-server-deployment.yaml | 2 +- .../study/geo-data-server-deployment.yaml | 2 +- .../study/network-map-server-deployment.yaml | 2 +- ...etwork-modification-server-deployment.yaml | 2 +- .../study/odre-server-deployment.yaml | 2 +- ...ensitivity-analysis-server-deployment.yaml | 2 +- .../study/shortcircuit-server-deployment.yaml | 2 +- ...single-line-diagram-server-deployment.yaml | 2 +- .../study-notification-server-deployment.yaml | 2 +- .../study/study-server-deployment.yaml | 2 +- .../study/timeseries-server-deployment.yaml | 2 +- .../study/voltage-init-server-deployment.yaml | 2 +- 41 files changed, 54 insertions(+), 54 deletions(-) rename k8s/components/gridsuite/patches/{deployments-springboot-cpu-large.yaml => deployments-springboot-cpu-l.yaml} (89%) rename k8s/components/gridsuite/patches/{deployments-springboot-cpu-medium-plus.yaml => deployments-springboot-cpu-m.yaml} (87%) rename k8s/components/gridsuite/patches/{deployments-springboot-cpu-medium.yaml => deployments-springboot-cpu-s.yaml} (88%) rename k8s/components/gridsuite/patches/{deployments-springboot-cpu-xlarge.yaml => deployments-springboot-cpu-xl.yaml} (88%) rename k8s/components/gridsuite/patches/{deployments-springboot-cpu-small.yaml => deployments-springboot-cpu-xs.yaml} (88%) rename k8s/components/gridsuite/patches/{deployments-springboot-cpu-xxlarge.yaml => deployments-springboot-cpu-xxl.yaml} (88%) rename k8s/components/gridsuite/patches/{deployments-springboot-cpu-minimal.yaml => deployments-springboot-cpu-xxs.yaml} (88%) diff --git a/k8s/components/gridsuite/kustomization.yaml b/k8s/components/gridsuite/kustomization.yaml index a44139f8..e89c9006 100644 --- a/k8s/components/gridsuite/kustomization.yaml +++ b/k8s/components/gridsuite/kustomization.yaml @@ -44,41 +44,41 @@ patches: target: kind: CronJob labelSelector: gridsuite.org/cronjob-with-database=true -- path: patches/deployments-springboot-cpu-minimal.yaml +- path: patches/deployments-springboot-cpu-xxs.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot - annotationSelector: gridsuite.org/cpu=cpu-minimal -- path: patches/deployments-springboot-cpu-small.yaml + annotationSelector: gridsuite.org/cpu=cpu-xxs +- path: patches/deployments-springboot-cpu-xs.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot - annotationSelector: gridsuite.org/cpu=cpu-small -- path: patches/deployments-springboot-cpu-medium.yaml + annotationSelector: gridsuite.org/cpu=cpu-xs +- path: patches/deployments-springboot-cpu-s.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot - annotationSelector: gridsuite.org/cpu=cpu-medium -- path: patches/deployments-springboot-cpu-medium-plus.yaml + annotationSelector: gridsuite.org/cpu=cpu-s +- path: patches/deployments-springboot-cpu-m.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot - annotationSelector: gridsuite.org/cpu=cpu-medium-plus -- path: patches/deployments-springboot-cpu-large.yaml + annotationSelector: gridsuite.org/cpu=cpu-m +- path: patches/deployments-springboot-cpu-l.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot - annotationSelector: gridsuite.org/cpu=cpu-large -- path: patches/deployments-springboot-cpu-xlarge.yaml + annotationSelector: gridsuite.org/cpu=cpu-l +- path: patches/deployments-springboot-cpu-xl.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot - annotationSelector: gridsuite.org/cpu=cpu-xlarge -- path: patches/deployments-springboot-cpu-xxlarge.yaml + annotationSelector: gridsuite.org/cpu=cpu-xl +- path: patches/deployments-springboot-cpu-xxl.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot - annotationSelector: gridsuite.org/cpu=cpu-xxlarge + annotationSelector: gridsuite.org/cpu=cpu-xxl - path: patches/deployments-springboot-cpu-security-analysis.yaml target: kind: Deployment diff --git a/k8s/components/gridsuite/patches/deployments-springboot-cpu-large.yaml b/k8s/components/gridsuite/patches/deployments-springboot-cpu-l.yaml similarity index 89% rename from k8s/components/gridsuite/patches/deployments-springboot-cpu-large.yaml rename to k8s/components/gridsuite/patches/deployments-springboot-cpu-l.yaml index db1a7085..9f832815 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-cpu-large.yaml +++ b/k8s/components/gridsuite/patches/deployments-springboot-cpu-l.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: not-important annotations: - gridsuite.org/cpu: cpu-large + gridsuite.org/cpu: cpu-l spec: template: spec: diff --git a/k8s/components/gridsuite/patches/deployments-springboot-cpu-medium-plus.yaml b/k8s/components/gridsuite/patches/deployments-springboot-cpu-m.yaml similarity index 87% rename from k8s/components/gridsuite/patches/deployments-springboot-cpu-medium-plus.yaml rename to k8s/components/gridsuite/patches/deployments-springboot-cpu-m.yaml index 86bcb6ad..68b8a620 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-cpu-medium-plus.yaml +++ b/k8s/components/gridsuite/patches/deployments-springboot-cpu-m.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: not-important annotations: - gridsuite.org/cpu: cpu-medium-plus + gridsuite.org/cpu: cpu-m spec: template: spec: diff --git a/k8s/components/gridsuite/patches/deployments-springboot-cpu-medium.yaml b/k8s/components/gridsuite/patches/deployments-springboot-cpu-s.yaml similarity index 88% rename from k8s/components/gridsuite/patches/deployments-springboot-cpu-medium.yaml rename to k8s/components/gridsuite/patches/deployments-springboot-cpu-s.yaml index 8f89f714..a675f841 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-cpu-medium.yaml +++ b/k8s/components/gridsuite/patches/deployments-springboot-cpu-s.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: not-important annotations: - gridsuite.org/cpu: cpu-medium + gridsuite.org/cpu: cpu-s spec: template: spec: diff --git a/k8s/components/gridsuite/patches/deployments-springboot-cpu-xlarge.yaml b/k8s/components/gridsuite/patches/deployments-springboot-cpu-xl.yaml similarity index 88% rename from k8s/components/gridsuite/patches/deployments-springboot-cpu-xlarge.yaml rename to k8s/components/gridsuite/patches/deployments-springboot-cpu-xl.yaml index 9fe29ef7..007239db 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-cpu-xlarge.yaml +++ b/k8s/components/gridsuite/patches/deployments-springboot-cpu-xl.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: not-important annotations: - gridsuite.org/cpu: cpu-xlarge + gridsuite.org/cpu: cpu-xl spec: template: spec: diff --git a/k8s/components/gridsuite/patches/deployments-springboot-cpu-small.yaml b/k8s/components/gridsuite/patches/deployments-springboot-cpu-xs.yaml similarity index 88% rename from k8s/components/gridsuite/patches/deployments-springboot-cpu-small.yaml rename to k8s/components/gridsuite/patches/deployments-springboot-cpu-xs.yaml index 8ff1916c..c3515c90 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-cpu-small.yaml +++ b/k8s/components/gridsuite/patches/deployments-springboot-cpu-xs.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: not-important annotations: - gridsuite.org/cpu: cpu-small + gridsuite.org/cpu: cpu-xs spec: template: spec: diff --git a/k8s/components/gridsuite/patches/deployments-springboot-cpu-xxlarge.yaml b/k8s/components/gridsuite/patches/deployments-springboot-cpu-xxl.yaml similarity index 88% rename from k8s/components/gridsuite/patches/deployments-springboot-cpu-xxlarge.yaml rename to k8s/components/gridsuite/patches/deployments-springboot-cpu-xxl.yaml index 70b28dc4..a1a9154e 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-cpu-xxlarge.yaml +++ b/k8s/components/gridsuite/patches/deployments-springboot-cpu-xxl.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: not-important annotations: - gridsuite.org/cpu: cpu-xxlarge + gridsuite.org/cpu: cpu-xxl spec: template: spec: diff --git a/k8s/components/gridsuite/patches/deployments-springboot-cpu-minimal.yaml b/k8s/components/gridsuite/patches/deployments-springboot-cpu-xxs.yaml similarity index 88% rename from k8s/components/gridsuite/patches/deployments-springboot-cpu-minimal.yaml rename to k8s/components/gridsuite/patches/deployments-springboot-cpu-xxs.yaml index 51bf5146..54c62ae1 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-cpu-minimal.yaml +++ b/k8s/components/gridsuite/patches/deployments-springboot-cpu-xxs.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: not-important annotations: - gridsuite.org/cpu: cpu-minimal + gridsuite.org/cpu: cpu-xxs spec: template: spec: diff --git a/k8s/resources/common/actions-server-deployment.yaml b/k8s/resources/common/actions-server-deployment.yaml index 2f9a41dd..388d318e 100644 --- a/k8s/resources/common/actions-server-deployment.yaml +++ b/k8s/resources/common/actions-server-deployment.yaml @@ -9,7 +9,7 @@ metadata: gridsuite.org/springboot-with-database: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/cpu: cpu-medium + gridsuite.org/cpu: cpu-s gridsuite.org/memory: memory-m spec: selector: diff --git a/k8s/resources/common/case-server-deployment.yaml b/k8s/resources/common/case-server-deployment.yaml index 57c3ca99..827e352b 100644 --- a/k8s/resources/common/case-server-deployment.yaml +++ b/k8s/resources/common/case-server-deployment.yaml @@ -11,7 +11,7 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" gridsuite.org/springboot-with-s3: "true" annotations: - gridsuite.org/cpu: cpu-small + gridsuite.org/cpu: cpu-xs gridsuite.org/memory: memory-s spec: selector: diff --git a/k8s/resources/common/config-notification-server-deployment.yaml b/k8s/resources/common/config-notification-server-deployment.yaml index 2f5d6f56..8847bfd9 100644 --- a/k8s/resources/common/config-notification-server-deployment.yaml +++ b/k8s/resources/common/config-notification-server-deployment.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/cpu: cpu-minimal + gridsuite.org/cpu: cpu-xxs gridsuite.org/memory: memory-xs spec: selector: diff --git a/k8s/resources/common/config-server-deployment.yaml b/k8s/resources/common/config-server-deployment.yaml index 1b251629..17148664 100644 --- a/k8s/resources/common/config-server-deployment.yaml +++ b/k8s/resources/common/config-server-deployment.yaml @@ -9,7 +9,7 @@ metadata: gridsuite.org/springboot-with-database: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/cpu: cpu-minimal + gridsuite.org/cpu: cpu-xxs gridsuite.org/memory: memory-xs spec: selector: diff --git a/k8s/resources/common/filter-server-deployment.yaml b/k8s/resources/common/filter-server-deployment.yaml index d8fc98eb..3c087d8c 100644 --- a/k8s/resources/common/filter-server-deployment.yaml +++ b/k8s/resources/common/filter-server-deployment.yaml @@ -9,7 +9,7 @@ metadata: gridsuite.org/springboot-with-database: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/cpu: cpu-small + gridsuite.org/cpu: cpu-xs gridsuite.org/memory: memory-m spec: selector: diff --git a/k8s/resources/common/gateway-deployment.yaml b/k8s/resources/common/gateway-deployment.yaml index 9b6f0e32..d9a87943 100644 --- a/k8s/resources/common/gateway-deployment.yaml +++ b/k8s/resources/common/gateway-deployment.yaml @@ -7,7 +7,7 @@ metadata: version: "1" app.kubernetes.io/component: gridsuite-springboot annotations: - gridsuite.org/cpu: cpu-small + gridsuite.org/cpu: cpu-xs gridsuite.org/memory: memory-xs spec: selector: diff --git a/k8s/resources/common/loadflow-server-deployment.yaml b/k8s/resources/common/loadflow-server-deployment.yaml index 9b0d7c79..01510528 100644 --- a/k8s/resources/common/loadflow-server-deployment.yaml +++ b/k8s/resources/common/loadflow-server-deployment.yaml @@ -9,7 +9,7 @@ metadata: gridsuite.org/springboot-with-database: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/cpu: cpu-xlarge + gridsuite.org/cpu: cpu-xl gridsuite.org/memory: memory-xxl-forking spec: selector: diff --git a/k8s/resources/common/network-conversion-server-deployment.yaml b/k8s/resources/common/network-conversion-server-deployment.yaml index 44370b03..66ffe0db 100644 --- a/k8s/resources/common/network-conversion-server-deployment.yaml +++ b/k8s/resources/common/network-conversion-server-deployment.yaml @@ -10,7 +10,7 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" gridsuite.org/springboot-with-large-storage: "true" annotations: - gridsuite.org/cpu: cpu-xlarge + gridsuite.org/cpu: cpu-xl gridsuite.org/memory: memory-xxl spec: selector: diff --git a/k8s/resources/common/network-store-server-deployment.yaml b/k8s/resources/common/network-store-server-deployment.yaml index a7d5e4d5..b35f9d73 100644 --- a/k8s/resources/common/network-store-server-deployment.yaml +++ b/k8s/resources/common/network-store-server-deployment.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-database: "true" annotations: - gridsuite.org/cpu: cpu-xxlarge + gridsuite.org/cpu: cpu-xxl gridsuite.org/memory: memory-xxl spec: selector: diff --git a/k8s/resources/common/report-server-deployment.yaml b/k8s/resources/common/report-server-deployment.yaml index e2f9bc8e..adf04d4e 100644 --- a/k8s/resources/common/report-server-deployment.yaml +++ b/k8s/resources/common/report-server-deployment.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-database: "true" annotations: - gridsuite.org/cpu: cpu-small + gridsuite.org/cpu: cpu-xs gridsuite.org/memory: memory-xxl spec: selector: diff --git a/k8s/resources/common/study-config-server-deployment.yaml b/k8s/resources/common/study-config-server-deployment.yaml index e949ab64..de2c4703 100644 --- a/k8s/resources/common/study-config-server-deployment.yaml +++ b/k8s/resources/common/study-config-server-deployment.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-database: "true" annotations: - gridsuite.org/cpu: cpu-minimal + gridsuite.org/cpu: cpu-xxs gridsuite.org/memory: memory-xs spec: selector: diff --git a/k8s/resources/common/user-admin-server-deployment.yaml b/k8s/resources/common/user-admin-server-deployment.yaml index abc0ed11..6221a927 100644 --- a/k8s/resources/common/user-admin-server-deployment.yaml +++ b/k8s/resources/common/user-admin-server-deployment.yaml @@ -9,7 +9,7 @@ metadata: gridsuite.org/springboot-with-database: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/cpu: cpu-small + gridsuite.org/cpu: cpu-xs gridsuite.org/memory: memory-xs spec: selector: 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 81b89e56..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,7 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-database: "true" annotations: - gridsuite.org/cpu: cpu-minimal + gridsuite.org/cpu: cpu-xxs gridsuite.org/memory: memory-xs spec: selector: diff --git a/k8s/resources/dynamic-mapping/dynamic-mapping-server-deployment.yaml b/k8s/resources/dynamic-mapping/dynamic-mapping-server-deployment.yaml index 9b6a525c..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,7 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-database: "true" annotations: - gridsuite.org/cpu: cpu-small + gridsuite.org/cpu: cpu-xs gridsuite.org/memory: memory-m spec: selector: diff --git a/k8s/resources/study/case-import-server-deployment.yaml b/k8s/resources/study/case-import-server-deployment.yaml index e525a2e1..185d0de5 100644 --- a/k8s/resources/study/case-import-server-deployment.yaml +++ b/k8s/resources/study/case-import-server-deployment.yaml @@ -7,7 +7,7 @@ metadata: version: "1" app.kubernetes.io/component: gridsuite-springboot annotations: - gridsuite.org/cpu: cpu-minimal + gridsuite.org/cpu: cpu-xxs gridsuite.org/memory: memory-xs spec: selector: diff --git a/k8s/resources/study/cgmes-gl-server-deployment.yaml b/k8s/resources/study/cgmes-gl-server-deployment.yaml index 73d49db5..d184f07a 100644 --- a/k8s/resources/study/cgmes-gl-server-deployment.yaml +++ b/k8s/resources/study/cgmes-gl-server-deployment.yaml @@ -7,7 +7,7 @@ metadata: version: "1" app.kubernetes.io/component: gridsuite-springboot annotations: - gridsuite.org/cpu: cpu-minimal + gridsuite.org/cpu: cpu-xxs gridsuite.org/memory: memory-xs spec: selector: diff --git a/k8s/resources/study/directory-notification-server-deployment.yaml b/k8s/resources/study/directory-notification-server-deployment.yaml index 3f2cb76d..3ed1d041 100644 --- a/k8s/resources/study/directory-notification-server-deployment.yaml +++ b/k8s/resources/study/directory-notification-server-deployment.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/cpu: cpu-minimal + gridsuite.org/cpu: cpu-xxs gridsuite.org/memory: memory-xs spec: selector: diff --git a/k8s/resources/study/directory-server-deployment.yaml b/k8s/resources/study/directory-server-deployment.yaml index 1b43b6d5..15ece048 100644 --- a/k8s/resources/study/directory-server-deployment.yaml +++ b/k8s/resources/study/directory-server-deployment.yaml @@ -10,7 +10,7 @@ metadata: gridsuite.org/springboot-with-rabbitmq: "true" gridsuite.org/springboot-with-elasticsearch: "true" annotations: - gridsuite.org/cpu: cpu-minimal + gridsuite.org/cpu: cpu-xxs gridsuite.org/memory: memory-xs spec: selector: diff --git a/k8s/resources/study/dynamic-margin-calculation-server-deployment.yaml b/k8s/resources/study/dynamic-margin-calculation-server-deployment.yaml index 5348bda2..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,7 @@ metadata: gridsuite.org/springboot-with-database: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/cpu: cpu-large + gridsuite.org/cpu: cpu-l gridsuite.org/memory: memory-m-forking spec: selector: diff --git a/k8s/resources/study/dynamic-security-analysis-server-deployment.yaml b/k8s/resources/study/dynamic-security-analysis-server-deployment.yaml index fb7b17ac..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,7 @@ metadata: gridsuite.org/springboot-with-s3: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/cpu: cpu-small + gridsuite.org/cpu: cpu-xs gridsuite.org/memory: memory-m-forking spec: selector: diff --git a/k8s/resources/study/dynamic-simulation-server-deployment.yaml b/k8s/resources/study/dynamic-simulation-server-deployment.yaml index 1c0a6241..fad6231a 100644 --- a/k8s/resources/study/dynamic-simulation-server-deployment.yaml +++ b/k8s/resources/study/dynamic-simulation-server-deployment.yaml @@ -10,7 +10,7 @@ metadata: gridsuite.org/springboot-with-s3: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/cpu: cpu-small + gridsuite.org/cpu: cpu-xs gridsuite.org/memory: memory-m-forking spec: selector: diff --git a/k8s/resources/study/explore-server-deployment.yaml b/k8s/resources/study/explore-server-deployment.yaml index 5f52698d..bfa8de2d 100644 --- a/k8s/resources/study/explore-server-deployment.yaml +++ b/k8s/resources/study/explore-server-deployment.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/cpu: cpu-minimal + gridsuite.org/cpu: cpu-xxs gridsuite.org/memory: memory-m spec: selector: diff --git a/k8s/resources/study/geo-data-server-deployment.yaml b/k8s/resources/study/geo-data-server-deployment.yaml index 4a278c0f..8c53f0f3 100644 --- a/k8s/resources/study/geo-data-server-deployment.yaml +++ b/k8s/resources/study/geo-data-server-deployment.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-database: "true" annotations: - gridsuite.org/cpu: cpu-medium + gridsuite.org/cpu: cpu-s gridsuite.org/memory: memory-l spec: selector: diff --git a/k8s/resources/study/network-map-server-deployment.yaml b/k8s/resources/study/network-map-server-deployment.yaml index ef79c539..a973c5bf 100644 --- a/k8s/resources/study/network-map-server-deployment.yaml +++ b/k8s/resources/study/network-map-server-deployment.yaml @@ -7,7 +7,7 @@ metadata: version: "1" app.kubernetes.io/component: gridsuite-springboot annotations: - gridsuite.org/cpu: cpu-medium-plus + gridsuite.org/cpu: cpu-m gridsuite.org/memory: memory-xxl spec: selector: diff --git a/k8s/resources/study/network-modification-server-deployment.yaml b/k8s/resources/study/network-modification-server-deployment.yaml index d8649bbe..dce5c7bd 100644 --- a/k8s/resources/study/network-modification-server-deployment.yaml +++ b/k8s/resources/study/network-modification-server-deployment.yaml @@ -10,7 +10,7 @@ metadata: gridsuite.org/springboot-with-elasticsearch: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/cpu: cpu-large + gridsuite.org/cpu: cpu-l gridsuite.org/memory: memory-xxxl spec: selector: diff --git a/k8s/resources/study/odre-server-deployment.yaml b/k8s/resources/study/odre-server-deployment.yaml index 49ff6dd7..a5d8b25b 100644 --- a/k8s/resources/study/odre-server-deployment.yaml +++ b/k8s/resources/study/odre-server-deployment.yaml @@ -7,7 +7,7 @@ metadata: version: "1" app.kubernetes.io/component: gridsuite-springboot annotations: - gridsuite.org/cpu: cpu-minimal + gridsuite.org/cpu: cpu-xxs gridsuite.org/memory: memory-l spec: selector: diff --git a/k8s/resources/study/sensitivity-analysis-server-deployment.yaml b/k8s/resources/study/sensitivity-analysis-server-deployment.yaml index b8973f6c..aef3dea9 100644 --- a/k8s/resources/study/sensitivity-analysis-server-deployment.yaml +++ b/k8s/resources/study/sensitivity-analysis-server-deployment.yaml @@ -9,7 +9,7 @@ metadata: gridsuite.org/springboot-with-database: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/cpu: cpu-xlarge + gridsuite.org/cpu: cpu-xl gridsuite.org/memory: memory-xl-forking spec: selector: diff --git a/k8s/resources/study/shortcircuit-server-deployment.yaml b/k8s/resources/study/shortcircuit-server-deployment.yaml index 5d34052b..e2604cca 100644 --- a/k8s/resources/study/shortcircuit-server-deployment.yaml +++ b/k8s/resources/study/shortcircuit-server-deployment.yaml @@ -10,7 +10,7 @@ metadata: gridsuite.org/springboot-with-s3: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/cpu: cpu-medium + gridsuite.org/cpu: cpu-s gridsuite.org/memory: memory-l-forking spec: selector: diff --git a/k8s/resources/study/single-line-diagram-server-deployment.yaml b/k8s/resources/study/single-line-diagram-server-deployment.yaml index f52dd6a3..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,7 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-database: "true" annotations: - gridsuite.org/cpu: cpu-medium-plus + gridsuite.org/cpu: cpu-m gridsuite.org/memory: memory-xl spec: selector: diff --git a/k8s/resources/study/study-notification-server-deployment.yaml b/k8s/resources/study/study-notification-server-deployment.yaml index 24c54ff6..56135e5d 100644 --- a/k8s/resources/study/study-notification-server-deployment.yaml +++ b/k8s/resources/study/study-notification-server-deployment.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/cpu: cpu-minimal + gridsuite.org/cpu: cpu-xxs gridsuite.org/memory: memory-m spec: selector: diff --git a/k8s/resources/study/study-server-deployment.yaml b/k8s/resources/study/study-server-deployment.yaml index 0651655c..2ab98268 100644 --- a/k8s/resources/study/study-server-deployment.yaml +++ b/k8s/resources/study/study-server-deployment.yaml @@ -10,7 +10,7 @@ metadata: gridsuite.org/springboot-with-elasticsearch: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/cpu: cpu-small + gridsuite.org/cpu: cpu-xs gridsuite.org/memory: memory-xs spec: selector: diff --git a/k8s/resources/study/timeseries-server-deployment.yaml b/k8s/resources/study/timeseries-server-deployment.yaml index 73f8c061..fa05759c 100644 --- a/k8s/resources/study/timeseries-server-deployment.yaml +++ b/k8s/resources/study/timeseries-server-deployment.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-database: "true" annotations: - gridsuite.org/cpu: cpu-small + gridsuite.org/cpu: cpu-xs gridsuite.org/memory: memory-m spec: selector: diff --git a/k8s/resources/study/voltage-init-server-deployment.yaml b/k8s/resources/study/voltage-init-server-deployment.yaml index 09e4d007..eae7027f 100644 --- a/k8s/resources/study/voltage-init-server-deployment.yaml +++ b/k8s/resources/study/voltage-init-server-deployment.yaml @@ -10,7 +10,7 @@ metadata: gridsuite.org/springboot-with-s3: "true" gridsuite.org/springboot-with-rabbitmq: "true" annotations: - gridsuite.org/cpu: cpu-large + gridsuite.org/cpu: cpu-l gridsuite.org/memory: memory-xl-forking spec: selector: From fa92994c62ab47330a645f0ae532a306a4b86f72 Mon Sep 17 00:00:00 2001 From: Joris Mancini Date: Wed, 29 Oct 2025 11:55:28 +0100 Subject: [PATCH 5/6] feat(k8s): move and order cpu and memory template files Signed-off-by: Joris Mancini --- k8s/components/gridsuite/kustomization.yaml | 42 +++++++++---------- .../deployments-springboot-cpu-l.yaml | 0 .../deployments-springboot-cpu-m.yaml | 0 .../deployments-springboot-cpu-s.yaml | 0 ...ents-springboot-cpu-security-analysis.yaml | 0 .../deployments-springboot-cpu-xl.yaml | 0 .../deployments-springboot-cpu-xs.yaml | 0 .../deployments-springboot-cpu-xxl.yaml | 0 .../deployments-springboot-cpu-xxs.yaml | 0 ...ployments-springboot-memory-l-forking.yaml | 0 .../deployments-springboot-memory-l.yaml | 0 ...ployments-springboot-memory-m-forking.yaml | 0 .../deployments-springboot-memory-m.yaml | 0 .../deployments-springboot-memory-s.yaml | 0 ...eployments-springboot-memory-security.yaml | 0 ...loyments-springboot-memory-xl-forking.yaml | 0 .../deployments-springboot-memory-xl.yaml | 0 .../deployments-springboot-memory-xs.yaml | 0 ...oyments-springboot-memory-xxl-forking.yaml | 0 .../deployments-springboot-memory-xxl.yaml | 0 .../deployments-springboot-memory-xxs.yaml | 0 .../deployments-springboot-memory-xxxl.yaml | 0 22 files changed, 21 insertions(+), 21 deletions(-) rename k8s/components/gridsuite/patches/{ => cpu}/deployments-springboot-cpu-l.yaml (100%) rename k8s/components/gridsuite/patches/{ => cpu}/deployments-springboot-cpu-m.yaml (100%) rename k8s/components/gridsuite/patches/{ => cpu}/deployments-springboot-cpu-s.yaml (100%) rename k8s/components/gridsuite/patches/{ => cpu}/deployments-springboot-cpu-security-analysis.yaml (100%) rename k8s/components/gridsuite/patches/{ => cpu}/deployments-springboot-cpu-xl.yaml (100%) rename k8s/components/gridsuite/patches/{ => cpu}/deployments-springboot-cpu-xs.yaml (100%) rename k8s/components/gridsuite/patches/{ => cpu}/deployments-springboot-cpu-xxl.yaml (100%) rename k8s/components/gridsuite/patches/{ => cpu}/deployments-springboot-cpu-xxs.yaml (100%) rename k8s/components/gridsuite/patches/{ => memory}/deployments-springboot-memory-l-forking.yaml (100%) rename k8s/components/gridsuite/patches/{ => memory}/deployments-springboot-memory-l.yaml (100%) rename k8s/components/gridsuite/patches/{ => memory}/deployments-springboot-memory-m-forking.yaml (100%) rename k8s/components/gridsuite/patches/{ => memory}/deployments-springboot-memory-m.yaml (100%) rename k8s/components/gridsuite/patches/{ => memory}/deployments-springboot-memory-s.yaml (100%) rename k8s/components/gridsuite/patches/{ => memory}/deployments-springboot-memory-security.yaml (100%) rename k8s/components/gridsuite/patches/{ => memory}/deployments-springboot-memory-xl-forking.yaml (100%) rename k8s/components/gridsuite/patches/{ => memory}/deployments-springboot-memory-xl.yaml (100%) rename k8s/components/gridsuite/patches/{ => memory}/deployments-springboot-memory-xs.yaml (100%) rename k8s/components/gridsuite/patches/{ => memory}/deployments-springboot-memory-xxl-forking.yaml (100%) rename k8s/components/gridsuite/patches/{ => memory}/deployments-springboot-memory-xxl.yaml (100%) rename k8s/components/gridsuite/patches/{ => memory}/deployments-springboot-memory-xxs.yaml (100%) rename k8s/components/gridsuite/patches/{ => memory}/deployments-springboot-memory-xxxl.yaml (100%) diff --git a/k8s/components/gridsuite/kustomization.yaml b/k8s/components/gridsuite/kustomization.yaml index e89c9006..478b1315 100644 --- a/k8s/components/gridsuite/kustomization.yaml +++ b/k8s/components/gridsuite/kustomization.yaml @@ -44,107 +44,107 @@ patches: target: kind: CronJob labelSelector: gridsuite.org/cronjob-with-database=true -- path: patches/deployments-springboot-cpu-xxs.yaml +- path: patches/cpu/deployments-springboot-cpu-xxs.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot annotationSelector: gridsuite.org/cpu=cpu-xxs -- path: patches/deployments-springboot-cpu-xs.yaml +- path: patches/cpu/deployments-springboot-cpu-xs.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot annotationSelector: gridsuite.org/cpu=cpu-xs -- path: patches/deployments-springboot-cpu-s.yaml +- path: patches/cpu/deployments-springboot-cpu-s.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot annotationSelector: gridsuite.org/cpu=cpu-s -- path: patches/deployments-springboot-cpu-m.yaml +- path: patches/cpu/deployments-springboot-cpu-m.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot annotationSelector: gridsuite.org/cpu=cpu-m -- path: patches/deployments-springboot-cpu-l.yaml +- path: patches/cpu/deployments-springboot-cpu-l.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot annotationSelector: gridsuite.org/cpu=cpu-l -- path: patches/deployments-springboot-cpu-xl.yaml +- path: patches/cpu/deployments-springboot-cpu-xl.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot annotationSelector: gridsuite.org/cpu=cpu-xl -- path: patches/deployments-springboot-cpu-xxl.yaml +- path: patches/cpu/deployments-springboot-cpu-xxl.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot annotationSelector: gridsuite.org/cpu=cpu-xxl -- path: patches/deployments-springboot-cpu-security-analysis.yaml +- path: patches/cpu/deployments-springboot-cpu-security-analysis.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot annotationSelector: gridsuite.org/cpu=cpu-security-analysis -- path: patches/deployments-springboot-memory-xxs.yaml +- path: patches/memory/deployments-springboot-memory-xxs.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot annotationSelector: gridsuite.org/memory=memory-xxs -- path: patches/deployments-springboot-memory-xs.yaml +- path: patches/memory/deployments-springboot-memory-xs.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot annotationSelector: gridsuite.org/memory=memory-xs -- path: patches/deployments-springboot-memory-s.yaml +- path: patches/memory/deployments-springboot-memory-s.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot annotationSelector: gridsuite.org/memory=memory-s -- path: patches/deployments-springboot-memory-m.yaml +- path: patches/memory/deployments-springboot-memory-m.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot annotationSelector: gridsuite.org/memory=memory-m -- path: patches/deployments-springboot-memory-l.yaml +- path: patches/memory/deployments-springboot-memory-l.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot annotationSelector: gridsuite.org/memory=memory-l -- path: patches/deployments-springboot-memory-xl.yaml +- 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/deployments-springboot-memory-xxl.yaml +- 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/deployments-springboot-memory-xxxl.yaml +- 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/deployments-springboot-memory-security.yaml +- path: patches/memory/deployments-springboot-memory-security.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot annotationSelector: gridsuite.org/memory=memory-security -- path: patches/deployments-springboot-memory-m-forking.yaml +- 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/deployments-springboot-memory-l-forking.yaml +- 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/deployments-springboot-memory-xl-forking.yaml +- 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/deployments-springboot-memory-xxl-forking.yaml +- path: patches/memory/deployments-springboot-memory-xxl-forking.yaml target: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot diff --git a/k8s/components/gridsuite/patches/deployments-springboot-cpu-l.yaml b/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-l.yaml similarity index 100% rename from k8s/components/gridsuite/patches/deployments-springboot-cpu-l.yaml rename to k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-l.yaml diff --git a/k8s/components/gridsuite/patches/deployments-springboot-cpu-m.yaml b/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-m.yaml similarity index 100% rename from k8s/components/gridsuite/patches/deployments-springboot-cpu-m.yaml rename to k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-m.yaml diff --git a/k8s/components/gridsuite/patches/deployments-springboot-cpu-s.yaml b/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-s.yaml similarity index 100% rename from k8s/components/gridsuite/patches/deployments-springboot-cpu-s.yaml rename to k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-s.yaml diff --git a/k8s/components/gridsuite/patches/deployments-springboot-cpu-security-analysis.yaml b/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-security-analysis.yaml similarity index 100% rename from k8s/components/gridsuite/patches/deployments-springboot-cpu-security-analysis.yaml rename to k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-security-analysis.yaml diff --git a/k8s/components/gridsuite/patches/deployments-springboot-cpu-xl.yaml b/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-xl.yaml similarity index 100% rename from k8s/components/gridsuite/patches/deployments-springboot-cpu-xl.yaml rename to k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-xl.yaml diff --git a/k8s/components/gridsuite/patches/deployments-springboot-cpu-xs.yaml b/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-xs.yaml similarity index 100% rename from k8s/components/gridsuite/patches/deployments-springboot-cpu-xs.yaml rename to k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-xs.yaml diff --git a/k8s/components/gridsuite/patches/deployments-springboot-cpu-xxl.yaml b/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-xxl.yaml similarity index 100% rename from k8s/components/gridsuite/patches/deployments-springboot-cpu-xxl.yaml rename to k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-xxl.yaml diff --git a/k8s/components/gridsuite/patches/deployments-springboot-cpu-xxs.yaml b/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-xxs.yaml similarity index 100% rename from k8s/components/gridsuite/patches/deployments-springboot-cpu-xxs.yaml rename to k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-xxs.yaml diff --git a/k8s/components/gridsuite/patches/deployments-springboot-memory-l-forking.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-l-forking.yaml similarity index 100% rename from k8s/components/gridsuite/patches/deployments-springboot-memory-l-forking.yaml rename to k8s/components/gridsuite/patches/memory/deployments-springboot-memory-l-forking.yaml diff --git a/k8s/components/gridsuite/patches/deployments-springboot-memory-l.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-l.yaml similarity index 100% rename from k8s/components/gridsuite/patches/deployments-springboot-memory-l.yaml rename to k8s/components/gridsuite/patches/memory/deployments-springboot-memory-l.yaml diff --git a/k8s/components/gridsuite/patches/deployments-springboot-memory-m-forking.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-m-forking.yaml similarity index 100% rename from k8s/components/gridsuite/patches/deployments-springboot-memory-m-forking.yaml rename to k8s/components/gridsuite/patches/memory/deployments-springboot-memory-m-forking.yaml diff --git a/k8s/components/gridsuite/patches/deployments-springboot-memory-m.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-m.yaml similarity index 100% rename from k8s/components/gridsuite/patches/deployments-springboot-memory-m.yaml rename to k8s/components/gridsuite/patches/memory/deployments-springboot-memory-m.yaml diff --git a/k8s/components/gridsuite/patches/deployments-springboot-memory-s.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-s.yaml similarity index 100% rename from k8s/components/gridsuite/patches/deployments-springboot-memory-s.yaml rename to k8s/components/gridsuite/patches/memory/deployments-springboot-memory-s.yaml diff --git a/k8s/components/gridsuite/patches/deployments-springboot-memory-security.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-security.yaml similarity index 100% rename from k8s/components/gridsuite/patches/deployments-springboot-memory-security.yaml rename to k8s/components/gridsuite/patches/memory/deployments-springboot-memory-security.yaml diff --git a/k8s/components/gridsuite/patches/deployments-springboot-memory-xl-forking.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xl-forking.yaml similarity index 100% rename from k8s/components/gridsuite/patches/deployments-springboot-memory-xl-forking.yaml rename to k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xl-forking.yaml diff --git a/k8s/components/gridsuite/patches/deployments-springboot-memory-xl.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xl.yaml similarity index 100% rename from k8s/components/gridsuite/patches/deployments-springboot-memory-xl.yaml rename to k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xl.yaml diff --git a/k8s/components/gridsuite/patches/deployments-springboot-memory-xs.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xs.yaml similarity index 100% rename from k8s/components/gridsuite/patches/deployments-springboot-memory-xs.yaml rename to k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xs.yaml diff --git a/k8s/components/gridsuite/patches/deployments-springboot-memory-xxl-forking.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xxl-forking.yaml similarity index 100% rename from k8s/components/gridsuite/patches/deployments-springboot-memory-xxl-forking.yaml rename to k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xxl-forking.yaml diff --git a/k8s/components/gridsuite/patches/deployments-springboot-memory-xxl.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xxl.yaml similarity index 100% rename from k8s/components/gridsuite/patches/deployments-springboot-memory-xxl.yaml rename to k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xxl.yaml diff --git a/k8s/components/gridsuite/patches/deployments-springboot-memory-xxs.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xxs.yaml similarity index 100% rename from k8s/components/gridsuite/patches/deployments-springboot-memory-xxs.yaml rename to k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xxs.yaml diff --git a/k8s/components/gridsuite/patches/deployments-springboot-memory-xxxl.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xxxl.yaml similarity index 100% rename from k8s/components/gridsuite/patches/deployments-springboot-memory-xxxl.yaml rename to k8s/components/gridsuite/patches/memory/deployments-springboot-memory-xxxl.yaml From 048b4c435d41595c924d73b5422b717e397af2c9 Mon Sep 17 00:00:00 2001 From: Joris Mancini Date: Wed, 29 Oct 2025 14:29:59 +0100 Subject: [PATCH 6/6] fix(sizing): remove specific sizing for security-analysis Signed-off-by: Joris Mancini --- k8s/components/gridsuite/kustomization.yaml | 10 ---------- ...ents-springboot-cpu-security-analysis.yaml | 16 ---------------- ...eployments-springboot-memory-security.yaml | 19 ------------------- .../security-analysis-server-deployment.yaml | 13 ++++++++++--- 4 files changed, 10 insertions(+), 48 deletions(-) delete mode 100644 k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-security-analysis.yaml delete mode 100644 k8s/components/gridsuite/patches/memory/deployments-springboot-memory-security.yaml diff --git a/k8s/components/gridsuite/kustomization.yaml b/k8s/components/gridsuite/kustomization.yaml index 478b1315..c2a079ef 100644 --- a/k8s/components/gridsuite/kustomization.yaml +++ b/k8s/components/gridsuite/kustomization.yaml @@ -79,11 +79,6 @@ patches: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot annotationSelector: gridsuite.org/cpu=cpu-xxl -- path: patches/cpu/deployments-springboot-cpu-security-analysis.yaml - target: - kind: Deployment - labelSelector: app.kubernetes.io/component=gridsuite-springboot - annotationSelector: gridsuite.org/cpu=cpu-security-analysis - path: patches/memory/deployments-springboot-memory-xxs.yaml target: kind: Deployment @@ -124,11 +119,6 @@ patches: kind: Deployment labelSelector: app.kubernetes.io/component=gridsuite-springboot annotationSelector: gridsuite.org/memory=memory-xxxl -- path: patches/memory/deployments-springboot-memory-security.yaml - target: - kind: Deployment - labelSelector: app.kubernetes.io/component=gridsuite-springboot - annotationSelector: gridsuite.org/memory=memory-security - path: patches/memory/deployments-springboot-memory-m-forking.yaml target: kind: Deployment diff --git a/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-security-analysis.yaml b/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-security-analysis.yaml deleted file mode 100644 index 4dd76200..00000000 --- a/k8s/components/gridsuite/patches/cpu/deployments-springboot-cpu-security-analysis.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: not-important - annotations: - gridsuite.org/cpu: cpu-security-analysis -spec: - template: - spec: - containers: - - name: main - resources: - requests: - cpu: "16000m" - limits: - cpu: "16000m" \ No newline at end of file diff --git a/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-security.yaml b/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-security.yaml deleted file mode 100644 index 3e70f1e1..00000000 --- a/k8s/components/gridsuite/patches/memory/deployments-springboot-memory-security.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: not-important - annotations: - gridsuite.org/memory: memory-security -spec: - template: - spec: - containers: - - name: main - env: - - name: JAVA_TOOL_OPTIONS - value: "-Xmx5760m" - resources: - requests: - memory: "7680Mi" - limits: - memory: "7680Mi" diff --git a/k8s/resources/study/security-analysis-server-deployment.yaml b/k8s/resources/study/security-analysis-server-deployment.yaml index 3f21dc4f..5dc0aaf7 100644 --- a/k8s/resources/study/security-analysis-server-deployment.yaml +++ b/k8s/resources/study/security-analysis-server-deployment.yaml @@ -8,9 +8,6 @@ metadata: app.kubernetes.io/component: gridsuite-springboot gridsuite.org/springboot-with-database: "true" gridsuite.org/springboot-with-rabbitmq: "true" - annotations: - gridsuite.org/cpu: cpu-security-analysis - gridsuite.org/memory: memory-security spec: selector: matchLabels: @@ -23,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