From fcf40500de008a898a7a3b09d8650fc62a08ca7f Mon Sep 17 00:00:00 2001 From: Nigel Jones Date: Tue, 21 Mar 2023 09:40:40 +0000 Subject: [PATCH] #235 adjust memory settings, jvm configuration Signed-off-by: Nigel Jones --- charts/odpi-egeria-lab/Chart.yaml | 2 +- .../templates/egeria-core.yaml | 1 + .../templates/egeria-datalake.yaml | 1 + .../odpi-egeria-lab/templates/egeria-dev.yaml | 4 +- .../odpi-egeria-lab/templates/egeria-ui.yaml | 1 + charts/odpi-egeria-lab/templates/env.yaml | 1 + charts/odpi-egeria-lab/values.yaml | 62 ++++++++++--------- 7 files changed, 41 insertions(+), 31 deletions(-) diff --git a/charts/odpi-egeria-lab/Chart.yaml b/charts/odpi-egeria-lab/Chart.yaml index 6f0339b3..5adfc72d 100644 --- a/charts/odpi-egeria-lab/Chart.yaml +++ b/charts/odpi-egeria-lab/Chart.yaml @@ -4,7 +4,7 @@ name: odpi-egeria-lab description: Egeria lab environment apiVersion: v2 -version: 4.0.0-prerelease.2 +version: 4.0.0-prerelease.5 appVersion: "4.0" icon: https://raw.githubusercontent.com/odpi/egeria/99016e77167fa30dcfade809b061358a92a59973/assets/img/egeria.png keywords: diff --git a/charts/odpi-egeria-lab/templates/egeria-core.yaml b/charts/odpi-egeria-lab/templates/egeria-core.yaml index 54e36e8c..23855177 100644 --- a/charts/odpi-egeria-lab/templates/egeria-core.yaml +++ b/charts/odpi-egeria-lab/templates/egeria-core.yaml @@ -16,6 +16,7 @@ spec: type: {{ .Values.service.type }} ports: - port: 9443 + name: https targetPort: 9443 {{- if ( eq .Values.service.type "NodePort" ) }} nodePort: {{ .Values.service.nodeport.core }} diff --git a/charts/odpi-egeria-lab/templates/egeria-datalake.yaml b/charts/odpi-egeria-lab/templates/egeria-datalake.yaml index d7432d38..fdd21188 100644 --- a/charts/odpi-egeria-lab/templates/egeria-datalake.yaml +++ b/charts/odpi-egeria-lab/templates/egeria-datalake.yaml @@ -16,6 +16,7 @@ spec: type: {{ .Values.service.type }} ports: - port: 9443 + name: https targetPort: 9443 {{- if ( eq .Values.service.type "NodePort" ) }} nodePort: {{ .Values.service.nodeport.datalake }} diff --git a/charts/odpi-egeria-lab/templates/egeria-dev.yaml b/charts/odpi-egeria-lab/templates/egeria-dev.yaml index 9f18940a..fcbb4a94 100644 --- a/charts/odpi-egeria-lab/templates/egeria-dev.yaml +++ b/charts/odpi-egeria-lab/templates/egeria-dev.yaml @@ -99,8 +99,8 @@ spec: name: {{ include "myapp.fullname" . }}-configmap env: {{ if .Values.debug.egeriaJVM }} - - name: JAVA_DEBUG - value: "true" + - name: JAVA_DEBUG + value: "true" {{ end }} - name: "LOADER_PATH" value: "/deployments/server/extralib,/deployments/server/lib" diff --git a/charts/odpi-egeria-lab/templates/egeria-ui.yaml b/charts/odpi-egeria-lab/templates/egeria-ui.yaml index 7bf5f252..eb543093 100644 --- a/charts/odpi-egeria-lab/templates/egeria-ui.yaml +++ b/charts/odpi-egeria-lab/templates/egeria-ui.yaml @@ -17,6 +17,7 @@ spec: type: {{ .Values.service.type }} ports: - port: 8443 + name: https targetPort: 8443 {{- if ( eq .Values.service.type "NodePort" ) }} nodePort: {{ .Values.service.nodeport.ui }} diff --git a/charts/odpi-egeria-lab/templates/env.yaml b/charts/odpi-egeria-lab/templates/env.yaml index b332c69b..dc7eac76 100644 --- a/charts/odpi-egeria-lab/templates/env.yaml +++ b/charts/odpi-egeria-lab/templates/env.yaml @@ -21,5 +21,6 @@ data: {{- end }} SCRIPT_SLEEP_AFTER: "{{ .Values.jupyter.scriptSleepAfter | default '0' }}" SCRIPT_SLEEP_BEFORE: "{{ .Values.jupyter.scriptSleepBefore | default '0' }}" + AB_JOLOKIA_OFF: "true" {{- if .Values.egeria.ssl }} {{- end -}} diff --git a/charts/odpi-egeria-lab/values.yaml b/charts/odpi-egeria-lab/values.yaml index 75819548..3372a82c 100644 --- a/charts/odpi-egeria-lab/values.yaml +++ b/charts/odpi-egeria-lab/values.yaml @@ -45,82 +45,88 @@ egeria: core: #jvmopts: "-Xms500m -Xmx1024m" #jvmopts: "-XX:MinRAMPercentage=10 -XX:MaxRAMPercentage=80" + jvmopts: "-Dmanagement.endpoints.web.exposure.include=*" resources: limits: cpu: 2000m - memory: 2Gi + memory: 1000Mi requests: - cpu: 500m - memory: 2Gi + cpu: 200m + memory: 1000Mi datalake: #jvmopts: "-Xms500m -Xmx1024m" #jvmopts: "-XX:MinRAMPercentage=10 -XX:MaxRAMPercentage=80" + jvmopts: "-Dmanagement.endpoints.web.exposure.include=*" resources: limits: cpu: 2000m - memory: 2Gi + memory: 1000Mi requests: - cpu: 500m - memory: 2Gi + cpu: 200m + memory: 1000Mi dev: #jvmopts: "-Xms500m -Xmx1024m" #jvmopts: "-XX:MinRAMPercentage=40 -XX:MaxRAMPercentage=80" + jvmopts: "-Dmanagement.endpoints.web.exposure.include=*" resources: limits: cpu: 2000m - memory: 2Gi + memory: 1000Mi requests: - cpu: 500m - memory: 2Gi + cpu: 200m + memory: 1000Mi factory: #jvmopts: "-Xms250m -Xmx512m" #jvmopts: "-XX:MinRAMPercentage=40 -XX:MaxRAMPercentage=80" + jvmopts: "-Dmanagement.endpoints.web.exposure.include=*" resources: limits: - cpu: 250m - memory: 1Gi - requests: cpu: 100m - memory: 1Gi + memory: 768Mi + requests: + cpu: 10m + memory: 768Mi ui: #jvmopts: "-Xms512m -Xmx1024m" #jvmopts: "-XX:MinRAMPercentage=40 -XX:MaxRAMPercentage=80" + jvmopts: "-XX:+HeapDumpOnOutOfMemoryError" resources: limits: cpu: 1000m - memory: 1Gi + memory: 500Mi requests: - cpu: 200m - memory: 1Gi + cpu: 50m + memory: 500Mi uistatic: #jvmopts: "-Xms128m -Xmx512m" #jvmopts: "-XX:MinRAMPercentage=40 -XX:MaxRAMPercentage=80" resources: limits: - cpu: 500m - memory: 256Mi - requests: cpu: 100m - memory: 256Mi + memory: 160Mi + requests: + cpu: 10m + memory: 160Mi presentation: #jvmopts: "-Xms250m -Xmx512m" #jvmopts: "-XX:MinRAMPercentage=25 -XX:MaxRAMPercentage=80" + jvmopts: "-XX:+HeapDumpOnOutOfMemoryError" resources: limits: cpu: 1000m memory: 768Mi requests: - cpu: 100m + cpu: 50m memory: 768Mi nginx: resources: limits: - cpu: 500m - memory: 256Mi - requests: cpu: 100m - memory: 256Mi + memory: 160Mi + requests: + cpu: 10m + memory: 160Mi # Additional connectors/libraries to be made available in egeria server chassis containers # This is just an example. You can have a list of connectors @@ -145,10 +151,10 @@ jupyter: resources: limits: cpu: 1000m - memory: 2Gi + memory: 1Gi requests: cpu: 100m - memory: 2Gi + memory: 1Gi # Strimzi is used to setup an operator which will manage the custom resource we define. # These entries are used to define that custom resource @@ -156,7 +162,7 @@ kafka: replicas: 1 resources: limits: - cpu: 2000m + cpu: 1000m memory: 1Gi requests: cpu: 250m