Changeup the args & command to work better

philterd · Dec 9, 2024 · 2c7d39b · 2c7d39b
1 parent 5b46767
commit 2c7d39b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/charts/philter/Chart.yaml b/charts/philter/Chart.yaml
@@ -15,7 +15,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: 0.1.14
+version: 0.1.15
 
 # 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/philter/templates/philter-api/deployment.yaml b/charts/philter/templates/philter-api/deployment.yaml
@@ -46,11 +46,10 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
 
+          {{- with .Values.api.args }}
           args:
-            - "$JAVA_OPTS"
-            {{- with .Values.api.args }}
             {{- toYaml . | nindent 12 }}
-            {{- end }}
+          {{- end }}
 
           {{- with .Values.api.env }}
           env:

diff --git a/charts/philter/templates/philter-ui/deployment.yaml b/charts/philter/templates/philter-ui/deployment.yaml
@@ -43,11 +43,10 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
 
+          {{- with .Values.ui.args }}
           args:
-            - "$JAVA_OPTS"
-            {{- with .Values.ui.args }}
             {{- toYaml . | nindent 12 }}
-            {{- end }}
+          {{- end }}
 
           env:
             - name: PHILTER_ENDPOINT

diff --git a/charts/philter/values.yaml b/charts/philter/values.yaml
@@ -151,8 +151,15 @@ api:
     # runAsNonRoot: true
     # runAsUser: 1000
 
-  command: ["java", "-jar", "/opt/philter/philter.jar"]
-  args: []
+  command:
+    - sh
+    - -c
+
+  args:
+    - java
+    - $JAVA_OPTS
+    - -jar
+    - philter.jar
 
   env: []
 
@@ -236,8 +243,14 @@ ui:
     # runAsNonRoot: true
     # runAsUser: 1000
 
-  command: ["java", "-jar", "/opt/philter/philter-ui.jar"]
-  args: []
+  command:
+    - sh
+    - -c
+
+  args:
+    - java
+    - $JAVA_OPTS
+    - -jar
 
   env: []