Merge pull request #238 from planetf1/resources

odpi · Mar 15, 2023 · df08a78 · df08a78
2 parents 5e11f6f + cf1ec04
commit df08a78
Show file tree

Hide file tree

Showing 12 changed files with 151 additions and 17 deletions.
diff --git a/charts/odpi-egeria-lab/Chart.yaml b/charts/odpi-egeria-lab/Chart.yaml
@@ -4,8 +4,8 @@
 name: odpi-egeria-lab
 description: Egeria lab environment
 apiVersion: v2
-version: 3.15.0
-appVersion: "3.15"
+version: 4.0.0-prerelease.0
+appVersion: "4.0"
 icon: https://raw.githubusercontent.com/odpi/egeria/99016e77167fa30dcfade809b061358a92a59973/assets/img/egeria.png
 keywords:
   - odpi, egeria, lab, jupyter, notebook
@@ -19,6 +19,6 @@ maintainers:
     email: [email protected]
 dependencies:
   - name: strimzi-kafka-operator
-    version: 0.33.0
+    version: 0.33.2
     repository: https://strimzi.io/charts/
     condition: strimzi.enabled
diff --git a/charts/odpi-egeria-lab/templates/egeria-core.yaml b/charts/odpi-egeria-lab/templates/egeria-core.yaml
@@ -102,6 +102,10 @@ spec:
             {{ end }}
             - name: "LOADER_PATH"
               value: "/deployments/server/extralib,/deployments/server/lib"
+            - name: JAVA_OPTS_APPEND
+              value: {{ .Values.egeria.core.jvmopts | quote }}
+            - name: JAVA_MAX_MEM_RATIO
+              value: "80"
           ports:
             - containerPort: 9443
           {{ if .Values.debug.egeriaJVM }}
@@ -113,7 +117,7 @@ spec:
             initialDelaySeconds: 10
             periodSeconds: 10
             failureThreshold: 6
-          resources: {}
+          resources: {{ toYaml .Values.egeria.core.resources | nindent 12 }}
           volumeMounts:
           {{ if .Values.persistence.enabled }}
             - mountPath: "/deployments/data"

diff --git a/charts/odpi-egeria-lab/templates/egeria-datalake.yaml b/charts/odpi-egeria-lab/templates/egeria-datalake.yaml
@@ -102,6 +102,8 @@ spec:
             {{ end }}
             - name: "LOADER_PATH"
               value: "/deployments/server/extralib,/deployments/server/lib"
+            - name: JAVA_OPTS_APPEND
+              value: {{ .Values.egeria.datalake.jvmopts | quote }}
           ports:
             - containerPort: 9443
           {{ if .Values.debug.egeriaJVM }}
@@ -113,7 +115,7 @@ spec:
             initialDelaySeconds: 10
             periodSeconds: 10
             failureThreshold: 6
-          resources: {}
+          resources: {{ toYaml .Values.egeria.datalake.resources | nindent 12 }}
           volumeMounts:
           {{ if .Values.persistence.enabled }}
             - mountPath: "/deployments/data"

diff --git a/charts/odpi-egeria-lab/templates/egeria-dev.yaml b/charts/odpi-egeria-lab/templates/egeria-dev.yaml
@@ -104,6 +104,8 @@ spec:
             {{ end }}
             - name: "LOADER_PATH"
               value: "/deployments/server/extralib,/deployments/server/lib"
+            - name: JAVA_OPTS_APPEND
+              value: {{ .Values.egeria.dev.jvmopts | quote }}
           ports:
             - containerPort: 9443
             {{ if .Values.debug.egeriaJVM }}
@@ -115,7 +117,7 @@ spec:
             initialDelaySeconds: 10
             periodSeconds: 10
             failureThreshold: 6
-          resources: {}
+          resources: {{ toYaml .Values.egeria.dev.resources | nindent 12 }}
           volumeMounts:
           {{ if .Values.persistence.enabled }}
             - mountPath: "/deployments/data"

diff --git a/charts/odpi-egeria-lab/templates/egeria-factory.yaml b/charts/odpi-egeria-lab/templates/egeria-factory.yaml
@@ -103,6 +103,8 @@ spec:
             {{ end }}
             - name: "LOADER_PATH"
               value: "/deployments/server/extralib,/deployments/server/lib"
+            - name: JAVA_OPTS_APPEND
+              value: {{ .Values.egeria.factory.jvmopts | quote }}
           ports:
             - containerPort: 9443
             {{ if .Values.debug.egeriaJVM }}
@@ -114,7 +116,7 @@ spec:
             initialDelaySeconds: 10
             periodSeconds: 10
             failureThreshold: 6
-          resources: {}
+          resources: {{ toYaml .Values.egeria.factory.resources | nindent 12 }}
           volumeMounts:
           {{ if .Values.persistence.enabled }}
             - mountPath: "/deployments/data"

