[sophora-webclient] javaOptions and extraEnv can now be configured

subshell · Nov 26, 2024 · babadac · babadac
1 parent 12b3ab0
commit babadac
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/charts/sophora-webclient/Chart.yaml b/charts/sophora-webclient/Chart.yaml
@@ -6,7 +6,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.3.0
+version: 1.4.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/sophora-webclient/templates/deployment.yaml b/charts/sophora-webclient/templates/deployment.yaml
@@ -35,6 +35,8 @@ spec:
           image: "{{ .Values.image.name }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
           env:
+          - name: JDK_JAVA_OPTIONS
+            value: {{ .Values.javaOptions }}
           - name: SOPHORA_CLIENT_SERVERCONNECTION_USERNAME
             valueFrom:
               secretKeyRef:
@@ -49,6 +51,9 @@ spec:
             value: {{ .Values.ingress.host | quote }}
           - name: SOPHORA_CLIENT_HTTPS_PORT
             value: "443"
+          {{- if .Values.extraEnv -}}
+          {{- toYaml .Values.extraEnv | nindent 10 }}
+          {{- end }}
           ports:
             - containerPort: 8080
               name: http

diff --git a/charts/sophora-webclient/test-values.yaml b/charts/sophora-webclient/test-values.yaml
@@ -19,6 +19,12 @@ webclient:
     a:
       b: test2
 
+extraEnv:
+  - name: FOO
+    value: bar
+  - name: EXTRA_ENV
+    value: extra-spicy-value
+
 extraDeploy:
   - |
     apiVersion: keda.sh/v1alpha1

diff --git a/charts/sophora-webclient/values.yaml b/charts/sophora-webclient/values.yaml
@@ -12,6 +12,8 @@ hostAliases:
 
 imagePullSecrets: []
 
+javaOptions: "-XX:InitialRAMPercentage=50.0 -XX:MaxRAMPercentage=80.0 -XX:+ExitOnOutOfMemoryError -XX:+PerfDisableSharedMem"
+
 podAnnotations: {}
 
 sophora:
@@ -53,6 +55,8 @@ service:
 
 extraDeploy: []
 
+extraEnv:
+
 serviceMonitor:
   enabled: false
   interval: 10s