diff --git a/docker-compose/allowed-issuers.yml b/docker-compose/allowed-issuers.yml index abfa6379..96f0f727 100644 --- a/docker-compose/allowed-issuers.yml +++ b/docker-compose/allowed-issuers.yml @@ -1 +1,3 @@ allowed-issuers: http://172.17.0.1:9090 +allowed-audiences: gridexplore-client, gridadmin-client, griddyna-client, gridstudy-client, gridexplore-local, gridadmin-local, griddyna-local, gridstudy-local +allowed-clients: \ No newline at end of file diff --git a/docker-compose/docker-compose.base.yml b/docker-compose/docker-compose.base.yml index b09ae02f..1c5f703c 100644 --- a/docker-compose/docker-compose.base.yml +++ b/docker-compose/docker-compose.base.yml @@ -418,6 +418,7 @@ services: environment: - PORT=9090 - ISSUER_HOST=172.17.0.1:9090 + - USERS_PROFILE=UTILISATEURS|ADMIN|ADMIN_EXPLORE - CLIENT_COUNT=8 # Client IDs for containers (grid*-app-idpSettings.json) diff --git a/k8s/components/gridsuite/patches/deployments-springboot-size-l.yaml b/k8s/components/gridsuite/patches/deployments-springboot-size-l.yaml index 491efa3c..0360bc8b 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-size-l.yaml +++ b/k8s/components/gridsuite/patches/deployments-springboot-size-l.yaml @@ -12,6 +12,6 @@ spec: value: "-Xmx768m" resources: requests: - memory: "1.25Gi" + memory: "1.5Gi" limits: - memory: "1.25Gi" + memory: "1.5Gi" diff --git a/k8s/components/gridsuite/patches/deployments-springboot-size-m.yaml b/k8s/components/gridsuite/patches/deployments-springboot-size-m.yaml index e50cf884..a99a7daf 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-size-m.yaml +++ b/k8s/components/gridsuite/patches/deployments-springboot-size-m.yaml @@ -12,6 +12,6 @@ spec: value: "-Xmx576m" resources: requests: - memory: "1Gi" + memory: "1.25Gi" limits: - memory: "1Gi" + memory: "1.25Gi" diff --git a/k8s/components/gridsuite/patches/deployments-springboot-size-s.yaml b/k8s/components/gridsuite/patches/deployments-springboot-size-s.yaml index 80865ed8..f5907d6a 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-size-s.yaml +++ b/k8s/components/gridsuite/patches/deployments-springboot-size-s.yaml @@ -12,6 +12,6 @@ spec: value: "-Xmx384m" resources: requests: - memory: "768Mi" + memory: "1Gi" limits: - memory: "768Mi" + memory: "1Gi" diff --git a/k8s/components/gridsuite/patches/deployments-springboot-size-xl.yaml b/k8s/components/gridsuite/patches/deployments-springboot-size-xl.yaml index ae9fc10e..c944a86e 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-size-xl.yaml +++ b/k8s/components/gridsuite/patches/deployments-springboot-size-xl.yaml @@ -12,6 +12,6 @@ spec: value: "-Xmx1086m" resources: requests: - memory: "1664Mi" + memory: "2Gi" limits: - memory: "1664Mi" + memory: "2Gi" diff --git a/k8s/components/gridsuite/patches/deployments-springboot-size-xs.yaml b/k8s/components/gridsuite/patches/deployments-springboot-size-xs.yaml index 2faa54ec..7f5d28eb 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-size-xs.yaml +++ b/k8s/components/gridsuite/patches/deployments-springboot-size-xs.yaml @@ -12,6 +12,6 @@ spec: value: "-Xmx186m" resources: requests: - memory: "512Mi" + memory: "768Mi" limits: - memory: "512Mi" + memory: "768Mi" diff --git a/k8s/components/gridsuite/patches/deployments-springboot-size-xxl.yaml b/k8s/components/gridsuite/patches/deployments-springboot-size-xxl.yaml index ae40ac68..b43a2c9e 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-size-xxl.yaml +++ b/k8s/components/gridsuite/patches/deployments-springboot-size-xxl.yaml @@ -12,6 +12,6 @@ spec: value: "-Xmx1408m" resources: requests: - memory: "2Gi" + memory: "2.5Gi" limits: - memory: "2Gi" + memory: "2.5Gi" diff --git a/k8s/components/gridsuite/patches/deployments-springboot-size-xxs.yaml b/k8s/components/gridsuite/patches/deployments-springboot-size-xxs.yaml index d9746fa7..0d5d96b9 100644 --- a/k8s/components/gridsuite/patches/deployments-springboot-size-xxs.yaml +++ b/k8s/components/gridsuite/patches/deployments-springboot-size-xxs.yaml @@ -9,9 +9,9 @@ spec: - name: main env: - name: JAVA_TOOL_OPTIONS - value: "-Xmx96m" + value: "-Xmx128m" resources: requests: - memory: "384Mi" + memory: "512Mi" limits: - memory: "384Mi" + memory: "512Mi" diff --git a/k8s/resources/common/config/common-application.yml b/k8s/resources/common/config/common-application.yml index c35e7bfb..a543871b 100644 --- a/k8s/resources/common/config/common-application.yml +++ b/k8s/resources/common/config/common-application.yml @@ -25,4 +25,4 @@ powsybl-ws: # elasticsearch index prefixes elasticsearch: index: - prefix: ${powsybl-ws.environment:} + prefix: ${powsybl-ws.environment:} \ No newline at end of file