diff --git a/charts/odpi-egeria-lab/templates/egeria-nginx.yaml b/charts/odpi-egeria-lab/templates/egeria-nginx.yaml
@@ -108,14 +108,16 @@ spec:
             initialDelaySeconds: 10
             periodSeconds: 10
             failureThreshold: 6
-          resources: {}
+          resources: {{ toYaml .Values.nginx.resources | nindent 12 }}
           env:
             - name: UI_STATIC
               value: http://{{ .Release.Name }}-uistatic:8080
             - name: UI_API
               value: https://{{ .Release.Name }}-ui:8443
             - name: NGINX_SERVER_NAME
               value: {{ .Release.Name}}-nginx
+            - name: JAVA_OPTS_APPEND
+              value: {{ .Values.nginx.jvmopts | quote }}
           volumeMounts:
             - name: template-vol
               mountPath: /etc/nginx/templates

diff --git a/charts/odpi-egeria-lab/templates/egeria-presentation.yaml b/charts/odpi-egeria-lab/templates/egeria-presentation.yaml
@@ -70,12 +70,14 @@ spec:
             initialDelaySeconds: 10
             periodSeconds: 10
             failureThreshold: 6
-          resources: {}
+          resources: {{ toYaml .Values.egeria.presentation.resources | nindent 12 }}
           env:
             - name: EGERIA_PRESENTATIONSERVER_SERVER_coco
               value: "{\"remoteServerName\":\"cocoView1\",\"remoteURL\":\"https://{{ .Release.Name }}-datalake:9443\"}"
             - name: EGERIA_PRESENTATIONSERVER_REJECTUNAUTHORIZED_FOR_OMAG
               value: "false"
+            - name: JAVA_OPTS_APPEND
+              value: {{ .Values.egeria.presentation.jvmopts | quote }}
       restartPolicy: Always
 
 ...
diff --git a/charts/odpi-egeria-lab/templates/egeria-ui.yaml b/charts/odpi-egeria-lab/templates/egeria-ui.yaml
@@ -82,7 +82,7 @@ spec:
             initialDelaySeconds: 10
             periodSeconds: 10
             failureThreshold: 6
-          resources: {}
+          resources: {{ toYaml .Values.egeria.ui.resources | nindent 12 }}
           env:
             - name: "OMAS_SERVER_NAME"
               value: "cocoMDS1"
@@ -100,6 +100,8 @@ spec:
             {{ end }}
             - name: "JAVA_APP_JAR"
               value: "user-interface/ui-chassis-spring-{{ .Values.egeria.version}}.jar"
+            - name: JAVA_OPTS_APPEND
+              value: {{ .Values.egeria.ui.jvmopts | quote }}
       restartPolicy: Always
 
 ...

diff --git a/charts/odpi-egeria-lab/templates/egeria-uistatic.yaml b/charts/odpi-egeria-lab/templates/egeria-uistatic.yaml
@@ -104,10 +104,13 @@ spec:
             initialDelaySeconds: 10
             periodSeconds: 10
             failureThreshold: 6
-          resources: {}
+          resources: {{ toYaml .Values.egeria.uistatic.resources | nindent 12 }}
           #env:
           #  - name: EGERIA_PRESENTATIONSERVER_SERVER_coco
           #    value: "{\"remoteServerName\":\"cocoView1\",\"remoteURL\":\"https://{{ .Release.Name }}-datalake:9443\"}"
+          env:
+            - name: JAVA_OPTS_APPEND
+              value: {{ .Values.egeria.uistatic.jvmopts | quote }}
           volumeMounts:
             - name: template-vol
               mountPath: /etc/nginx/templates

diff --git a/charts/odpi-egeria-lab/templates/jupyter.yaml b/charts/odpi-egeria-lab/templates/jupyter.yaml
@@ -122,7 +122,7 @@ spec:
               mountPath: "/usr/local/bin/before-notebook.d"
             #- name: ssl-vol
             #  mountPath: "/home/jovyan/ssl"
-          resources: {}
+          resources: {{ toYaml .Values.jupyter.resources | nindent 12 }}
       volumes:
         - name: notebook-scripts-vol
           configMap:

diff --git a/charts/odpi-egeria-lab/templates/kafka-cluster.yaml b/charts/odpi-egeria-lab/templates/kafka-cluster.yaml
@@ -7,8 +7,8 @@ metadata:
   name: {{ .Release.Name }}-strimzi
 spec:
   kafka:
-    version: 3.3.2
-    replicas: 1
+    version: 3.4.0
+    replicas: {{ .Values.kafka.replicas }}
     listeners:
       - name: plain
         port: 9092
@@ -32,12 +32,14 @@ spec:
           type: persistent-claim
           size: 5Gi
           deleteClaim: true
+    resources: {{ .Values.kafka.resources | toYaml | nindent 6 }}}
   zookeeper:
-    replicas: 1
+    replicas: {{ .Values.zookeeper.replicas }}
     storage:
       type: persistent-claim
       size: 1Gi
       deleteClaim: true
+    resources: {{ .Values.zookeeper.resources | toYaml | nindent 6 }}}
   entityOperator:
     topicOperator:
       reconciliationIntervalSeconds: 20

diff --git a/charts/odpi-egeria-lab/values.yaml b/charts/odpi-egeria-lab/values.yaml
@@ -31,13 +31,97 @@ service:
 egeria:
   #logging: OFF
   development: true
-  version: "3.15"
+  version: "4.0-SNAPSHOT"
   #repositoryType: "local-graph-repository"
   repositoryType: "in-memory-repository"
   # See https://github.com/odpi/egeria-charts/issues/56 for status of the Egeria UI (polymer) in this environment
   # Set to 'true' to deploy the Egeria UI, but note the configuration may not work properly
   egeriaui: true
 
+  # Container specific -- including fine grained control of memory limits
+  # Note that by default 'jvmopts' is not set as this will be set automatically when using the Egeria base container, based off the memory limits
+  # This is done by JAVA_MAX_MEM_RATIO=80 in the templates
+  # Best practice is to not overcommit, especially memory, so limits-requests set same. In some cases the request can be set lower
+  core:
+    #jvmopts: "-Xms500m -Xmx1024m"
+    #jvmopts: "-XX:MinRAMPercentage=10 -XX:MaxRAMPercentage=80"
+    resources:
+      limits:
+        cpu: 2000m
+        memory: 2Gi
+      requests:
+        cpu: 2000m
+        memory: 1Gi
+  datalake:
+    #jvmopts: "-Xms500m -Xmx1024m"
+    #jvmopts: "-XX:MinRAMPercentage=10 -XX:MaxRAMPercentage=80"
+    resources:
+      limits:
+        cpu: 2000m
+        memory: 2Gi
+      requests:
+        cpu: 250m
+        memory: 2Gi
+  dev:
+    #jvmopts: "-Xms500m -Xmx1024m"
+    #jvmopts: "-XX:MinRAMPercentage=40 -XX:MaxRAMPercentage=80"
+    resources:
+      limits:
+        cpu: 1000m
+        memory: 1Gi
+      requests:
+        cpu: 500m
+        memory: 1Gi
+  factory:
+    #jvmopts: "-Xms250m -Xmx512m"
+    #jvmopts: "-XX:MinRAMPercentage=40 -XX:MaxRAMPercentage=80"
+    resources:
+      limits:
+        cpu: 250m
+        memory: 1Gi
+      requests:
+        cpu: 100m
+        memory: 1Gi
+  ui:
+    #jvmopts: "-Xms512m -Xmx1024m"
+    #jvmopts: "-XX:MinRAMPercentage=40 -XX:MaxRAMPercentage=80"
+    resources:
+      limits:
+        cpu: 1000m
+        memory: 1Gi
+      requests:
+        cpu: 200m
+        memory: 1Gi
+  uistatic:
+    #jvmopts: "-Xms128m -Xmx512m"
+    #jvmopts: "-XX:MinRAMPercentage=40 -XX:MaxRAMPercentage=80"
+    resources:
+      limits:
+        cpu: 500m
+        memory: 256Mi
+      requests:
+        cpu: 100m
+        memory: 256Mi
+  presentation:
+    #jvmopts: "-Xms250m -Xmx512m"
+    #jvmopts: "-XX:MinRAMPercentage=25 -XX:MaxRAMPercentage=80"
+    resources:
+      limits:
+        cpu: 1000m
+        memory: 768Mi
+      requests:
+        cpu: 100m
+        memory: 768Mi
+
+nginx:
+  resources:
+    limits:
+      cpu: 500m
+      memory: 256Mi
+    requests:
+      cpu: 100m
+      memory: 256Mi
+
 # Additional connectors/libraries to be made available in egeria server chassis containers
 # This is just an example. You can have a list of connectors
 #extralibs:
@@ -57,8 +141,35 @@ jupyter:
   # tokenPlain:
   # ----
   # Git tag to checkout in the egeria-jupyter repo
-  gitTagForNotebooks: "v315"
+  gitTagForNotebooks: "main"
+  resources:
+    limits:
+      cpu: 1000m
+      memory: 2Gi
+    requests:
+      cpu: 100m
+      memory: 2Gi
 
+# Strimzi is used to setup an operator which will manage the custom resource we define.
+# These entries are used to define that custom resource
+kafka:
+  replicas: 1
+  resources:
+    limits:
+      cpu: 2000m
+      memory: 1Gi
+    requests:
+      cpu: 250m
+      memory: 1Gi
+zookeeper:
+  replicas: 1
+  resources:
+    limits:
+      cpu: 500m
+      memory: 750Mi
+    requests:
+      cpu: 100m
+      memory: 750Mi
 debug:
   egeriaJVM: false
 
@@ -137,3 +248,5 @@ persistence:
 # installed on the cluster by an admin, or a prior install
 strimzi:
   enabled: true
+
+